3.0.24

.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

.gitlab-ci.yml

@@ -13,31 +13,24 @@ stages:
   - metadata
 
 before_script:
-  - npm install -g @shipzone/npmci
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
-  stage: security
+# security stage
-  script:
+# ====================
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 auditProductionDependencies:
   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 --production --ignore-scripts
+     - npmci command pnpm audit --audit-level=high --prod
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -45,11 +38,10 @@ auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=dev
+    - npmci command pnpm audit --audit-level=high --dev
   tags:
+    - lossless
     - docker
   allow_failure: true
 
@@ -60,7 +52,6 @@ auditDevDependencies:
 testStable:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
     - npmci npm test
@@ -71,10 +62,9 @@ testStable:
 testBuild:
   stage: test
   script:
-    - npmci npm prepare
     - npmci node install stable
     - npmci npm install
-    - npmci command npm run build
+    - npmci npm build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -100,10 +90,9 @@ codequality:
   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:
     - lossless
     - docker
@@ -123,11 +112,9 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "3.0.13",
+  "version": "3.0.24",
   "private": false,
   "description": "securely request from browsers",
   "main": "dist_ts/index.js",
@@ -10,23 +10,25 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)"
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.65",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsbundle": "^2.0.7",
+    "@gitzone/tsbundle": "^2.0.8",
+    "@gitzone/tsrun": "^1.2.42",
     "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/smartexpress": "^4.0.21",
+    "@pushrocks/smartexpress": "^4.0.35",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@pushrocks/tapbundle": "^5.0.8",
-    "@types/node": "^18.6.4"
+    "@types/node": "^20.3.3"
   },
   "dependencies": {
-    "@adobe/helix-fetch": "^3.1.1",
+    "@adobe/fetch": "^4.0.13",
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartdelay": "^3.0.1",
     "@pushrocks/smartenv": "^5.0.2",
-    "@pushrocks/smartjson": "^5.0.1",
+    "@pushrocks/smartjson": "^5.0.6",
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/webstore": "^2.0.5"
+    "@pushrocks/webstore": "^2.0.8"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -21,7 +21,6 @@ Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](htt
 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)
-Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -33,7 +32,6 @@ We are always happy for code contributions. If you are not the code contributing
 
 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

@@ -2,10 +2,9 @@ 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()
+  const response = await new webrequest.WebRequest().request('https://api.signup.software', {
-    .request('https://api.signup.software', {
+    method: 'GET',
-      method: 'GET',
+  });
-    })
   console.log(JSON.stringify(await response.text()));
 });
 

test/test.ts

@@ -43,14 +43,19 @@ tap.test('setup test server', async () => {
 });
 
 tap.test('first test', async (tools) => {
-  const response = await (await new webrequest.WebRequest().requestMultiEndpoint([
+  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',
-    method: 'GET'
+        'http://localhost:2345/apiroute3',
-  })).json();
+      ],
+      {
+        method: 'GET',
+      }
+    )
+  ).json();
 
   const response2 = await new webrequest.WebRequest().getJson('http://localhost:2345/apiroute3');
 
@@ -68,6 +73,6 @@ tap.test('should cache response', async () => {
   await testServer.stop();
   const response2 = await webrequestInstance.getJson('http://localhost:2345/apiroute3', true);
   expect(response2).toHaveProperty('hithere');
-})
+});
 
 tap.start();

ts/00_commitinfo_data.ts

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

ts/index.ts

@@ -10,10 +10,10 @@ export interface IWebrequestContructorOptions {
 export class WebRequest {
   private static polyfillStatusEvaluated = false;
   private static neededPolyfillsLoadedDeferred = plugins.smartpromise.defer<{
-    fetch: typeof fetch,
+    fetch: typeof fetch;
-    Response: typeof Response,
+    Response: typeof Response;
-    AbortController?: typeof AbortController,
+    AbortController?: typeof AbortController;
-    helixTimeout?: any,
+    helixTimeout?: any;
   }>();
 
   /**
@@ -29,7 +29,7 @@ export class WebRequest {
     if (!smartenv.isBrowser) {
       console.log('webrequest using node context.');
       this.polyfillStatusEvaluated = true;
-      const fetchMod = await smartenv.getSafeNodeModule('@adobe/helix-fetch');
+      const fetchMod = await smartenv.getSafeNodeModule('@adobe/fetch');
       this.neededPolyfillsLoadedDeferred.resolve({
         fetch: fetchMod.fetch,
         Response: fetchMod.Response,
@@ -42,7 +42,7 @@ export class WebRequest {
           return fetch(...args);
         },
         Response: globalThis.Response,
-        AbortController: globalThis.AbortController
+        AbortController: globalThis.AbortController,
       });
     }
   }
@@ -57,8 +57,8 @@ export class WebRequest {
   constructor(public optionsArg: IWebrequestContructorOptions = {}) {
     this.options = {
       logging: true,
-      ...optionsArg
+      ...optionsArg,
-    }
+    };
     WebRequest.loadNeededPolyfills();
   }
 
@@ -150,34 +150,36 @@ export class WebRequest {
         });
       } else {
         controller = {
-          signal: fetchObject.helixTimeout(optionsArg.timeoutMs)
+          signal: fetchObject.helixTimeout(optionsArg.timeoutMs),
         } as any;
       }
     }
     let cachedResponseDeferred = plugins.smartpromise.defer<Response>();
     let cacheUsed = false;
-    if (optionsArg.useCache && await this.cacheStore.check(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);
     }
-    let response: Response = await fetchObject.fetch(urlArg, {
+    let response: Response = await fetchObject
-      signal: controller ? controller.signal : null,
+      .fetch(urlArg, {
-      method: optionsArg.method,
+        signal: controller ? controller.signal : null,
-      headers: {
+        method: optionsArg.method,
-        ...(optionsArg.headers || {}),
+        headers: {
-      },
+          ...(optionsArg.headers || {}),
-      body: optionsArg.body,
+        },
-    }).catch(async (err) => {
+        body: optionsArg.body,
-      if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
+      })
-        cacheUsed = true;
+      .catch(async (err) => {
-        const cachedResponse = cachedResponseDeferred.promise;
+        if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
-        return cachedResponse;
+          cacheUsed = true;
-      } else {
+          const cachedResponse = cachedResponseDeferred.promise;
-        return err;
+          return cachedResponse;
-      }
+        } else {
-    });
+          return err;
+        }
+      });
     if (optionsArg.useCache && (await cachedResponseDeferred.promise) && response.status === 500) {
       cacheUsed = true;
       response = await cachedResponseDeferred.promise;

tsconfig.json

@@ -5,6 +5,7 @@
     "target": "ES2022",
     "module": "ES2022",
     "moduleResolution": "nodenext",
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true,
   }
 }