dexie-cloud-addon 4.1.0-beta.41 → 4.1.0-beta.43

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

@@ -8,7 +8,7 @@
  *
  * ==========================================================================
  *
- * Version 4.1.0-beta.41, Wed Jan 29 2025
+ * Version 4.1.0-beta.43, Fri Feb 07 2025
  *
  * https://dexie.org
  *
@@ -3038,19 +3038,25 @@
         }
     }
 
+    const hasArrayBufferB64 = "fromBase64" in Uint8Array; // https://github.com/tc39/proposal-arraybuffer-base64;
     const b64decode = typeof Buffer !== "undefined"
-        ? (base64) => Buffer.from(base64, "base64")
-        : (base64) => {
-            const binary_string = atob(base64);
-            const len = binary_string.length;
-            const bytes = new Uint8Array(len);
-            for (var i = 0; i < len; i++) {
-                bytes[i] = binary_string.charCodeAt(i);
-            }
-            return bytes;
-        };
+        ? (base64) => Buffer.from(base64, "base64") // Node
+        : hasArrayBufferB64
+            ? // @ts-ignore: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array/fromBase64
+                (base64) => Uint8Array.fromBase64(base64) // Modern javascript standard
+            : (base64) => {
+                // Legacy DOM workaround
+                const binary_string = atob(base64);
+                const len = binary_string.length;
+                const bytes = new Uint8Array(len);
+                for (var i = 0; i < len; i++) {
+                    bytes[i] = binary_string.charCodeAt(i);
+                }
+                return bytes;
+            };
     const b64encode = typeof Buffer !== "undefined"
         ? (b) => {
+            // Node
             if (ArrayBuffer.isView(b)) {
                 return Buffer.from(b.buffer, b.byteOffset, b.byteLength).toString("base64");
             }
@@ -3058,16 +3064,20 @@
                 return Buffer.from(b).toString("base64");
             }
         }
-        : (b) => {
-            const u8a = ArrayBuffer.isView(b) ? b : new Uint8Array(b);
-            const CHUNK_SIZE = 0x1000;
-            const strs = [];
-            for (let i = 0, l = u8a.length; i < l; i += CHUNK_SIZE) {
-                const chunk = u8a.subarray(i, i + CHUNK_SIZE);
-                strs.push(String.fromCharCode.apply(null, chunk));
-            }
-            return btoa(strs.join(""));
-        };
+        : hasArrayBufferB64
+            ? // @ts-ignore https://github.com/tc39/proposal-arraybuffer-base64
+                (b) => b.toBase64() // Modern Javascript standard
+            : (b) => {
+                // Legacy DOM workaround
+                const u8a = ArrayBuffer.isView(b) ? b : new Uint8Array(b);
+                const CHUNK_SIZE = 0x1000;
+                const strs = [];
+                for (let i = 0, l = u8a.length; i < l; i += CHUNK_SIZE) {
+                    const chunk = u8a.subarray(i, i + CHUNK_SIZE);
+                    strs.push(String.fromCharCode.apply(null, chunk));
+                }
+                return btoa(strs.join(""));
+            };
 
     class TokenErrorResponseError extends Error {
         constructor({ title, message, messageCode, messageParams, }) {
@@ -4554,6 +4564,26 @@
         },
     };
 
+    var FileDef = {
+        File: {
+            test: (file, toStringTag) => toStringTag === "File",
+            replace: (file) => ({
+                $t: "File",
+                v: b64encode(string2ArrayBuffer(readBlobSync(file))),
+                type: file.type,
+                name: file.name,
+                lastModified: new Date(file.lastModified).toISOString(),
+            }),
+            revive: ({ type, v, name, lastModified }) => {
+                const ab = b64decode(v);
+                return new File([ab], name, {
+                    type,
+                    lastModified: new Date(lastModified).getTime(),
+                });
+            },
+        },
+    };
+
     // Since server revisions are stored in bigints, we need to handle clients without
     // bigint support to not fail when serverRevision is passed over to client.
     // We need to not fail when reviving it and we need to somehow store the information.
@@ -4589,7 +4619,7 @@
                 revive: ({ v }) => new FakeBigInt(v),
             },
         };
