@powersync/web 0.0.0-dev-20251127205344 → 0.0.0-dev-20251129133952

package/dist/worker/SharedSyncImplementation.umd.js

@@ -14659,7 +14659,7 @@ The next upload iteration will be delayed.`);
                                 uploadError: ex
                             }
                         });
-                        await this.delayRetry(controller.signal);
+                        await this.delayRetry(controller.signal, this.options.crudUploadThrottleMs);
                         if (!this.isConnected) {
                             // Exit the upload loop if the sync stream is no longer connected
                             break;
@@ -15370,14 +15370,14 @@ The next upload iteration will be delayed.`);
         // trigger this for all updates
         this.iterateListeners((cb) => cb.statusUpdated?.(options));
     }
-    async delayRetry(signal) {
+    async delayRetry(signal, delayMs) {
         return new Promise((resolve) => {
             if (signal?.aborted) {
                 // If the signal is already aborted, resolve immediately
                 resolve();
                 return;
             }
-            const { retryDelayMs } = this.options;
+            const delay = delayMs ?? this.options.retryDelayMs;
             let timeoutId;
             const endDelay = () => {
                 resolve();
@@ -15388,7 +15388,7 @@ The next upload iteration will be delayed.`);
                 signal?.removeEventListener('abort', endDelay);
             };
             signal?.addEventListener('abort', endDelay, { once: true });
-            timeoutId = setTimeout(endDelay, retryDelayMs);
+            timeoutId = setTimeout(endDelay, delay);
         });
     }
     updateSubscriptions(subscriptions) {
@@ -17600,6 +17600,26 @@ const parseQuery = (query, parameters) => {
 //# sourceMappingURL=bundle.mjs.map
 
 
+/***/ }),
+
+/***/ "./lib/src/db/adapters/AsyncDatabaseConnection.js":
+/*!********************************************************!*\
+  !*** ./lib/src/db/adapters/AsyncDatabaseConnection.js ***!
+  \********************************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   ConnectionClosedError: () => (/* binding */ ConnectionClosedError)
+/* harmony export */ });
+class ConnectionClosedError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'ConnectionClosedError';
+    }
+}
+
+
 /***/ }),
 
 /***/ "./lib/src/db/adapters/LockedAsyncDatabaseAdapter.js":
@@ -17614,8 +17634,10 @@ __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 _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");
+/* harmony import */ var _AsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./AsyncDatabaseConnection */ "./lib/src/db/adapters/AsyncDatabaseConnection.js");
+/* harmony import */ var _WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./WorkerWrappedAsyncDatabaseConnection */ "./lib/src/db/adapters/WorkerWrappedAsyncDatabaseConnection.js");
+/* harmony import */ var _wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./wa-sqlite/WASQLiteConnection */ "./lib/src/db/adapters/wa-sqlite/WASQLiteConnection.js");
+
 
 
 
@@ -17637,6 +17659,8 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
     _config = null;
     pendingAbortControllers;
     requiresHolds;
+    requiresReOpen;
+    databaseOpenPromise = null;
     closing;
     closed;
     constructor(options) {
@@ -17648,6 +17672,7 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
         this.closed = false;
         this.closing = false;
         this.requiresHolds = null;
+        this.requiresReOpen = false;
         // Set the name if provided. We can query for the name if not available yet
         this.debugMode = options.debugMode ?? false;
         if (this.debugMode) {
@@ -17686,16 +17711,26 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
     async init() {
         return this.initPromise;
     }
-    async _init() {
+    async openInternalDB() {
+        // Dispose any previous table change listener.
+        this._disposeTableChangeListener?.();
+        this._disposeTableChangeListener = null;
+        const isReOpen = !!this._db;
         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?.());
+        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;
+        this.requiresHolds = this._config.vfs == _wa_sqlite_WASQLiteConnection__WEBPACK_IMPORTED_MODULE_4__.WASQLiteVFS.IDBBatchAtomicVFS;
+    }
+    async _init() {
+        await this.openInternalDB();
+        this.iterateListeners((cb) => cb.initialized?.());
     }
     getConfiguration() {
         if (!this._config) {
@@ -17708,7 +17743,7 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
         await this.initPromise;
     }
     async shareConnection() {
-        if (false == this._db instanceof _WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_2__.WorkerWrappedAsyncDatabaseConnection) {
+        if (false == this._db instanceof _WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_3__.WorkerWrappedAsyncDatabaseConnection) {
             throw new Error(`Only worker connections can be shared`);
         }
         return this._db.shareConnection();
@@ -17762,13 +17797,13 @@ 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) {
@@ -17779,7 +17814,7 @@ class LockedAsyncDatabaseAdapter extends _powersync_common__WEBPACK_IMPORTED_MOD
         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);
@@ -17787,13 +17822,37 @@ 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;
+            let holdId = null;
             try {
+                // The database is being opened in the background. Wait for it here.
+                if (this.databaseOpenPromise) {
+                    try {
+                        await this.databaseOpenPromise;
+                    }
+                    catch (ex) {
+                        // This will cause a retry of opening the database.
+                        const wrappedError = new _AsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_2__.ConnectionClosedError('Could not open database');
+                        wrappedError.cause = ex;
+                        throw wrappedError;
+                    }
+                }
+                holdId = this.requiresHolds ? await this.baseDB.markHold() : null;
                 return await callback();
             }
+            catch (ex) {
+                if (ex instanceof _AsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_2__.ConnectionClosedError) {
+                    if (this.options.reOpenOnConnectionClosed && !this.databaseOpenPromise && !this.closing) {
+                        // Immediately re-open the database. We need to miss as little table updates as possible.
+                        this.databaseOpenPromise = this.openInternalDB().finally(() => {
+                            this.databaseOpenPromise = null;
+                        });
+                    }
+                }
+                throw ex;
+            }
             finally {
                 if (holdId) {
                     await this.baseDB.releaseHold(holdId);
@@ -17926,7 +17985,9 @@ __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 comlink__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! comlink */ "../../node_modules/comlink/dist/esm/comlink.mjs");
+/* harmony import */ var _AsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./AsyncDatabaseConnection */ "./lib/src/db/adapters/AsyncDatabaseConnection.js");
+
 
 /**
  * Wraps a provided instance of {@link AsyncDatabaseConnection}, providing necessary proxy
@@ -17974,12 +18035,12 @@ class WorkerWrappedAsyncDatabaseConnection {
         if (controller) {
             return new Promise((resolve, reject) => {
                 if (controller.signal.aborted) {
-                    reject(new Error('Called operation on closed remote'));
+                    reject(new _AsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Called operation on closed remote'));
                     // Don't run the operation if we're going to reject
                     return;
                 }
                 function handleAbort() {
-                    reject(new Error('Remote peer closed with request in flight'));
+                    reject(new _AsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_0__.ConnectionClosedError('Remote peer closed with request in flight'));
                 }
                 function completePromise(action) {
                     controller.signal.removeEventListener('abort', handleAbort);
@@ -18033,7 +18094,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 };
     }
     /**
@@ -18041,7 +18102,7 @@ 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.
@@ -18050,7 +18111,7 @@ class WorkerWrappedAsyncDatabaseConnection {
             await this.withRemote(() => this.baseConnection.close());
         }
         finally {
-            this.options.remote[comlink__WEBPACK_IMPORTED_MODULE_0__.releaseProxy]();
+            this.options.remote[comlink__WEBPACK_IMPORTED_MODULE_1__.releaseProxy]();
             this.options.onClose?.();
         }
     }
@@ -18877,7 +18938,6 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
     statusListener;
     fetchCredentialsController;
     uploadDataController;
-    dbAdapter;
     syncParams;
     logger;
     lastConnectOptions;
@@ -18886,10 +18946,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;
@@ -18902,26 +18962,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.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
         });
@@ -18932,6 +18989,18 @@ 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.
+     */
+    get lastWrappedPort() {
+        // Find the last port which is protected from close
+        for (let i = this.ports.length - 1; i >= 0; i--) {
+            if (this.ports[i].isProtectedFromClose && !this.ports[i].isClosing) {
+                return this.ports[i];
+            }
+        }
+        return;
+    }
     async waitForStatus(status) {
         return this.withSyncImplementation(async (sync) => {
             return sync.waitForStatus(status);
@@ -18974,10 +19043,6 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
             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
@@ -18985,13 +19050,28 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
             if (params.streamOptions?.flags?.broadcastLogs) {
                 this.logger = this.broadCastLogger;
             }
+            const lockedAdapter = new _db_adapters_LockedAsyncDatabaseAdapter__WEBPACK_IMPORTED_MODULE_4__.LockedAsyncDatabaseAdapter({
+                name: params.dbParams.dbFilename,
+                openConnection: async () => {
+                    // Gets a connection from the clients when a new connection is requested.
+                    return await this.openInternalDB();
+                },
+                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();
+                }
+            });
             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();
-            }
             this.iterateListeners((l) => l.initialized?.());
         });
     }
@@ -19022,7 +19102,9 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 port,
                 clientProvider: comlink__WEBPACK_IMPORTED_MODULE_7__.wrap(port),
                 currentSubscriptions: [],
-                closeListeners: []
+                closeListeners: [],
+                isProtectedFromClose: false,
+                isClosing: false
             };
             this.ports.push(portProvider);
             // Give the newly connected client the latest status
@@ -19038,14 +19120,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
@@ -19059,40 +19143,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;
-            /**
-             * If the current database adapter is the one that is being closed, we need to disconnect from the backend.
-             * We can disconnect in the portMutex lock. This ensures the disconnect is not affected by potential other
-             * connect operations coming from other tabs.
-             */
-            if (this.dbAdapter && this.dbAdapter == trackedPort.db) {
-                this.logger.debug(`Disconnecting due to closed database: should reconnect: ${shouldReconnect}`);
-                this.dbAdapter = null;
-                // 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));
+            // Close the worker wrapped database connection, we can't accurately rely on this connection
+            for (const closeListener of trackedPort.closeListeners) {
+                await closeListener();
             }
-            return {
-                shouldReconnect,
-                trackedPort
-            };
+            this.collectActiveSubscriptions();
+            return () => trackedPort.clientProvider[comlink__WEBPACK_IMPORTED_MODULE_7__.releaseProxy]();
         });
-        if (!trackedPort) {
-            // We could not find the port to remove
-            return () => { };
-        }
-        for (const closeListener of trackedPort.closeListeners) {
-            await closeListener();
-        }
-        if (shouldReconnect) {
-            await this.connectionManager.connect(CONNECTOR_PLACEHOLDER, this.lastConnectOptions ?? {});
-        }
-        // 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]();
     }
     triggerCrudUpload() {
         this.withSyncImplementation(async (sync) => {
@@ -19129,10 +19186,13 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         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),
+            adapter: new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.SqliteBucketStorage(this.distributedDB, this.logger),
             remote: new _db_sync_WebRemote__WEBPACK_IMPORTED_MODULE_2__.WebRemote({
                 invalidateCredentials: async () => {
-                    const lastPort = this.ports[this.ports.length - 1];
+                    const lastPort = this.lastWrappedPort;
+                    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();
@@ -19142,7 +19202,10 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                     }
                 },
                 fetchCredentials: async () => {
-                    const lastPort = this.ports[this.ports.length - 1];
+                    const lastPort = this.lastWrappedPort;
+                    if (!lastPort) {
+                        throw new Error('No client port found to fetch credentials');
+                    }
                     return new Promise(async (resolve, reject) => {
                         const abortController = new AbortController();
                         this.fetchCredentialsController = {
@@ -19164,7 +19227,10 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 }
             }, this.logger),
             uploadCrud: async () => {
-                const lastPort = this.ports[this.ports.length - 1];
+                const lastPort = this.lastWrappedPort;
+                if (!lastPort) {
+                    throw new Error('No client port found to upload crud');
+                }
                 return new Promise(async (resolve, reject) => {
                     const abortController = new AbortController();
                     this.uploadDataController = {
@@ -19190,19 +19256,47 @@ 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) {
-            // 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);
-        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 () => {
+        while (true) {
+            try {
+                const lastClient = this.lastWrappedPort;
+                if (!lastClient) {
+                    // Should not really happen in practice
+                    throw new Error(`Could not open DB connection since no client is connected.`);
+                }
+                /**
+                 * Handle cases where the client might close while opening a connection.
+                 */
+                const abortController = new AbortController();
+                const closeListener = () => {
+                    abortController.abort();
+                };
+                const removeCloseListener = () => {
+                    const index = lastClient.closeListeners.indexOf(closeListener);
+                    if (index >= 0) {
+                        lastClient.closeListeners.splice(index, 1);
+                    }
+                };
+                lastClient.closeListeners.push(closeListener);
+                const workerPort = await withAbort(() => lastClient.clientProvider.getDBWorkerPort(), abortController.signal).catch((ex) => {
+                    removeCloseListener();
+                    throw ex;
+                });
+                const remote = comlink__WEBPACK_IMPORTED_MODULE_7__.wrap(workerPort);
+                const identifier = this.syncParams.dbParams.dbFilename;
+                /**
+                 * 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(() => remote(this.syncParams.dbParams), abortController.signal).finally(() => {
+                    // We can remove the close listener here since we no longer need it past this point.
+                    removeCloseListener();
+                });
                 const wrapped = new _db_adapters_WorkerWrappedAsyncDatabaseConnection__WEBPACK_IMPORTED_MODULE_5__.WorkerWrappedAsyncDatabaseConnection({
                     remote,
                     baseConnection: db,
@@ -19222,11 +19316,12 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                     wrapped.markRemoteClosed();
                 });
                 return wrapped;
-            },
-            logger: this.logger
-        });
-        await locked.init();
-        this.dbAdapter = lastClient.db = locked;
+            }
+            catch (ex) {
+                this.logger.warn('Error opening internal DB', ex);
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+            }
+        }
     }
     /**
      * A method to update the all shared statuses for each
@@ -19249,6 +19344,29 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         this.updateAllStatuses(status);
     }
 }
+/**
+ * Runs the action with an abort controller.
+ */
+function withAbort(action, signal) {
+    return new Promise((resolve, reject) => {
+        if (signal.aborted) {
+            reject(new _powersync_common__WEBPACK_IMPORTED_MODULE_0__.AbortOperation('Operation aborted by abort controller'));
+            return;
+        }
+        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) => completePromise(() => resolve(data)))
+            .catch((e) => completePromise(() => reject(e)));
+    });
+}
 
 
 /***/ }),
@@ -19279,6 +19397,7 @@ class WorkerClient {
     sync;
     port;
     resolvedPort = null;
+    resolvedPortPromise = null;
     constructor(sync, port) {
         this.sync = sync;
         this.port = port;
@@ -19295,7 +19414,15 @@ class WorkerClient {
                 await this.removePort();
             }
         });
-        this.resolvedPort = await this.sync.addPort(this.port);
+        /**
+         * Keep a reference to the resolved port promise.
+         * The init timing is difficult to predict due to the async message passing.
+         * We only want to use a port if we are know it's been protected from being closed.
+         * The lock based close signal will be added asynchronously. We need to use the
+         * added port once the lock is configured.
+         */
+        this.resolvedPortPromise = this.sync.addPort(this.port);
+        this.resolvedPort = await this.resolvedPortPromise;
     }
     async removePort() {
         if (this.resolvedPort) {
@@ -19316,7 +19443,20 @@ 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) {
+        if (!this.resolvedPortPromise) {
+            // The init logic above is actually synchronous, so this should not happen.
+            this.sync.broadCastLogger.warn('addLockBasedCloseSignal called before port promise registered');
+        }
+        else {
+            const wrappedPort = await this.resolvedPortPromise;
+            /**
+             * The client registered a navigator lock. We now can guarantee detecting if the client has closed.
+             * E.g. before this point: It's possible some ports might have been created and closed before the
+             * lock based close signal is added. We should not trust those ports.
+             */
+            wrappedPort.isProtectedFromClose = true;
+        }
         (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_0__.getNavigatorLocks)().request(name, async () => {
             await this.removePort();
         });