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

package/dist/modern/yjs/applyYMessages.d.ts

@@ -1,5 +1,8 @@
 import { DexieCloudDB } from '../db/DexieCloudDB';
 import { YServerMessage } from 'dexie-cloud-common';
 export declare function applyYServerMessages(yMessages: YServerMessage[], db: DexieCloudDB): Promise<{
-    [yTable: string]: number;
+    receivedUntils: {
+        [yTable: string]: number;
+    };
+    resyncNeeded: boolean;
 }>;

package/dist/umd/dexie-cloud-addon.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
  *
@@ -982,13 +982,17 @@
     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) {
@@ -1332,6 +1336,9 @@
     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) {
@@ -5063,12 +5070,13 @@
     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,
                         });
@@ -5097,13 +5105,13 @@
                         // 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 => Dexie.cmp(u.k, primaryKey) === 0 && ((u.f || 0) & 1) === 1)
+                                    .filter((u) => Dexie.cmp(u.k, primaryKey) === 0 && ((u.f || 0) & 1) === 1)
                                     .delete();
                             });
                             // Destroy active doc
@@ -5120,9 +5128,15 @@
                         }
                         break;
                     }
+                    case 'outdated-server-rev':
+                        resyncNeeded = true;
+                        break;
                 }
             }
-            return result;
+            return {
+                receivedUntils,
+                resyncNeeded,
+            };
         });
     }
 
@@ -5529,11 +5543,14 @@
                     //
                     // 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
@@ -6982,6 +6999,10 @@
                         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);
                         }
@@ -7024,12 +7045,19 @@
                             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(rxjs.tap((msg) => {
+                            if (msg.type === 'u-c') {
+                                console.log("u-c:A", ++gotClientUpdateA, msg.i);
+                            }
+                        })).subscribe(this.db.messageProducer));
                     }
                 }
                 catch (error) {
@@ -7038,6 +7066,8 @@
             });
         }
     }
+    let gotClientUpdateA = 0;
+    let gotClientUpdateB = 0;
 
     class InvalidLicenseError extends Error {
         constructor(license) {
@@ -8100,7 +8130,7 @@
         const syncComplete = new rxjs.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() {
@@ -8402,7 +8432,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.1.0-alpha.20";
+    dexieCloud.version = "4.1.0-alpha.21";
     Dexie.Cloud = dexieCloud;
 
     const ydocTriggers = {};