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

package/dist/worker/SharedSyncImplementation.umd.js

@@ -7914,7 +7914,7 @@ function requireDist () {
 
 var distExports = requireDist();
 
-var version = "1.41.0";
+var version = "1.42.0";
 var PACKAGE = {
 	version: version};
 
@@ -8662,9 +8662,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) {
@@ -8672,17 +8674,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) {
@@ -9842,6 +9848,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,
@@ -9952,17 +9959,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);
@@ -9976,13 +9986,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);
@@ -14112,15 +14123,11 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
                 const start = performance.now();
                 try {
                     const r = await originalExecute(sql, bindings);
-                    const duration = performance.now() - start;
                     performance.measure(`[SQL] ${sql}`, { start });
-                    console.log('%c[SQL] %c%s %c%s', 'color: grey; font-weight: normal', durationStyle(duration), `[${duration.toFixed(1)}ms]`, 'color: grey; font-weight: normal', sql);
                     return r;
                 }
                 catch (e) {
-                    const duration = performance.now() - start;
                     performance.measure(`[SQL] [ERROR: ${e.message}] ${sql}`, { start });
-                    console.error('%c[SQL] %c%s %c%s %c%s', 'color: grey; font-weight: normal', 'color: red;  font-weight: normal', `[ERROR: ${e.message}]`, durationStyle(duration), `[${duration.toFixed(1)}ms]`, 'color: grey; font-weight: normal', sql);
                     throw e;
                 }
             };
@@ -14241,12 +14248,18 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
                 this.pendingAbortControllers.delete(abortController);
             }, timeoutMs)
             : null;
-        return (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, () => {
+        return (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(`db-lock-${this._dbIdentifier}`, { signal: abortController.signal }, async () => {
             this.pendingAbortControllers.delete(abortController);
             if (timoutId) {
                 clearTimeout(timoutId);
             }
-            return callback();
+            const holdId = await this.baseDB.markHold();
+            try {
+                return await callback();
+            }
+            finally {
+                await this.baseDB.releaseHold(holdId);
+            }
         });
     }
     async readTransaction(fn, options) {
@@ -14360,17 +14373,6 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
         };
     };
 }
-function durationStyle(duration) {
-    if (duration < 30) {
-        return 'color: grey; font-weight: normal';
-    }
-    else if (duration < 300) {
-        return 'color: blue; font-weight: normal';
-    }
-    else {
-        return 'color: red; font-weight: normal';
-    }
-}
 
 
 /***/ }),
@@ -14420,6 +14422,12 @@ class WorkerWrappedAsyncDatabaseConnection {
         // set.
         this.notifyRemoteClosed.abort();
     }
+    markHold() {
+        return this.baseConnection.markHold();
+    }
+    releaseHold(holdId) {
+        return this.baseConnection.releaseHold(holdId);
+    }
     withRemote(workerPromise) {
         const controller = this.notifyRemoteClosed;
         if (controller) {