3.0.29

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.24",
+  "version": "3.0.29",
   "private": false,
   "description": "securely request from browsers",
   "main": "dist_ts/index.js",
@@ -18,12 +18,12 @@
     "@gitzone/tsbundle": "^2.0.8",
     "@gitzone/tsrun": "^1.2.42",
     "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/smartexpress": "^4.0.35",
     "@pushrocks/tapbundle": "^5.0.8",
     "@types/node": "^20.3.3"
   },
   "dependencies": {
     "@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",

test/test.ts

@@ -2,12 +2,12 @@ import { expect, tap } from '@pushrocks/tapbundle';
 import * as webrequest from '../ts/index.js';
 
 // 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,
@@ -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',

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.24',
+  version: '3.0.29',
   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/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',
@@ -59,11 +21,9 @@ export class WebRequest {
       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',
       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',
@@ -140,20 +97,10 @@ export class WebRequest {
       ...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))) {
@@ -162,9 +109,8 @@ export class WebRequest {
     } else {
       cachedResponseDeferred.resolve(null);
     }
-    let response: Response = await fetchObject
+    let response: Response = await fetch(urlArg, {
-      .fetch(urlArg, {
+        signal: controller.signal,
-        signal: controller ? controller.signal : null,
         method: optionsArg.method,
         headers: {
           ...(optionsArg.headers || {}),
@@ -203,7 +149,7 @@ export class WebRequest {
       headers?: HeadersInit;
     }
   ): Promise<Response> {
-    await WebRequest.neededPolyfillsLoadedDeferred.promise;
+    
     let allUrls: string[];
     let usedUrlIndex = 0;