3.0.11

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "3.0.6",
+  "version": "3.0.11",
   "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/tsbundle": "^2.0.4",
-    "@gitzone/tstest": "^1.0.71",
-    "@pushrocks/smartexpress": "^4.0.5",
-    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^17.0.36",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsbundle": "^2.0.7",
+    "@gitzone/tstest": "^1.0.73",
+    "@pushrocks/smartexpress": "^4.0.21",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.6.4"
   },
   "dependencies": {
+    "@adobe/helix-fetch": "^3.1.1",
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartenv": "^5.0.2",
-    "@pushrocks/smartjson": "^4.0.6",
+    "@pushrocks/smartjson": "^5.0.1",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/webstore": "^2.0.3",
-    "node-fetch": "^3.2.4"
+    "@pushrocks/webstore": "^2.0.5"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

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

ts/index.ts

@@ -1,11 +1,19 @@
 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
+  }>();
   public static async loadNeededPolyfills() {
     if (this.polyfillStatusEvaluated) {
       return this.neededPolyfillsLoadedDeferred.promise;
@@ -14,11 +22,19 @@ export class WebRequest {
     const smartenv = new plugins.smartenv.Smartenv();
     if (!smartenv.isBrowser) {
       this.polyfillStatusEvaluated = true;
-      const fetchMod = await smartenv.getSafeNodeModule('node-fetch');
-      globalThis.Response = fetchMod.Response;
-      globalThis.fetch = fetchMod.default;
+      const fetchMod = await smartenv.getSafeNodeModule('@adobe/helix-fetch');
+      this.neededPolyfillsLoadedDeferred.resolve({
+        fetch: fetchMod.fetch,
+        Response: fetchMod.Response,
+        AbortController: fetchMod.AbortSignal
+      });
+    } else {
+      this.neededPolyfillsLoadedDeferred.resolve({
+        fetch: globalThis.fetch,
+        Response: globalThis.Response,
+        AbortController: globalThis.AbortController
+      });
     }
-    this.neededPolyfillsLoadedDeferred.resolve();
   }
 
   public cacheStore = new plugins.webstore.WebStore({
@@ -26,7 +42,13 @@ export class WebRequest {
     storeName: 'webrequest',
   });
 
-  constructor() {
+  public options: IWebrequestContructorOptions;
+
+  constructor(public optionsArg: IWebrequestContructorOptions = {}) {
+    this.options = {
+      logging: true,
+      ...optionsArg
+    }
     WebRequest.loadNeededPolyfills();
   }
 
@@ -49,7 +71,7 @@ export class WebRequest {
     const response: Response = await this.request(urlArg, {
       body: plugins.smartjson.stringify(requestBody),
       method: 'POST',
-      useCache: useCacheArg
+      useCache: useCacheArg,
     });
     const responseText = await response.text();
     const responseResult = plugins.smartjson.parse(responseText);
@@ -93,8 +115,8 @@ export class WebRequest {
       timeoutMs?: number;
     }
   ) {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
-    const controller = new AbortController();
+    const fetchObject = await WebRequest.neededPolyfillsLoadedDeferred.promise;
+    const controller = new fetchObject.AbortController();
     if (optionsArg.timeoutMs) {
       plugins.smartdelay.delayFor(optionsArg.timeoutMs).then(() => {
         controller.abort();
@@ -102,13 +124,13 @@ export class WebRequest {
     }
     let cachedResponseDeferred = plugins.smartpromise.defer<Response>();
     let cacheUsed = false;
-    if (optionsArg.useCache && this.cacheStore.check(urlArg)) {
-      const responseBuffer: ArrayBuffer = await this.cacheStore.get(urlArg)
+    if (optionsArg.useCache && await this.cacheStore.check(urlArg)) {
+      const responseBuffer: ArrayBuffer = await this.cacheStore.get(urlArg);
       cachedResponseDeferred.resolve(new Response(responseBuffer, {}));
     } else {
       cachedResponseDeferred.resolve(null);
     }
-    const response: Response = await fetch(urlArg, {
+    let response: Response = await fetchObject.fetch(urlArg, {
       signal: controller.signal,
       method: optionsArg.method,
       headers: {
@@ -116,8 +138,8 @@ export class WebRequest {
         ...(optionsArg.headers || {}),
       },
       body: optionsArg.body,
-    }).catch(async err => {
-      if (optionsArg.useCache && await cachedResponseDeferred.promise) {
+    }).catch(async (err) => {
+      if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
         cacheUsed = true;
         const cachedResponse = cachedResponseDeferred.promise;
         return cachedResponse;
@@ -125,11 +147,15 @@ export class WebRequest {
         return err;
       }
     });
+    if (optionsArg.useCache && (await cachedResponseDeferred.promise) && response.status === 500) {
+      cacheUsed = true;
+      response = await cachedResponseDeferred.promise;
+    }
     if (!cacheUsed && optionsArg.useCache && response.status < 300) {
       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;
   }
 
@@ -181,7 +207,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: {
@@ -190,7 +216,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;
@@ -206,4 +232,10 @@ export class WebRequest {
     const finalResponse: Response = await doRequest(allUrls[usedUrlIndex]);
     return finalResponse;
   }
+
+  public log(logArg: string) {
+    if (this.options.logging) {
+      console.log(logArg);
+    }
+  }
 }

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}