@devries-cameron20 / t3code Mirror · read-only / commits / 938feb3246
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 06:00 UTC

fix(server): a stalled poll no longer stalls headless T3 Connect login (#39214)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Elias committed Nov 19, 2026 at 15:11 UTC 938feb32464352d61e7e474792d69da01a7e6e87
2 files changed +31 -10
apps/server/src/cloud/CliTokenManager.test.ts
+29 -8
@@ -56,7 +56,7 @@ const provideTestEnv = Effect.provide(
56
57 interface DeviceFlowServer {
58 readonly requests: Array<RecordedTokenRequest>;
59 - readonly tokenReplies: Array<{ readonly status: number; readonly body: string }>;
59 + readonly tokenReplies: Array<{ readonly status: number; readonly body: string } | "stall">;
60 }
61
62 const DEVICE_AUTHORIZATION_BODY = JSON.stringify({
@@ -84,7 +84,7 @@ const layerDeviceFlow = (server: DeviceFlowServer) =>
84 Layer.succeed(
85 HttpClient.HttpClient,
86 HttpClient.make((request) =>
87 - Effect.sync(() => {
87 + Effect.suspend(() => {
88 const body =
89 request.body._tag === "Uint8Array" ? new TextDecoder().decode(request.body.body) : "";
90 server.requests.push({ url: request.url, params: new URLSearchParams(body) });
@@ -93,12 +93,15 @@ const layerDeviceFlow = (server: DeviceFlowServer) =>
93 : ((server.tokenReplies.length > 1
94 ? server.tokenReplies.shift()
95 : server.tokenReplies[0]) ?? oauthError("invalid_grant"));
96 - return HttpClientResponse.fromWeb(
97 - request,
98 - new Response(reply.body, {
99 - status: reply.status,
100 - headers: { "content-type": "application/json" },
101 - }),
96 + if (reply === "stall") return Effect.never;
97 + return Effect.succeed(
98 + HttpClientResponse.fromWeb(
99 + request,
100 + new Response(reply.body, {
101 + status: reply.status,
102 + headers: { "content-type": "application/json" },
103 + }),
104 + ),
105 );
106 }),
107 ),
@@ -302,6 +305,24 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))(
305 }),
306 );
307
308 + it.effect("retries a poll that never answers instead of waiting out the device code", () =>
309 + Effect.gen(function* () {
310 + const server: DeviceFlowServer = { requests: [], tokenReplies: ["stall", tokenGranted] };
311 +
312 + const fiber = yield* CliTokenManager.deviceAuthorizationLogin(() => Effect.void).pipe(
313 + Effect.provide(layerDeviceFlow(server)),
314 + provideTestEnv,
315 + Effect.forkChild,
316 + );
317 + // 5 s interval, a 10 s request timeout, then the 10 s slowed-down interval.
318 + yield* TestClock.adjust(Duration.seconds(25));
319 +
320 + assert.lengthOf(tokenRequests(server.requests), 2);
321 + const { token } = yield* Fiber.join(fiber);
322 + assert.equal(token.accessToken, "access-token-1");
323 + }),
324 + );
325 +
326 it.effect("fails with a denied error when the user rejects the request", () =>
327 Effect.gen(function* () {
328 const server: DeviceFlowServer = {
apps/server/src/cloud/CliTokenManager.ts
+2 -2
@@ -404,10 +404,10 @@ const pollDeviceToken = Effect.fn("cloud.cli_token.poll_device_token")(function*
404 const response = yield* HttpClientRequest.post(metadata.tokenEndpoint).pipe(
405 HttpClientRequest.bodyUrlParams(params),
406 httpClient.execute,
407 - Effect.asSome,
407 + Effect.timeoutOption(OAUTH_REQUEST_TIMEOUT),
408 Effect.catchIf(isTransportError, () => Effect.succeedNone),
409 );
410 - // Retry transport errors and 5xx while the device code is valid, backing off per RFC 8628 §3.5. Drain bodies to reuse connections.
410 + // Retry transport errors, timeouts and 5xx while the device code is valid, backing off per RFC 8628 §3.5. Drain bodies to reuse connections.
411 if (Option.isNone(response) || response.value.status >= 500) {
412 if (Option.isSome(response)) yield* Effect.ignore(response.value.text);
413 interval = Duration.sum(interval, DEVICE_AUTHORIZATION_SLOW_DOWN_INCREMENT);