3.0.35

.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

@@ -1,141 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-before_script:
-  - npm install -g @shipzone/npmci
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  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 install --production --ignore-scripts
-    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high --only=prod --production
-  tags:
-    - docker
-  allow_failure: true
-
-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
-  tags:
-    - docker
-  allow_failure: true
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  only:
-    - tags
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

npmextra.json

@@ -7,10 +7,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "webrequest",
       "description": "securely request from browsers",
-      "npmPackagename": "@pushrocks/webrequest",
+      "npmPackagename": "@push.rocks/webrequest",
       "license": "MIT"
     }
   }

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/webrequest",
+  "name": "@push.rocks/webrequest",
-  "version": "3.0.13",
+  "version": "3.0.35",
   "private": false,
   "description": "securely request from browsers",
   "main": "dist_ts/index.js",
@@ -10,23 +10,24 @@
   "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",
+    "@api.global/typedserver": "^3.0.26",
-    "@gitzone/tsbundle": "^2.0.7",
+    "@git.zone/tsbuild": "^2.1.72",
-    "@gitzone/tstest": "^1.0.73",
+    "@git.zone/tsbundle": "^2.0.15",
-    "@pushrocks/smartexpress": "^4.0.21",
+    "@git.zone/tsrun": "^1.2.46",
-    "@pushrocks/tapbundle": "^5.0.4",
+    "@git.zone/tstest": "^1.0.86",
-    "@types/node": "^18.6.4"
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.11.24"
   },
   "dependencies": {
-    "@adobe/helix-fetch": "^3.1.1",
+    "@push.rocks/smartdelay": "^3.0.5",
-    "@pushrocks/smartdelay": "^2.0.13",
+    "@push.rocks/smartenv": "^5.0.12",
-    "@pushrocks/smartenv": "^5.0.2",
+    "@push.rocks/smartjson": "^5.0.14",
-    "@pushrocks/smartjson": "^5.0.1",
+    "@push.rocks/smartpromise": "^4.0.3",
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@push.rocks/webstore": "^2.0.13"
-    "@pushrocks/webstore": "^2.0.5"
   },
   "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

@@ -1,11 +1,10 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/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

@@ -1,13 +1,13 @@
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as webrequest from '../ts/index.js';
 
 // test dependencies
-import * as smartexpress from '@pushrocks/smartexpress';
+import * as typedserver from '@api.global/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,
@@ -15,7 +15,7 @@ tap.test('setup test server', async () => {
 
   testServer.addRoute(
     '/apiroute1',
-    new smartexpress.Handler('GET', (req, res) => {
+    new typedserver.servertools.Handler('GET', (req, res) => {
       res.status(429);
       res.end();
     })
@@ -23,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();
     })
@@ -31,7 +31,7 @@ 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',
@@ -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

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/webrequest',
+  name: '@push.rocks/webrequest',
-  version: '3.0.13',
+  version: '3.0.35',
   description: 'securely request from browsers'
 }

ts/index.ts

@@ -8,44 +8,6 @@ export interface IWebrequestContructorOptions {
  * web request
  */
 export class WebRequest {
-  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) {
-      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,
-        helixTimeout: fetchMod.timeoutSignal,
-      });
-    } else {
-      console.log('webrequest using browser context.');
-      this.neededPolyfillsLoadedDeferred.resolve({
-        fetch: (...args) => {
-          return fetch(...args);
-        },
-        Response: globalThis.Response,
-        AbortController: globalThis.AbortController
-      });
-    }
-  }
 
   public cacheStore = new plugins.webstore.WebStore({
     dbName: 'webrequest',
@@ -57,13 +19,11 @@ export class WebRequest {
   constructor(public optionsArg: IWebrequestContructorOptions = {}) {
     this.options = {
       logging: true,
-      ...optionsArg
+      ...optionsArg,
-    }
+    };
-    WebRequest.loadNeededPolyfills();
   }
 
   public async getJson(urlArg: string, useCacheArg: boolean = false) {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
       method: 'GET',
       useCache: useCacheArg,
@@ -77,7 +37,6 @@ export class WebRequest {
    * postJson
    */
   public async postJson(urlArg: string, requestBody?: any, useCacheArg: boolean = false) {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
       method: 'POST',
       headers: {
@@ -95,7 +54,6 @@ export class WebRequest {
    * put js
    */
   public async putJson(urlArg: string, requestBody?: any, useStoreAsFallback: boolean = false) {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
       method: 'PUT',
       headers: {
@@ -112,7 +70,6 @@ export class WebRequest {
    * put js
    */
   public async deleteJson(urlArg: string, useStoreAsFallback: boolean = false) {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
     const response: Response = await this.request(urlArg, {
       headers: {
         'Content-Type': 'application/json',
@@ -139,45 +96,36 @@ export class WebRequest {
       useCache: false,
       ...optionsArg,
     };
-    
+
-    const fetchObject = await WebRequest.neededPolyfillsLoadedDeferred.promise;
+    let controller = new AbortController();
-    let controller: AbortController;
+    plugins.smartdelay.delayFor(optionsArg.timeoutMs).then(() => {
-    if (optionsArg.timeoutMs) {
+      controller.abort();
-      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)) {
+    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 fetch(urlArg, {
-      signal: controller ? controller.signal : null,
+        signal: controller.signal,
-      method: optionsArg.method,
+        method: optionsArg.method,
-      headers: {
+        headers: {
-        ...(optionsArg.headers || {}),
+          ...(optionsArg.headers || {}),
-      },
+        },
-      body: optionsArg.body,
+        body: optionsArg.body,
-    }).catch(async (err) => {
+      })
-      if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
+      .catch(async (err) => {
-        cacheUsed = true;
+        if (optionsArg.useCache && (await cachedResponseDeferred.promise)) {
-        const cachedResponse = cachedResponseDeferred.promise;
+          cacheUsed = true;
-        return cachedResponse;
+          const cachedResponse = cachedResponseDeferred.promise;
-      } else {
+          return cachedResponse;
-        return err;
+        } else {
-      }
+          return err;
-    });
+        }
+      });
     if (optionsArg.useCache && (await cachedResponseDeferred.promise) && response.status === 500) {
       cacheUsed = true;
       response = await cachedResponseDeferred.promise;
@@ -201,7 +149,7 @@ export class WebRequest {
       headers?: HeadersInit;
     }
   ): Promise<Response> {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
+    
     let allUrls: string[];
     let usedUrlIndex = 0;
 

ts/webrequest.plugins.ts

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

tsconfig.json

@@ -3,8 +3,12 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "target": "ES2022",
-    "module": "ES2022",
+    "module": "NodeNext",
-    "moduleResolution": "nodenext",
+    "moduleResolution": "NodeNext",
-    "esModuleInterop": true
+    "esModuleInterop": true,
-  }
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
 }