fix: parse escaped retryable error messages

2026-07-08 10:08:25 +08:00
parent a62f2cf1b9
commit 5d48ef5880
4 changed files with 64 additions and 15 deletions
@@ -3,13 +3,15 @@
 import http from "node:http";
 import net from "node:net";
 import { once } from "node:events";
-import { spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
-
-const gatewayRoot = path.resolve(import.meta.dirname, "..");
-const gatewayEntry = path.join(gatewayRoot, "gateway.mjs");
+import os from "node:os";
+import path from "node:path";
+
+import { normalizePhraseArray } from "./admin-lib.mjs";
+
+const gatewayRoot = path.resolve(import.meta.dirname, "..");
+const gatewayEntry = path.join(gatewayRoot, "gateway.mjs");

 function assert(condition, message) {
  if (!condition) {
@@ -463,8 +465,13 @@ async function readSseUntilClose(url, requestBody) {
  };
 }

-async function run() {
-  const tempRoot = await mkdtemp(path.join(os.tmpdir(), "codex-retry-gateway-"));
+async function run() {
+  assert(
+    JSON.stringify(normalizePhraseArray("a\\nb", [])) === JSON.stringify(["a", "b"]),
+    "normalizePhraseArray 未拆分字面量换行",
+  );
+
+  const tempRoot = await mkdtemp(path.join(os.tmpdir(), "codex-retry-gateway-"));
  const upstreamPort = await getFreePort();
  const gatewayPort = await getFreePort();
  const configPath = path.join(tempRoot, "config.json");
@@ -1103,6 +1110,30 @@ async function run() {
    assert(metricsAfterRestart?.metrics?.total_proxy_request_count >= metricsBeforeRestart?.metrics?.total_proxy_request_count, "重启后 total_proxy_request_count 未保留");
    assert(metricsAfterRestart?.metrics?.persistent_since, "重启后未返回 persistent_since");

+    config.retryable_error_messages = [
+      "Selected model is at capacity. Please try a different model.\\nstream disconnected before completion: Concurrency limit exceeded for account, please retry later",
+    ];
+    await writeFile(configPath, JSON.stringify(config, null, 2), "utf8");
+    gateway.child.kill();
+    await once(gateway.child, "exit");
+    gateway = startGateway(configPath, logPath);
+    await waitForHealth(`http://127.0.0.1:${gatewayPort}${config.health_path}`);
+
+    const escapedNewlineCapacityResponse = await fetch(`http://127.0.0.1:${gatewayPort}/responses`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ test_capacity_before_success_times: 2, test_capacity_status: 200, test_reasoning_tokens: 128 }),
+    });
+    const escapedNewlineCapacityBody = await escapedNewlineCapacityResponse.json();
+    assert(
+      escapedNewlineCapacityResponse.status === 200,
+      `字面量换行 retryable_error_messages 下 200+capacity 未自动恢复: ${escapedNewlineCapacityResponse.status}`,
+    );
+    assert(
+      escapedNewlineCapacityBody?.usage?.output_tokens_details?.reasoning_tokens === 128,
+      "字面量换行 retryable_error_messages 恢复后的返回体异常",
+    );
+
    await new Promise((resolve) => setTimeout(resolve, 120));
    const logText = await readFile(logPath, "utf8");
    assert(