dexie-cloud-addon 4.0.1-beta.39 → 4.0.1-beta.41

package/dist/umd/service-worker.js

@@ -2146,7 +2146,7 @@
             event.next(null);
         }
         function consumeQueue() {
-            var _a, _b, _c;
+            var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function* () {
                 while (queue.length > 0) {
                     const msg = queue.shift();
@@ -2178,29 +2178,32 @@
                                 // new token. So we don't need to do anything more here.
                                 break;
                             case 'realm-added':
-                                //if (!persistedSyncState?.realms?.includes(msg.realm) && !persistedSyncState?.inviteRealms?.includes(msg.realm)) {
-                                triggerSync(db, 'pull');
-                                //}
+                                if (!((_a = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) === null || _a === void 0 ? void 0 : _a.includes(msg.realm)) &&
+                                    !((_b = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.inviteRealms) === null || _b === void 0 ? void 0 : _b.includes(msg.realm))) {
+                                    yield db.cloud.sync({ purpose: 'pull', wait: true });
+                                    //triggerSync(db, 'pull');
+                                }
                                 break;
                             case 'realm-accepted':
-                                //if (!persistedSyncState?.realms?.includes(msg.realm)) {
-                                triggerSync(db, 'pull');
-                                //}
+                                if (!((_c = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) === null || _c === void 0 ? void 0 : _c.includes(msg.realm))) {
+                                    yield db.cloud.sync({ purpose: 'pull', wait: true });
+                                    //triggerSync(db, 'pull');
+                                }
                                 break;
                             case 'realm-removed':
-                                //if (
-                                ((_a = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) === null || _a === void 0 ? void 0 : _a.includes(msg.realm)) ||
-                                    ((_b = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.inviteRealms) === null || _b === void 0 ? void 0 : _b.includes(msg.realm));
-                                //) {
-                                triggerSync(db, 'pull');
-                                //}
+                                if (((_d = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.realms) === null || _d === void 0 ? void 0 : _d.includes(msg.realm)) ||
+                                    ((_e = persistedSyncState === null || persistedSyncState === void 0 ? void 0 : persistedSyncState.inviteRealms) === null || _e === void 0 ? void 0 : _e.includes(msg.realm))) {
+                                    yield db.cloud.sync({ purpose: 'pull', wait: true });
+                                    //triggerSync(db, 'pull');
+                                }
                                 break;
                             case 'realms-changed':
-                                triggerSync(db, 'pull');
+                                //triggerSync(db, 'pull');
+                                yield db.cloud.sync({ purpose: 'pull', wait: true });
                                 break;
                             case 'changes':
                                 console.debug('changes');
-                                if (((_c = db.cloud.syncState.value) === null || _c === void 0 ? void 0 : _c.phase) === 'error') {
+                                if (((_f = db.cloud.syncState.value) === null || _f === void 0 ? void 0 : _f.phase) === 'error') {
                                     triggerSync(db, 'pull');
                                     break;
                                 }
@@ -3002,6 +3005,7 @@
                         if (mode === 'readwrite') {
                             // Give each transaction a globally unique id.
                             tx.txid = randomString$1(16);
+                            tx.opCount = 0;
                             // Introduce the concept of current user that lasts through the entire transaction.
                             // This is important because the tracked mutations must be connected to the user.
                             tx.currentUser = currentUserObservable.value;
@@ -3108,6 +3112,7 @@
                             trans.mutationsAdded = true;
                             const { txid, currentUser: { userId } } = trans;
                             const { type } = req;
+                            const opNo = ++trans.opCount;
                             return table.mutate(req).then((res) => {
                                 const { numFailures: hasFailures, failures } = res;
                                 let keys = type === 'delete' ? req.keys : res.results;
@@ -3122,6 +3127,7 @@
                                     ? {
                                         type: 'delete',
                                         ts,
+                                        opNo,
                                         keys,
                                         criteria: req.criteria,
                                         txid,
@@ -3554,10 +3560,13 @@
         const messageProducer = db.messageConsumer.readyToServe.pipe(operators.filter((isReady) => isReady), // When consumer is ready for new messages, produce such a message to inform server about it
         operators.switchMap(() => db.getPersistedSyncState()), // We need the info on which server revision we are at:
         operators.filter((syncState) => syncState && syncState.serverRevision), // We wont send anything to server before inital sync has taken place
-        operators.map((syncState) => ({
-            // Produce the message to trigger server to send us new messages to consume:
-            type: 'ready',
-            rev: syncState.serverRevision,
+        operators.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)
+            });
         })));
         function createObservable() {
             return db.cloud.persistedSyncState.pipe(operators.filter((syncState) => syncState === null || syncState === void 0 ? void 0 : syncState.serverRevision), // Don't connect before there's no initial sync performed.
@@ -4434,7 +4443,7 @@
         });
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
-            version: '4.0.1-beta.39',
+            version: '4.0.1-beta.41',
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -4695,7 +4704,7 @@
             });
         }
     }
-    dexieCloud.version = '4.0.1-beta.39';
+    dexieCloud.version = '4.0.1-beta.41';
     Dexie__default["default"].Cloud = dexieCloud;
 
     // In case the SW lives for a while, let it reuse already opened connections: