@livequery/rest 1.0.18 → 1.0.21

package/build/RestTransporter.d.ts

@@ -1,5 +1,4 @@
 import { Transporter, QueryOption, QueryStream } from '@livequery/types';
-import { Observable } from 'rxjs';
 declare type MaybePromise<T> = T | Promise<T>;
 export declare type RestTransporterConfig = {
     websocket_url: () => MaybePromise<string>;
@@ -7,22 +6,21 @@ export declare type RestTransporterConfig = {
     headers?: () => Promise<{
         [key: string]: string;
     }>;
-    realtime?: boolean;
 };
 export declare class RestTransporter implements Transporter {
+    #private;
     private config;
-    private queries;
     private socket;
     constructor(config: RestTransporterConfig);
-    get<T>(ref: string, query?: any): Promise<T>;
     query<T extends {
         id: string;
-    }>(ref: string, options?: Partial<QueryOption<T>>): Observable<QueryStream<T> | {
+    }>(ref: string, options?: Partial<QueryOption<T>>): import("rxjs").Observable<QueryStream<T> | {
         error: any;
     }> & {
         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

@@ -8,6 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _RestTransporter_instances, _RestTransporter_encode_query;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestTransporter = void 0;
 const rxjs_1 = require("rxjs");
@@ -18,44 +24,40 @@ const query_string_1 = require("query-string");
 class RestTransporter {
     constructor(config) {
         this.config = config;
-        this.queries = new Set();
-        config.realtime && (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);
-        });
+        _RestTransporter_instances.add(this);
+        config.websocket_url && (this.socket = new Socket_1.Socket(config.websocket_url));
     }
     query(ref, options) {
         var _a;
         const $on_reload = new rxjs_2.Subject();
-        const $when_socket_ready = ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.$last_state.pipe(operators_1.filter(s => s == 1))) || rxjs_1.of(true);
-        const $on_can_reload = $on_reload.pipe(operators_1.filter(() => !this.socket || this.socket.$last_state.getValue() == 1));
-        const http_request = rxjs_2.merge($when_socket_ready, $on_can_reload)
-            .pipe(operators_1.mergeMap(() => this.call(ref, 'GET', options)), operators_1.map(response => {
-            const collection_response = response;
-            const document_response = response;
+        const http_request = (0, rxjs_2.merge)((0, rxjs_1.of)(1), ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.$reconnect) || (0, rxjs_1.of)(), $on_reload)
+            .pipe((0, operators_1.mergeMap)(() => this.call(ref, 'GET', options)), (0, operators_1.map)(({ data, error }) => {
+            var _a;
+            if (error)
+                throw error;
+            data.realtime_token && ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.subscribe(data.realtime_token));
             // If collection
-            if (collection_response.items) {
-                const { items, paging } = collection_response;
+            const collection = data;
+            if (collection.items) {
                 return {
                     data: {
-                        changes: items.map(data => ({ data, type: 'added', ref })),
-                        paging: Object.assign(Object.assign({}, paging), { n: 0 })
+                        changes: collection.items.map(data => ({ data, type: 'added', ref })),
+                        paging: Object.assign(Object.assign({}, collection.paging), { n: 0 })
                     }
                 };
             }
             // If document  
+            const document = data;
             return {
                 data: {
-                    changes: [{ data: document_response, type: 'added', ref }],
+                    changes: [{ data: document.item, type: 'added', ref }],
                     paging: { n: 0 }
                 }
             };
-        }), operators_1.catchError(error => rxjs_1.of({ error })));
-        const websocket_sync = (!this.socket || options._cursor) ? rxjs_2.from([]) : (this.socket.listen(ref).pipe(operators_1.map((change) => ({ data: { changes: [change] } }))));
-        return Object.assign(rxjs_2.merge(http_request, websocket_sync), {
-            reload: () => $on_reload.next(0)
+        }), (0, operators_1.catchError)(error => (0, rxjs_1.of)({ error })));
+        const websocket_sync = (!this.socket || options._cursor) ? (0, rxjs_1.of)() : (this.socket.listen(ref).pipe((0, operators_1.map)((change) => ({ data: { changes: [change] } }))));
+        return Object.assign((0, rxjs_2.merge)(http_request, websocket_sync), {
+            reload: () => $on_reload.next()
         });
     }
     call(url, method, query = {}, payload) {
@@ -63,21 +65,20 @@ class RestTransporter {
         return __awaiter(this, void 0, void 0, function* () {
             const headers = Object.assign(Object.assign(Object.assign({}, (yield ((_b = (_a = this.config).headers) === null || _b === void 0 ? void 0 : _b.call(_a))) || {}), payload ? {
                 'Content-Type': 'application/json'
-            } : {}), this.config.realtime ? { socket_id: this.socket.socket_session } : {});
+            } : {}), this.socket ? { socket_id: this.socket.socket_session } : {});
             try {
-                const { data, error, statusCode, message } = yield fetch(`${this.config.base_url()}/${url}${query ? `?${query_string_1.stringify(query)}` : ''}`, Object.assign({ method, headers: headers }, payload ? { body: JSON.stringify(payload) } : {}))
-                    .then(r => r.json());
-                if (error)
-                    throw typeof error == 'string' ? { error: { message: error, code: error } } : error;
-                if (statusCode > 205)
-                    throw { message };
-                return data;
+                return 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());
             }
-            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);
@@ -100,3 +101,9 @@ class RestTransporter {
     }
 }
 exports.RestTransporter = RestTransporter;
