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

package/dist/modern/service-worker.js

@@ -1539,9 +1539,19 @@ function encodeIdsForServer(schema, currentUser, changes) {
                     const mutClone = changeClone.muts[mutIndex];
                     const rewrittenKey = JSON.stringify(key);
                     mutClone.keys[keyIndex] = rewrittenKey;
-                    if (rewriteValues) {
-                        Dexie.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!
@@ -1848,7 +1858,7 @@ function sync(db, options, schema, syncOptions) {
         });
         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);
     }));
@@ -2664,14 +2674,17 @@ const DISABLE_SERVICEWORKER_STRATEGY = (isSafari && safariVersion <= 605) || //
  */
 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;
     };
 }
 
@@ -3580,13 +3593,17 @@ function connectWebSocket(db) {
                 return db.cloud.persistedSyncState.pipe(filter((syncState) => (syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId)) || false), take(1), map((syncState) => [userLogin, syncState]));
             }
             return new BehaviorSubject([userLogin, syncState]);
-        }), switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), 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)
-            : from([])), catchError((error) => {
+        }), switchMap(([userLogin, syncState]) => __awaiter(this, void 0, void 0, function* () { return [userLogin, yield computeRealmSetHash(syncState)]; })), distinctUntilChanged(([prevUser, prevHash], [currUser, currHash]) => prevUser === currUser && prevHash === currHash), 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 from([]);
+            }
+        }), catchError((error) => {
             if ((error === null || error === void 0 ? void 0 : error.name) === 'TokenExpiredError') {
                 console.debug('WebSocket observable: Token expired. Refreshing token...');
                 return of(true).pipe(switchMap(() => __awaiter(this, void 0, void 0, function* () {
@@ -3608,15 +3625,19 @@ function connectWebSocket(db) {
             return from(waitAndReconnectWhenUserDoesSomething(error)).pipe(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');
+        },
     });
 }
 
@@ -4444,7 +4465,7 @@ function dexieCloud(dexie) {
     });
     const syncComplete = new Subject();
     dexie.cloud = {
-        version: '4.0.1-beta.44',
+        version: '4.0.1-beta.46',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -4705,7 +4726,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.1-beta.44';
+dexieCloud.version = '4.0.1-beta.46';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: