Skip to content

Commit 6c6a2dc

Browse files
committed
fix(opencode): fail stalled event subscriptions promptly
1 parent cefb544 commit 6c6a2dc

2 files changed

Lines changed: 38 additions & 1 deletion

File tree

‎packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import { assert, it } from "@effect/vitest";
22
import { Session } from "@opencode/client/effect";
3+
import * as Cause from "effect/Cause";
4+
import * as Deferred from "effect/Deferred";
35
import * as Effect from "effect/Effect";
6+
import * as Fiber from "effect/Fiber";
47
import * as Layer from "effect/Layer";
58
import * as Redacted from "effect/Redacted";
69
import * as Schema from "effect/Schema";
10+
import * as TestClock from "effect/testing/TestClock";
711
import * as HttpClient from "effect/http/HttpClient";
812
import * as HttpClientResponse from "effect/http/HttpClientResponse";
913
import { describe } from "vite-plus/test";
@@ -48,6 +52,36 @@ describe("OpenCode2Client authorization", () => {
4852
);
4953
});
5054

55+
describe("OpenCode2Client event subscription", () => {
56+
it.effect("times out and cancels a subscription with no response headers", () =>
57+
Effect.gen(function* () {
58+
const cancelled = yield* Deferred.make<void>();
59+
const transport = Layer.succeed(
60+
HttpClient.HttpClient,
61+
HttpClient.make((request) => {
62+
assert.strictEqual(request.url, "http://127.0.0.1:4096/api/event");
63+
return Effect.never.pipe(Effect.ensuring(Deferred.succeed(cancelled, undefined)));
64+
}),
65+
);
66+
const opencode = yield* OpenCode2Client.OpenCode2Client.pipe(
67+
Effect.provide(OpenCode2Client.layer.pipe(Layer.provide(transport))),
68+
);
69+
const { events } = yield* opencode.connect({
70+
baseUrl: "http://127.0.0.1:4096",
71+
password: "test-password",
72+
});
73+
const opening = yield* events.pipe(Effect.flip, Effect.forkScoped);
74+
75+
yield* TestClock.adjust("10 seconds");
76+
assert.isTrue(yield* Deferred.isDone(cancelled));
77+
const error = yield* Fiber.join(opening);
78+
assert.strictEqual(error._tag, "HttpClientError");
79+
assert.strictEqual(error.reason._tag, "TransportError");
80+
assert.isTrue(Cause.isTimeoutError(error.cause));
81+
}).pipe(Effect.scoped),
82+
);
83+
});
84+
5185
const previous = {
5286
id: "msg_repro088",
5387
type: "synthetic",

‎packages/provider-opencode/src/server/v2/OpenCode2Client.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export class OpenCode2Client extends Context.Service<
7474

7575
// Heartbeats arrive every 10-15 seconds; longer silence means stuck, not idle.
7676
const SILENT_STREAM_TIMEOUT = "45 seconds";
77+
const SUBSCRIPTION_TIMEOUT = "10 seconds";
7778

7879
const decodeEvent = Schema.decodeUnknownResult(Schema.fromJsonString(OpenCodeEvent));
7980
const decodeEnvelope = Schema.decodeUnknownOption(
@@ -214,7 +215,9 @@ export const make = Effect.gen(function* () {
214215
events: readEvents.pipe(
215216
Effect.provideService(
216217
HttpClient.HttpClient,
217-
HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)),
218+
HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)).pipe(
219+
HttpClient.timeout(SUBSCRIPTION_TIMEOUT),
220+
),
218221
),
219222
),
220223
})),

0 commit comments

Comments
 (0)