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

package/src/worker/sync/WorkerClient.ts

@@ -17,6 +17,7 @@ import {
  */
 export class WorkerClient {
   private resolvedPort: WrappedSyncPort | null = null;
+  protected resolvedPortPromise: Promise<WrappedSyncPort> | null = null;
 
   constructor(
     private readonly sync: SharedSyncImplementation,
@@ -37,7 +38,15 @@ export class WorkerClient {
       }
     });
 
-    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;
   }
 
   private async removePort() {
@@ -60,7 +69,19 @@ export 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: string) {
+  async addLockBasedCloseSignal(name: string) {
+    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;
+    }
     getNavigatorLocks().request(name, async () => {
       await this.removePort();
     });