@taybart/corvid 0.1.19 → 0.1.21

package/dist/index.js

@@ -544,7 +544,8 @@ class request {
             override
         });
         this.log.debug(`${this.opts.method} ${url}`);
-        const res = await fetch(url, options);
+        let res;
+        res = this.opts.fetch ? await this.opts.fetch(url, options) : await fetch(url, options);
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
             const body = await res.text();
@@ -556,7 +557,11 @@ class request {
                     override,
                     _recurselevel: _recurselevel + 1
                 });
-            } else throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
+            } else throw {
+                message: `bad wesponse ${res.status} !== ${expect}, body: ${body}`,
+                status: res.status,
+                body
+            };
         }
         this.log.debug(`content type: ${res.headers.get('content-type')}`);
         if ('application/json' === res.headers.get('content-type')) return await res.json();
@@ -577,7 +582,6 @@ class request {
             this.log.debug("converting object params to class");
             this.opts.params = new network_params(this.opts.params);
         }
-        if (!this.opts.fetch) this.opts.fetch = window.fetch;
         this.log.debug(`with options: ${JSON.stringify(this.opts)}`);
     }
 }

package/dist/network.d.ts

@@ -7,8 +7,13 @@ export declare class params {
     toString(): string;
     static render(p: Object): string;
 }
+export type RequestError = {
+    error: string;
+    status: number;
+    body: string;
+};
 /*** http request ***/
-export type requestOpts = {
+export type RequestOpts = {
     url?: string;
     type?: 'json';
     method?: 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'OPTIONS';
@@ -26,9 +31,9 @@ export type requestOpts = {
     fetch?: (url: string, init: RequestInit) => Promise<any>;
 };
 export declare class request {
-    opts: requestOpts;
+    opts: RequestOpts;
     log: logger;
-    constructor(opts?: requestOpts, verbose?: boolean);
+    constructor(opts?: RequestOpts, verbose?: boolean);
     auth(a: string | {
         username: string;
         password: string;

package/dist/network.js

@@ -135,7 +135,8 @@ class request {
             override
         });
         this.log.debug(`${this.opts.method} ${url}`);
-        const res = await fetch(url, options);
+        let res;
+        res = this.opts.fetch ? await this.opts.fetch(url, options) : await fetch(url, options);
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
             const body = await res.text();
@@ -147,7 +148,11 @@ class request {
                     override,
                     _recurselevel: _recurselevel + 1
                 });
-            } else throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
+            } else throw {
+                message: `bad wesponse ${res.status} !== ${expect}, body: ${body}`,
+                status: res.status,
+                body
+            };
         }
         this.log.debug(`content type: ${res.headers.get('content-type')}`);
         if ('application/json' === res.headers.get('content-type')) return await res.json();
@@ -168,7 +173,6 @@ class request {
             this.log.debug("converting object params to class");
             this.opts.params = new network_params(this.opts.params);
         }
-        if (!this.opts.fetch) this.opts.fetch = window.fetch;
         this.log.debug(`with options: ${JSON.stringify(this.opts)}`);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taybart/corvid",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {