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

package/dist/worker/SharedSyncImplementation.umd.js

@@ -19060,6 +19060,20 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 }
             });
             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));
+            }
             return {
                 shouldReconnect,
                 trackedPort
@@ -19072,17 +19086,8 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
         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 ?? {});
-            }
+        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();
@@ -19208,6 +19213,11 @@ class SharedSyncImplementation extends _powersync_common__WEBPACK_IMPORTED_MODUL
                 });
                 lastClient.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 run the close operation first, before marking the remote as closed. This gives the database some chance
+                     * to close the connection.
+                     */
                     wrapped.close().catch((ex) => this.logger.warn('error closing database connection', ex));
                     wrapped.markRemoteClosed();
                 });
@@ -19254,8 +19264,8 @@ __webpack_require__.r(__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 _shared_navigator__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/navigator */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _shared_navigator__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/navigator */ "./lib/src/shared/navigator.js");
+/* harmony import */ var _SharedSyncImplementation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./SharedSyncImplementation */ "./lib/src/worker/sync/SharedSyncImplementation.js");
 
 
 
@@ -19272,6 +19282,7 @@ class WorkerClient {
     constructor(sync, port) {
         this.sync = sync;
         this.port = port;
+        comlink__WEBPACK_IMPORTED_MODULE_2__.expose(this, this.port);
     }
     async initialize() {
         /**
@@ -19280,12 +19291,11 @@ class WorkerClient {
          */
         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_1__.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) {
@@ -19294,7 +19304,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_1__.SharedSyncClientEvent.CLOSE_ACK,
                 data: {}
             });
             release?.();
@@ -19307,7 +19317,7 @@ class WorkerClient {
      * it can consider the connection to be closed.
      */
     addLockBasedCloseSignal(name) {
-        (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_1__.getNavigatorLocks)().request(name, async () => {
+        (0,_shared_navigator__WEBPACK_IMPORTED_MODULE_0__.getNavigatorLocks)().request(name, async () => {
             await this.removePort();
         });
     }