3.0.14

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "3.0.11",
+  "version": "3.0.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/webrequest",
-      "version": "3.0.11",
+      "version": "3.0.14",
       "license": "MIT",
       "dependencies": {
         "@adobe/helix-fetch": "^3.1.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "3.0.11",
+  "version": "3.0.14",
   "private": false,
   "description": "securely request from browsers",
   "main": "dist_ts/index.js",
@@ -21,7 +21,7 @@
     "@types/node": "^18.6.4"
   },
   "dependencies": {
-    "@adobe/helix-fetch": "^3.1.1",
+    "@adobe/fetch": "^4.0.1",
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartenv": "^5.0.2",
     "@pushrocks/smartjson": "^5.0.1",

test/test.browser.ts

@@ -2,15 +2,11 @@ import { expect, tap } from '@pushrocks/tapbundle';
 import * as webrequest from '../ts/index.js';
 
 tap.test('should run multiendpoint request', async (tools) => {
-  const done = tools.defer();
   const response = await new webrequest.WebRequest()
-    .requestMultiEndpoint(['https://lossless.com'], {
+    .request('https://api.signup.software', {
       method: 'GET',
     })
-    .catch((e) => {
+  console.log(JSON.stringify(await response.text()));
-      done.resolve();
-    });
-  await done.promise;
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/webrequest',
-  version: '3.0.11',
+  version: '3.0.14',
   description: 'securely request from browsers'
 }

ts/index.ts

@@ -12,8 +12,14 @@ export class WebRequest {
   private static neededPolyfillsLoadedDeferred = plugins.smartpromise.defer<{
     fetch: typeof fetch,
     Response: typeof Response,
-    AbortController: typeof AbortController
+    AbortController?: typeof AbortController,
+    helixTimeout?: any,
   }>();
+
+  /**
+   * loads the needed polyfill
+   * @returns
+   */
   public static async loadNeededPolyfills() {
     if (this.polyfillStatusEvaluated) {
       return this.neededPolyfillsLoadedDeferred.promise;
@@ -21,16 +27,20 @@ export class WebRequest {
     this.polyfillStatusEvaluated = true;
     const smartenv = new plugins.smartenv.Smartenv();
     if (!smartenv.isBrowser) {
+      console.log('webrequest using node context.');
       this.polyfillStatusEvaluated = true;
       const fetchMod = await smartenv.getSafeNodeModule('@adobe/helix-fetch');
       this.neededPolyfillsLoadedDeferred.resolve({
         fetch: fetchMod.fetch,
         Response: fetchMod.Response,
-        AbortController: fetchMod.AbortSignal
+        helixTimeout: fetchMod.timeoutSignal,
       });
     } else {
+      console.log('webrequest using browser context.');
       this.neededPolyfillsLoadedDeferred.resolve({
-        fetch: globalThis.fetch,
+        fetch: (...args) => {
+          return fetch(...args);
+        },
         Response: globalThis.Response,
         AbortController: globalThis.AbortController
       });
@@ -69,8 +79,11 @@ export class WebRequest {
   public async postJson(urlArg: string, requestBody?: any, useCacheArg: boolean = false) {
     await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
-      body: plugins.smartjson.stringify(requestBody),
       method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: plugins.smartjson.stringify(requestBody),
       useCache: useCacheArg,
     });
     const responseText = await response.text();
@@ -84,8 +97,11 @@ export class WebRequest {
   public async putJson(urlArg: string, requestBody?: any, useStoreAsFallback: boolean = false) {
     await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
-      body: plugins.smartjson.stringify(requestBody),
       method: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: plugins.smartjson.stringify(requestBody),
     });
     const responseText = await response.text();
     const responseResult = plugins.smartjson.parse(responseText);
@@ -98,6 +114,9 @@ export class WebRequest {
   public async deleteJson(urlArg: string, useStoreAsFallback: boolean = false) {
     await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
+      headers: {
+        'Content-Type': 'application/json',
+      },
       method: 'GET',
     });
     const responseText = await response.text();
@@ -115,12 +134,25 @@ export class WebRequest {
       timeoutMs?: number;
     }
   ) {
+    optionsArg = {
+      timeoutMs: 60000,
+      useCache: false,
+      ...optionsArg,
+    };
+    
     const fetchObject = await WebRequest.neededPolyfillsLoadedDeferred.promise;
-    const controller = new fetchObject.AbortController();
+    let controller: AbortController;
     if (optionsArg.timeoutMs) {
+      if (fetchObject.AbortController) {
+        controller = new fetchObject.AbortController();
         plugins.smartdelay.delayFor(optionsArg.timeoutMs).then(() => {
           controller.abort();
         });
+      } else {
+        controller = {
+          signal: fetchObject.helixTimeout(optionsArg.timeoutMs)
+        } as any;
+      }
     }
     let cachedResponseDeferred = plugins.smartpromise.defer<Response>();
     let cacheUsed = false;
@@ -131,10 +163,9 @@ export class WebRequest {
       cachedResponseDeferred.resolve(null);
     }
     let response: Response = await fetchObject.fetch(urlArg, {
-      signal: controller.signal,
+      signal: controller ? controller.signal : null,
       method: optionsArg.method,
       headers: {
-        'Content-Type': 'application/json',
         ...(optionsArg.headers || {}),
       },
       body: optionsArg.body,