@powersync/web 0.0.0-dev-20251111122755 → 0.0.0-dev-20251119142638

package/dist/worker/WASQLiteDB.umd.js

@@ -9627,7 +9627,7 @@ function requireDist () {
 
 var distExports = requireDist();
 
-var version = "1.41.0";
+var version = "1.42.0";
 var PACKAGE = {
 	version: version};
 
@@ -10375,9 +10375,11 @@ class AbstractRemote {
         // Create a new stream splitting the response at line endings while also handling cancellations
         // by closing the reader.
         const reader = res.body.getReader();
+        let readerReleased = false;
         // This will close the network request and read stream
         const closeReader = async () => {
             try {
+                readerReleased = true;
                 await reader.cancel();
             }
             catch (ex) {
@@ -10385,17 +10387,21 @@ class AbstractRemote {
             }
             reader.releaseLock();
         };
+        const stream = new DataStream({
+            logger: this.logger,
+            mapLine: mapLine
+        });
         abortSignal?.addEventListener('abort', () => {
             closeReader();
+            stream.close();
         });
         const decoder = this.createTextDecoder();
         let buffer = '';
-        const stream = new DataStream({
-            logger: this.logger,
-            mapLine: mapLine
-        });
         const l = stream.registerListener({
             lowWater: async () => {
+                if (stream.closed || abortSignal?.aborted || readerReleased) {
+                    return;
+                }
                 try {
                     let didCompleteLine = false;
                     while (!didCompleteLine) {
@@ -11555,6 +11561,7 @@ class TriggerManagerImpl {
             await hooks?.beforeCreate?.(tx);
             await tx.execute(/* sql */ `
         CREATE TEMP TABLE ${destination} (
+          operation_id INTEGER PRIMARY KEY AUTOINCREMENT,
           id TEXT,
           operation TEXT,
           timestamp TEXT,
@@ -11665,17 +11672,20 @@ class TriggerManagerImpl {
                     const callbackResult = await options.onChange({
                         ...tx,
                         destinationTable: destination,
-                        withDiff: async (query, params) => {
+                        withDiff: async (query, params, options) => {
                             // Wrap the query to expose the destination table
+                            const operationIdSelect = options?.castOperationIdAsText
+                                ? 'id, operation, CAST(operation_id AS TEXT) as operation_id, timestamp, value, previous_value'
+                                : '*';
                             const wrappedQuery = /* sql */ `
                   WITH
                     DIFF AS (
                       SELECT
-                        *
+                        ${operationIdSelect}
                       FROM
                         ${destination}
                       ORDER BY
-                        timestamp ASC
+                        operation_id ASC
                     ) ${query}
                 `;
                             return tx.getAll(wrappedQuery, params);
@@ -11689,13 +11699,14 @@ class TriggerManagerImpl {
                         id,
                         ${contextColumns.length > 0
                                 ? `${contextColumns.map((col) => `json_extract(value, '$.${col}') as ${col}`).join(', ')},`
-                                : ''} operation as __operation,
+                                : ''} operation_id as __operation_id,
+                        operation as __operation,
                         timestamp as __timestamp,
                         previous_value as __previous_value
                       FROM
                         ${destination}
                       ORDER BY
-                        __timestamp ASC
+                        __operation_id ASC
                     ) ${query}
                 `;
                             return tx.getAll(wrappedQuery, params);
@@ -15903,6 +15914,8 @@ class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.
      * notification loops.
      */
     connectionId;
+    _holdCounter;
+    _holdId;
     constructor(options) {
         super();
         this.options = options;
@@ -15912,6 +15925,15 @@ class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.
         this.connectionId = new Date().valueOf() + Math.random();
         this.statementMutex = new async_mutex__WEBPACK_IMPORTED_MODULE_2__.Mutex();
         this._moduleFactory = DEFAULT_MODULE_FACTORIES[this.options.vfs];
+        this._holdCounter = 0;
+        this._holdId = null;
+    }
+    /**
+     * Gets the id for the current hold.
+     * This can be used to check for invalid states.
+     */
+    get currentHoldId() {
+        return this._holdId;
     }
     get sqliteAPI() {
         if (!this._sqliteAPI) {
@@ -15925,6 +15947,20 @@ class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.
         }
         return this._dbP;
     }
+    async markHold() {
+        const previousHoldId = this._holdId;
+        this._holdId = `${++this._holdCounter}`;
+        if (previousHoldId) {
+            await this.iterateAsyncListeners(async (cb) => cb.holdOverwritten?.(previousHoldId));
+        }
+        return this._holdId;
+    }
+    async releaseHold(holdId) {
+        if (holdId != this._holdId) {
+            throw new Error(`Invalid hold state, expected ${this._holdId} but got ${holdId}`);
+        }
+        this._holdId = null;
+    }
     async openDB() {
         this._dbP = await this.sqliteAPI.open_v2(this.options.dbFilename);
         return this._dbP;
@@ -16177,6 +16213,152 @@ const getNavigatorLocks = () => {
 };
 
 
+/***/ }),
+
+/***/ "./lib/src/worker/db/SharedWASQLiteConnection.js":
+/*!*******************************************************!*\
+  !*** ./lib/src/worker/db/SharedWASQLiteConnection.js ***!
+  \*******************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   SharedWASQLiteConnection: () => (/* binding */ SharedWASQLiteConnection)
+/* harmony export */ });
+class SharedWASQLiteConnection {
+    options;
+    isClosing;
+    // Keeps track if this current hold if the shared connection has a hold
+    activeHoldId;
+    constructor(options) {
+        this.options = options;
+        // Add this client ID to the set of known clients
+        this.clientIds.add(options.clientId);
+        this.isClosing = false;
+        this.activeHoldId = null;
+    }
+    async init() {
+        // No-op since the connection is already initialized when it was created
+    }
+    async markHold() {
+        this.activeHoldId = await this.connection.markHold();
+        return this.activeHoldId;
+    }
+    async releaseHold(id) {
+        try {
+            await this.connection.releaseHold(id);
+        }
+        finally {
+            this.activeHoldId = null;
+        }
+    }
+    get logger() {
+        return this.options.logger;
+    }
+    get dbEntry() {
+        return this.options.dbMap.get(this.options.dbFilename);
+    }
+    get connection() {
+        return this.dbEntry.db;
+    }
+    get clientIds() {
+        return this.dbEntry.clientIds;
+    }
+    /**
+     * Handles closing of a shared connection.
+     * The connection is only closed if there are no active clients using it.
+     */
+    async close() {
+        // This prevents further statements on this connection from being executed
+        this.isClosing = true;
+        const { clientIds, logger } = this;
+        const { clientId, dbFilename, dbMap } = this.options;
+        logger.debug(`Close requested from client ${clientId} of ${[...clientIds]}`);
+        clientIds.delete(clientId);
+        if (this.activeHoldId) {
+            /**
+             * The hold hasn't been released, but we're closing now.
+             * We can proactively cleanup and release the hold.
+             */
+            await this.connection.execute('ROLLBACK').catch(() => { });
+            await this.connection.releaseHold(this.activeHoldId).catch(() => { });
+        }
+        if (clientIds.size == 0) {
+            logger.debug(`Closing connection to ${this.options}.`);
+            const connection = this.connection;
+            dbMap.delete(dbFilename);
+            await connection.close();
+        }
+        logger.debug(`Connection to ${dbFilename} not closed yet due to active clients.`);
+        return;
+    }
+    async withClosing(action) {
+        if (this.isClosing) {
+            throw new Error('Connection is closing');
+        }
+        return action();
+    }
+    async execute(sql, params) {
+        return this.withClosing(() => this.connection.execute(sql, params));
+    }
+    async executeRaw(sql, params) {
+        return this.withClosing(() => this.connection.executeRaw(sql, params));
+    }
+    executeBatch(sql, params) {
+        return this.withClosing(() => this.connection.executeBatch(sql, params));
+    }
+    registerOnTableChange(callback) {
+        return this.connection.registerOnTableChange(callback);
+    }
+    getConfig() {
+        return this.connection.getConfig();
+    }
+}
+
+
+/***/ }),
+
+/***/ "./lib/src/worker/db/WorkerWASQLiteConnection.js":
+/*!*******************************************************!*\
+  !*** ./lib/src/worker/db/WorkerWASQLiteConnection.js ***!
+  \*******************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   WorkerWASQLiteConnection: () => (/* binding */ WorkerWASQLiteConnection),
+/* harmony export */   proxyWASQLiteConnection: () => (/* binding */ proxyWASQLiteConnection)
+/* harmony export */ });
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
+/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/WASQLiteConnection */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
+
+
+/**
+ * Fully proxies a WASQLiteConnection to be used as an AsyncDatabaseConnection.
+ */
+function proxyWASQLiteConnection(connection) {
+    return comlink__WEBPACK_IMPORTED_MODULE_1__.proxy({
+        init: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(() => connection.init()),
+        close: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(() => connection.close()),
+        markHold: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(() => connection.markHold()),
+        releaseHold: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy((holdId) => connection.releaseHold(holdId)),
+        execute: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy((sql, params) => connection.execute(sql, params)),
+        executeRaw: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy((sql, params) => connection.executeRaw(sql, params)),
+        executeBatch: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy((sql, params) => connection.executeBatch(sql, params)),
+        registerOnTableChange: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy((callback) => connection.registerOnTableChange(callback)),
+        getConfig: comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(() => connection.getConfig())
+    });
+}
+class WorkerWASQLiteConnection extends _db_adapters_wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_0__.WASqliteConnection {
+    async registerOnTableChange(callback) {
+        // Proxy the callback remove function
+        return comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(await super.registerOnTableChange(callback));
+    }
+}
+
+
 /***/ })
 
 /******/ 	});