-    const defs = Object.assign(Object.assign(Object.assign({}, undefinedDef), bigIntDef), { PropModification: {
+    const defs = Object.assign(Object.assign(Object.assign(Object.assign({}, undefinedDef), bigIntDef), FileDef), { PropModification: {
             test: (val) => val instanceof Dexie.PropModification,
             replace: (propModification) => {
                 return Object.assign({ $t: 'PropModification' }, propModification['@@propmod']);
@@ -4964,7 +4994,7 @@
             .toArray();
     }
 
-    function $Y$1(db) {
+    function $Y(db) {
         const $Y = db.dx._options.Y;
         if (!$Y)
             throw new Error('Y library not supplied to Dexie constructor');
@@ -4994,7 +5024,7 @@
             for (const table of tablesToSync) {
                 if (table.schema.yProps) {
                     for (const yProp of table.schema.yProps) {
-                        const Y = $Y$1(db); // This is how we retrieve the user-provided Y library
+                        const Y = $Y(db); // This is how we retrieve the user-provided Y library
                         const yTable = db.table(yProp.updatesTable); // the updates-table for this combo of table+propName
                         const syncState = (yield yTable.get(DEXIE_CLOUD_SYNCER_ID));
                         // unsentFrom = the `i` value of updates that aren't yet sent to server (or at least not acked by the server yet)
@@ -8109,7 +8139,7 @@
                     if (provider.destroyed || currentFlowId !== myFlow || !connected)
                         return;
                     if (serverUpdatesSinceLastSync.length > 0) {
-                        const Y = $Y$1(db); // Get the Yjs library from Dexie constructor options
+                        const Y = $Y(db); // Get the Yjs library from Dexie constructor options
                         const mergedUpdate = Y.mergeUpdatesV2(serverUpdatesSinceLastSync.map((update) => update.u));
                         const stateVector = Y.encodeStateVectorFromUpdateV2(mergedUpdate);
                         docOpenMsg.sv = stateVector;
@@ -8129,8 +8159,68 @@
     }
 
     const ydocTriggers = {};
-    const docIsAlreadyHooked = new WeakSet();
     const middlewares = new WeakMap();
+    const txRunner = TriggerRunner("tx");
+    const unloadRunner = TriggerRunner("unload");
+    function TriggerRunner(name) {
+        let triggerExecPromise = null;
+        let triggerScheduled = false;
+        let registry = new Map();
+        function execute(registryCopy) {
+            return __awaiter(this, void 0, void 0, function* () {
+                for (const { db, parentId, triggers, parentTable, prop, } of registryCopy.values()) {
+                    const yDoc = Dexie.DexieYProvider.getOrCreateDocument(db, parentTable, prop, parentId);
+                    try {
+                        Dexie.DexieYProvider.load(yDoc); // If doc is open, this would just be a ++refount
+                        yield yDoc.whenLoaded; // If doc is loaded, this would resolve immediately
+                        for (const trigger of triggers) {
+                            yield trigger(yDoc, parentId);
+                        }
+                    }
+                    catch (error) {
+                        console.error(`Error in YDocTrigger ${error}`);
+                    }
+                    finally {
+                        Dexie.DexieYProvider.release(yDoc);
+                    }
+                }
+            });
+        }
+        return {
+            name,
+            run() {
+                return __awaiter(this, void 0, void 0, function* () {
+                    if (!triggerScheduled && registry.size > 0) {
+                        triggerScheduled = true;
+                        if (triggerExecPromise)
+                            yield triggerExecPromise.catch(() => { });
+                        setTimeout(() => {
+                            // setTimeout() is to escape from Promise.PSD zones and never run within liveQueries or transaction scopes
+                            triggerScheduled = false;
+                            const registryCopy = registry;
+                            registry = new Map();
+                            triggerExecPromise = execute(registryCopy).finally(() => (triggerExecPromise = null));
+                        }, 0);
+                    }
+                });
+            },
+            enqueue(db, parentTable, parentId, prop, trigger) {
+                const key = `${db.name}:${parentTable}:${parentId}:${prop}`;
+                let entry = registry.get(key);
+                if (!entry) {
+                    entry = {
+                        db,
+                        parentTable,
+                        parentId,
+                        prop,
+                        triggers: new Set(),
+                    };
+                    registry.set(key, entry);
+                }
+                entry.triggers.add(trigger);
+            },
+        };
+    }
     const createMiddleware = (db) => ({
         stack: 'dbcore',
         level: 10,
@@ -8138,15 +8228,20 @@
         create: (down) => {
             return Object.assign(Object.assign({}, down), { transaction: (stores, mode, options) => {
                     const idbtrans = down.transaction(stores, mode, options);
+                    if (mode === 'readonly')
+                        return idbtrans;
+                    if (!stores.some((store) => ydocTriggers[store]))
+                        return idbtrans;
                     idbtrans.addEventListener('complete', onTransactionCommitted);
                     return idbtrans;
-                }, table: (tblName) => {
-                    const coreTable = down.table(tblName);
-                    const triggerSpec = ydocTriggers[tblName];
+                }, table: (updatesTable) => {
+                    const coreTable = down.table(updatesTable);
+                    const triggerSpec = ydocTriggers[updatesTable];
                     if (!triggerSpec)
                         return coreTable;
                     const { trigger, parentTable, prop } = triggerSpec;
                     return Object.assign(Object.assign({}, coreTable), { mutate(req) {
+                            var _a;
                             switch (req.type) {
                                 case 'add': {
                                     for (const yUpdateRow of req.values) {
@@ -8154,15 +8249,10 @@
                                             continue; // A syncer or garbage collection state does not point to a key
                                         const primaryKey = yUpdateRow.k;
                                         const doc = Dexie.DexieYProvider.getDocCache(db).find(parentTable, primaryKey, prop);
-                                        if (doc) {
-                                            if (!docIsAlreadyHooked.has(doc)) {
-                                                hookToDoc(doc, primaryKey, trigger);
-                                                docIsAlreadyHooked.add(doc);
-                                            }
-                                        }
-                                        else {
-                                            enqueueTrigger(db, tblName, primaryKey, trigger);
-                                        }
+                                        const runner = doc && ((_a = Dexie.DexieYProvider.for(doc)) === null || _a === void 0 ? void 0 : _a.refCount)
+                                            ? unloadRunner // Document is open. Wait with trigger until it's closed.
+                                            : txRunner; // Document is closed. Run trigger immediately after transaction commits.
+                                        runner.enqueue(db, parentTable, primaryKey, prop, trigger);
                                     }
                                     break;
                                 }
@@ -8185,7 +8275,7 @@
                                                     keySet.addKey(k);
                                             }
                                             for (const interval of keySet) {
-                                                enqueueTrigger(db, tblName, interval.from, trigger);
+                                                txRunner.enqueue(db, parentTable, interval.from, prop, trigger);
                                             }
                                         });
                                     }
@@ -8196,74 +8286,11 @@
                 } });
         },
     });
-    let triggerExecPromise = null;
-    let triggerScheduled = false;
-    let scheduledTriggers = [];
-    function $Y(db) {
-        const $Y = db._options.Y;
-        if (!$Y)
-            throw new Error('Y library not supplied to Dexie constructor');
-        return $Y;
-    }
-    function executeTriggers(triggersToRun) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const { db, parentId, trigger, updatesTable } of triggersToRun) {
-                // Load entire document into an Y.Doc instance:
-                const updates = yield db
-                    .table(updatesTable)
-                    .where({ k: parentId })
-                    .toArray();
-                const Y = $Y(db);
-                const yDoc = new Y.Doc();
-                for (const update of updates) {
-                    Y.applyUpdateV2(yDoc, update.u);
-                }
-                try {
-                    yield trigger(yDoc, parentId);
-                }
-                catch (error) {
-                    console.error(`Error in YDocTrigger ${error}`);
-                }
-            }
-        });
-    }
-    function enqueueTrigger(db, updatesTable, parentId, trigger) {
-        scheduledTriggers.push({
-            db,
-            updatesTable,
-            parentId,
-            trigger,
-        });
-    }
     function onTransactionCommitted() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!triggerScheduled && scheduledTriggers.length > 0) {
-                triggerScheduled = true;
-                if (triggerExecPromise)
-                    yield triggerExecPromise.catch(() => { });
-                setTimeout(() => {
-                    // setTimeout() is to escape from Promise.PSD zones and never run within liveQueries or transaction scopes
-                    triggerScheduled = false;
-                    const triggersToRun = scheduledTriggers;
-                    scheduledTriggers = [];
-                    triggerExecPromise = executeTriggers(triggersToRun).finally(() => (triggerExecPromise = null));
-                }, 0);
-            }
-        });
+        txRunner.run();
     }
-    function hookToDoc(doc, parentId, trigger) {
-        // From now on, keep listening to doc updates and execute the trigger when it happens there instead
-        doc.on('updateV2', (update, origin) => {
-            //Dexie.ignoreTransaction(()=>{
-            trigger(doc, parentId);
-            //});
-        });
-        /*
-          NOT NEEDED because DexieYProvider's docCache will also listen to destroy and remove it from its cache:
-          doc.on('destroy', ()=>{
-          docIsAlreadyHooked.delete(doc);
-        })
-        */
+    function beforeProviderUnload() {
+        unloadRunner.run();
     }
     function defineYDocTrigger(table, prop, trigger) {
         var _a, _b;
@@ -8282,6 +8309,9 @@
             middlewares.set(db, mw);
         }
         db.use(mw);
+        {
+            Dexie.DexieYProvider.on('beforeunload', beforeProviderUnload);
+        }
     }
 
     const DEFAULT_OPTIONS = {
@@ -8324,7 +8354,7 @@
         const syncComplete = new rxjs.Subject();
         dexie.cloud = {
             // @ts-ignore
-            version: "4.1.0-beta.41",
+            version: "4.1.0-beta.43",
             options: Object.assign({}, DEFAULT_OPTIONS),
             schema: null,
             get currentUserId() {
@@ -8642,7 +8672,7 @@
         }
     }
     // @ts-ignore
-    dexieCloud.version = "4.1.0-beta.41";
+    dexieCloud.version = "4.1.0-beta.43";
     Dexie.Cloud = dexieCloud;
 
     exports.default = dexieCloud;