Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

deduplicate codex test helpers

Raine Virtad745bf5e6208
diff --git a/src/providers/codex/translate/stream.test.ts b/src/providers/codex/translate/stream.test.ts
index 98949ec..280d0b2 100644
--- a/src/providers/codex/translate/stream.test.ts
+++ b/src/providers/codex/translate/stream.test.ts
@@ -63,6 +63,16 @@ function collectFromChunks(
);
}
+function collectWithTime(chunks: string[]): Promise<string> {
+ return withMockNow(() =>
+ collectFromChunks(chunks, {
+ advance: () => {
+ now += 16_000;
+ },
+ }),
+ );
+}
+
describe("translateStream", () => {
it("emits keepalive pings while Read arguments are buffered", async () => {
const chunks = [
@@ -70,13 +80,7 @@ describe("translateStream", () => {
sse("response.completed", { response: { usage: {} } }),
];
- const output = await withMockNow(() =>
- collectFromChunks(chunks, {
- advance: () => {
- now += 16_000;
- },
- }),
- );
+ const output = await collectWithTime(chunks);
expect(output).toContain("event: content_block_start");
expect(output).toContain("event: content_block_delta");
@@ -99,13 +103,7 @@ describe("translateStream", () => {
sse("response.completed", { response: { usage: {} } }),
];
- const output = await withMockNow(() =>
- collectFromChunks(chunks, {
- advance: () => {
- now += 16_000;
- },
- }),
- );
+ const output = await collectWithTime(chunks);
expect(output.match(/event: ping/g)?.length).toBeGreaterThanOrEqual(2);
expect(output).toContain("event: message_stop");
diff --git a/src/providers/codex/websocket.test.ts b/src/providers/codex/websocket.test.ts
index 5eaadea..f7a0b51 100644
--- a/src/providers/codex/websocket.test.ts
+++ b/src/providers/codex/websocket.test.ts
@@ -10,16 +10,9 @@ import {
toWebSocketUrl,
WEBSOCKET_PROTOCOL_HEADER,
} from "./websocket.ts";
+import { collect, silentLog } from "./translate/test-helpers.ts";
import type { ResponsesWebSocketRequest } from "./translate/request.ts";
-const silentLog = {
- debug: () => {},
- info: () => {},
- warn: () => {},
- error: () => {},
- child: () => silentLog,
-};
-
const websocketTimeoutMs = {
connect: 1_000,
idle: 1_000,
@@ -46,17 +39,6 @@ function body(): ResponsesWebSocketRequest {
};
}
-async function collect(stream: ReadableStream<Uint8Array>): Promise<string> {
- const reader = stream.getReader();
- const decoder = new TextDecoder();
- let out = "";
- while (true) {
- const { done, value } = await reader.read();
- if (done) return out;
- out += decoder.decode(value, { stream: true });
- }
-}
-
function webSocketRequest(
url: string,
options: { poolKey?: string } = {},
@@ -124,6 +106,20 @@ async function withCompletionServer(
};
}
+async function withAutoCompletionServer(): Promise<{
+ url: string;
+ close: () => Promise<void>;
+ sockets: () => number;
+}> {
+ return withCompletionServer((socket, socketIndex) => {
+ socket.on("message", () => {
+ socket.send(
+ JSON.stringify({ type: "response.completed", response: { id: `resp_${socketIndex}` } }),
+ );
+ });
+ });
+}
+
describe("Codex WebSocket helpers", () => {
it("converts HTTP URLs to WebSocket URLs", () => {
expect(toWebSocketUrl("https://chatgpt.com/backend-api/codex/responses")).toBe(
@@ -235,13 +231,7 @@ describe("Codex WebSocket helpers", () => {
});
it("reuses a pooled websocket", async () => {
- const server = await withCompletionServer((socket, socketIndex) => {
- socket.on("message", () => {
- socket.send(
- JSON.stringify({ type: "response.completed", response: { id: `resp_${socketIndex}` } }),
- );
- });
- });
+ const server = await withAutoCompletionServer();
try {
const request = () =>
webSocketRequest(server.url, {
@@ -259,13 +249,7 @@ describe("Codex WebSocket helpers", () => {
});
it("does not pool websocket requests without a pool key", async () => {
- const server = await withCompletionServer((socket, socketIndex) => {
- socket.on("message", () => {
- socket.send(
- JSON.stringify({ type: "response.completed", response: { id: `resp_${socketIndex}` } }),
- );
- });
- });
+ const server = await withAutoCompletionServer();
try {
const makeRequest = () => webSocketRequest(server.url).then(collect);
@@ -276,4 +260,5 @@ describe("Codex WebSocket helpers", () => {
await server.close();
}
});
+
});