@powersync/web 1.30.0 → 1.31.0

package/dist/worker/SharedSyncImplementation.umd.js

@@ -3,11 +3,11 @@ var sdk_web;
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ "../../node_modules/@journeyapps/wa-sqlite/src/sqlite-api.js":
+/***/ "../../node_modules/@journeyapps/wa-sqlite/src/sqlite-api.js"
 /*!*******************************************************************!*\
   !*** ../../node_modules/@journeyapps/wa-sqlite/src/sqlite-api.js ***!
   \*******************************************************************/
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -1147,8 +1147,11 @@ function Factory(Module) {
       // Wait for all pending retry operations to complete. This is
       // normally empty on the first loop iteration.
       if (Module.retryOps.length) {
-        await Promise.all(Module.retryOps);
-        Module.retryOps = [];
+        try {
+          await Promise.all(Module.retryOps);
+        } finally {
+          Module.retryOps = [];
+        }
       }
       
       rc = await f();
@@ -1193,13 +1196,13 @@ function decl(s) {
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "../../node_modules/@journeyapps/wa-sqlite/src/sqlite-constants.js":
+/***/ "../../node_modules/@journeyapps/wa-sqlite/src/sqlite-constants.js"
 /*!*************************************************************************!*\
   !*** ../../node_modules/@journeyapps/wa-sqlite/src/sqlite-constants.js ***!
   \*************************************************************************/
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -1712,13 +1715,13 @@ const SQLITE_PREPARE_PERSISTENT = 0x01;
 const SQLITE_PREPARE_NORMALIZED = 0x02;
 const SQLITE_PREPARE_NO_VTAB = 0x04;
 
-/***/ }),
+/***/ },
 
-/***/ "../../node_modules/async-mutex/index.mjs":
+/***/ "../../node_modules/async-mutex/index.mjs"
 /*!************************************************!*\
   !*** ../../node_modules/async-mutex/index.mjs ***!
   \************************************************/
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -2023,13 +2026,13 @@ function tryAcquire(sync, alreadyAcquiredError = E_ALREADY_LOCKED) {
 
 
 
-/***/ }),
+/***/ },
 
-/***/ "../../node_modules/comlink/dist/esm/comlink.mjs":
+/***/ "../../node_modules/comlink/dist/esm/comlink.mjs"
 /*!*******************************************************!*\
   !*** ../../node_modules/comlink/dist/esm/comlink.mjs ***!
   \*******************************************************/
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -2404,13 +2407,13 @@ function generateUUID() {
 //# sourceMappingURL=comlink.mjs.map
 
 
-/***/ }),
+/***/ },
 
-/***/ "../common/dist/bundle.mjs":
+/***/ "../common/dist/bundle.mjs"
 /*!*********************************!*\
   !*** ../common/dist/bundle.mjs ***!
   \*********************************/
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -2424,6 +2427,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   BaseObserver: () => (/* binding */ BaseObserver),
 /* harmony export */   Column: () => (/* binding */ Column),
 /* harmony export */   ColumnType: () => (/* binding */ ColumnType),
+/* harmony export */   ConnectionClosedError: () => (/* binding */ ConnectionClosedError),
 /* harmony export */   ConnectionManager: () => (/* binding */ ConnectionManager),
 /* harmony export */   ControlledExecutor: () => (/* binding */ ControlledExecutor),
 /* harmony export */   CrudBatch: () => (/* binding */ CrudBatch),
@@ -3228,12 +3232,30 @@ class SyncStatus {
         return {
             connected: this.connected,
             connecting: this.connecting,
-            dataFlow: this.dataFlowStatus,
+            dataFlow: {
+                ...this.dataFlowStatus,
+                uploadError: this.serializeError(this.dataFlowStatus.uploadError),
+                downloadError: this.serializeError(this.dataFlowStatus.downloadError)
+            },
             lastSyncedAt: this.lastSyncedAt,
             hasSynced: this.hasSynced,
             priorityStatusEntries: this.priorityStatusEntries
         };
     }
+    /**
+     * Not all errors are serializable over a MessagePort. E.g. some `DomExceptions` fail to be passed across workers.
+     * This explicitly serializes errors in the SyncStatus.
+     */
+    serializeError(error) {
+        if (typeof error == 'undefined') {
+            return undefined;
+        }
+        return {
+            name: error.name,
+            message: error.message,
+            stack: error.stack
+        };
+    }
     static comparePriorities(a, b) {
         return b.priority - a.priority; // Reverse because higher priorities have lower numbers
     }
@@ -4846,7 +4868,7 @@ var hasRequiredBuffer$1;
 function requireBuffer$1 () {
 	if (hasRequiredBuffer$1) return buffer$1;
 	hasRequiredBuffer$1 = 1;
-	(function (exports) {
+	(function (exports$1) {
 
 		const base64 = requireBase64Js();
 		const ieee754 = requireIeee754();
@@ -4855,12 +4877,12 @@ function requireBuffer$1 () {
 		    ? Symbol['for']('nodejs.util.inspect.custom') // eslint-disable-line dot-notation
 		    : null;
 
-		exports.Buffer = Buffer;
-		exports.SlowBuffer = SlowBuffer;
-		exports.INSPECT_MAX_BYTES = 50;
+		exports$1.Buffer = Buffer;
+		exports$1.SlowBuffer = SlowBuffer;
+		exports$1.INSPECT_MAX_BYTES = 50;
 
 		const K_MAX_LENGTH = 0x7fffffff;
-		exports.kMaxLength = K_MAX_LENGTH;
+		exports$1.kMaxLength = K_MAX_LENGTH;
 
 		/**
 		 * If `Buffer.TYPED_ARRAY_SUPPORT`:
@@ -5456,7 +5478,7 @@ function requireBuffer$1 () {
 
 		Buffer.prototype.inspect = function inspect () {
 		  let str = '';
-		  const max = exports.INSPECT_MAX_BYTES;
+		  const max = exports$1.INSPECT_MAX_BYTES;
 		  str = this.toString('hex', 0, max).replace(/(.{2})/g, '$1 ').trim();
 		  if (this.length > max) str += ' ... ';
 		  return '<Buffer ' + str + '>'
@@ -6964,7 +6986,7 @@ var hasRequiredBuffer;
 function requireBuffer () {
 	if (hasRequiredBuffer) return buffer;
 	hasRequiredBuffer = 1;
-	(function (exports) {
+	(function (exports$1) {
 
 		var base64 = requireBase64Js();
 		var ieee754 = requireIeee754();
@@ -6973,12 +6995,12 @@ function requireBuffer () {
 		    ? Symbol['for']('nodejs.util.inspect.custom') // eslint-disable-line dot-notation
 		    : null;
 
-		exports.Buffer = Buffer;
-		exports.SlowBuffer = SlowBuffer;
-		exports.INSPECT_MAX_BYTES = 50;
+		exports$1.Buffer = Buffer;
+		exports$1.SlowBuffer = SlowBuffer;
+		exports$1.INSPECT_MAX_BYTES = 50;
 
 		var K_MAX_LENGTH = 0x7fffffff;
-		exports.kMaxLength = K_MAX_LENGTH;
+		exports$1.kMaxLength = K_MAX_LENGTH;
 
 		/**
 		 * If `Buffer.TYPED_ARRAY_SUPPORT`:
@@ -7575,7 +7597,7 @@ function requireBuffer () {
 
 		Buffer.prototype.inspect = function inspect () {
 		  var str = '';
-		  var max = exports.INSPECT_MAX_BYTES;
+		  var max = exports$1.INSPECT_MAX_BYTES;
 		  str = this.toString('hex', 0, max).replace(/(.{2})/g, '$1 ').trim();
 		  if (this.length > max) str += ' ... ';
 		  return '<Buffer ' + str + '>'
@@ -8788,7 +8810,7 @@ var hasRequiredFrames;
 function requireFrames () {
 	if (hasRequiredFrames) return Frames;
 	hasRequiredFrames = 1;
-	(function (exports) {
+	(function (exports$1) {
 		/*
 		 * Copyright 2021-2022 the original author or authors.
 		 *
@@ -8804,8 +8826,8 @@ function requireFrames () {
 		 * See the License for the specific language governing permissions and
 		 * limitations under the License.
 		 */
-		Object.defineProperty(exports, "__esModule", { value: true });
-		exports.Frame = exports.Lengths = exports.Flags = exports.FrameTypes = void 0;
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		exports$1.Frame = exports$1.Lengths = exports$1.Flags = exports$1.FrameTypes = void 0;
 		var FrameTypes;
 		(function (FrameTypes) {
 		    FrameTypes[FrameTypes["RESERVED"] = 0] = "RESERVED";
@@ -8824,7 +8846,7 @@ function requireFrames () {
 		    FrameTypes[FrameTypes["RESUME"] = 13] = "RESUME";
 		    FrameTypes[FrameTypes["RESUME_OK"] = 14] = "RESUME_OK";
 		    FrameTypes[FrameTypes["EXT"] = 63] = "EXT";
-		})(FrameTypes = exports.FrameTypes || (exports.FrameTypes = {}));
+		})(FrameTypes = exports$1.FrameTypes || (exports$1.FrameTypes = {}));
 		(function (Flags) {
 		    Flags[Flags["NONE"] = 0] = "NONE";
 		    Flags[Flags["COMPLETE"] = 64] = "COMPLETE";
@@ -8835,7 +8857,7 @@ function requireFrames () {
 		    Flags[Flags["NEXT"] = 32] = "NEXT";
 		    Flags[Flags["RESPOND"] = 128] = "RESPOND";
 		    Flags[Flags["RESUME_ENABLE"] = 128] = "RESUME_ENABLE";
-		})(exports.Flags || (exports.Flags = {}));
+		})(exports$1.Flags || (exports$1.Flags = {}));
 		(function (Flags) {
 		    function hasMetadata(flags) {
 		        return (flags & Flags.METADATA) === Flags.METADATA;
@@ -8869,13 +8891,13 @@ function requireFrames () {
 		        return (flags & Flags.RESUME_ENABLE) === Flags.RESUME_ENABLE;
 		    }
 		    Flags.hasResume = hasResume;
-		})(exports.Flags || (exports.Flags = {}));
+		})(exports$1.Flags || (exports$1.Flags = {}));
 		(function (Lengths) {
 		    Lengths[Lengths["FRAME"] = 3] = "FRAME";
 		    Lengths[Lengths["HEADER"] = 6] = "HEADER";
 		    Lengths[Lengths["METADATA"] = 3] = "METADATA";
 		    Lengths[Lengths["REQUEST"] = 3] = "REQUEST";
-		})(exports.Lengths || (exports.Lengths = {}));
+		})(exports$1.Lengths || (exports$1.Lengths = {}));
 		(function (Frame) {
 		    function isConnection(frame) {
 		        return frame.streamId === 0;
@@ -8886,7 +8908,7 @@ function requireFrames () {
 		            frame.type <= FrameTypes.REQUEST_CHANNEL);
 		    }
 		    Frame.isRequest = isRequest;
-		})(exports.Frame || (exports.Frame = {}));
+		})(exports$1.Frame || (exports$1.Frame = {}));
 		
 	} (Frames));
 	return Frames;
