cleanup code flow

Author: stevensJourney

packages/web/src/worker/sync/SharedSyncImplementation.ts

@@ -341,34 +341,38 @@ export class SharedSyncImplementation extends BaseObserver<SharedSyncImplementat
         }
       });
 
-      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));
-      }
+      const shouldReconnect =
+        !!this.connectionManager.syncStreamImplementation &&
+        this.ports.length > 0 &&
+        this.dbAdapter &&
+        this.dbAdapter == trackedPort.db;
 
+      // Close the worker wrapped database connection, we can't accurately rely on this connection
       for (const closeListener of trackedPort.closeListeners) {
         await closeListener();
       }
 
+      // Close the LockedAsyncDatabaseAdapter for cleanup
       try {
         await trackedPort.db?.close();
       } catch (ex) {
         this.logger.warn('error closing database', ex);
       }
 
-      // Re-index subscriptions, the subscriptions of the removed port would no longer be considered.
+      /**
+       * 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.
+       * Re-index subscriptions, the subscriptions of the removed port would no longer be considered.
+       */
       if (shouldReconnect) {
+        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));
         /**
          * The internals of this needs a port mutex lock.
          * It should be safe to start this operation here, but we cannot and don't need to await it.