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

package/dist/modern/service-worker.js

@@ -2140,7 +2140,7 @@ function MessagesFromServerConsumer(db) {
         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();
@@ -2172,29 +2172,32 @@ function MessagesFromServerConsumer(db) {
                             // 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;
                             }
@@ -2996,6 +2999,7 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                     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;
@@ -3102,6 +3106,7 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                         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;
@@ -3116,6 +3121,7 @@ function createMutationTrackingMiddleware({ currentUserObservable, db }) {
                                 ? {
                                     type: 'delete',
                                     ts,
+                                    opNo,
                                     keys,
                                     criteria: req.criteria,
                                     txid,
@@ -3548,10 +3554,13 @@ function connectWebSocket(db) {
     const messageProducer = db.messageConsumer.readyToServe.pipe(filter((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((syncState) => syncState && syncState.serverRevision), // We wont send anything to server before inital sync has taken place
-    map((syncState) => ({
-        // Produce the message to trigger server to send us new messages to consume:
-        type: 'ready',
-        rev: syncState.serverRevision,
+    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(filter((syncState) => syncState === null || syncState === void 0 ? void 0 : syncState.serverRevision), // Don't connect before there's no initial sync performed.
@@ -4428,7 +4437,7 @@ function dexieCloud(dexie) {
     });
     const syncComplete = new Subject();
     dexie.cloud = {
-        version: '4.0.1-beta.39',
+        version: '4.0.1-beta.41',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -4689,7 +4698,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.1-beta.39';
+dexieCloud.version = '4.0.1-beta.41';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: