ensure Channel executor catches defects in doneHalt (#4430)

Effect-TS · Feb 11, 2025 · b6a032f · b6a032f
1 parent 2473ad5
commit b6a032f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/.changeset/neat-ducks-visit.md b/.changeset/neat-ducks-visit.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+ensure Channel executor catches defects in doneHalt
diff --git a/packages/effect/src/internal/channel.ts b/packages/effect/src/internal/channel.ts
@@ -1855,9 +1855,15 @@ export const orDieWith = dual<
   self: Channel.Channel<OutElem, InElem, OutErr, InErr, OutDone, InDone, Env>,
   f: (e: OutErr) => unknown
 ): Channel.Channel<OutElem, InElem, never, InErr, OutDone, InDone, Env> =>
-  catchAll(self, (e) => {
-    throw f(e)
-  }) as Channel.Channel<OutElem, InElem, never, InErr, OutDone, InDone, Env>)
+  catchAll(self, (e) => core.failCauseSync(() => Cause.die(f(e)))) as Channel.Channel<
+    OutElem,
+    InElem,
+    never,
+    InErr,
+    OutDone,
+    InDone,
+    Env
+  >)
 
 /** @internal */
 export const orElse = dual<

diff --git a/packages/effect/src/internal/channel/channelExecutor.ts b/packages/effect/src/internal/channel/channelExecutor.ts
@@ -503,7 +503,11 @@ export class ChannelExecutor<
     const head = this._doneStack[this._doneStack.length - 1] as Continuation.Primitive
     if (head._tag === ContinuationOpCodes.OP_CONTINUATION_K) {
       this._doneStack.pop()
-      this._currentChannel = head.onHalt(cause) as core.Primitive
+      try {
+        this._currentChannel = head.onHalt(cause) as core.Primitive
+      } catch (error) {
+        this._currentChannel = core.failCause(Cause.die(error)) as core.Primitive
+      }
       return undefined
     }