diff --git a/packages/server/src/handlers/persistent-pty.ts b/packages/server/src/handlers/persistent-pty.ts index 8e620a7fe29..d12ada7bba0 100644 --- a/packages/server/src/handlers/persistent-pty.ts +++ b/packages/server/src/handlers/persistent-pty.ts @@ -12,6 +12,7 @@ import { HttpApiBuilder, HttpApiSchema } from "effect/unstable/httpapi" import { Socket } from "effect/unstable/socket" import { Api } from "../api" import { CorsConfig, isAllowedRequestOrigin } from "../cors" +import { runPtySocket } from "./pty-socket" export const PersistentPtyHandler = HttpApiBuilder.group(Api, "server.experimental", (handlers) => Effect.gen(function* () { @@ -191,7 +192,7 @@ export const PersistentPtyHandler = HttpApiBuilder.group(Api, "server.experiment } }) - yield* Effect.race( + yield* runPtySocket( drain, socket.runRaw( (message) => @@ -221,9 +222,9 @@ export const PersistentPtyHandler = HttpApiBuilder.group(Api, "server.experiment ), { onOpen }, ), + () => attachment?.detach(), ).pipe( Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void), - Effect.ensuring(Effect.sync(() => attachment?.detach())), Effect.orDie, ) return HttpServerResponse.empty() diff --git a/packages/server/src/handlers/pty-socket.ts b/packages/server/src/handlers/pty-socket.ts new file mode 100644 index 00000000000..ecf965bb179 --- /dev/null +++ b/packages/server/src/handlers/pty-socket.ts @@ -0,0 +1,9 @@ +import { Effect } from "effect" + +export function runPtySocket( + drain: Effect.Effect, + socket: Effect.Effect, + detach: () => void, +) { + return Effect.raceFirst(drain, socket).pipe(Effect.ensuring(Effect.sync(detach))) +} diff --git a/packages/server/src/handlers/pty.ts b/packages/server/src/handlers/pty.ts index 1bcdd4c22e5..c933a2a1bc8 100644 --- a/packages/server/src/handlers/pty.ts +++ b/packages/server/src/handlers/pty.ts @@ -17,6 +17,7 @@ import { } from "@opencode-ai/protocol/groups/pty" import { response } from "../location" import { PtyEnvironment } from "../pty-environment" +import { runPtySocket } from "./pty-socket" const ticketScope = Effect.gen(function* () { const location = yield* Location.Service @@ -209,15 +210,15 @@ export const PtyHandler = HttpApiBuilder.group(Api, "server.pty", (handlers) => } }) - yield* Effect.race( + yield* runPtySocket( drain, socket.runRaw((message) => { const decoded = PtyProtocol.decodeInput(message) if (decoded !== undefined) attachment.write(decoded) }), + attachment.detach, ).pipe( Effect.catchReason("SocketError", "SocketCloseError", () => Effect.void), - Effect.ensuring(Effect.sync(() => attachment.detach())), Effect.orDie, ) return HttpServerResponse.empty() diff --git a/packages/server/test/pty-socket.test.ts b/packages/server/test/pty-socket.test.ts new file mode 100644 index 00000000000..405ff2c5d4e --- /dev/null +++ b/packages/server/test/pty-socket.test.ts @@ -0,0 +1,16 @@ +import { expect } from "bun:test" +import { Effect, Option, Result } from "effect" +import { it } from "../../core/test/lib/effect" +import { runPtySocket } from "../src/handlers/pty-socket" + +it.live("detaches when the socket fails while the outbox drain is blocked", () => + Effect.gen(function* () { + const state = { detached: false } + const result = yield* runPtySocket(Effect.never, Effect.fail("socket closed"), () => { + state.detached = true + }).pipe(Effect.result, Effect.timeoutOption("100 millis")) + + expect(Option.isSome(result) && Result.isFailure(result.value)).toBeTrue() + expect(state.detached).toBeTrue() + }), +)