@@ -16346,9 +16528,10 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _journeyapps_wa_sqlite__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @journeyapps/wa-sqlite */ "../../node_modules/@journeyapps/wa-sqlite/src/sqlite-api.js");
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @powersync/common */ "../common/dist/bundle.mjs");
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
-/* harmony import */ var _db_adapters_wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../db/adapters/wa-sqlite/WASQLiteConnection */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
-/* harmony import */ var _shared_navigator__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/navigator */ "./lib/src/shared/navigator.js");
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
+/* harmony import */ var _shared_navigator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/navigator */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _SharedWASQLiteConnection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./SharedWASQLiteConnection */ "./lib/src/worker/db/SharedWASQLiteConnection.js");
+/* harmony import */ var _WorkerWASQLiteConnection__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./WorkerWASQLiteConnection */ "./lib/src/worker/db/WorkerWASQLiteConnection.js");
 /**
  * Supports both shared and dedicated workers, based on how the worker is constructed (new SharedWorker vs new Worker()).
  */
@@ -16357,64 +16540,47 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 const baseLogger = (0,_powersync_common__WEBPACK_IMPORTED_MODULE_1__.createBaseLogger)();
 baseLogger.useDefaults();
 const logger = (0,_powersync_common__WEBPACK_IMPORTED_MODULE_1__.createLogger)('db-worker');
 const DBMap = new Map();
 const OPEN_DB_LOCK = 'open-wasqlite-db';
 let nextClientId = 1;