+_RestTransporter_instances = new WeakSet(), _RestTransporter_encode_query = function _RestTransporter_encode_query(query) {
+    if (!query || Object.keys(query || {}).length == 0)
+        return '';
+    const encoded_query = Object.keys(query).reduce((o, key) => (Object.assign(Object.assign({}, o), { [key]: typeof query[key] == 'object' ? JSON.stringify(query[key]) : query[key] })), {});
+    return `?${(0, query_string_1.stringify)(encoded_query)}`;
+};

package/build/Socket.d.ts

@@ -1,13 +1,14 @@
 import { UpdatedData } from "@livequery/types";
-import { Observable, BehaviorSubject } from "rxjs";
+import { Observable, Subject } from "rxjs";
 export declare class Socket {
+    #private;
     private ws_url_fatory;
     private topics;
     private $input;
-    readonly $last_state: BehaviorSubject<number>;
+    readonly $reconnect: Subject<void>;
     readonly socket_session: string;
-    private init;
     constructor(ws_url_fatory: () => string | Promise<string>);
     private $sync;
+    subscribe(realtime_token: string): void;
     listen(ref: string): Observable<UpdatedData>;
 }

package/build/Socket.js

@@ -8,6 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Socket_instances, _Socket_init;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Socket = void 0;
 const rxjs_1 = require("rxjs");
