@taybart/corvid 0.1.19 → 0.1.20

package/dist/index.js

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

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

package/dist/network.js

@@ -84,8 +84,10 @@ class network_params {
     }
 }
 class request {
-    auth(a) {
-        this.opts.auth = a;
+    auth(token) {
+        const header = `Bearer ${token}`;
+        this.log.debug(`adding auth token header ${header}`);
+        this.opts.headers.Authorization = header;
         return this;
     }
     basicAuth(username, password) {
@@ -99,7 +101,7 @@ class request {
         return this;
     }
     build({ path, params: passedParams, override } = {}) {
-        if (this.opts.auth) if ('string' == typeof this.opts.auth) this.opts.headers.Authorization = `Bearer ${this.opts.auth}`;
+        if (this.opts.auth && !this.opts.headers.Authorization) 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;
@@ -128,7 +130,7 @@ class request {
             }
         };
     }
-    async do({ path, params: passedParams, override = {}, _recurselevel = 0 } = {}) {
+    async do({ path, params: passedParams, override = {} } = {}) {
         const { url, options } = this.build({
             path,
             params: passedParams,
@@ -139,15 +141,14 @@ class request {
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
             const body = await res.text();
-            if (401 === res.status && this.opts.onUnauthorized && _recurselevel < 1) {
+            if (401 === res.status && this.opts.onUnauthorized) {
                 this.log.warn("unauthorized");
-                if (await this.opts.onUnauthorized.call(this, this, body)) return this.do({
-                    path,
-                    params: passedParams,
-                    override,
-                    _recurselevel: _recurselevel + 1
-                });
-            } else throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
+                this.opts.onUnauthorized(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();

package/package.json

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