Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy
Rust
time out stalled codex header waits
Raine Virta3545ac637ccd
diff --git a/src/providers/codex/client.test.ts b/src/providers/codex/client.test.tsnew file mode 100644index 0000000..19d00d2--- /dev/null+++ b/src/providers/codex/client.test.ts@@ -0,0 +1,18 @@+import { afterEach, describe, expect, it } from "bun:test";+import { CodexHeaderTimeoutError, setCodexHeaderTimeoutForTests } from "./client.ts";++const originalFetch = globalThis.fetch;++afterEach(() => {+ globalThis.fetch = originalFetch;+ setCodexHeaderTimeoutForTests(60_000, 1);+});++describe("CodexHeaderTimeoutError", () => {+ it("identifies header wait timeouts", () => {+ const err = new CodexHeaderTimeoutError(123);++ expect(err.name).toBe("CodexHeaderTimeoutError");+ expect(err.message).toContain("123ms");+ });+});diff --git a/src/providers/codex/client.ts b/src/providers/codex/client.tsindex 3999960..f5cc924 100644--- a/src/providers/codex/client.ts+++ b/src/providers/codex/client.ts@@ -6,9 +6,16 @@ import { forceRefresh, getAuth } from "./auth/manager.ts";import type { Logger } from "../../log.ts";import type { RequestContext } from "../types.ts";import type { ResponsesRequest } from "./translate/request.ts";-import { retryOn429 } from "../retry.ts";+import { retryOn429, sleep } from "../retry.ts";const FETCH_WATCHDOG_INTERVAL_MS = 30_000;+let fetchHeaderTimeoutMs = 60_000;+let fetchHeaderTimeoutRetries = 1;++export function setCodexHeaderTimeoutForTests(timeoutMs: number, retries: number): void {+ fetchHeaderTimeoutMs = timeoutMs;+ fetchHeaderTimeoutRetries = retries;+}export interface CodexResponse {body: ReadableStream<Uint8Array>;@@ -21,14 +28,46 @@ export async function postCodex(ctx: RequestContext,): Promise<CodexResponse> {const log = ctx.childLogger("codex.client");- return retryOn429(() => attemptPostCodex(body, ctx, log), {+ return retryHeaderTimeouts(+ () =>+ retryOn429(() => attemptPostCodex(body, ctx, log), {+ log,+ signal: ctx.signal,+ classify: (err) =>+ err instanceof CodexError && err.status === 429+ ? { retryAfter: err.meta?.retryAfter }+ : undefined,+ }),log,- signal: ctx.signal,- classify: (err) =>- err instanceof CodexError && err.status === 429- ? { retryAfter: err.meta?.retryAfter }- : undefined,- });+ ctx.signal,+ body,+ );+}++async function retryHeaderTimeouts(+ run: () => Promise<CodexResponse>,+ log: Logger,+ signal: AbortSignal | undefined,+ body: ResponsesRequest,+): Promise<CodexResponse> {+ for (let attempt = 0; ; attempt++) {+ try {+ return await run();+ } catch (err) {+ if (!(err instanceof CodexHeaderTimeoutError) || attempt >= fetchHeaderTimeoutRetries) throw err;+ const waitMs = fetchHeaderTimeoutMs <= 10 ? 0 : 500 + Math.round(Math.random() * 1000);+ log.warn("codex response headers timed out, retrying", {+ attempt: attempt + 1,+ maxRetries: fetchHeaderTimeoutRetries,+ waitMs,+ timeoutMs: fetchHeaderTimeoutMs,+ model: body.model,+ inputCount: body.input.length,+ toolCount: body.tools?.length ?? 0,+ });+ await sleep(waitMs, signal);+ }+ }}async function attemptPostCodex(@@ -113,19 +152,32 @@ async function doFetch(toolCount: body.tools?.length ?? 0,});}, FETCH_WATCHDOG_INTERVAL_MS);+ const headerTimeout = new AbortController();+ const timeout = setTimeout(() => {+ headerTimeout.abort(new CodexHeaderTimeoutError(fetchHeaderTimeoutMs));+ }, fetchHeaderTimeoutMs);+ const onAbort = () => headerTimeout.abort(signal?.reason);+ signal?.addEventListener("abort", onAbort, { once: true });try {const resp = await fetch(codexUrl, {method: "POST",headers,body: JSON.stringify(body),- signal,+ signal: headerTimeout.signal,});log.debug("received codex response headers", {status: resp.status,elapsedMs: Date.now() - startedAt,});return resp;+ } catch (err) {+ if (headerTimeout.signal.reason instanceof CodexHeaderTimeoutError) {+ throw headerTimeout.signal.reason;+ }+ throw err;} finally {+ signal?.removeEventListener("abort", onAbort);+ clearTimeout(timeout);clearInterval(watchdog);}}@@ -138,6 +190,13 @@ async function safeText(resp: Response): Promise<string> {}}+export class CodexHeaderTimeoutError extends Error {+ constructor(public timeoutMs: number) {+ super(`Timed out waiting ${timeoutMs}ms for Codex response headers`);+ this.name = "CodexHeaderTimeoutError";+ }+}+export class CodexError extends Error {constructor(public status: number,