ensure fibers can't be added to Fiber{Handle,Set,Map} during closing (#4496)

Author: tim-smart

.changeset/grumpy-lions-remain.md

@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+ensure fibers can't be added to Fiber{Handle,Set,Map} during closing

packages/effect/src/FiberHandle.ts

@@ -111,13 +111,17 @@ export const make = <A = unknown, E = unknown>(): Effect.Effect<FiberHandle<A, E
   Effect.acquireRelease(
     Effect.map(Deferred.make<void, E>(), (deferred) => unsafeMake<A, E>(deferred)),
     (handle) =>
-      Effect.zipRight(
-        clear(handle),
-        Effect.suspend(() => {
-          handle.state = { _tag: "Closed" }
-          return Deferred.done(handle.deferred, Exit.void)
-        })
-      )
+      Effect.withFiberRuntime((parent) => {
+        const state = handle.state
+        if (state._tag === "Closed") return Effect.void
+        handle.state = { _tag: "Closed" }
+        return state.fiber ?
+          Effect.intoDeferred(
+            Effect.asVoid(Fiber.interruptAs(state.fiber, FiberId.combine(parent.id(), internalFiberId))),
+            handle.deferred
+          ) :
+          Deferred.done(handle.deferred, Exit.void)
+      })
   )
 
 /**

packages/effect/src/FiberMap.ts

@@ -125,13 +125,17 @@ export const make = <K, A = unknown, E = unknown>(): Effect.Effect<FiberMap<K, A
         deferred
       )),
     (map) =>
-      Effect.zipRight(
-        clear(map),
-        Effect.suspend(() => {
-          map.state = { _tag: "Closed" }
-          return Deferred.done(map.deferred, Exit.void)
-        })
-      )
+      Effect.withFiberRuntime((parent) => {
+        const state = map.state
+        if (state._tag === "Closed") return Effect.void
+        map.state = { _tag: "Closed" }
+        return Fiber.interruptAllAs(
+          Iterable.map(state.backing, ([, fiber]) => fiber),
+          FiberId.combine(parent.id(), internalFiberId)
+        ).pipe(
+          Effect.intoDeferred(map.deferred)
+        )
+      })
   )
 
 /**

packages/effect/src/FiberSet.ts

@@ -118,13 +118,15 @@ export const make = <A = unknown, E = unknown>(): Effect.Effect<FiberSet<A, E>,
   Effect.acquireRelease(
     Effect.map(Deferred.make<void, unknown>(), (deferred) => unsafeMake(new Set(), deferred)),
     (set) =>
-      Effect.zipRight(
-        clear(set),
-        Effect.suspend(() => {
-          set.state = { _tag: "Closed" }
-          return Deferred.done(set.deferred, Exit.void)
-        })
-      )
+      Effect.withFiberRuntime((parent) => {
+        const state = set.state
+        if (state._tag === "Closed") return Effect.void
+        set.state = { _tag: "Closed" }
+        const fibers = state.backing
+        return Fiber.interruptAllAs(fibers, FiberId.combine(parent.id(), internalFiberId)).pipe(
+          Effect.intoDeferred(set.deferred)
+        )
+      })
   )
 
 /**