@taybart/corvid 0.1.20 → 0.1.22

package/dist/index.js

@@ -61,6 +61,7 @@ var local_storage_namespaceObject = {};
 __webpack_require__.r(local_storage_namespaceObject);
 __webpack_require__.d(local_storage_namespaceObject, {
     clear: ()=>clear,
+    default: ()=>local_storage,
     get: ()=>get,
     getJSON: ()=>getJSON,
     listen: ()=>listen,
@@ -493,10 +494,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 +509,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 +538,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 +583,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)}`);
     }
 }
@@ -775,4 +779,13 @@ function unlisten(key, cb) {
 function clear(key) {
     localStorage.removeItem(key);
 }
+const local_storage = {
+    get,
+    getJSON,
+    set,
+    update: local_storage_update,
+    listen,
+    unlisten,
+    clear
+};
 export { clipboard, dom_namespaceObject as dom, genID, utils_logLevel as logLevel, logger, local_storage_namespaceObject as ls, network_namespaceObject as network, strings_namespaceObject as strings, style_namespaceObject as style };

package/dist/local_storage.d.ts

@@ -13,3 +13,13 @@ export declare function unlisten(key: string, cb: (update: {
     value: any;
 }) => void | el): void;
 export declare function clear(key: string): void;
+declare const _default_1: {
+    get: typeof get;
+    getJSON: typeof getJSON;
+    set: typeof set;
+    update: typeof update;
+    listen: typeof listen;
+    unlisten: typeof unlisten;
+    clear: typeof clear;
+};
+export default _default_1;

package/dist/ls.js

@@ -333,4 +333,13 @@ function unlisten(key, cb) {
 function clear(key) {
     localStorage.removeItem(key);
 }
-export { clear, get, getJSON, listen, set, setObj, unlisten, local_storage_update as update };
+const local_storage = {
+    get,
+    getJSON,
+    set,
+    update: local_storage_update,
+    listen,
+    unlisten,
+    clear
+};
+export { clear, local_storage as default, get, getJSON, listen, set, setObj, unlisten, local_storage_update as update };

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/dist/utils.js

@@ -0,0 +1,95 @@
+function _define_property(obj, key, value) {
+    if (key in obj) Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+    });
+    else obj[key] = value;
+    return obj;
+}
+function genID(len = 15, alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz') {
+    return [
+        ...crypto.getRandomValues(new Uint8Array(len))
+    ].map((value)=>alphabet[Math.floor(value / 255 * alphabet.length)]).join('');
+}
+const clipboard = {
+    check () {
+        if (!navigator.clipboard) throw new Error('Clipboard API not supported, or context is not https');
+    },
+    async copy (text) {
+        this.check();
+        await navigator.clipboard.writeText(text);
+    },
+    async copyArbitrary (data) {
+        this.check();
+        await navigator.clipboard.write(data);
+    },
+    async read () {
+        this.check();
+        return await navigator.clipboard.readText();
+    },
+    async readArbitrary () {
+        this.check();
+        return await navigator.clipboard.read();
+    },
+    listen (query, cb) {
+        let el;
+        el = 'string' == typeof query ? document.querySelector(query) : query;
+        if (!el) throw new Error(`no element from query: ${query}`);
+        el.addEventListener('copy', (ev)=>{
+            const cbEv = ev;
+            const selection = document.getSelection();
+            if (selection) {
+                const text = selection.toString();
+                if (text && cbEv.clipboardData) cbEv.clipboardData.setData('text/plain', cb(text));
+            }
+        });
+    }
+};
+var utils_logLevel = /*#__PURE__*/ function(logLevel) {
+    logLevel[logLevel["none"] = -1] = "none";
+    logLevel[logLevel["error"] = 0] = "error";
+    logLevel[logLevel["warn"] = 1] = "warn";
+    logLevel[logLevel["info"] = 2] = "info";
+    logLevel[logLevel["debug"] = 3] = "debug";
+    logLevel[logLevel["trace"] = 4] = "trace";
+    return logLevel;
+}({});
+class logger {
+    error(...args) {
+        if (this.level >= 0) console.error(`[corvid] ${this.prefix}`, ...args);
+    }
+    warn(...args) {
+        if (this.level >= 1) console.warn(`[corvid] ${this.prefix}`, ...args);
+    }
+    info(...args) {
+        if (this.level >= 2) console.info(`[corvid] ${this.prefix}`, ...args);
+    }
+    debug(...args) {
+        if (this.level >= 3) console.debug(`[corvid] ${this.prefix}`, ...args);
+    }
+    trace(...args) {
+        if (this.level >= 4) console.trace(`[corvid] ${this.prefix}`, ...args);
+    }
+    log(...args) {
+        console.log(`[corvid] ${this.prefix}`, ...args);
+    }
+    constructor(level = 2, prefix){
+        _define_property(this, "level", void 0);
+        _define_property(this, "prefix", void 0);
+        this.level = level;
+        this.prefix = prefix ? `(${prefix}):` : ':';
+        if (-1 === this.level) [
+            'error',
+            'warn',
+            'info',
+            'debug',
+            'trace',
+            'log'
+        ].forEach((methodName)=>{
+            this[methodName] = ()=>{};
+        });
+    }
+}
+export { clipboard, genID, utils_logLevel as logLevel, logger };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taybart/corvid",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -16,8 +16,8 @@
       "types": "./dist/style.d.ts",
       "import": "./dist/style.js"
     },
-    "./local_storage": {
-      "types": "./dist/ls.d.ts",
+    "./ls": {
+      "types": "./dist/local_storage.d.ts",
       "import": "./dist/ls.js"
     },
     "./network": {
@@ -25,8 +25,12 @@
       "import": "./dist/network.js"
     },
     "./qr": {
-      "types": "./dist/qr.d.ts",
+      "types": "./dist/qr/index.d.ts",
       "import": "./dist/qr.js"
+    },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.js"
     }
   },
   "module": "./dist/index.js",