-const openWorkerConnection = async (options) => {
-    const connection = new _db_adapters_wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_2__.WASqliteConnection(options);
-    return {
-        init: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(() => connection.init()),
-        getConfig: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(() => connection.getConfig()),
-        close: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(() => connection.close()),
-        execute: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(async (sql, params) => connection.execute(sql, params)),
-        executeRaw: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(async (sql, params) => connection.executeRaw(sql, params)),
-        executeBatch: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(async (sql, params) => connection.executeBatch(sql, params)),
-        registerOnTableChange: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(async (callback) => {
-            // Proxy the callback remove function
-            return comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(await connection.registerOnTableChange(callback));
-        })
-    };
-};
 const openDBShared = async (options) => {
     // Prevent multiple simultaneous opens from causing race conditions
-    return (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_3__.getNavigatorLocks)().request(OPEN_DB_LOCK, async () => {
+    return (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_2__.getNavigatorLocks)().request(OPEN_DB_LOCK, async () => {
         const clientId = nextClientId++;
         const { dbFilename, logLevel } = options;
         logger.setLevel(logLevel);
         if (!DBMap.has(dbFilename)) {
             const clientIds = new Set();
-            const connection = await openWorkerConnection(options);
+            // This format returns proxy objects for function callbacks
+            const connection = new _WorkerWASQLiteConnection__WEBPACK_IMPORTED_MODULE_4__.WorkerWASQLiteConnection(options);
             await connection.init();
+            connection.registerListener({
+                holdOverwritten: async () => {
+                    /**
+                     * The previous hold has been overwritten, without being released.
+                     * we need to cleanup any resources associated with it.
+                     * We can perform a rollback to release any potential transactions that were started.
+                     */
+                    await connection.execute('ROLLBACK').catch(() => { });
+                }
+            });
             DBMap.set(dbFilename, {
                 clientIds,
                 db: connection
             });
         }
-        const dbEntry = DBMap.get(dbFilename);
-        dbEntry.clientIds.add(clientId);
-        const { db } = dbEntry;
-        const wrappedConnection = {
-            ...db,
-            init: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(async () => {
-                // the init has been done automatically
-            }),
-            close: comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(async () => {
-                const { clientIds } = dbEntry;
-                logger.debug(`Close requested from client ${clientId} of ${[...clientIds]}`);
-                clientIds.delete(clientId);
-                if (clientIds.size == 0) {
-                    logger.debug(`Closing connection to ${dbFilename}.`);
-                    DBMap.delete(dbFilename);
-                    return db.close?.();
-                }
-                logger.debug(`Connection to ${dbFilename} not closed yet due to active clients.`);
-                return;
-            })
-        };
-        return comlink__WEBPACK_IMPORTED_MODULE_4__.proxy(wrappedConnection);
+        // Associates this clientId with the shared connection entry
+        const sharedConnection = new _SharedWASQLiteConnection__WEBPACK_IMPORTED_MODULE_3__.SharedWASQLiteConnection({
+            dbMap: DBMap,
+            dbFilename,
+            clientId,
+            logger
+        });
+        return (0,_WorkerWASQLiteConnection__WEBPACK_IMPORTED_MODULE_4__.proxyWASQLiteConnection)(sharedConnection);
     });
 };
 // Check if we're in a SharedWorker context
@@ -16422,12 +16588,12 @@ if (typeof SharedWorkerGlobalScope !== 'undefined') {
     const _self = self;
     _self.onconnect = function (event) {
         const port = event.ports[0];
-        comlink__WEBPACK_IMPORTED_MODULE_4__.expose(openDBShared, port);
+        comlink__WEBPACK_IMPORTED_MODULE_5__.expose(openDBShared, port);
     };
 }
 else {
     // A dedicated worker can be shared externally
-    comlink__WEBPACK_IMPORTED_MODULE_4__.expose(openDBShared);
+    comlink__WEBPACK_IMPORTED_MODULE_5__.expose(openDBShared);
 }
 addEventListener('unload', () => {
     Array.from(DBMap.values()).forEach(async (dbConnection) => {