dexie-cloud-addon 4.1.0-alpha.20 → 4.1.0-alpha.21

package/dist/modern/service-worker.js

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.1.0-alpha.20, Wed Oct 23 2024
+ * Version 4.1.0-alpha.21, Mon Nov 18 2024
  *
  * https://dexie.org
  *
@@ -2754,13 +2754,17 @@ const writeAny = (encoder, data) => {
 function encodeYMessage(msg) {
     const encoder = new Encoder();
     writeVarString(encoder, msg.type);
-    writeVarString(encoder, msg.table);
-    writeVarString(encoder, msg.prop);
+    if ('table' in msg)
+        writeVarString(encoder, msg.table);
+    if ('prop' in msg)
+        writeVarString(encoder, msg.prop);
     switch (msg.type) {
         case 'u-ack':
         case 'u-reject':
             writeBigUint64(encoder, BigInt(msg.i));
             break;
+        case 'outdated-server-rev':
+            break;
         default:
             writeAny(encoder, msg.k);
             switch (msg.type) {
@@ -3104,6 +3108,9 @@ const readAny = decoder => readAnyLookupTable[127 - readUint8(decoder)](decoder)
 function decodeYMessage(a) {
     const decoder = new Decoder(a);
     const type = readVarString(decoder);
+    if (type === 'outdated-server-rev') {
+        return { type };
+    }
     const table = readVarString(decoder);
     const prop = readVarString(decoder);
     switch (type) {
@@ -4754,12 +4761,13 @@ function getUpdatesTable(db, table, ydocProp) {
 function applyYServerMessages(yMessages, db) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const result = {};
+        const receivedUntils = {};
+        let resyncNeeded = false;
         for (const m of yMessages) {
             switch (m.type) {
                 case 'u-s': {
                     const utbl = getUpdatesTable(db, m.table, m.prop);
-                    result[utbl.name] = yield utbl.add({
+                    receivedUntils[utbl.name] = yield utbl.add({
                         k: m.k,
                         u: m.u,
                     });
@@ -4788,13 +4796,13 @@ function applyYServerMessages(yMessages, db) {
                     // and destroy it's open document if there is one.
                     const primaryKey = (_a = (yield utbl.get(m.i))) === null || _a === void 0 ? void 0 : _a.k;
                     if (primaryKey != null) {
-                        yield db.transaction('rw', utbl, tx => {
+                        yield db.transaction('rw', utbl, (tx) => {
                             // @ts-ignore
                             tx.idbtrans._rejecting_y_ypdate = true; // Inform ydoc triggers that we delete because of a rejection and not GC
                             return utbl
                                 .where('i')
                                 .aboveOrEqual(m.i)
-                                .filter(u => cmp(u.k, primaryKey) === 0 && ((u.f || 0) & 1) === 1)
+                                .filter((u) => cmp(u.k, primaryKey) === 0 && ((u.f || 0) & 1) === 1)
                                 .delete();
                         });
                         // Destroy active doc
@@ -4811,9 +4819,15 @@ function applyYServerMessages(yMessages, db) {
                     }
                     break;
                 }
+                case 'outdated-server-rev':
+                    resyncNeeded = true;
+                    break;
             }
         }
-        return result;
+        return {
+            receivedUntils,
+            resyncNeeded,
+        };
     });
 }
 
@@ -5220,11 +5234,14 @@ function _sync(db_1, options_1, schema_1) {
                 //
                 // apply yMessages
                 //
-                const receivedUntils = yield applyYServerMessages(res.yMessages, db);
+                const { receivedUntils, resyncNeeded } = yield applyYServerMessages(res.yMessages, db);
                 //
                 // update Y SyncStates
                 //
                 yield updateYSyncStates(lastUpdateIds, receivedUntils, db, res.serverRevision);
+                if (resyncNeeded) {
+                    newSyncState.yDownloadedRealms = {}; // Will trigger a full download of Y-documents below...
+                }
             }
             //
             // Update regular syncState
@@ -6979,6 +6996,10 @@ class WSConnection extends Subscription$1 {
                     else if (msg.type === 'u-ack' || msg.type === 'u-reject' || msg.type === 'u-s' || msg.type === 'in-sync') {
                         applyYServerMessages([msg], this.db);
                     }
+                    else if (msg.type === 'outdated-server-rev') {
+                        // Won't happen but need this for typing.
+                        throw new Error('Outdated server revision not expected over WebSocket - only in sync using fetch()');
+                    }
                     else if (msg.type !== 'pong') {
                         this.subscriber.next(msg);
                     }
@@ -7021,12 +7042,19 @@ class WSConnection extends Subscription$1 {
                         else {
                             // If it's not a "ready" message, it's an YMessage.
                             // YMessages can be sent binary encoded.
+                            if (msg.type === 'u-c') {
+                                console.log("u-c:B", ++gotClientUpdateB);
+                            }
                             (_b = this.ws) === null || _b === void 0 ? void 0 : _b.send(encodeYMessage(msg));
                         }
                     }
                 }));
                 if (this.user.isLoggedIn && !isEagerSyncDisabled(this.db)) {
-                    this.subscriptions.add(createYClientUpdateObservable(this.db).subscribe(this.db.messageProducer));
+                    this.subscriptions.add(createYClientUpdateObservable(this.db).pipe(tap$1((msg) => {
+                        if (msg.type === 'u-c') {
+                            console.log("u-c:A", ++gotClientUpdateA, msg.i);
+                        }
+                    })).subscribe(this.db.messageProducer));
                 }
             }
             catch (error) {
@@ -7035,6 +7063,8 @@ class WSConnection extends Subscription$1 {
         });
     }
 }
+let gotClientUpdateA = 0;
+let gotClientUpdateB = 0;
 
 class InvalidLicenseError extends Error {
     constructor(license) {
@@ -8090,7 +8120,7 @@ function dexieCloud(dexie) {
     const syncComplete = new Subject();
     dexie.cloud = {
         // @ts-ignore
-        version: "4.1.0-alpha.20",
+        version: "4.1.0-alpha.21",
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         get currentUserId() {
@@ -8392,7 +8422,7 @@ function dexieCloud(dexie) {
     }
 }
 // @ts-ignore
-dexieCloud.version = "4.1.0-alpha.20";
+dexieCloud.version = "4.1.0-alpha.21";
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections: