Merge remote-tracking branch 'origin/master'

scripts/src/platform-infra-sub2api-codex.ts

@@ -124,6 +124,7 @@ interface CodexPoolPublicExposureConfig {
     configPath: string;
     serviceName: string;
     upstreamBaseUrl: string;
+    responseHeaderTimeoutSeconds: number;
   };
 }
 
@@ -651,6 +652,7 @@ function defaultCodexPoolConfig(): CodexPoolConfig {
         configPath: "/etc/caddy/Caddyfile",
         serviceName: "caddy",
         upstreamBaseUrl: "http://127.0.0.1:21880",
+        responseHeaderTimeoutSeconds: 180,
       },
     },
     localCodex: {
@@ -828,6 +830,15 @@ function readAccountLoadFactor(value: unknown, key: string): number {
   return loadFactor;
 }
 
+function readCaddyTimeoutSeconds(value: unknown, key: string, fallback: number): number {
+  if (value === undefined || value === null) return fallback;
+  const seconds = numberValue(value);
+  if (seconds === null || !Number.isInteger(seconds) || seconds < 30 || seconds > 900) {
+    throw new Error(`${codexPoolConfigPath}.${key} must be an integer from 30 to 900`);
+  }
+  return seconds;
+}
+
 function readTempUnschedulablePolicy(value: unknown, key: string, fallback: CodexTempUnschedulablePolicy): CodexTempUnschedulablePolicy {
   if (value === undefined || value === null) return cloneTempUnschedulablePolicy(fallback);
   if (!isRecord(value)) throw new Error(`${codexPoolConfigPath}.${key} must be a YAML object`);
@@ -922,6 +933,11 @@ function readPublicExposureConfig(value: unknown, defaults: CodexPoolPublicExpos
       configPath: stringValue(masterCaddyValue.configPath) ?? defaults.masterCaddy.configPath,
       serviceName: stringValue(masterCaddyValue.serviceName) ?? defaults.masterCaddy.serviceName,
       upstreamBaseUrl: normalizeBaseUrl(stringValue(masterCaddyValue.upstreamBaseUrl)) ?? defaults.masterCaddy.upstreamBaseUrl,
+      responseHeaderTimeoutSeconds: readCaddyTimeoutSeconds(
+        masterCaddyValue.responseHeaderTimeoutSeconds,
+        "publicExposure.masterCaddy.responseHeaderTimeoutSeconds",
+        defaults.masterCaddy.responseHeaderTimeoutSeconds,
+      ),
     },
   };
   validateKubernetesName(config.configMapName, "publicExposure.configMapName", true);
@@ -1098,6 +1114,7 @@ function publicExposureSummary(pool: CodexPoolConfig): Record<string, unknown> {
       configPath: pool.publicExposure.masterCaddy.configPath,
       serviceName: pool.publicExposure.masterCaddy.serviceName,
       upstreamBaseUrl: pool.publicExposure.masterCaddy.upstreamBaseUrl,
+      responseHeaderTimeoutSeconds: pool.publicExposure.masterCaddy.responseHeaderTimeoutSeconds,
     },
     upstream: {
       localIP: pool.publicExposure.localIP,
@@ -1162,7 +1179,7 @@ async function applyMasterCaddySite(pool: CodexPoolConfig): Promise<Record<strin
   const path = caddy.configPath;
   if (!existsSync(path)) return { ok: false, error: "master-caddy-config-missing", path, valuesPrinted: false };
   const before = readFileSync(path, "utf8");
-  const desiredBlock = renderCaddySiteBlock(caddy.domain, caddy.upstreamBaseUrl);
+  const desiredBlock = renderCaddySiteBlock(caddy.domain, caddy.upstreamBaseUrl, caddy.responseHeaderTimeoutSeconds);
   const existing = caddySiteBlock(before, caddy.domain);
   const alreadyConfigured = existing === desiredBlock;
   let backupPath: string | null = null;
@@ -1193,6 +1210,7 @@ async function applyMasterCaddySite(pool: CodexPoolConfig): Promise<Record<strin
     domain: caddy.domain,
     upstreamBaseUrl: caddy.upstreamBaseUrl,
     serviceName: caddy.serviceName,
+    responseHeaderTimeoutSeconds: caddy.responseHeaderTimeoutSeconds,
     validate: {
       exitCode: validate.exitCode,
       stdoutTail: Buffer.from(validate.stdout).toString("utf8").slice(-1000),
@@ -1212,7 +1230,7 @@ async function applyMasterCaddySite(pool: CodexPoolConfig): Promise<Record<strin
   };
 }
 
-function renderCaddySiteBlock(domain: string, upstreamBaseUrl: string): string {
+export function renderCaddySiteBlock(domain: string, upstreamBaseUrl: string, responseHeaderTimeoutSeconds = 180): string {
   const upstream = new URL(upstreamBaseUrl);
   const upstreamHost = `${upstream.hostname}${upstream.port ? `:${upstream.port}` : ""}`;
   return `${domain} {
@@ -1222,7 +1240,7 @@ function renderCaddySiteBlock(domain: string, upstreamBaseUrl: string): string {
         header_up X-Real-IP {remote_host}
         transport http {
             dial_timeout 5s
-            response_header_timeout 30s
+            response_header_timeout ${responseHeaderTimeoutSeconds}s
         }
     }
 }`;