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

package/dist/umd/service-worker.js

@@ -1545,9 +1545,19 @@
                         const mutClone = changeClone.muts[mutIndex];
                         const rewrittenKey = JSON.stringify(key);
                         mutClone.keys[keyIndex] = rewrittenKey;
-                        if (rewriteValues) {
-                            Dexie__default["default"].setByKeyPath(mutClone.values[keyIndex], primaryKey.keyPath, rewrittenKey);
-                        }
+                        /* Bug (#1777)
+                          We should not rewrite values. It will fail because the key is array and the value is string.
+                          Only the keys should be rewritten and it's already done on the server.
+                          We should take another round of revieweing how key transformations are being done between
+                          client and server and let the server do the key transformations entirely instead now that
+                          we have the primary key schema on the server making it possible to do so.
+                          if (rewriteValues) {
+                          Dexie.setByKeyPath(
+                            (mutClone as DBInsertOperation).values[keyIndex],
+                            primaryKey.keyPath!,
+                            rewrittenKey
+                          );
+                        }*/
                     }
                     else if (key[0] === '#') {
                         // Private ID - translate!
@@ -1854,7 +1864,7 @@
             });
             db.syncStateChangedEvent.next({
                 phase: isOnline ? 'error' : 'offline',
-                error,
+                error: new Error('' + (error === null || error === void 0 ? void 0 : error.message) || error),
             });
             return Promise.reject(error);
         }));
@@ -2670,14 +2680,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 +3599,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 +3631,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');
+            },
         });
     }
 
@@ -4450,7 +4471,7 @@
         });
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
-            version: '4.0.1-beta.44',
+            version: '4.0.1-beta.46',
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -4711,7 +4732,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.1-beta.44';
+    dexieCloud.version = '4.0.1-beta.46';
     Dexie__default["default"].Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: