dexie-cloud-addon 4.0.1-beta.44 → 4.0.1-beta.45

package/dist/umd/service-worker.js

@@ -2670,14 +2670,17 @@
      */
     function dbOnClosed(db, handler) {
         db.on.close.subscribe(handler);
-        const origClose = db.close;
-        db.close = function () {
+        // @ts-ignore
+        const origClose = db._close;
+        // @ts-ignore
+        db._close = function () {
             origClose.call(this);
             handler();
         };
         return () => {
             db.on.close.unsubscribe(handler);
-            db.close = origClose;
+            // @ts-ignore
+            db._close = origClose;
         };
     }
 
@@ -3586,13 +3589,17 @@
                     return db.cloud.persistedSyncState.pipe(operators.filter((syncState) => (syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId)) || false), operators.take(1), operators.map((syncState) => [userLogin, syncState]));
                 }
                 return new rxjs.BehaviorSubject([userLogin, syncState]);
-            }), operators.switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), operators.switchMap(([userLogin, realmSetHash]) => 
-            // Let server end query changes from last entry of same client-ID and forward.
-            // If no new entries, server won't bother the client. If new entries, server sends only those
-            // and the baseRev of the last from same client-ID.
-            userLogin
-                ? new WSObservable(db.cloud.options.databaseUrl, db.cloud.persistedSyncState.value.serverRevision, realmSetHash, db.cloud.persistedSyncState.value.clientIdentity, messageProducer, db.cloud.webSocketStatus, userLogin.accessToken, userLogin.accessTokenExpiration)
-                : rxjs.from([])), operators.catchError((error) => {
+            }), operators.switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), operators.distinctUntilChanged(([prevUser, prevHash], [currUser, currHash]) => prevUser === currUser && prevHash === currHash), operators.switchMap(([userLogin, realmSetHash]) => {
+                // Let server end query changes from last entry of same client-ID and forward.
+                // If no new entries, server won't bother the client. If new entries, server sends only those
+                // and the baseRev of the last from same client-ID.
+                if (userLogin) {
+                    return new WSObservable(db.cloud.options.databaseUrl, db.cloud.persistedSyncState.value.serverRevision, realmSetHash, db.cloud.persistedSyncState.value.clientIdentity, messageProducer, db.cloud.webSocketStatus, userLogin.accessToken, userLogin.accessTokenExpiration);
+                }
+                else {
+                    return rxjs.from([]);
+                }
+            }), operators.catchError((error) => {
                 if ((error === null || error === void 0 ? void 0 : error.name) === 'TokenExpiredError') {
                     console.debug('WebSocket observable: Token expired. Refreshing token...');
                     return rxjs.of(true).pipe(operators.switchMap(() => __awaiter(this, void 0, void 0, function* () {
@@ -3614,15 +3621,19 @@
                 return rxjs.from(waitAndReconnectWhenUserDoesSomething(error)).pipe(operators.switchMap(() => createObservable()));
             }));
         }
-        return createObservable().subscribe((msg) => {
-            if (msg) {
-                console.debug('WS got message', msg);
-                db.messageConsumer.enqueue(msg);
-            }
-        }, (error) => {
-            console.error('Oops! The main observable errored!', error);
-        }, () => {
-            console.error('Oops! The main observable completed!');
+        return createObservable().subscribe({
+            next: (msg) => {
+                if (msg) {
+                    console.debug('WS got message', msg);
+                    db.messageConsumer.enqueue(msg);
+                }
+            },
+            error: (error) => {
+                console.error('WS got error', error);
+            },
+            complete: () => {
+                console.debug('WS observable completed');
+            },
         });
     }