@taybart/corvid 0.1.20 → 0.1.21

package/dist/index.js

@@ -493,10 +493,8 @@ class network_params {
     }
 }
 class request {
-    auth(token) {
-        const header = `Bearer ${token}`;
-        this.log.debug(`adding auth token header ${header}`);
-        this.opts.headers.Authorization = header;
+    auth(a) {
+        this.opts.auth = a;
         return this;
     }
     basicAuth(username, password) {
@@ -510,7 +508,7 @@ class request {
         return this;
     }
     build({ path, params: passedParams, override } = {}) {
-        if (this.opts.auth && !this.opts.headers.Authorization) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
+        if (this.opts.auth) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
         else this.opts.headers.Authorization = `Basic ${btoa(`${this.opts.auth.username}:${this.opts.auth.password}`)}`;
         if (!override) override = {};
         const body = override.body || this.opts.body;
@@ -539,20 +537,26 @@ class request {
             }
         };
     }
-    async do({ path, params: passedParams, override = {} } = {}) {
+    async do({ path, params: passedParams, override = {}, _recurselevel = 0 } = {}) {
         const { url, options } = this.build({
             path,
             params: passedParams,
             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();
-            if (401 === res.status && this.opts.onUnauthorized) {
+            if (401 === res.status && this.opts.onUnauthorized && _recurselevel < 1) {
                 this.log.warn("unauthorized");
-                this.opts.onUnauthorized(body);
+                if (await this.opts.onUnauthorized.call(this, this, body)) return this.do({
+                    path,
+                    params: passedParams,
+                    override,
+                    _recurselevel: _recurselevel + 1
+                });
             } else throw {
                 message: `bad wesponse ${res.status} !== ${expect}, body: ${body}`,
                 status: res.status,
@@ -578,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

@@ -27,14 +27,14 @@ export type RequestOpts = {
     expect?: number;
     credentials?: RequestCredentials;
     insecureNoVerify?: boolean;
-    onUnauthorized?: (body: any) => void;
+    onUnauthorized?: (client: request, body: any) => Promise<boolean>;
     fetch?: (url: string, init: RequestInit) => Promise<any>;
 };
 export declare class request {
     opts: RequestOpts;
     log: logger;
     constructor(opts?: RequestOpts, verbose?: boolean);
-    auth(token: string | {
+    auth(a: string | {
         username: string;
         password: string;
     }): this;
@@ -67,7 +67,7 @@ export declare class request {
             body: string;
         };
     };
-    do({ path, params: passedParams, override, }?: {
+    do({ path, params: passedParams, override, _recurselevel, }?: {
         path?: string;
         params?: Object;
         method?: string;
@@ -78,6 +78,7 @@ export declare class request {
             body?: Object;
             expect?: number;
         };
+        _recurselevel?: number;
     }): Promise<any>;
 }
 /*** websocket ***/

package/dist/network.js

@@ -84,10 +84,8 @@ class network_params {
     }
 }
 class request {
-    auth(token) {
-        const header = `Bearer ${token}`;
-        this.log.debug(`adding auth token header ${header}`);
-        this.opts.headers.Authorization = header;
+    auth(a) {
+        this.opts.auth = a;
         return this;
     }
     basicAuth(username, password) {
@@ -101,7 +99,7 @@ class request {
         return this;
     }
     build({ path, params: passedParams, override } = {}) {
-        if (this.opts.auth && !this.opts.headers.Authorization) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
+        if (this.opts.auth) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
         else this.opts.headers.Authorization = `Basic ${btoa(`${this.opts.auth.username}:${this.opts.auth.password}`)}`;
         if (!override) override = {};
         const body = override.body || this.opts.body;
@@ -130,20 +128,26 @@ class request {
             }
         };
     }
-    async do({ path, params: passedParams, override = {} } = {}) {
+    async do({ path, params: passedParams, override = {}, _recurselevel = 0 } = {}) {
         const { url, options } = this.build({
             path,
             params: passedParams,
             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();
-            if (401 === res.status && this.opts.onUnauthorized) {
+            if (401 === res.status && this.opts.onUnauthorized && _recurselevel < 1) {
                 this.log.warn("unauthorized");
-                this.opts.onUnauthorized(body);
+                if (await this.opts.onUnauthorized.call(this, this, body)) return this.do({
+                    path,
+                    params: passedParams,
+                    override,
+                    _recurselevel: _recurselevel + 1
+                });
             } else throw {
                 message: `bad wesponse ${res.status} !== ${expect}, body: ${body}`,
                 status: res.status,
@@ -169,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.20",
+  "version": "0.1.21",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {