Avoid treating completed requests as interrupted when race conditions…

… occur (#2637)
Effect-TS · Apr 27, 2024 · 18de56b · 18de56b
1 parent 0517e3e
commit 18de56b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/.changeset/perfect-glasses-worry.md b/.changeset/perfect-glasses-worry.md
@@ -0,0 +1,5 @@
+---
+"effect": patch
+---
+
+Avoid treating completed requests as interrupted when race conditions occur
diff --git a/packages/effect/src/internal/fiberRuntime.ts b/packages/effect/src/internal/fiberRuntime.ts
@@ -3518,9 +3518,26 @@ export const invokeWithInterrupt: <A, E, R>(
             const counts = entries.map((_) => _.listeners.count)
             const checkDone = () => {
               if (counts.every((count) => count === 0)) {
-                cleanup.forEach((f) => f())
-                onInterrupt?.()
-                cb(core.interruptFiber(processing))
+                if (
+                  entries.every((_) => {
+                    if (_.result.state.current._tag === "Pending") {
+                      return true
+                    } else if (
+                      _.result.state.current._tag === "Done" &&
+                      core.exitIsExit(_.result.state.current.effect) &&
+                      _.result.state.current.effect._tag === "Failure" &&
+                      internalCause.isInterrupted(_.result.state.current.effect.cause)
+                    ) {
+                      return true
+                    } else {
+                      return false
+                    }
+                  })
+                ) {
+                  cleanup.forEach((f) => f())
+                  onInterrupt?.()
+                  cb(core.interruptFiber(processing))
+                }
               }
             }
             processing.addObserver((exit) => {

diff --git a/packages/effect/test/Effect/query.test.ts b/packages/effect/test/Effect/query.test.ts
@@ -160,6 +160,22 @@ const EnvLive = Layer.mergeAll(
 const provideEnv = Effect.provide(EnvLive)
 
 describe("Effect", () => {
+  it.effect("avoid false interruption when concurrency happens in resolver", () =>
+    Effect.gen(function*() {
+      class RequestUserById extends Request.TaggedClass("RequestUserById")<number, never, {
+        id: string
+      }> {}
+      let count = 0
+      const resolver = Resolver.makeBatched((i) => {
+        count++
+        return Effect.forEach(i, Request.complete(Exit.succeed(1)), { concurrency: "unbounded" })
+      })
+      yield* Effect.request(new RequestUserById({ id: "1" }), resolver).pipe(
+        Effect.withRequestCaching(true),
+        Effect.repeatN(3)
+      )
+      expect(count).toBe(1)
+    }))
   it.effect("requests are executed correctly", () =>
     provideEnv(
       Effect.gen(function*($) {