@taybart/corvid 0.1.15 → 0.1.17

package/dist/index.js

@@ -543,10 +543,12 @@ class request {
         const res = await fetch(url, options);
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
-            const body = await res.json();
+            const body = await res.text();
             throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
         }
-        return await res.json();
+        this.log.debug(`content type: ${res.headers.get('content-type')}`);
+        if ('application/json' === res.headers.get('content-type')) return await res.json();
+        return await res.text();
     }
     constructor(opts = {}, verbose = false){
         network_define_property(this, "opts", void 0);
@@ -576,12 +578,12 @@ class ws {
         this.backoff = 100;
         this.ws.addEventListener('open', ()=>{
             const rl = this.recursion_level;
-            this.log.debug(`on open: reconnected (${rl})`);
+            this.log.debug(`on open: reconnected(${rl})`);
             this.is_connected = true;
             if (!this.ws) return;
             for(let key in this.event_listeners)this.event_listeners[key].forEach((cb)=>{
                 if (this.ws) {
-                    this.log.debug(`adding listener (${rl}): ${key}`);
+                    this.log.debug(`adding listener(${rl}): ${key} `);
                     this.ws.addEventListener(key, cb);
                 }
             });
@@ -590,7 +592,7 @@ class ws {
             this.log.debug('connection closed');
             this.is_connected = false;
             this.backoff = Math.min(2 * this.backoff, this.max_timeout);
-            this.log.debug(`backoff: ${this.backoff}`);
+            this.log.debug(`backoff: ${this.backoff} `);
             this.reconnect_timer = window.setTimeout(()=>{
                 if (this.should_reconnect) {
                     this.ws = null;
@@ -609,7 +611,7 @@ class ws {
         if (!this.event_listeners.message) this.event_listeners.message = [];
         const handler = (e)=>{
             const rl = this.recursion_level;
-            this.log.debug(`message(${rl}): ${e.data}`);
+            this.log.debug(`message(${rl}): ${e.data} `);
             cb(e.data);
         };
         this.event_listeners.message.push(handler);
@@ -674,7 +676,7 @@ const network = {
 };
 function get(key, _default) {
     let ret = localStorage.getItem(key);
-    if (!ret && null != _default) {
+    if (null === ret && null != _default) {
         ret = _default;
         if ('function' == typeof _default) ret = _default();
         set(key, ret);

package/dist/ls.js

@@ -244,7 +244,7 @@ function interpolate(str, params) {
 }
 function get(key, _default) {
     let ret = localStorage.getItem(key);
-    if (!ret && null != _default) {
+    if (null === ret && null != _default) {
         ret = _default;
         if ('function' == typeof _default) ret = _default();
         set(key, ret);

package/dist/network.js

@@ -140,10 +140,12 @@ class request {
         const res = await fetch(url, options);
         const expect = override.expect || this.opts.expect;
         if (res.status !== expect) {
-            const body = await res.json();
+            const body = await res.text();
             throw new Error(`bad response ${res.status} !== ${expect}, body: ${body}`);
         }
-        return await res.json();
+        this.log.debug(`content type: ${res.headers.get('content-type')}`);
+        if ('application/json' === res.headers.get('content-type')) return await res.json();
+        return await res.text();
     }
     constructor(opts = {}, verbose = false){
         network_define_property(this, "opts", void 0);
@@ -173,12 +175,12 @@ class ws {
         this.backoff = 100;
         this.ws.addEventListener('open', ()=>{
             const rl = this.recursion_level;
-            this.log.debug(`on open: reconnected (${rl})`);
+            this.log.debug(`on open: reconnected(${rl})`);
             this.is_connected = true;
             if (!this.ws) return;
             for(let key in this.event_listeners)this.event_listeners[key].forEach((cb)=>{
                 if (this.ws) {
-                    this.log.debug(`adding listener (${rl}): ${key}`);
+                    this.log.debug(`adding listener(${rl}): ${key} `);
                     this.ws.addEventListener(key, cb);
                 }
             });
@@ -187,7 +189,7 @@ class ws {
             this.log.debug('connection closed');
             this.is_connected = false;
             this.backoff = Math.min(2 * this.backoff, this.max_timeout);
-            this.log.debug(`backoff: ${this.backoff}`);
+            this.log.debug(`backoff: ${this.backoff} `);
             this.reconnect_timer = window.setTimeout(()=>{
                 if (this.should_reconnect) {
                     this.ws = null;
@@ -206,7 +208,7 @@ class ws {
         if (!this.event_listeners.message) this.event_listeners.message = [];
         const handler = (e)=>{
             const rl = this.recursion_level;
-            this.log.debug(`message(${rl}): ${e.data}`);
+            this.log.debug(`message(${rl}): ${e.data} `);
             cb(e.data);
         };
         this.event_listeners.message.push(handler);

package/package.json

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