ensure last port in browser worker closes naturally with the outer sc…

…ope (#4433)
Effect-TS · Feb 11, 2025 · 3ffe06d · 3ffe06d
1 parent b6a032f
commit 3ffe06d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.changeset/green-socks-occur.md b/.changeset/green-socks-occur.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform-browser": patch
+---
+
+ensure last port in browser worker closes naturally with the outer scope
diff --git a/packages/platform-browser/src/internal/workerRunner.ts b/packages/platform-browser/src/internal/workerRunner.ts
@@ -59,13 +59,14 @@ export const make = (self: MessagePort | Window) =>
                   FiberSet.unsafeAdd(fiberSet, fiber)
                 } else {
                   const port = ports.get(portId)
-                  if (port) {
-                    Effect.runFork(Scope.close(port[1], Exit.void))
+                  if (!port) {
+                    return
+                  } else if (ports.size === 1) {
+                    // let the last port close with the outer scope
+                    return Deferred.unsafeDone(closeLatch, Exit.void)
                   }
                   ports.delete(portId)
-                  if (ports.size === 0) {
-                    Deferred.unsafeDone(closeLatch, Exit.void)
-                  }
+                  Effect.runFork(Scope.close(port[1], Exit.void))
                 }
               }
             }