3.0.28

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @gitzone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -3,36 +3,47 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
+
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-  - npmci git mirror
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+  allow_failure: true
 
-snyk:
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm install -g snyk
+    - npmci command pnpm audit --audit-level=high --dev
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -41,37 +52,34 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci node install stable
-  - npmci node install stable
+    - npmci npm install
-  - npmci npm install
+    - npmci npm test
-  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci node install stable
-  - npmci node install stable
+    - npmci npm install
-  - npmci npm install
+    - npmci npm build
-  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -79,35 +87,36 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
+    - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -115,5 +124,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -4,11 +4,12 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "webrequest",
-      "shortDescription": "securely request from browsers",
+      "description": "securely request from browsers",
       "npmPackagename": "@pushrocks/webrequest",
       "license": "MIT"
     }

package.json

@@ -1,39 +1,48 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "2.0.2",
+  "version": "3.0.28",
   "private": false,
   "description": "securely request from browsers",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)",
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)",
-    "format": "(gitzone format)"
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tsbundle": "^2.0.8",
-    "@pushrocks/smartexpress": "^3.0.40",
+    "@gitzone/tsrun": "^1.2.42",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@gitzone/tstest": "^1.0.73",
-    "@types/node": "^12.7.8",
+    "@pushrocks/tapbundle": "^5.0.8",
-    "node-fetch": "^2.6.0",
+    "@types/node": "^20.3.3"
-    "tslint": "^5.20.0",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.3"
+    "@adobe/fetch": "^4.0.13",
+    "@apiglobal/typedserver": "^2.0.65",
+    "@pushrocks/smartdelay": "^3.0.1",
+    "@pushrocks/smartenv": "^5.0.2",
+    "@pushrocks/smartjson": "^5.0.6",
+    "@pushrocks/smartpromise": "^4.0.2",
+    "@pushrocks/webstore": "^2.0.8"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "dist_ts_web/*",
+    "dist_ts/**/*",
-    "assets/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,19 +8,30 @@ securely request from browsers
 * [docs (typedoc)](https://pushrocks.gitlab.io/webrequest/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/webrequest/badges/master/build.svg)](https://gitlab.com/pushrocks/webrequest/commits/master)
+
-[![coverage report](https://gitlab.com/pushrocks/webrequest/badges/master/coverage.svg)](https://gitlab.com/pushrocks/webrequest/commits/master)
+Status Category | Status Badge
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/webrequest.svg)](https://www.npmjs.com/package/@pushrocks/webrequest)
+-- | --
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/webrequest/badge.svg)](https://snyk.io/test/npm/@pushrocks/webrequest)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/webrequest/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/webrequest/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/webrequest)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/webrequest)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/webrequest)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/webrequest)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/webrequest)](https://lossless.cloud)
 
 ## Usage
 
+Use TypeScript for best in class intellisense.
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
 | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
-
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.browser.ts

@@ -0,0 +1,11 @@
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as webrequest from '../ts/index.js';
+
+tap.test('should run multiendpoint request', async (tools) => {
+  const response = await new webrequest.WebRequest().request('https://api.signup.software', {
+    method: 'GET',
+  });
+  console.log(JSON.stringify(await response.text()));
+});
+
+tap.start();

test/test.ts

@@ -1,31 +1,21 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as webrequest from '../ts/index';
+import * as webrequest from '../ts/index.js';
-import * as fetch from 'node-fetch';
-
-declare global {
-  namespace NodeJS {
-    interface Global {
-      fetch: any;
-    }
-  }
-}
-global.fetch = fetch;
 
 // test dependencies
-import * as smartexpress from '@pushrocks/smartexpress';
+import * as typedserver from '@apiglobal/typedserver';
 
-let testServer: smartexpress.Server;
+let testServer: typedserver.servertools.Server;
 
 tap.test('setup test server', async () => {
-  testServer = new smartexpress.Server({
+  testServer = new typedserver.servertools.Server({
     cors: false,
     forceSsl: false,
-    port: 2345
+    port: 2345,
   });
 
   testServer.addRoute(
     '/apiroute1',
-    new smartexpress.Handler('GET', (req, res) => {
+    new typedserver.servertools.Handler('GET', (req, res) => {
       res.status(429);
       res.end();
     })
@@ -33,7 +23,7 @@ tap.test('setup test server', async () => {
 
   testServer.addRoute(
     '/apiroute2',
-    new smartexpress.Handler('GET', (req, res) => {
+    new typedserver.servertools.Handler('GET', (req, res) => {
       res.status(500);
       res.end();
     })
@@ -41,10 +31,10 @@ tap.test('setup test server', async () => {
 
   testServer.addRoute(
     '/apiroute3',
-    new smartexpress.Handler('GET', (req, res) => {
+    new typedserver.servertools.Handler('GET', (req, res) => {
       res.status(200);
       res.send({
-        hithere: 'hi'
+        hithere: 'hi',
       });
     })
   );
@@ -52,23 +42,37 @@ tap.test('setup test server', async () => {
   await testServer.start();
 });
 
-tap.test('first test', async tools => {
+tap.test('first test', async (tools) => {
-  const response = await new webrequest.WebRequest().getJson([
+  const response = await (
-    'http://localhost:2345/apiroute1',
+    await new webrequest.WebRequest().requestMultiEndpoint(
-    'http://localhost:2345/apiroute2',
+      [
-    'http://localhost:2345/apiroute4',
+        'http://localhost:2345/apiroute1',
-    'http://localhost:2345/apiroute3'
+        'http://localhost:2345/apiroute2',
-  ]);
+        'http://localhost:2345/apiroute4',
+        'http://localhost:2345/apiroute3',
+      ],
+      {
+        method: 'GET',
+      }
+    )
+  ).json();
 
-  console.log(response);
+  const response2 = await new webrequest.WebRequest().getJson('http://localhost:2345/apiroute3');
 
-  expect(response)
+  console.log('response 1: ' + JSON.stringify(response));
-    .property('hithere')
+  console.log('response 2: ' + JSON.stringify(response2));
-    .to.equal('hi');
+
+  expect(response).toHaveProperty('hithere'); //.to.equal('hi');
+  expect(response2).toHaveProperty('hithere'); //.to.equal('hi');
 });
 
-tap.test('tear down server', async () => {
+tap.test('should cache response', async () => {
-  testServer.stop();
+  const webrequestInstance = new webrequest.WebRequest();
+  const response = await webrequestInstance.getJson('http://localhost:2345/apiroute3', true);
+  expect(response).toHaveProperty('hithere');
+  await testServer.stop();
+  const response2 = await webrequestInstance.getJson('http://localhost:2345/apiroute3', true);
+  expect(response2).toHaveProperty('hithere');
 });
 
 tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/webrequest',
+  version: '3.0.28',
+  description: 'securely request from browsers'
+}

ts/index.ts

@@ -1,58 +1,207 @@
-import * as plugins from './webrequest.plugins';
+import * as plugins from './webrequest.plugins.js';
+
+export interface IWebrequestContructorOptions {
+  logging?: boolean;
+}
 
 /**
  * web request
  */
 export class WebRequest {
-  public async getJson(urlArg: string | string[]) {
+  private static polyfillStatusEvaluated = false;
+  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;
+    }
+    this.polyfillStatusEvaluated = true;
+    const smartenv = new plugins.smartenv.Smartenv();
+    if (!smartenv.isBrowser) {
+      this.polyfillStatusEvaluated = true;
+      const fetchMod = await smartenv.getSafeNodeModule('@adobe/fetch');
+      this.neededPolyfillsLoadedDeferred.resolve({
+        fetch: fetchMod.fetch,
+        Response: fetchMod.Response,
+        helixTimeout: fetchMod.timeoutSignal,
+      });
+    } else {
+      this.neededPolyfillsLoadedDeferred.resolve({
+        fetch: (...args) => {
+          return fetch(...args);
+        },
+        Response: globalThis.Response,
+        AbortController: globalThis.AbortController,
+      });
+    }
+  }
+
+  public cacheStore = new plugins.webstore.WebStore({
+    dbName: 'webrequest',
+    storeName: 'webrequest',
+  });
+
+  public options: IWebrequestContructorOptions;
+
+  constructor(public optionsArg: IWebrequestContructorOptions = {}) {
+    this.options = {
+      logging: true,
+      ...optionsArg,
+    };
+    WebRequest.loadNeededPolyfills();
+  }
+
+  public async getJson(urlArg: string, useCacheArg: boolean = false) {
+    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
-      method: 'GET'
+      method: 'GET',
+      useCache: useCacheArg,
     });
-    return response.json();
+    const responseText = await response.text();
+    const responseResult = plugins.smartjson.parse(responseText);
+    return responseResult;
   }
 
   /**
    * postJson
    */
-  public async postJson(urlArg: string, requestBody?: any) {
+  public async postJson(urlArg: string, requestBody?: any, useCacheArg: boolean = false) {
+    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
-      body: requestBody,
+      method: 'POST',
-      method: 'POST'
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: plugins.smartjson.stringify(requestBody),
+      useCache: useCacheArg,
     });
-    return response.json();
+    const responseText = await response.text();
+    const responseResult = plugins.smartjson.parse(responseText);
+    return responseResult;
   }
 
   /**
    * put js
    */
-  public async putJson(urlArg: string, requestBody?: any) {
+  public async putJson(urlArg: string, requestBody?: any, useStoreAsFallback: boolean = false) {
+    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
-      body: requestBody,
+      method: 'PUT',
-      method: 'PUT'
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: plugins.smartjson.stringify(requestBody),
     });
-    return response.json();
+    const responseText = await response.text();
+    const responseResult = plugins.smartjson.parse(responseText);
+    return responseResult;
   }
 
   /**
    * put js
    */
-  public async deleteJson(urlArg: string) {
+  public async deleteJson(urlArg: string, useStoreAsFallback: boolean = false) {
+    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
-      method: 'GET'
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      method: 'GET',
     });
-    return response.json();
+    const responseText = await response.text();
+    const responseResult = plugins.smartjson.parse(responseText);
+    return responseResult;
   }
 
-  /**
-   * a fault tolerant request
-   */
   public async request(
+    urlArg: string,
+    optionsArg: {
+      method: 'GET' | 'POST' | 'PUT' | 'DELETE';
+      body?: any;
+      headers?: HeadersInit;
+      useCache?: boolean;
+      timeoutMs?: number;
+    }
+  ) {
+    optionsArg = {
+      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;
+    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);
+    }
+    let response: Response = await fetchObject
+      .fetch(urlArg, {
+        signal: controller ? controller.signal : null,
+        method: optionsArg.method,
+        headers: {
+          ...(optionsArg.headers || {}),
+        },
+        body: optionsArg.body,
+      })
+      .catch(async (err) => {
+        if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
+          cacheUsed = true;
+          const cachedResponse = cachedResponseDeferred.promise;
+          return cachedResponse;
+        } else {
+          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);
+    }
+    this.log(`${urlArg} answers with status: ${response.status}`);
+    return response;
+  }
+
+  /**
+   * a multi endpoint, fault tolerant request function
+   */
+  public async requestMultiEndpoint(
     urlArg: string | string[],
     optionsArg: {
       method: 'GET' | 'POST' | 'PUT' | 'DELETE';
       body?: any;
+      headers?: HeadersInit;
     }
   ): Promise<Response> {
+    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     let allUrls: string[];
     let usedUrlIndex = 0;
 
@@ -85,31 +234,39 @@ export class WebRequest {
     };
 
     // lets go recursive
-    const doRequest = async (urlToUse: string) => {
+    const doRequest = async (urlToUse: string): Promise<any> => {
       if (!urlToUse) {
         throw new Error('request failed permanently');
       }
-
+      this.log(`Getting ${urlToUse} with method ${optionsArg.method}`);
       const response = await fetch(urlToUse, {
         method: optionsArg.method,
         headers: {
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...(optionsArg.headers || {}),
         },
-        body: optionsArg.body
+        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;
       } else {
+        // lets perform a history check to determine failed urls
         await doHistoryCheck(response.status.toString());
-        // tslint:disable-next-line: no-return-await
+        // lets fire the request
-        return await doRequest(allUrls[usedUrlIndex]);
+        const result = await doRequest(allUrls[usedUrlIndex]);
+        return result;
       }
     };
 
-    const finalResponse: Response = await doRequest(urlArg[usedUrlIndex]);
+    const finalResponse: Response = await doRequest(allUrls[usedUrlIndex]);
-    console.log(finalResponse);
     return finalResponse;
   }
+
+  public log(logArg: string) {
+    if (this.options.logging) {
+      console.log(logArg);
+    }
+  }
 }

ts/webrequest.plugins.ts

@@ -1,3 +1,7 @@
 import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartenv from '@pushrocks/smartenv';
+import * as smartjson from '@pushrocks/smartjson';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as webstore from '@pushrocks/webstore';
 
-export { smartdelay };
+export { smartdelay, smartenv, smartjson, smartpromise, webstore };

tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": 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"
-}