@livequery/rest 1.0.20 → 1.0.22

package/build/RestTransporter.d.ts

@@ -1,6 +1,6 @@
 import { Transporter, QueryOption, QueryStream } from '@livequery/types';
-declare type MaybePromise<T> = T | Promise<T>;
-export declare type RestTransporterConfig = {
+type MaybePromise<T> = T | Promise<T>;
+export type RestTransporterConfig = {
     websocket_url: () => MaybePromise<string>;
     base_url: () => MaybePromise<string>;
     headers?: () => Promise<{
@@ -12,7 +12,6 @@ export declare class RestTransporter implements Transporter {
     private config;
     private socket;
     constructor(config: RestTransporterConfig);
-    get<T>(ref: string, query?: any): Promise<T>;
     query<T extends {
         id: string;
     }>(ref: string, options?: Partial<QueryOption<T>>): import("rxjs").Observable<QueryStream<T> | {
@@ -21,6 +20,7 @@ export declare class RestTransporter implements Transporter {
         reload: () => void;
     };
     private call;
+    get<T>(ref: string, query?: any): Promise<T>;
     add<T extends {} = {}>(ref: string, data: Partial<T>): Promise<any>;
     update<T extends {} = {}>(ref: string, data: Partial<T>, method?: 'PATCH' | 'PUT'): Promise<any>;
     remove(ref: string): Promise<void>;

package/build/RestTransporter.js

@@ -27,11 +27,6 @@ class RestTransporter {
         _RestTransporter_instances.add(this);
         config.websocket_url && (this.socket = new Socket_1.Socket(config.websocket_url));
     }
-    get(ref, query = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.call(ref, 'GET', query, null);
-        });
-    }
     query(ref, options) {
         var _a;
         const $on_reload = new rxjs_2.Subject();
@@ -72,17 +67,24 @@ class RestTransporter {
                 'Content-Type': 'application/json'
             } : {}), this.socket ? { socket_id: this.socket.socket_session } : {});
             try {
-                const { data, error } = yield fetch(`${this.config.base_url()}/${url}${__classPrivateFieldGet(this, _RestTransporter_instances, "m", _RestTransporter_encode_query).call(this, query)}`, Object.assign({ method, headers: headers }, payload ? { body: JSON.stringify(payload) } : {}))
-                    .then(r => r.json());
-                if (error)
-                    throw error;
-                return data;
+                const result = yield fetch(`${this.config.base_url()}/${url}${__classPrivateFieldGet(this, _RestTransporter_instances, "m", _RestTransporter_encode_query).call(this, query)}`, Object.assign({ method, headers: headers }, payload ? { body: JSON.stringify(payload) } : {})).then(r => r.text());
+                try {
+                    return JSON.parse(result);
+                }
+                catch (e) {
+                    return null;
+                }
             }
-            catch (e) {
-                throw e.error || e;
+            catch (error) {
+                throw error;
             }
         });
     }
+    get(ref, query = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.call(ref, 'GET', query, null);
+        });
+    }
     add(ref, data) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.call(ref, 'POST', {}, data);

package/build/Socket.js

@@ -72,7 +72,7 @@ _Socket_instances = new WeakSet(), _Socket_init = function _Socket_init() {
                 (_a = this[`$${event}`]) === null || _a === void 0 ? void 0 : _a.call(this, data);
             });
             const data_sender = (0, rxjs_1.fromEvent)(ws, 'open').subscribe(() => {
-                console.log('Websocket connected');
+                console.log(n == 0 ? 'Websocket connected' : 'Websocket re-connected');
                 ws.send(JSON.stringify({ event: 'start', data: { id: this.socket_session } }));
                 const subscription = this.$input.subscribe(data => ws.send(JSON.stringify(data)));
                 n > 0 && this.$reconnect.next();

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "1.0.20",
+    "version": "1.0.22",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -14,6 +14,7 @@
         "@types/uuid": "^8.3.0",
         "query-string": "^7.0.1",
         "rxjs": "^7.1.0",
+        "typescript": "4.9.5",
         "uuid": "^8.3.2"
     },
     "devDependencies": {