@@ -8897,7 +8919,7 @@ var hasRequiredCodecs;
 function requireCodecs () {
 	if (hasRequiredCodecs) return Codecs;
 	hasRequiredCodecs = 1;
-	(function (exports) {
+	(function (exports$1) {
 		var __generator = (Codecs && Codecs.__generator) || function (thisArg, body) {
 		    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
 		    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
@@ -8925,22 +8947,22 @@ function requireCodecs () {
 		        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
 		    }
 		};
-		Object.defineProperty(exports, "__esModule", { value: true });
-		exports.Deserializer = exports.sizeOfFrame = exports.serializeFrame = exports.deserializeFrame = exports.serializeFrameWithLength = exports.deserializeFrames = exports.deserializeFrameWithLength = exports.writeUInt64BE = exports.readUInt64BE = exports.writeUInt24BE = exports.readUInt24BE = exports.MAX_VERSION = exports.MAX_TTL = exports.MAX_STREAM_ID = exports.MAX_RESUME_LENGTH = exports.MAX_REQUEST_N = exports.MAX_REQUEST_COUNT = exports.MAX_MIME_LENGTH = exports.MAX_METADATA_LENGTH = exports.MAX_LIFETIME = exports.MAX_KEEPALIVE = exports.MAX_CODE = exports.FRAME_TYPE_OFFFSET = exports.FLAGS_MASK = void 0;
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		exports$1.Deserializer = exports$1.sizeOfFrame = exports$1.serializeFrame = exports$1.deserializeFrame = exports$1.serializeFrameWithLength = exports$1.deserializeFrames = exports$1.deserializeFrameWithLength = exports$1.writeUInt64BE = exports$1.readUInt64BE = exports$1.writeUInt24BE = exports$1.readUInt24BE = exports$1.MAX_VERSION = exports$1.MAX_TTL = exports$1.MAX_STREAM_ID = exports$1.MAX_RESUME_LENGTH = exports$1.MAX_REQUEST_N = exports$1.MAX_REQUEST_COUNT = exports$1.MAX_MIME_LENGTH = exports$1.MAX_METADATA_LENGTH = exports$1.MAX_LIFETIME = exports$1.MAX_KEEPALIVE = exports$1.MAX_CODE = exports$1.FRAME_TYPE_OFFFSET = exports$1.FLAGS_MASK = void 0;
 		var Frames_1 = requireFrames();
-		exports.FLAGS_MASK = 0x3ff; // low 10 bits
-		exports.FRAME_TYPE_OFFFSET = 10; // frame type is offset 10 bytes within the uint16 containing type + flags
-		exports.MAX_CODE = 0x7fffffff; // uint31
-		exports.MAX_KEEPALIVE = 0x7fffffff; // uint31
-		exports.MAX_LIFETIME = 0x7fffffff; // uint31
-		exports.MAX_METADATA_LENGTH = 0xffffff; // uint24
-		exports.MAX_MIME_LENGTH = 0xff; // int8
-		exports.MAX_REQUEST_COUNT = 0x7fffffff; // uint31
-		exports.MAX_REQUEST_N = 0x7fffffff; // uint31
-		exports.MAX_RESUME_LENGTH = 0xffff; // uint16
-		exports.MAX_STREAM_ID = 0x7fffffff; // uint31
-		exports.MAX_TTL = 0x7fffffff; // uint31
-		exports.MAX_VERSION = 0xffff; // uint16
+		exports$1.FLAGS_MASK = 0x3ff; // low 10 bits
+		exports$1.FRAME_TYPE_OFFFSET = 10; // frame type is offset 10 bytes within the uint16 containing type + flags
+		exports$1.MAX_CODE = 0x7fffffff; // uint31
+		exports$1.MAX_KEEPALIVE = 0x7fffffff; // uint31
+		exports$1.MAX_LIFETIME = 0x7fffffff; // uint31
+		exports$1.MAX_METADATA_LENGTH = 0xffffff; // uint24
+		exports$1.MAX_MIME_LENGTH = 0xff; // int8
+		exports$1.MAX_REQUEST_COUNT = 0x7fffffff; // uint31
+		exports$1.MAX_REQUEST_N = 0x7fffffff; // uint31
+		exports$1.MAX_RESUME_LENGTH = 0xffff; // uint16
+		exports$1.MAX_STREAM_ID = 0x7fffffff; // uint31
+		exports$1.MAX_TTL = 0x7fffffff; // uint31
+		exports$1.MAX_VERSION = 0xffff; // uint16
 		/**
 		 * Mimimum value that would overflow bitwise operators (2^32).
 		 */
@@ -8954,7 +8976,7 @@ function requireCodecs () {
 		    var val3 = buffer.readUInt8(offset + 2);
 		    return val1 | val2 | val3;
 		}
-		exports.readUInt24BE = readUInt24BE;
+		exports$1.readUInt24BE = readUInt24BE;
 		/**
 		 * Writes a uint24 to a buffer starting at the given offset, returning the
 		 * offset of the next byte.
@@ -8964,7 +8986,7 @@ function requireCodecs () {
 		    offset = buffer.writeUInt8((value >>> 8) & 0xff, offset); // 2nd byte
 		    return buffer.writeUInt8(value & 0xff, offset); // 1st byte
 		}
-		exports.writeUInt24BE = writeUInt24BE;
+		exports$1.writeUInt24BE = writeUInt24BE;
 		/**
 		 * Read a uint64 (technically supports up to 53 bits per JS number
 		 * representation).
@@ -8974,7 +8996,7 @@ function requireCodecs () {
 		    var low = buffer.readUInt32BE(offset + 4);
 		    return high * BITWISE_OVERFLOW + low;
 		}
-		exports.readUInt64BE = readUInt64BE;
+		exports$1.readUInt64BE = readUInt64BE;
 		/**
 		 * Write a uint64 (technically supports up to 53 bits per JS number
 		 * representation).
@@ -8985,7 +9007,7 @@ function requireCodecs () {
 		    offset = buffer.writeUInt32BE(high, offset); // first half of uint64
 		    return buffer.writeUInt32BE(low, offset); // second half of uint64
 		}
-		exports.writeUInt64BE = writeUInt64BE;
+		exports$1.writeUInt64BE = writeUInt64BE;
 		/**
 		 * Frame header is:
 		 * - stream id (uint32 = 4)
@@ -9003,7 +9025,7 @@ function requireCodecs () {
 		    var frameLength = readUInt24BE(buffer, 0);
 		    return deserializeFrame(buffer.slice(UINT24_SIZE, UINT24_SIZE + frameLength));
 		}
-		exports.deserializeFrameWithLength = deserializeFrameWithLength;
+		exports$1.deserializeFrameWithLength = deserializeFrameWithLength;
 		/**
 		 * Given a buffer that may contain zero or more length-prefixed frames followed
 		 * by zero or more bytes of a (partial) subsequent frame, returns an array of
@@ -9036,7 +9058,7 @@ function requireCodecs () {
 		        }
 		    });
 		}
-		exports.deserializeFrames = deserializeFrames;
+		exports$1.deserializeFrames = deserializeFrames;
 		/**
 		 * Writes a frame to a buffer with a length prefix.
 		 */
@@ -9047,7 +9069,7 @@ function requireCodecs () {
 		    buffer.copy(lengthPrefixed, UINT24_SIZE);
 		    return lengthPrefixed;
 		}
-		exports.serializeFrameWithLength = serializeFrameWithLength;
+		exports$1.serializeFrameWithLength = serializeFrameWithLength;
 		/**
 		 * Read a frame from the buffer.
 		 */
@@ -9062,8 +9084,8 @@ function requireCodecs () {
 		    // );
 		    var typeAndFlags = buffer.readUInt16BE(offset);
 		    offset += 2;
-		    var type = typeAndFlags >>> exports.FRAME_TYPE_OFFFSET; // keep highest 6 bits
-		    var flags = typeAndFlags & exports.FLAGS_MASK; // keep lowest 10 bits
+		    var type = typeAndFlags >>> exports$1.FRAME_TYPE_OFFFSET; // keep highest 6 bits
+		    var flags = typeAndFlags & exports$1.FLAGS_MASK; // keep lowest 10 bits
 		    switch (type) {
 		        case Frames_1.FrameTypes.SETUP:
 		            return deserializeSetupFrame(buffer, streamId, flags);
@@ -9100,7 +9122,7 @@ function requireCodecs () {
 		        // );
 		    }
 		}
-		exports.deserializeFrame = deserializeFrame;
+		exports$1.deserializeFrame = deserializeFrame;
 		/**
 		 * Convert the frame to a (binary) buffer.
 		 */
@@ -9139,7 +9161,7 @@ function requireCodecs () {
 		        // );
 		    }
 		}
-		exports.serializeFrame = serializeFrame;
+		exports$1.serializeFrame = serializeFrame;
 		/**
 		 * Byte size of frame without size prefix
 		 */
@@ -9178,7 +9200,7 @@ function requireCodecs () {
 		        // );
 		    }
 		}
-		exports.sizeOfFrame = sizeOfFrame;
+		exports$1.sizeOfFrame = sizeOfFrame;
 		/**
 		 * Writes a SETUP frame into a new buffer and returns it.
 		 *
@@ -9813,7 +9835,7 @@ function requireCodecs () {
 		function writeHeader(frame, buffer) {
 		    var offset = buffer.writeInt32BE(frame.streamId, 0);
 		    // shift frame to high 6 bits, extract lowest 10 bits from flags
-		    return buffer.writeUInt16BE((frame.type << exports.FRAME_TYPE_OFFFSET) | (frame.flags & exports.FLAGS_MASK), offset);
+		    return buffer.writeUInt16BE((frame.type << exports$1.FRAME_TYPE_OFFFSET) | (frame.flags & exports$1.FLAGS_MASK), offset);
 		}
 		/**
 		 * Determine the length of the payload section of a frame. Only applies to
@@ -9894,7 +9916,7 @@ function requireCodecs () {
 		    };
 		    return Deserializer;
 		}());
-		exports.Deserializer = Deserializer;
+		exports$1.Deserializer = Deserializer;
 		
 	} (Codecs));
 	return Codecs;
@@ -10040,7 +10062,7 @@ var hasRequiredErrors;
 function requireErrors () {
 	if (hasRequiredErrors) return Errors;
 	hasRequiredErrors = 1;
-	(function (exports) {
+	(function (exports$1) {
 		/*
 		 * Copyright 2021-2022 the original author or authors.
 		 *
@@ -10071,8 +10093,8 @@ function requireErrors () {
 		        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
 		    };
 		})();
-		Object.defineProperty(exports, "__esModule", { value: true });
-		exports.ErrorCodes = exports.RSocketError = void 0;
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		exports$1.ErrorCodes = exports$1.RSocketError = void 0;
 		var RSocketError = /** @class */ (function (_super) {
 		    __extends(RSocketError, _super);
 		    function RSocketError(code, message) {
@@ -10082,7 +10104,7 @@ function requireErrors () {
 		    }
 		    return RSocketError;
 		}(Error));
-		exports.RSocketError = RSocketError;
+		exports$1.RSocketError = RSocketError;
 		(function (ErrorCodes) {
 		    ErrorCodes[ErrorCodes["RESERVED"] = 0] = "RESERVED";
 		    ErrorCodes[ErrorCodes["INVALID_SETUP"] = 1] = "INVALID_SETUP";
@@ -10096,7 +10118,7 @@ function requireErrors () {
 		    ErrorCodes[ErrorCodes["CANCELED"] = 515] = "CANCELED";
 		    ErrorCodes[ErrorCodes["INVALID"] = 516] = "INVALID";
 		    ErrorCodes[ErrorCodes["RESERVED_EXTENSION"] = 4294967295] = "RESERVED_EXTENSION";
-		})(exports.ErrorCodes || (exports.ErrorCodes = {}));
+		})(exports$1.ErrorCodes || (exports$1.ErrorCodes = {}));
 		
 	} (Errors));
 	return Errors;
@@ -10138,7 +10160,7 @@ var hasRequiredClientServerMultiplexerDemultiplexer;
 function requireClientServerMultiplexerDemultiplexer () {
 	if (hasRequiredClientServerMultiplexerDemultiplexer) return ClientServerMultiplexerDemultiplexer;
 	hasRequiredClientServerMultiplexerDemultiplexer = 1;
-	(function (exports) {
+	(function (exports$1) {
 		/*
 		 * Copyright 2021-2022 the original author or authors.
 		 *
@@ -10205,8 +10227,8 @@ function requireClientServerMultiplexerDemultiplexer () {
 		        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
 		    }
 		};
-		Object.defineProperty(exports, "__esModule", { value: true });
-		exports.ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer = exports.ResumableClientServerInputMultiplexerDemultiplexer = exports.ClientServerInputMultiplexerDemultiplexer = exports.StreamIdGenerator = void 0;
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		exports$1.ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer = exports$1.ResumableClientServerInputMultiplexerDemultiplexer = exports$1.ClientServerInputMultiplexerDemultiplexer = exports$1.StreamIdGenerator = void 0;
 		var _1 = requireDist();
 		var Deferred_1 = requireDeferred();
 		var Errors_1 = requireErrors();
@@ -10229,7 +10251,7 @@ function requireClientServerMultiplexerDemultiplexer () {
 		        };
 		        return StreamIdGeneratorImpl;
 		    }());
-		})(exports.StreamIdGenerator || (exports.StreamIdGenerator = {}));
+		})(exports$1.StreamIdGenerator || (exports$1.StreamIdGenerator = {}));
 		var ClientServerInputMultiplexerDemultiplexer = /** @class */ (function (_super) {
 		    __extends(ClientServerInputMultiplexerDemultiplexer, _super);
 		    function ClientServerInputMultiplexerDemultiplexer(streamIdSupplier, outbound, closeable) {
@@ -10318,7 +10340,7 @@ function requireClientServerMultiplexerDemultiplexer () {
 		    };
 		    return ClientServerInputMultiplexerDemultiplexer;
 		}(Deferred_1.Deferred));
-		exports.ClientServerInputMultiplexerDemultiplexer = ClientServerInputMultiplexerDemultiplexer;
+		exports$1.ClientServerInputMultiplexerDemultiplexer = ClientServerInputMultiplexerDemultiplexer;
 		var ResumableClientServerInputMultiplexerDemultiplexer = /** @class */ (function (_super) {
 		    __extends(ResumableClientServerInputMultiplexerDemultiplexer, _super);
 		    function ResumableClientServerInputMultiplexerDemultiplexer(streamIdSupplier, outbound, closeable, frameStore, token, sessionStoreOrReconnector, sessionTimeout) {
@@ -10475,7 +10497,7 @@ function requireClientServerMultiplexerDemultiplexer () {
 		    };
 		    return ResumableClientServerInputMultiplexerDemultiplexer;
 		}(ClientServerInputMultiplexerDemultiplexer));
-		exports.ResumableClientServerInputMultiplexerDemultiplexer = ResumableClientServerInputMultiplexerDemultiplexer;
+		exports$1.ResumableClientServerInputMultiplexerDemultiplexer = ResumableClientServerInputMultiplexerDemultiplexer;
 		var ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer = /** @class */ (function () {
 		    function ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer(outbound, closeable, delegate) {
 		        this.outbound = outbound;
@@ -10532,7 +10554,7 @@ function requireClientServerMultiplexerDemultiplexer () {
 		    };
 		    return ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer;
 		}());
-		exports.ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer = ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer;
+		exports$1.ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer = ResumeOkAwaitingResumableClientServerInputMultiplexerDemultiplexer;
 		
 	} (ClientServerMultiplexerDemultiplexer));
 	return ClientServerMultiplexerDemultiplexer;
@@ -13518,7 +13540,7 @@ var hasRequiredDist;
 function requireDist () {
 	if (hasRequiredDist) return dist;
 	hasRequiredDist = 1;
-	(function (exports) {
+	(function (exports$1) {
 		/*
 		 * Copyright 2021-2022 the original author or authors.
 		 *
@@ -13541,19 +13563,19 @@ function requireDist () {
 		    if (k2 === undefined) k2 = k;
 		    o[k2] = m[k];
 		}));
-		var __exportStar = (dist && dist.__exportStar) || function(m, exports) {
-		    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+		var __exportStar = (dist && dist.__exportStar) || function(m, exports$1) {
+		    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports$1, p)) __createBinding(exports$1, m, p);
 		};
-		Object.defineProperty(exports, "__esModule", { value: true });
-		__exportStar(requireCodecs(), exports);
-		__exportStar(requireCommon(), exports);
-		__exportStar(requireDeferred(), exports);
-		__exportStar(requireErrors(), exports);
-		__exportStar(requireFrames(), exports);
-		__exportStar(requireRSocket(), exports);
-		__exportStar(requireRSocketConnector(), exports);
-		__exportStar(requireRSocketServer(), exports);
-		__exportStar(requireTransport(), exports);
+		Object.defineProperty(exports$1, "__esModule", { value: true });
+		__exportStar(requireCodecs(), exports$1);
+		__exportStar(requireCommon(), exports$1);
+		__exportStar(requireDeferred(), exports$1);
+		__exportStar(requireErrors(), exports$1);
+		__exportStar(requireFrames(), exports$1);
+		__exportStar(requireRSocket(), exports$1);
+		__exportStar(requireRSocketConnector(), exports$1);
+		__exportStar(requireRSocketServer(), exports$1);
+		__exportStar(requireTransport(), exports$1);
 		
 	} (dist));
 	return dist;
@@ -13561,7 +13583,7 @@ function requireDist () {
 
 var distExports = requireDist();
 
-var version = "1.44.0";
+var version = "1.45.0";
 var PACKAGE = {
 	version: version};
 
@@ -17050,6 +17072,27 @@ class SyncDataBatch {
     }
 }
 
+/**
+ * Thrown when an underlying database connection is closed.
+ * This is particularly relevant when worker connections are marked as closed while
+ * operations are still in progress.
+ */
+class ConnectionClosedError extends Error {
+    static NAME = 'ConnectionClosedError';
+    static MATCHES(input) {
+        /**
+         * If there are weird package issues which cause multiple versions of classes to be present, the instanceof
+         * check might fail. This also performs a failsafe check.
+         * This might also happen if the Error is serialized and parsed over a bridging channel like a MessagePort.
+         */
+        return (input instanceof ConnectionClosedError || (input instanceof Error && input.name == ConnectionClosedError.NAME));
+    }
+    constructor(message) {
+        super(message);
+        this.name = ConnectionClosedError.NAME;
+    }
+}
+
 // https://www.sqlite.org/lang_expr.html#castexpr
 var ColumnType;
 (function (ColumnType) {
@@ -17608,20 +17651,20 @@ const parseQuery = (query, parameters) => {
 //# sourceMappingURL=bundle.mjs.map
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js":
+/***/ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js"
 /*!***********************************************************!*\
   !*** ./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js ***!
   \***********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   LockedAsyncDatabaseAdapter: () => (/* binding */ LockedAsyncDatabaseAdapter)
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "../common/dist/bundle.mjs");
-/* harmony import */ var _shared_navigator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../..//shared/navigator */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _shared_navigator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/navigator */ "./lib/src/shared/navigator.js");
 /* harmony import */ var _WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./WorkerWrappedAsyncDatabaseConnection */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
 /* harmony import */ var _wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./wa-sqlite/WASQLiteConnection */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
 
@@ -17645,6 +17688,7 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
     _config = null;
     pendingAbortControllers;
     requiresHolds;
+    databaseOpenPromise = null;
     closing;
     closed;
     constructor(options) {
@@ -17694,16 +17738,69 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
     async init() {
         return this.initPromise;
     }
+    async openInternalDB() {
+        /**
+         * Execute opening of the db in a lock in order not to interfere with other operations.
+         */
+        return this._acquireLock(async () => {
+            // Dispose any previous table change listener.
+            this._disposeTableChangeListener?.();
+            this._disposeTableChangeListener = null;
+            this._db?.close().catch((ex) => this.logger.warn(`Error closing database before opening new instance`, ex));
+            const isReOpen = !!this._db;
+            this._db = null;
+            this._db = await this.options.openConnection();
+            await this._db.init();
+            this._config = await this._db.getConfig();
+            await this.registerOnChangeListener(this._db);
+            if (isReOpen) {
+                this.iterateListeners((cb) => cb.databaseReOpened?.());
+            }
+            /**
+             * This is only required for the long-lived shared IndexedDB connections.
+             */
+            this.requiresHolds = this._config.vfs == _wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_3__.WASQLiteVFS.IDBBatchAtomicVFS;
+        });
+    }
+    _reOpen() {
+        this.databaseOpenPromise = this.openInternalDB().finally(() => {
+            this.databaseOpenPromise = null;
+        });
+        return this.databaseOpenPromise;
+    }
+    /**
+     * Re-opens the underlying database.
+     * Returns a pending operation if one is already in progress.
+     */
+    async reOpenInternalDB() {
+        if (!this.options.reOpenOnConnectionClosed) {
+            throw new Error(`Cannot re-open underlying database, reOpenOnConnectionClosed is not enabled`);
+        }
+        if (this.databaseOpenPromise) {
+            return this.databaseOpenPromise;
+        }
+        return this._reOpen();
+    }
     async _init() {
-        this._db = await this.options.openConnection();
-        await this._db.init();
-        this._config = await this._db.getConfig();
-        await this.registerOnChangeListener(this._db);
-        this.iterateListeners((cb) => cb.initialized?.());
         /**
-         * This is only required for the long-lived shared IndexedDB connections.
+         * For OPFS, we can see this open call sometimes fail due to NoModificationAllowedError.
+         * We should be able to recover from this by re-opening the database.
          */
-        this.requiresHolds = this._config.vfs == _wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_3__.WASQLiteVFS.IDBBatchAtomicVFS;
+        const maxAttempts = 3;
+        for (let count = 0; count < maxAttempts; count++) {
+            try {
+                await this.openInternalDB();
+                break;
+            }
+            catch (ex) {
+                if (count == maxAttempts - 1) {
+                    throw ex;
+                }
+                this.logger.warn(`Attempt ${count + 1} of ${maxAttempts} to open database failed, retrying in 1 second...`, ex);
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+        }
+        this.iterateListeners((cb) => cb.initialized?.());
     }
     getConfiguration() {
         if (!this._config) {
@@ -17750,7 +17847,14 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
      */
     async close() {
         this.closing = true;
-        this._disposeTableChangeListener?.();
+        /**
+         * Note that we obtain a reference to the callback to avoid calling the callback with `this` as the context.
+         * This is to avoid Comlink attempting to clone `this` when calling the method.
+         */
+        const dispose = this._disposeTableChangeListener;
+        if (dispose) {
+            dispose();
+        }
         this.pendingAbortControllers.forEach((controller) => controller.abort('Closed'));
         await this.baseDB?.close?.();
         this.closed = true;
@@ -17770,24 +17874,23 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
     async readLock(fn, options) {
         await this.waitForInitialized();
         return this.acquireLock(async () => fn(this.generateDBHelpers({ execute: this._execute, executeRaw: this._executeRaw })), {
-            timeoutMs: options?.timeoutMs
+            timeoutMs: options?.timeoutMs ?? this.options.defaultLockTimeoutMs
         });
     }
     async writeLock(fn, options) {
         await this.waitForInitialized();
         return this.acquireLock(async () => fn(this.generateDBHelpers({ execute: this._execute, executeRaw: this._executeRaw })), {
-            timeoutMs: options?.timeoutMs
+            timeoutMs: options?.timeoutMs ?? this.options.defaultLockTimeoutMs
         });
     }
-    async acquireLock(callback, options) {
-        await this.waitForInitialized();
+    async _acquireLock(callback, options) {
         if (this.closing) {
             throw new Error(`Cannot acquire lock, the database is closing`);
         }
         const abortController = new AbortController();
         this.pendingAbortControllers.add(abortController);
         const { timeoutMs } = options ?? {};
-        const timoutId = timeoutMs
+        const timeoutId = timeoutMs
             ? setTimeout(() => {
                 abortController.abort(`Timeout after ${timeoutMs}ms`);
                 this.pendingAbortControllers.delete(abortController);
@@ -17795,19 +17898,49 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
             : null;
         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);
+            if (timeoutId) {
+                clearTimeout(timeoutId);
             }
-            const holdId = this.requiresHolds ? await this.baseDB.markHold() : null;
+            return await callback();
+        });
+    }
+    async acquireLock(callback, options) {
+        await this.waitForInitialized();
+        // The database is being opened in the background. Wait for it here.
+        if (this.databaseOpenPromise) {
+            await this.databaseOpenPromise;
+        }
+        return this._acquireLock(async () => {
+            let holdId = null;
             try {
+                /**
+                 * We can't await this since it uses the same lock as we're in now.
+                 * If there is a pending open, this call will throw.
+                 * If there is no pending open, but there is also no database - the open
+                 * might have failed. We need to re-open the database.
+                 */
+                if (this.databaseOpenPromise || !this._db) {
+                    throw new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Connection is busy re-opening');
+                }
+                holdId = this.requiresHolds ? await this.baseDB.markHold() : null;
                 return await callback();
             }
+            catch (ex) {
+                if (_powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError.MATCHES(ex)) {
+                    if (this.options.reOpenOnConnectionClosed && !this.databaseOpenPromise && !this.closing) {
+                        // Immediately re-open the database. We need to miss as little table updates as possible.
+                        // Note, don't await this since it uses the same lock as we're in now.
+                        this.reOpenInternalDB();
+                    }
+                }
+                throw ex;
+            }
             finally {
                 if (holdId) {
                     await this.baseDB.releaseHold(holdId);
                 }
             }
-        });
+        }, options);
     }
     async readTransaction(fn, options) {
         return this.readLock(this.wrapTransaction(fn));
@@ -17922,29 +18055,32 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js":
+/***/ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js"
 /*!*********************************************************************!*\
   !*** ./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js ***!
   \*********************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   WorkerWrappedAsyncDatabaseConnection: () => (/* binding */ WorkerWrappedAsyncDatabaseConnection)
 /* harmony export */ });
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
+/* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "../common/dist/bundle.mjs");
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
+
 
 /**
  * Wraps a provided instance of {@link AsyncDatabaseConnection}, providing necessary proxy
  * functions for worker listeners.
  */
-class WorkerWrappedAsyncDatabaseConnection {
+class WorkerWrappedAsyncDatabaseConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.BaseObserver {
     options;
     lockAbortController = new AbortController();
     notifyRemoteClosed;
     constructor(options) {
+        super();
         this.options = options;
         if (options.remoteCanCloseUnexpectedly) {
             this.notifyRemoteClosed = new AbortController();
@@ -17977,17 +18113,20 @@ class WorkerWrappedAsyncDatabaseConnection {
     isAutoCommit() {
         return this.withRemote(() => this.baseConnection.isAutoCommit());
     }
-    withRemote(workerPromise) {
+    withRemote(workerPromise, fireActionOnAbort = false) {
         const controller = this.notifyRemoteClosed;
         if (controller) {
             return new Promise((resolve, reject) => {
                 if (controller.signal.aborted) {
-                    reject(new Error('Called operation on closed remote'));
-                    // Don't run the operation if we're going to reject
-                    return;
+                    reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Called operation on closed remote'));
+                    if (!fireActionOnAbort) {
+                        // Don't run the operation if we're going to reject
+                        // We might want to fire-and-forget the operation in some cases (like a close operation)
+                        return;
+                    }
                 }
                 function handleAbort() {
-                    reject(new Error('Remote peer closed with request in flight'));
+                    reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Remote peer closed with request in flight'));
                 }
                 function completePromise(action) {
                     controller.signal.removeEventListener('abort', handleAbort);
@@ -18041,7 +18180,7 @@ class WorkerWrappedAsyncDatabaseConnection {
                 reject(ex);
             }
         }));
-        const newPort = await remote[comlink__WEBPACK_IMPORTED_MODULE_0__.createEndpoint]();
+        const newPort = await remote[comlink__WEBPACK_IMPORTED_MODULE_1__.createEndpoint]();
         return { port: newPort, identifier };
     }
     /**
@@ -18049,17 +18188,19 @@ class WorkerWrappedAsyncDatabaseConnection {
      * This can be extended by custom implementations in order to handle proxy events.
      */
     async registerOnTableChange(callback) {
-        return this.baseConnection.registerOnTableChange(comlink__WEBPACK_IMPORTED_MODULE_0__.proxy(callback));
+        return this.baseConnection.registerOnTableChange(comlink__WEBPACK_IMPORTED_MODULE_1__.proxy(callback));
     }
     async close() {
         // Abort any pending lock requests.
         this.lockAbortController.abort();
         try {
-            await this.withRemote(() => this.baseConnection.close());
+            // fire and forget the close operation
+            await this.withRemote(() => this.baseConnection.close(), true);
         }
         finally {
-            this.options.remote[comlink__WEBPACK_IMPORTED_MODULE_0__.releaseProxy]();
+            this.options.remote[comlink__WEBPACK_IMPORTED_MODULE_1__.releaseProxy]();
             this.options.onClose?.();
+            this.iterateListeners((l) => l.closing?.());
         }
     }
     execute(sql, params) {
@@ -18077,13 +18218,13 @@ class WorkerWrappedAsyncDatabaseConnection {
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js":
+/***/ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js"
 /*!*************************************************************!*\
   !*** ./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js ***!
   \*************************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18182,9 +18323,10 @@ const DEFAULT_MODULE_FACTORIES = {
         }
         // @ts-expect-error The types for this static method are missing upstream
         const { OPFSCoopSyncVFS } = await __webpack_require__.e(/*! import() */ "node_modules_journeyapps_wa-sqlite_src_examples_OPFSCoopSyncVFS_js").then(__webpack_require__.bind(__webpack_require__, /*! @journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js */ "../../node_modules/@journeyapps/wa-sqlite/src/examples/OPFSCoopSyncVFS.js"));
+        const vfs = await OPFSCoopSyncVFS.create(options.dbFileName, module);
         return {
             module,
-            vfs: await OPFSCoopSyncVFS.create(options.dbFileName, module)
+            vfs
         };
     }
 };
@@ -18410,7 +18552,15 @@ class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.
     }
     async close() {
         this.broadcastChannel?.close();
-        await this.sqliteAPI.close(this.dbP);
+        await this.acquireExecuteLock(async () => {
+            /**
+             * Running the close operation inside the same execute mutex prevents errors like:
+             * ```
+             * unable to close due to unfinalized statements or unfinished backups
+             * ```
+             */
+            await this.sqliteAPI.close(this.dbP);
+        });
     }
     async registerOnTableChange(callback) {
         return this.registerListener({
@@ -18492,13 +18642,13 @@ class WASqliteConnection extends _powersync_common__WEBPACK_IMPORTED_MODULE_1__.
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/db/sync/WebRemote.js":
+/***/ "./lib/src/db/sync/WebRemote.js"
 /*!**************************************!*\
   !*** ./lib/src/db/sync/WebRemote.js ***!
   \**************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18552,13 +18702,13 @@ class WebRemote extends _powersync_common__WEBPACK_IMPORTED_MODULE_0__.AbstractR
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/db/sync/WebStreamingSyncImplementation.js":
+/***/ "./lib/src/db/sync/WebStreamingSyncImplementation.js"
 /*!***********************************************************!*\
   !*** ./lib/src/db/sync/WebStreamingSyncImplementation.js ***!
   \***********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18586,13 +18736,13 @@ class WebStreamingSyncImplementation extends _powersync_common__WEBPACK_IMPORTED
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/db/sync/userAgent.js":
+/***/ "./lib/src/db/sync/userAgent.js"
 /*!**************************************!*\
   !*** ./lib/src/db/sync/userAgent.js ***!
   \**************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18664,13 +18814,13 @@ function getOsInfo(nav) {
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/shared/navigator.js":
+/***/ "./lib/src/shared/navigator.js"
 /*!*************************************!*\
   !*** ./lib/src/shared/navigator.js ***!
   \*************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18684,13 +18834,13 @@ const getNavigatorLocks = () => {
 };
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/worker/sync/BroadcastLogger.js":
+/***/ "./lib/src/worker/sync/BroadcastLogger.js"
 /*!************************************************!*\
   !*** ./lib/src/worker/sync/BroadcastLogger.js ***!
   \************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18827,13 +18977,13 @@ class BroadcastLogger {
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/worker/sync/SharedSyncImplementation.js":
+/***/ "./lib/src/worker/sync/SharedSyncImplementation.js"
 /*!*********************************************************!*\
   !*** ./lib/src/worker/sync/SharedSyncImplementation.js ***!
   \*********************************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
@@ -18842,12 +18992,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _powersync_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @powersync/common */ "../common/dist/bundle.mjs");
 /* harmony import */ var async_mutex__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! async-mutex */ "../../node_modules/async-mutex/index.mjs");
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
-/* harmony import */ var _db_sync_WebRemote__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../db/sync/WebRemote */ "./lib/src/db/sync/WebRemote.js");
-/* harmony import */ var _db_sync_WebStreamingSyncImplementation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../db/sync/WebStreamingSyncImplementation */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
-/* harmony import */ var _db_adapters_LockedAsyncDatabaseAdapter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../db/adapters/LockedAsyncDatabaseAdapter */ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js");
-/* harmony import */ var _db_adapters_WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../db/adapters/WorkerWrappedAsyncDatabaseConnection */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
-/* harmony import */ var _BroadcastLogger__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./BroadcastLogger */ "./lib/src/worker/sync/BroadcastLogger.js");
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
+/* harmony import */ var _db_sync_WebRemote__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../db/sync/WebRemote */ "./lib/src/db/sync/WebRemote.js");
+/* harmony import */ var _db_sync_WebStreamingSyncImplementation__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../db/sync/WebStreamingSyncImplementation */ "./lib/src/db/sync/WebStreamingSyncImplementation.js");
+/* harmony import */ var _db_adapters_LockedAsyncDatabaseAdapter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../db/adapters/LockedAsyncDatabaseAdapter */ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js");
+/* harmony import */ var _db_adapters_WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../db/adapters/WorkerWrappedAsyncDatabaseConnection */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
+/* harmony import */ var _BroadcastLogger__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./BroadcastLogger */ "./lib/src/worker/sync/BroadcastLogger.js");
 
 
 
@@ -18885,7 +19035,6 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
     statusListener;
     fetchCredentialsController;
     uploadDataController;
-    dbAdapter;
     syncParams;
     logger;
     lastConnectOptions;
@@ -18894,10 +19043,10 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
     connectionManager;
     syncStatus;
     broadCastLogger;
+    distributedDB;
     constructor() {
         super();
         this.ports = [];
-        this.dbAdapter = null;
         this.syncParams = null;
         this.logger = (0,_powersync_common__WEBPACK_IMPORTED_MODULE_0__.createLogger)('shared-sync');
         this.lastConnectOptions = undefined;
@@ -18910,26 +19059,23 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 }
             });
         });
+        // Should be configured once we get params
+        this.distributedDB = null;
         this.syncStatus = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SyncStatus({});
-        this.broadCastLogger = new _BroadcastLogger__WEBPACK_IMPORTED_MODULE_6__.BroadcastLogger(this.ports);
+        this.broadCastLogger = new _BroadcastLogger__WEBPACK_IMPORTED_MODULE_7__.BroadcastLogger(this.ports);
         this.connectionManager = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.ConnectionManager({
             createSyncImplementation: async () => {
-                return this.portMutex.runExclusive(async () => {
-                    await this.waitForReady();
-                    if (!this.dbAdapter) {
-                        await this.openInternalDB();
+                await this.waitForReady();
+                const sync = this.generateStreamingImplementation();
+                const onDispose = sync.registerListener({
+                    statusChanged: (status) => {
+                        this.updateAllStatuses(status.toJSON());
                     }
-                    const sync = this.generateStreamingImplementation();
-                    const onDispose = sync.registerListener({
-                        statusChanged: (status) => {
-                            this.updateAllStatuses(status.toJSON());
-                        }
-                    });
-                    return {
-                        sync,
-                        onDispose
-                    };
                 });
+                return {
+                    sync,
+                    onDispose
+                };
             },
             logger: this.logger
         });
@@ -18940,6 +19086,30 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
     get isConnected() {
         return this.connectionManager.syncStreamImplementation?.isConnected ?? false;
     }
+    /**
+     * Gets the last client port which we know is safe from unexpected closes.
+     */
+    async getLastWrappedPort() {
+        // Find the last port which is not closing
+        return await this.portMutex.runExclusive(() => {
+            for (let i = this.ports.length - 1; i >= 0; i--) {
+                if (!this.ports[i].isClosing) {
+                    return this.ports[i];
+                }
+            }
+            return;
+        });
+    }
+    /**
+     * In some very rare cases a specific tab might not respond to requests.
+     * This returns a random port which is not closing.
+     */
+    async getRandomWrappedPort() {
+        return await this.portMutex.runExclusive(() => {
+            const nonClosingPorts = this.ports.filter((p) => !p.isClosing);
+            return nonClosingPorts[Math.floor(Math.random() * nonClosingPorts.length)];
+        });
+    }
     async waitForStatus(status) {
         return this.withSyncImplementation(async (sync) => {
             return sync.waitForStatus(status);
@@ -18980,28 +19150,53 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
     async setParams(params) {
         await this.portMutex.runExclusive(async () => {
             this.collectActiveSubscriptions();
-            if (this.syncParams) {
-                // Cannot modify already existing sync implementation params
-                // But we can ask for a DB adapter, if required, at this point.
-                if (!this.dbAdapter) {
-                    await this.openInternalDB();
-                }
-                return;
-            }
-            // First time setting params
-            this.syncParams = params;
-            if (params.streamOptions?.flags?.broadcastLogs) {
-                this.logger = this.broadCastLogger;
-            }
-            self.onerror = (event) => {
-                // Share any uncaught events on the broadcast logger
-                this.logger.error('Uncaught exception in PowerSync shared sync worker', event);
-            };
-            if (!this.dbAdapter) {
-                await this.openInternalDB();
+        });
+        if (this.syncParams) {
+            // Cannot modify already existing sync implementation params
+            return;
+        }
+        // First time setting params
+        this.syncParams = params;
+        if (params.streamOptions?.flags?.broadcastLogs) {
+            this.logger = this.broadCastLogger;
+        }
+        const lockedAdapter = new _db_adapters_LockedAsyncDatabaseAdapter__WEBPACK_IMPORTED_MODULE_5__.LockedAsyncDatabaseAdapter({
+            name: params.dbParams.dbFilename,
+            openConnection: async () => {
+                // Gets a connection from the clients when a new connection is requested.
+                const db = await this.openInternalDB();
+                db.registerListener({
+                    closing: () => {
+                        lockedAdapter.reOpenInternalDB();
+                    }
+                });
+                return db;
+            },
+            logger: this.logger,
+            reOpenOnConnectionClosed: true
+        });
+        this.distributedDB = lockedAdapter;
+        await lockedAdapter.init();
+        lockedAdapter.registerListener({
+            databaseReOpened: () => {
+                // We may have missed some table updates while the database was closed.
+                // We can poke the crud in case we missed any updates.
+                this.connectionManager.syncStreamImplementation?.triggerCrudUpload();
+                /**
+                 * FIXME or IMPROVE ME
+                 * The Rust client implementation stores sync state on the connection level.
+                 * Reopening the database causes a state machine error which should cause the
+                 * StreamingSyncImplementation to reconnect. It would be nicer if we could trigger
+                 * this reconnect earlier.
+                 * This reconnect is not required for IndexedDB.
+                 */
             }
-            this.iterateListeners((l) => l.initialized?.());
         });
+        self.onerror = (event) => {
+            // Share any uncaught events on the broadcast logger
+            this.logger.error('Uncaught exception in PowerSync shared sync worker', event);
+        };
+        this.iterateListeners((l) => l.initialized?.());
     }
     async dispose() {
         await this.waitForReady();
@@ -19028,9 +19223,10 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         return await this.portMutex.runExclusive(() => {
             const portProvider = {
                 port,
-                clientProvider: comlink__WEBPACK_IMPORTED_MODULE_7__.wrap(port),
+                clientProvider: comlink__WEBPACK_IMPORTED_MODULE_2__.wrap(port),
                 currentSubscriptions: [],
-                closeListeners: []
+                closeListeners: [],
+                isClosing: false
             };
             this.ports.push(portProvider);
             // Give the newly connected client the latest status
@@ -19046,14 +19242,16 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
      * clients.
      */
     async removePort(port) {
+        // Ports might be removed faster than we can process them.
+        port.isClosing = true;
         // Remove the port within a mutex context.
         // Warns if the port is not found. This should not happen in practice.
         // We return early if the port is not found.
-        const { trackedPort, shouldReconnect } = await this.portMutex.runExclusive(async () => {
+        return await this.portMutex.runExclusive(async () => {
             const index = this.ports.findIndex((p) => p == port);
             if (index < 0) {
                 this.logger.warn(`Could not remove port ${port} since it is not present in active ports.`);
-                return {};
+                return () => { };
             }
             const trackedPort = this.ports[index];
             // Remove from the list of active ports
@@ -19067,35 +19265,13 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                     abortController.controller.abort(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.AbortOperation('Closing pending requests after client port is removed'));
                 }
             });
-            const shouldReconnect = !!this.connectionManager.syncStreamImplementation && this.ports.length > 0;
-            return {
-                shouldReconnect,
-                trackedPort
-            };
-        });
-        if (!trackedPort) {
-            // We could not find the port to remove
-            return () => { };
-        }
-        for (const closeListener of trackedPort.closeListeners) {
-            await closeListener();
-        }
-        if (this.dbAdapter && this.dbAdapter == trackedPort.db) {
-            // Unconditionally close the connection because the database it's writing to has just been closed.
-            // The connection has been closed previously, this might throw. We should be able to ignore it.
-            await this.connectionManager
-                .disconnect()
-                .catch((ex) => this.logger.warn('Error while disconnecting. Will attempt to reconnect.', ex));
-            // Clearing the adapter will result in a new one being opened in connect
-            this.dbAdapter = null;
-            if (shouldReconnect) {
-                await this.connectionManager.connect(CONNECTOR_PLACEHOLDER, this.lastConnectOptions ?? {});
+            // Close the worker wrapped database connection, we can't accurately rely on this connection
+            for (const closeListener of trackedPort.closeListeners) {
+                await closeListener();
             }
-        }
-        // Re-index subscriptions, the subscriptions of the removed port would no longer be considered.
-        this.collectActiveSubscriptions();
-        // Release proxy
-        return () => trackedPort.clientProvider[comlink__WEBPACK_IMPORTED_MODULE_7__.releaseProxy]();
+            this.collectActiveSubscriptions();
+            return () => trackedPort.clientProvider[comlink__WEBPACK_IMPORTED_MODULE_2__.releaseProxy]();
+        });
     }
     triggerCrudUpload() {
         this.withSyncImplementation(async (sync) => {
@@ -19131,11 +19307,14 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         // This should only be called after initialization has completed
         const syncParams = this.syncParams;
         // Create a new StreamingSyncImplementation for each connect call. This is usually done is all SDKs.
-        return new _db_sync_WebStreamingSyncImplementation__WEBPACK_IMPORTED_MODULE_3__.WebStreamingSyncImplementation({
-            adapter: new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SqliteBucketStorage(this.dbAdapter, this.logger),
-            remote: new _db_sync_WebRemote__WEBPACK_IMPORTED_MODULE_2__.WebRemote({
+        return new _db_sync_WebStreamingSyncImplementation__WEBPACK_IMPORTED_MODULE_4__.WebStreamingSyncImplementation({
+            adapter: new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SqliteBucketStorage(this.distributedDB, this.logger),
+            remote: new _db_sync_WebRemote__WEBPACK_IMPORTED_MODULE_3__.WebRemote({
                 invalidateCredentials: async () => {
-                    const lastPort = this.ports[this.ports.length - 1];
+                    const lastPort = await this.getLastWrappedPort();
+                    if (!lastPort) {
+                        throw new Error('No client port found to invalidate credentials');
+                    }
                     try {
                         this.logger.log('calling the last port client provider to invalidate credentials');
                         lastPort.clientProvider.invalidateCredentials();
@@ -19145,7 +19324,10 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                     }
                 },
                 fetchCredentials: async () => {
-                    const lastPort = this.ports[this.ports.length - 1];
+                    const lastPort = await this.getLastWrappedPort();
+                    if (!lastPort) {
+                        throw new Error('No client port found to fetch credentials');
+                    }
                     return new Promise(async (resolve, reject) => {
                         const abortController = new AbortController();
                         this.fetchCredentialsController = {
@@ -19167,7 +19349,10 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 }
             }, this.logger),
             uploadCrud: async () => {
-                const lastPort = this.ports[this.ports.length - 1];
+                const lastPort = await this.getLastWrappedPort();
+                if (!lastPort) {
+                    throw new Error('No client port found to upload crud');
+                }
                 return new Promise(async (resolve, reject) => {
                     const abortController = new AbortController();
                     this.uploadDataController = {
@@ -19193,38 +19378,81 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
             logger: this.logger
         });
     }
+    /**
+     * Opens a worker wrapped database connection. Using the last connected client port.
+     */
     async openInternalDB() {
-        const lastClient = this.ports[this.ports.length - 1];
-        if (!lastClient) {
+        const client = await this.getRandomWrappedPort();
+        if (!client) {
             // Should not really happen in practice
             throw new Error(`Could not open DB connection since no client is connected.`);
         }
-        const workerPort = await lastClient.clientProvider.getDBWorkerPort();
-        const remote = comlink__WEBPACK_IMPORTED_MODULE_7__.wrap(workerPort);
+        // Fail-safe timeout for opening a database connection.
+        const timeout = setTimeout(() => {
+            abortController.abort();
+        }, 10_000);
+        /**
+         * Handle cases where the client might close while opening a connection.
+         */
+        const abortController = new AbortController();
+        const closeListener = () => {
+            abortController.abort();
+        };
+        const removeCloseListener = () => {
+            const index = client.closeListeners.indexOf(closeListener);
+            if (index >= 0) {
+                client.closeListeners.splice(index, 1);
+            }
+        };
+        client.closeListeners.push(closeListener);
+        const workerPort = await withAbort({
+            action: () => client.clientProvider.getDBWorkerPort(),
+            signal: abortController.signal,
+            cleanupOnAbort: (port) => {
+                port.close();
+            }
+        }).catch((ex) => {
+            removeCloseListener();
+            throw ex;
+        });
+        const remote = comlink__WEBPACK_IMPORTED_MODULE_2__.wrap(workerPort);
         const identifier = this.syncParams.dbParams.dbFilename;
-        const db = await remote(this.syncParams.dbParams);
-        const locked = new _db_adapters_LockedAsyncDatabaseAdapter__WEBPACK_IMPORTED_MODULE_4__.LockedAsyncDatabaseAdapter({
-            name: identifier,
-            openConnection: async () => {
-                const wrapped = new _db_adapters_WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_5__.WorkerWrappedAsyncDatabaseConnection({
-                    remote,
-                    baseConnection: db,
-                    identifier,
-                    // It's possible for this worker to outlive the client hosting the database for us. We need to be prepared for
-                    // that and ensure pending requests are aborted when the tab is closed.
-                    remoteCanCloseUnexpectedly: true
-                });
-                lastClient.closeListeners.push(async () => {
-                    this.logger.info('Aborting open connection because associated tab closed.');
-                    await wrapped.close().catch((ex) => this.logger.warn('error closing database connection', ex));
-                    wrapped.markRemoteClosed();
-                });
-                return wrapped;
-            },
-            logger: this.logger
+        /**
+         * The open could fail if the tab is closed while we're busy opening the database.
+         * This operation is typically executed inside an exclusive portMutex lock.
+         * We typically execute the closeListeners using the portMutex in a different context.
+         * We can't rely on the closeListeners to abort the operation if the tab is closed.
+         */
+        const db = await withAbort({
+            action: () => remote(this.syncParams.dbParams),
+            signal: abortController.signal,
+            cleanupOnAbort: (db) => {
+                db.close();
+            }
+        }).finally(() => {
+            // We can remove the close listener here since we no longer need it past this point.
+            removeCloseListener();
+        });
+        clearTimeout(timeout);
+        const wrapped = new _db_adapters_WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_6__.WorkerWrappedAsyncDatabaseConnection({
+            remote,
+            baseConnection: db,
+            identifier,
+            // It's possible for this worker to outlive the client hosting the database for us. We need to be prepared for
+            // that and ensure pending requests are aborted when the tab is closed.
+            remoteCanCloseUnexpectedly: true
+        });
+        client.closeListeners.push(async () => {
+            this.logger.info('Aborting open connection because associated tab closed.');
+            /**
+             * Don't await this close operation. It might never resolve if the tab is closed.
+             * We mark the remote as closed first, this will reject any pending requests.
+             * We then call close. The close operation is configured to fire-and-forget, the main promise will reject immediately.
+             */
+            wrapped.markRemoteClosed();
+            wrapped.close().catch((ex) => this.logger.warn('error closing database connection', ex));
         });
-        await locked.init();
-        this.dbAdapter = lastClient.db = locked;
+        return wrapped;
     }
     /**
      * A method to update the all shared statuses for each
@@ -19234,36 +19462,54 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         this.syncStatus = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SyncStatus(status);
         this.ports.forEach((p) => p.clientProvider.statusChanged(status));
     }
-    /**
-     * A function only used for unit tests which updates the internal
-     * sync stream client and all tab client's sync status
-     */
-    async _testUpdateAllStatuses(status) {
-        if (!this.connectionManager.syncStreamImplementation) {
-            throw new Error('Cannot update status without a sync stream implementation');
+}
+/**
+ * Runs the action with an abort controller.
+ */
+function withAbort(options) {
+    const { action, signal, cleanupOnAbort } = options;
+    return new Promise((resolve, reject) => {
+        if (signal.aborted) {
+            reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.AbortOperation('Operation aborted by abort controller'));
+            return;
         }
-        // Only assigning, don't call listeners for this test
-        this.connectionManager.syncStreamImplementation.syncStatus = new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SyncStatus(status);
-        this.updateAllStatuses(status);
-    }
+        function handleAbort() {
+            signal.removeEventListener('abort', handleAbort);
+            reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.AbortOperation('Operation aborted by abort controller'));
+        }
+        signal.addEventListener('abort', handleAbort, { once: true });
+        function completePromise(action) {
+            signal.removeEventListener('abort', handleAbort);
+            action();
+        }
+        action()
+            .then((data) => {
+            // We already rejected due to the abort, allow for cleanup
+            if (signal.aborted) {
+                return completePromise(() => cleanupOnAbort?.(data));
+            }
+            completePromise(() => resolve(data));
+        })
+            .catch((e) => completePromise(() => reject(e)));
+    });
 }
 
 
-/***/ }),
+/***/ },
 
-/***/ "./lib/src/worker/sync/WorkerClient.js":
+/***/ "./lib/src/worker/sync/WorkerClient.js"
 /*!*********************************************!*\
   !*** ./lib/src/worker/sync/WorkerClient.js ***!
   \*********************************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   WorkerClient: () => (/* binding */ WorkerClient)
 /* harmony export */ });
-/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
-/* harmony import */ var _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./SharedSyncImplementation */ "./lib/src/worker/sync/SharedSyncImplementation.js");
+/* harmony import */ var comlink__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
 /* harmony import */ var _shared_navigator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/navigator */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./SharedSyncImplementation */ "./lib/src/worker/sync/SharedSyncImplementation.js");
 
 
 
@@ -19277,23 +19523,21 @@ class WorkerClient {
     sync;
     port;
     resolvedPort = null;
+    resolvedPortPromise = null;
     constructor(sync, port) {
         this.sync = sync;
         this.port = port;
-    }
-    async initialize() {
+        comlink__WEBPACK_IMPORTED_MODULE_0__.expose(this, this.port);
         /**
          * Adds an extra listener which can remove this port
          * from the list of monitored ports.
          */
         this.port.addEventListener('message', async (event) => {
             const payload = event.data;
-            if (payload?.event == _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_0__.SharedSyncClientEvent.CLOSE_CLIENT) {
+            if (payload?.event == _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_2__.SharedSyncClientEvent.CLOSE_CLIENT) {
                 await this.removePort();
             }
         });
-        this.resolvedPort = await this.sync.addPort(this.port);
-        comlink__WEBPACK_IMPORTED_MODULE_2__.expose(this, this.port);
     }
     async removePort() {
         if (this.resolvedPort) {
@@ -19302,7 +19546,7 @@ class WorkerClient {
             const release = await this.sync.removePort(resolved);
             this.resolvedPort = null;
             this.port.postMessage({
-                event: _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_0__.SharedSyncClientEvent.CLOSE_ACK,
+                event: _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_2__.SharedSyncClientEvent.CLOSE_ACK,
                 data: {}
             });
             release?.();
@@ -19314,7 +19558,10 @@ class WorkerClient {
      * When the client tab is closed, its lock will be returned. So when the shared worker attempts to acquire the lock,
      * it can consider the connection to be closed.
      */
-    addLockBasedCloseSignal(name) {
+    async addLockBasedCloseSignal(name) {
+        // Only add the port once the lock has been obtained on the client.
+        this.resolvedPort = await this.sync.addPort(this.port);
+        // Don't await this lock request
         (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(name, async () => {
             await this.removePort();
         });
@@ -19346,13 +19593,10 @@ class WorkerClient {
     disconnect() {
         return this.sync.disconnect();
     }
-    async _testUpdateAllStatuses(status) {
-        return this.sync._testUpdateAllStatuses(status);
-    }
 }
 
 
-/***/ })
+/***/ }
 
 /******/ 	});
 /************************************************************************/
@@ -19366,6 +19610,12 @@ class WorkerClient {
 /******/ 		if (cachedModule !== undefined) {
 /******/ 			return cachedModule.exports;
 /******/ 		}
+/******/ 		// Check if module exists (development only)
+/******/ 		if (__webpack_modules__[moduleId] === undefined) {
+/******/ 			var e = new Error("Cannot find module '" + moduleId + "'");
+/******/ 			e.code = 'MODULE_NOT_FOUND';
+/******/ 			throw e;
+/******/ 		}
 /******/ 		// Create a new module (and put it into the cache)
 /******/ 		var module = __webpack_module_cache__[moduleId] = {
 /******/ 			// no module.id needed
@@ -19530,7 +19780,7 @@ logger.useDefaults();
 const sharedSyncImplementation = new _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_1__.SharedSyncImplementation();
 _self.onconnect = async function (event) {
     const port = event.ports[0];
-    await new _WorkerClient__WEBPACK_IMPORTED_MODULE_2__.WorkerClient(sharedSyncImplementation, port).initialize();
+    new _WorkerClient__WEBPACK_IMPORTED_MODULE_2__.WorkerClient(sharedSyncImplementation, port);
 };
 
 })();