@@ -16,41 +22,12 @@ const uuid_1 = require("uuid");
 class Socket {
     constructor(ws_url_fatory) {
         this.ws_url_fatory = ws_url_fatory;
+        _Socket_instances.add(this);
         this.topics = new Map();
-        this.$input = new rxjs_1.Subject();
-        this.$last_state = new rxjs_1.BehaviorSubject(0);
-        this.socket_session = uuid_1.v4();
-        this.init();
-    }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof WebSocket == 'undefined')
-                return;
-            console.log('Use websocket to sync realtime data');
-            for (let n = 0; true; n++) {
-                console.log('Try connecting websocket .... ');
-                const ws = new WebSocket(yield this.ws_url_fatory());
-                const messages_handler = rxjs_1.fromEvent(ws, 'message').subscribe((evt) => {
-                    var _a;
-                    const { data, event } = JSON.parse(evt.data);
-                    (_a = this[`$${event}`]) === null || _a === void 0 ? void 0 : _a.call(this, data);
-                });
-                const connection_handler = rxjs_1.fromEvent(ws, 'open').subscribe(() => {
-                    console.log('Websocket connected');
-                    ws.send(JSON.stringify({ event: 'start', data: { id: this.socket_session } }));
-                    const { unsubscribe } = this.$input.subscribe(data => ws.send(JSON.stringify(data)));
-                    this.$last_state.next(ws.readyState);
-                    return unsubscribe;
-                });
-                yield rxjs_1.firstValueFrom(rxjs_1.merge(rxjs_1.fromEvent(ws, 'error'), rxjs_1.fromEvent(ws, 'close'), rxjs_1.fromEvent(ws, 'closed')));
-                this.$last_state.next(ws.readyState);
-                connection_handler.unsubscribe();
-                messages_handler.unsubscribe();
-                ws.close();
-                console.log(`Websocket connection droped, reconnect in 1s`);
-                yield new Promise(s => setTimeout(s, 1000));
-            }
-        });
+        this.$input = new rxjs_1.ReplaySubject(1000);
+        this.$reconnect = new rxjs_1.Subject();
+        this.socket_session = (0, uuid_1.v4)();
+        __classPrivateFieldGet(this, _Socket_instances, "m", _Socket_init).call(this);
     }
     $sync(data) {
         var _a, _b;
@@ -62,13 +39,16 @@ class Socket {
             (_b = this.topics.get(ref)) === null || _b === void 0 ? void 0 : _b.stream.next(Object.assign(Object.assign({}, change), { ref }));
         }
     }
+    subscribe(realtime_token) {
+        this.$input.next({ event: 'subscribe', data: { realtime_token } });
+    }
     listen(ref) {
         if (!this.topics.has(ref)) {
             const stream = new rxjs_1.Subject();
             this.topics.set(ref, { stream, listen_count: 0 });
         }
         this.topics.get(ref).listen_count++;
-        const stream = this.topics.get(ref).stream.pipe(operators_1.finalize(() => {
+        return this.topics.get(ref).stream.pipe((0, operators_1.finalize)(() => {
             this.topics.get(ref).listen_count--;
             setTimeout(() => {
                 if (this.topics.get(ref).listen_count == 0) {
@@ -76,7 +56,38 @@ class Socket {
                 }
             }, 2000);
         }));
-        return stream;
     }
 }
 exports.Socket = Socket;
+_Socket_instances = new WeakSet(), _Socket_init = function _Socket_init() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (typeof WebSocket == 'undefined')
+            return;
+        for (let n = 0; true; n++) {
+            console.log('Connecting websocket .... ');
+            const ws = new WebSocket(yield this.ws_url_fatory());
+            const messages_handler = (0, rxjs_1.fromEvent)(ws, 'message').subscribe((evt) => {
+                var _a;
+                const { data, event } = JSON.parse(evt.data);
+                (_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(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();
+                return () => {
+                    subscription.unsubscribe();
+                    this.$input.complete();
+                };
+            });
+            yield (0, rxjs_1.firstValueFrom)((0, rxjs_1.merge)((0, rxjs_1.fromEvent)(ws, 'error'), (0, rxjs_1.fromEvent)(ws, 'close'), (0, rxjs_1.fromEvent)(ws, 'closed')));
+            this.$input = new rxjs_1.ReplaySubject(1000);
+            data_sender.unsubscribe();
+            messages_handler.unsubscribe();
+            ws.close();
+            console.log(`Websocket connection dropped, reconnect in 1s ...`);
+            yield new Promise(s => setTimeout(s, 1000));
+        }
+    });
+};

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "1.0.18",
+    "version": "1.0.21",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -17,7 +17,7 @@
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@livequery/types": "^1.0.29"
+        "@livequery/types": "1.0.37"
     },
     "peerDependencies": {},
     "scripts": {