@livequery/rest 1.0.16 → 1.0.19

package/build/RestTransporter.d.ts

@@ -10,6 +10,7 @@ export declare type RestTransporterConfig = {
     realtime?: boolean;
 };
 export declare class RestTransporter implements Transporter {
+    #private;
     private config;
     private queries;
     private socket;
@@ -17,7 +18,7 @@ export declare class RestTransporter implements Transporter {
     get<T>(ref: string, query?: any): Promise<T>;
     query<T extends {
         id: string;
-    }>(query_id: number, ref: string, options?: Partial<QueryOption<T>>): Observable<QueryStream<T> | {
+    }>(ref: string, options?: Partial<QueryOption<T>>): Observable<QueryStream<T> | {
         error: any;
     }> & {
         reload: () => 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,6 +24,7 @@ const query_string_1 = require("query-string");
 class RestTransporter {
     constructor(config) {
         this.config = config;
+        _RestTransporter_instances.add(this);
         this.queries = new Set();
         config.realtime && (this.socket = new Socket_1.Socket(config.websocket_url));
     }
@@ -26,13 +33,13 @@ class RestTransporter {
             return yield this.call(ref, 'GET', query, null);
         });
     }
-    query(query_id, ref, options) {
+    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 $when_socket_ready = ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.$last_state.pipe((0, operators_1.filter)(s => s == 1))) || (0, rxjs_1.of)(true);
+        const $on_can_reload = $on_reload.pipe((0, operators_1.filter)(() => !this.socket || this.socket.$last_state.getValue() == 1));
+        const http_request = (0, rxjs_2.merge)($when_socket_ready, $on_can_reload)
+            .pipe((0, operators_1.mergeMap)(() => this.call(ref, 'GET', options)), (0, operators_1.map)(response => {
             const collection_response = response;
             const document_response = response;
             // If collection
@@ -52,21 +59,20 @@ class RestTransporter {
                     paging: { n: 0 }
                 }
             };
-        }), operators_1.catchError(error => rxjs_1.of({ error })));
-        const websocket_sync = (!this.socket || this.queries.has(query_id)) ? rxjs_2.from([]) : (this.queries.add(query_id),
-            this.socket.listen(ref).pipe(operators_1.map((change) => ({ data: { changes: [change] } })), operators_1.finalize(() => this.queries.delete(query_id))));
-        return Object.assign(rxjs_2.merge(http_request, websocket_sync), {
+        }), (0, operators_1.catchError)(error => (0, rxjs_1.of)({ error })));
+        const websocket_sync = (!this.socket || options._cursor) ? (0, rxjs_2.from)([]) : (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(0)
         });
     }
     call(url, method, query = {}, payload) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const headers = Object.assign(Object.assign({}, (yield ((_b = (_a = this.config).headers) === null || _b === void 0 ? void 0 : _b.call(_a))) || {}), payload ? {
+            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 } : {});
             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) } : {}))
+                const { data, error, statusCode, message } = 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 typeof error == 'string' ? { error: { message: error, code: error } } : error;
@@ -101,3 +107,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.js

@@ -19,7 +19,7 @@ class Socket {
         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.socket_session = (0, uuid_1.v4)();
         this.init();
     }
     init() {
@@ -30,19 +30,19 @@ class Socket {
             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) => {
+                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 connection_handler = rxjs_1.fromEvent(ws, 'open').subscribe(() => {
+                const connection_handler = (0, 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')));
+                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.$last_state.next(ws.readyState);
                 connection_handler.unsubscribe();
                 messages_handler.unsubscribe();
@@ -68,11 +68,13 @@ class Socket {
             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(() => {
+        const stream = this.topics.get(ref).stream.pipe((0, operators_1.finalize)(() => {
             this.topics.get(ref).listen_count--;
-            if (this.topics.get(ref).listen_count == 0) {
-                this.$input.next({ event: 'unsubscribe', data: { ref } });
-            }
+            setTimeout(() => {
+                if (this.topics.get(ref).listen_count == 0) {
+                    this.$input.next({ event: 'unsubscribe', data: { ref } });
+                }
+            }, 2000);
         }));
         return stream;
     }

package/package.json

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