3.0.14

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "3.0.8",
+  "version": "3.0.14",
   "private": false,
   "description": "securely request from browsers",
   "main": "dist_ts/index.js",
@@ -13,22 +13,20 @@
     "build": "(tsbuild --web --allowimplicitany && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tsbundle": "^2.0.6",
+    "@gitzone/tsbundle": "^2.0.7",
-    "@gitzone/tstest": "^1.0.72",
+    "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/smartexpress": "^4.0.5",
+    "@pushrocks/smartexpress": "^4.0.21",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.1",
+    "@types/node": "^18.6.4"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
+    "@adobe/fetch": "^4.0.1",
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartenv": "^5.0.2",
     "@pushrocks/smartjson": "^5.0.1",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/webstore": "^2.0.4",
+    "@pushrocks/webstore": "^2.0.5"
-    "node-fetch": "^3.2.9"
   },
   "files": [
     "ts/**/*",

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.8',
+  version: '3.0.14',
   description: 'securely request from browsers'
 }

ts/index.ts

@@ -1,11 +1,25 @@
 import * as plugins from './webrequest.plugins.js';
 
+export interface IWebrequestContructorOptions {
+  logging?: boolean;
+}
+
 /**
  * web request
  */
 export class WebRequest {
   private static polyfillStatusEvaluated = false;
-  private static neededPolyfillsLoadedDeferred = plugins.smartpromise.defer();
+  private static neededPolyfillsLoadedDeferred = plugins.smartpromise.defer<{
+    fetch: typeof fetch,
+    Response: typeof Response,
+    AbortController?: typeof AbortController,
+    helixTimeout?: any,
+  }>();
+
+  /**
+   * loads the needed polyfill
+   * @returns
+   */
   public static async loadNeededPolyfills() {
     if (this.polyfillStatusEvaluated) {
       return this.neededPolyfillsLoadedDeferred.promise;
@@ -13,12 +27,24 @@ 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('node-fetch');
+      const fetchMod = await smartenv.getSafeNodeModule('@adobe/helix-fetch');
-      globalThis.Response = fetchMod.Response;
+      this.neededPolyfillsLoadedDeferred.resolve({
-      globalThis.fetch = fetchMod.default;
+        fetch: fetchMod.fetch,
+        Response: fetchMod.Response,
+        helixTimeout: fetchMod.timeoutSignal,
+      });
+    } else {
+      console.log('webrequest using browser context.');
+      this.neededPolyfillsLoadedDeferred.resolve({
+        fetch: (...args) => {
+          return fetch(...args);
+        },
+        Response: globalThis.Response,
+        AbortController: globalThis.AbortController
+      });
     }
-    this.neededPolyfillsLoadedDeferred.resolve();
   }
 
   public cacheStore = new plugins.webstore.WebStore({
@@ -26,7 +52,13 @@ export class WebRequest {
     storeName: 'webrequest',
   });
 
-  constructor() {
+  public options: IWebrequestContructorOptions;
+
+  constructor(public optionsArg: IWebrequestContructorOptions = {}) {
+    this.options = {
+      logging: true,
+      ...optionsArg
+    }
     WebRequest.loadNeededPolyfills();
   }
 
@@ -47,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();
@@ -62,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);
@@ -76,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();
@@ -93,12 +134,25 @@ export class WebRequest {
       timeoutMs?: number;
     }
   ) {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
+    optionsArg = {
-    const controller = new AbortController();
+      timeoutMs: 60000,
+      useCache: false,
+      ...optionsArg,
+    };
+    
+    const fetchObject = await WebRequest.neededPolyfillsLoadedDeferred.promise;
+    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;
@@ -108,11 +162,10 @@ export class WebRequest {
     } else {
       cachedResponseDeferred.resolve(null);
     }
-    let response: Response = await fetch(urlArg, {
+    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,
@@ -133,7 +186,7 @@ export class WebRequest {
       const buffer = await response.clone().arrayBuffer();
       await this.cacheStore.set(urlArg, buffer);
     }
-    console.log(`${urlArg} answers with status: ${response.status}`);
+    this.log(`${urlArg} answers with status: ${response.status}`);
     return response;
   }
 
@@ -185,7 +238,7 @@ export class WebRequest {
       if (!urlToUse) {
         throw new Error('request failed permanently');
       }
-      console.log(`Getting ${urlToUse} with method ${optionsArg.method}`);
+      this.log(`Getting ${urlToUse} with method ${optionsArg.method}`);
       const response = await fetch(urlToUse, {
         method: optionsArg.method,
         headers: {
@@ -194,7 +247,7 @@ export class WebRequest {
         },
         body: optionsArg.body,
       });
-      console.log(`${urlToUse} answers with status: ${response.status}`);
+      this.log(`${urlToUse} answers with status: ${response.status}`);
 
       if (response.status >= 200 && response.status < 300) {
         return response;
@@ -210,4 +263,10 @@ export class WebRequest {
     const finalResponse: Response = await doRequest(allUrls[usedUrlIndex]);
     return finalResponse;
   }
+
+  public log(logArg: string) {
+    if (this.options.logging) {
+      console.log(logArg);
+    }
+  }
 }