dexie-cloud-addon 4.4.4 → 4.4.6

package/dist/modern/dexie-cloud-addon.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.4.4, Wed Mar 25 2026
+ * Version 4.4.6, Thu Mar 26 2026
  *
  * https://dexie.org
  *
@@ -3759,6 +3759,16 @@ function applyServerChanges(changes, db) {
                         }
                         break;
                     case 'update':
+                        if (!primaryKey.outbound && primaryKey.keyPath) {
+                            // The primary key should never be part of an updateSpec — it cannot change
+                            // and is already communicated via the operation's keys array.
+                            // For private singleton IDs (e.g. "#key:userId" on server, "#key" on client),
+                            // the encoded server-side key may leak into the changeSpec via getObjectDiff().
+                            // Strip it here unconditionally as a defensive measure.
+                            for (const changeSpec of mut.changeSpecs) {
+                                Dexie.delByKeyPath(changeSpec, primaryKey.keyPath);
+                            }
+                        }
                         yield bulkUpdate(table, keys, mut.changeSpecs);
                         break;
                     case 'delete':
@@ -6773,14 +6783,13 @@ function connectWebSocket(db) {
         throw new Error(`No database URL to connect WebSocket to`);
     }
     const readyForChangesMessage = db.messageConsumer.readyToServe.pipe(filter$1((isReady) => isReady), // When consumer is ready for new messages, produce such a message to inform server about it
-    switchMap(() => db.getPersistedSyncState()), // We need the info on which server revision we are at:
-    filter$1((syncState) => syncState && syncState.serverRevision), // We wont send anything to server before inital sync has taken place
+    switchMap(() => db.cloud.persistedSyncState.pipe(filter$1((syncState) => !!(syncState && syncState.serverRevision)), take(1))), // Wait reactively for syncState with serverRevision (avoids race with logout/re-sync)
     switchMap((syncState) => __awaiter(this, void 0, void 0, function* () {
         return ({
             // Produce the message to trigger server to send us new messages to consume:
             type: 'ready',
             rev: syncState.serverRevision,
-            realmSetHash: yield computeRealmSetHash(syncState)
+            realmSetHash: yield computeRealmSetHash(syncState),
         });
     })));
     const messageProducer = merge(readyForChangesMessage, db.messageProducer);
@@ -6793,7 +6802,8 @@ function connectWebSocket(db) {
             }*/
             return userIsReallyActive.pipe(map((isActive) => [isActive ? userLogin : null, syncState]));
         }), switchMap(([userLogin, syncState]) => {
-            if ((userLogin === null || userLogin === void 0 ? void 0 : userLogin.isLoggedIn) && !(syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId))) {
+            if ((userLogin === null || userLogin === void 0 ? void 0 : userLogin.isLoggedIn) &&
+                !(syncState === null || syncState === void 0 ? void 0 : syncState.realms.includes(userLogin.userId))) {
                 // We're in an in-between state when user is logged in but the user's realms are not yet synced.
                 // Don't make this change reconnect the websocket just yet. Wait till syncState is updated
                 // to iclude the user's realm.
@@ -6828,7 +6838,7 @@ function connectWebSocket(db) {
                         accessTokenExpiration: refreshedLogin.accessTokenExpiration,
                         claims: refreshedLogin.claims,
                         license: refreshedLogin.license,
-                        data: refreshedLogin.data
+                        data: refreshedLogin.data,
                     });
                 })), switchMap(() => createObservable()));
             }
@@ -6836,7 +6846,7 @@ function connectWebSocket(db) {
                 return throwError(() => error);
             }
         }), catchError((error) => {
-            db.cloud.webSocketStatus.next("error");
+            db.cloud.webSocketStatus.next('error');
             if (error instanceof InvalidLicenseError) {
                 // Don't retry. Just throw and don't try connect again.
                 return throwError(() => error);
@@ -6948,27 +6958,30 @@ function LocalSyncWorker(db, cloudOptions, cloudSchema) {
         // break free from possible active transaction:
         setTimeout(() => {
             const purpose = pullSignalled ? 'pull' : 'push';
+            pullSignalled = false;
+            pushSignalled = false;
             syncStartTime = Date.now();
             syncIfPossible(db, cloudOptions, cloudSchema, {
                 cancelToken,
                 retryImmediatelyOnFetchError: true, // workaround for "net::ERR_NETWORK_CHANGED" in chrome.
                 purpose,
-            }).then(() => {
+            })
+                .then(() => {
                 if (cancelToken.cancelled) {
                     stop();
                 }
                 else {
                     if (pullSignalled || pushSignalled) {
                         // If we have signalled for more sync, do it now.
-                        pullSignalled = false;
-                        pushSignalled = false;
+                        // Note: don't reset flags here - syncAndRetry reads them in setTimeout
                         return syncAndRetry();
                     }
                 }
                 ongoingSync = false;
                 nextRetryTime = 0;
                 syncStartTime = 0;
-            }).catch((error) => {
+            })
+                .catch((error) => {
                 console.error('error in syncIfPossible()', error);
                 if (cancelToken.cancelled) {
                     stop();
@@ -7011,7 +7024,8 @@ function LocalSyncWorker(db, cloudOptions, cloudSchema) {
             if (nextRetryTime) {
                 console.debug(`Sync is paused until ${new Date(nextRetryTime).toISOString()} due to error in last sync attempt`);
             }
-            else if (syncStartTime > 0 && Date.now() - syncStartTime > 20 * SECONDS) {
+            else if (syncStartTime > 0 &&
+                Date.now() - syncStartTime > 20 * SECONDS) {
                 console.debug(`An existing sync operation is taking more than 20 seconds. Will resync when done.`);
             }
             return;
@@ -8373,7 +8387,7 @@ function dexieCloud(dexie) {
     const downloading$ = createDownloadingState();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.4.4",
+        version: "4.4.6",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -8800,7 +8814,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.4.4";
+dexieCloud.version = "4.4.6";
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, defineYDocTrigger, dexieCloud, getTiedObjectId, getTiedRealmId, resolveText };