@livequery/rest 2.0.22 → 2.0.27

package/build/RestTransporter.js

@@ -40,7 +40,7 @@ export class RestTransporter {
         return this.#query(ref, options);
     }
     #query(ref, options, hook) {
-        const http_request = merge(of(1), this.socket?.$reconnect || of())
+        const http_request = merge(this.socket?.$reconnect || of(1))
             .pipe(mergeMap(() => this.call(ref, 'GET', undefined, options, hook)), map(({ data, error }) => {
             if (error)
                 throw error;
@@ -83,14 +83,18 @@ export class RestTransporter {
             ...payload ? {
                 'Content-Type': 'application/json'
             } : {},
-            ...this.socket ? { socket_id: this.socket.socket_session } : {}
+            ...this.socket ? {
+                socket_id: this.socket.client_id,
+                'x-lcid': this.socket.client_id,
+                'x-lgid': await firstValueFrom(this.socket.$gateway.pipe(map(g => g.id)))
+            } : {}
         };
         try {
             const request = {
                 url: `${this.config.base_url()}/${url}${encode_query(query)}`,
                 options: {
                     method,
-                    headers: headers,
+                    headers,
                     ...payload ? { body: JSON.stringify(payload) } : {},
                 }
             };

package/build/Socket.d.ts

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

package/build/Socket.js

@@ -1,71 +1,62 @@
-import { firstValueFrom, fromEvent, Subject, merge, ReplaySubject } from "rxjs";
-import { finalize } from "rxjs/operators";
+import { fromEvent, Subject, BehaviorSubject, merge, ReplaySubject, of, interval } from "rxjs";
+import { delay, finalize, map, mergeMap, retry, switchMap, tap } from "rxjs/operators";
 import { v4 } from 'uuid';
 export class Socket {
     ws_url_fatory;
-    topics = new Map();
-    $input = new ReplaySubject(1000);
-    $reconnect = new Subject();
-    socket_session = v4();
-    async #init() {
+    client_id = v4();
+    $gateway = new BehaviorSubject(undefined);
+    $reconnect = new BehaviorSubject(0);
+    #topics = new Map();
+    #$input = new ReplaySubject(1000);
+    #running;
+    #init() {
         if (typeof WebSocket == 'undefined')
             return;
-        for (let n = 0; true; n++) {
-            console.log('Connecting websocket .... ');
-            const ws = new WebSocket(await this.ws_url_fatory());
-            const messages_handler = fromEvent(ws, 'message').subscribe((evt) => {
-                const { data, event } = JSON.parse(evt.data);
-                this[`$${event}`]?.(data);
-            });
-            const data_sender = 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();
-                };
-            });
-            await firstValueFrom(merge(fromEvent(ws, 'error'), fromEvent(ws, 'close'), fromEvent(ws, 'closed')));
-            this.$input = new ReplaySubject(1000);
-            data_sender.unsubscribe();
-            messages_handler.unsubscribe();
-            ws.close();
-            console.log(`Websocket connection dropped, reconnect in 1s ...`);
-            await new Promise(s => setTimeout(s, 1000));
-        }
+        return of(1).pipe(mergeMap(() => this.ws_url_fatory()), map(url => new WebSocket(url)), switchMap(ws => merge(fromEvent(ws, 'closed').pipe(map(e => { throw e; })), fromEvent(ws, 'close').pipe(map(e => { throw e; })), fromEvent(ws, 'error').pipe(map(e => { throw e; })), fromEvent(ws, 'open').pipe(switchMap(() => interval(60000)), tap(() => ws.send(JSON.stringify({ event: 'ping' })))), fromEvent(ws, 'open').pipe(tap(() => {
+            console.log(this.$reconnect.getValue() == 0 ? 'Websocket connected' : `Websocket re-connected (${this.$reconnect.getValue()})`);
+            this.$reconnect.next(this.$reconnect.getValue() + 1);
+            ws.send(JSON.stringify({ event: 'start', data: { id: this.client_id } }));
+        }), delay(1000), tap(() => !this.$gateway.getValue() && this.$gateway.next({ id: '' })), mergeMap(() => this.#$input), tap(data => ws.send(JSON.stringify(data)))), fromEvent(ws, 'message').pipe(tap((evt) => {
+            const e = JSON.parse(evt.data);
+            this[`$${e.event}`]?.(e);
+        }))).pipe(finalize(() => ws.close()))), retry({ delay: 1000 })).subscribe();
     }
     constructor(ws_url_fatory) {
         this.ws_url_fatory = ws_url_fatory;
-        this.#init();
+        this.#running = this.#init();
     }
-    $sync(data) {
-        for (const change of data.changes) {
+    stop() {
+        this.#running?.unsubscribe();
+    }
+    $sync(e) {
+        for (const change of e.data.changes) {
             // Collection ref broadcast
-            this.topics.get(change.ref)?.stream.next(change);
+            this.#topics.get(change.ref)?.stream.next(change);
             // Document ref broadcast
             const ref = `${change.ref}/${change.data.id}`;
-            this.topics.get(ref)?.stream.next({
+            this.#topics.get(ref)?.stream.next({
                 ...change,
                 ref
             });
         }
     }
+    $hello(e) {
+        this.$gateway.next({ id: e.gid });
+    }
     subscribe(realtime_token) {
-        this.$input.next({ event: 'subscribe', data: { realtime_token } });
+        this.#$input.next({ event: 'subscribe', data: { realtime_token } });
     }
     listen(ref) {
-        if (!this.topics.has(ref)) {
+        if (!this.#topics.has(ref)) {
             const stream = new Subject();
-            this.topics.set(ref, { stream, listen_count: 0 });
+            this.#topics.set(ref, { stream, listen_count: 0 });
         }
-        this.topics.get(ref).listen_count++;
-        return this.topics.get(ref).stream.pipe(finalize(() => {
-            this.topics.get(ref).listen_count--;
+        this.#topics.get(ref).listen_count++;
+        return this.#topics.get(ref).stream.pipe(finalize(() => {
+            this.#topics.get(ref).listen_count--;
             setTimeout(() => {
-                if (this.topics.get(ref).listen_count == 0) {
-                    this.$input.next({ event: 'unsubscribe', data: { ref } });
+                if (this.#topics.get(ref).listen_count == 0) {
+                    this.#$input.next({ event: 'unsubscribe', data: { ref } });
                 }
             }, 2000);
         }));

package/package.json

@@ -3,7 +3,7 @@
     "repository": {
         "url": "https://github.com/livequery/rest"
     },
-    "version": "2.0.22",
+    "version": "2.0.27",
     "type": "module",
     "description": "",
     "main": "build/index.js",