@openxiaobu/codexl 0.1.5 → 0.1.6

package/dist/server.js

@@ -57,6 +57,18 @@ function resolveBlockWindow(picked, errorText) {
         reason: "temporary_5m_limit"
     };
 }
+/**
+ * 为当前请求失败的账号设置临时熔断状态，避免短时间内被重复选中。
+ *
+ * @param accountId 账号标识。
+ * @param reason 本地状态中记录的失败原因。
+ * @param blockSeconds 熔断持续秒数。
+ * @returns 无返回值。
+ */
+function markAccountFailure(accountId, reason, blockSeconds) {
+    // 请求链路中的短期失败通常是瞬时异常，记录一个较短的本地熔断窗口即可。
+    (0, state_1.setAccountBlock)(accountId, Math.floor(Date.now() / 1000) + blockSeconds, reason);
+}
 /**
  * 启动一个极轻量本地服务，供后续接入代理或脚本化查询使用。
  *
@@ -115,16 +127,12 @@ async function startServer(port) {
         };
         let lastStatusCode = 503;
         for (const picked of candidates) {
-            try {
-                await (0, usage_sync_1.refreshAccountUsage)(picked.account.id);
-            }
-            catch {
-                // 刷新失败时继续使用本地缓存，不中断请求链路。
-            }
             const auth = (0, account_store_1.readAuthFile)(picked.account.codex_home);
             let accessToken = auth?.tokens?.access_token;
             const accountIdHeader = auth?.tokens?.account_id;
             if (!accessToken) {
+                // 当前账号认证信息不完整时，先做短时熔断，再切到下一个账号。
+                markAccountFailure(picked.account.id, "invalid_account_auth", 10 * 60);
                 lastErrorPayload = {
                     error: {
                         message: `账号 ${picked.account.id} 缺少 access_token`,
@@ -145,12 +153,41 @@ async function startServer(port) {
                 },
                 body: JSON.stringify(requestMessage)
             });
-            let upstream = await sendUpstream();
-            if (upstream.statusCode === 401) {
-                const refreshed = await (0, usage_sync_1.refreshAccountTokens)(picked.account.id);
-                accessToken = refreshed.tokens?.access_token ?? accessToken;
+            let upstream;
+            try {
                 upstream = await sendUpstream();
             }
+            catch (error) {
+                // 上游连接异常通常是账号或链路瞬时问题，短时标记后继续尝试下一个账号。
+                markAccountFailure(picked.account.id, "request_failed", 60);
+                lastStatusCode = 503;
+                lastErrorPayload = {
+                    error: {
+                        message: `账号 ${picked.account.id} 请求上游失败: ${error instanceof Error ? error.message : String(error)}`,
+                        type: "account_request_failed"
+                    }
+                };
+                continue;
+            }
+            if (upstream.statusCode === 401) {
+                try {
+                    const refreshed = await (0, usage_sync_1.refreshAccountTokens)(picked.account.id);
+                    accessToken = refreshed.tokens?.access_token ?? accessToken;
+                    upstream = await sendUpstream();
+                }
+                catch (error) {
+                    // token 刷新失败说明该账号短期内不可用，先熔断再切换。
+                    markAccountFailure(picked.account.id, "token_refresh_failed", 10 * 60);
+                    lastStatusCode = 503;
+                    lastErrorPayload = {
+                        error: {
+                            message: `账号 ${picked.account.id} 刷新 token 失败: ${error instanceof Error ? error.message : String(error)}`,
+                            type: "account_token_refresh_failed"
+                        }
+                    };
+                    continue;
+                }
+            }
             if (upstream.statusCode === 429 || upstream.statusCode === 403) {
                 const errorText = await upstream.body.text();
                 const block = resolveBlockWindow(picked, errorText);
@@ -179,6 +216,18 @@ async function startServer(port) {
                     };
                     continue;
                 }
+                if (upstream.statusCode >= 500) {
+                    // 上游 5xx 先视为当前账号链路失败，短时熔断并切到下一个账号。
+                    markAccountFailure(picked.account.id, "upstream_5xx", 60);
+                    lastStatusCode = upstream.statusCode;
+                    lastErrorPayload = {
+                        error: {
+                            message: `账号 ${picked.account.id} 上游异常: ${errorText}`,
+                            type: "account_upstream_failed"
+                        }
+                    };
+                    continue;
+                }
                 reply.raw.writeHead(upstream.statusCode, {
                     "content-type": "application/json"
                 });

package/dist/status.js

@@ -31,6 +31,46 @@ function formatReset(unixSeconds) {
         hour12: false
     });
 }
+/**
+ * 将剩余秒数格式化为紧凑的人类可读文本，便于在状态列中展示熔断剩余时间。
+ *
+ * @param unixSeconds 熔断截止时间，Unix 秒时间戳。
+ * @returns 格式化后的剩余时长；当时间为空或已过期时返回 `null`。
+ */
+function formatRemainingDuration(unixSeconds) {
+    if (!unixSeconds) {
+        return null;
+    }
+    const diffSeconds = unixSeconds - Math.floor(Date.now() / 1000);
+    if (diffSeconds <= 0) {
+        return null;
+    }
+    const hours = Math.floor(diffSeconds / 3600);
+    const minutes = Math.floor((diffSeconds % 3600) / 60);
+    const seconds = diffSeconds % 60;
+    if (hours > 0) {
+        return `${hours}h${minutes}m`;
+    }
+    if (minutes > 0) {
+        return `${minutes}m${seconds}s`;
+    }
+    return `${seconds}s`;
+}
+/**
+ * 将本地熔断原因与剩余时间格式化为更直观的状态文本。
+ *
+ * @param reason 熔断原因。
+ * @param until 熔断截止时间，Unix 秒时间戳。
+ * @returns 适合在终端表格中展示的状态文本。
+ */
+function formatBlockedStatus(reason, until) {
+    const label = reason ?? "blocked";
+    const remaining = formatRemainingDuration(until ?? null);
+    if (!remaining) {
+        return label;
+    }
+    return `${label}(${remaining})`;
+}
 /**
  * 汇总所有受管账号的运行状态，供状态展示与调度复用。
  *
@@ -94,7 +134,7 @@ function renderStatusTable(statuses) {
                 status = "disabled";
             }
             else if (item.localBlockUntil && item.localBlockUntil * 1000 > Date.now()) {
-                status = item.localBlockReason ?? "blocked";
+                status = formatBlockedStatus(item.localBlockReason, item.localBlockUntil);
             }
             else if (item.isWeeklyLimited) {
                 status = "weekly_limited";

package/dist/usage-sync.js

@@ -2,11 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refreshAccountTokens = refreshAccountTokens;
 exports.refreshAccountUsage = refreshAccountUsage;
+exports.isUsageCacheStale = isUsageCacheStale;
+exports.refreshAccountUsageInBackgroundIfNeeded = refreshAccountUsageInBackgroundIfNeeded;
 exports.refreshAllAccountUsage = refreshAllAccountUsage;
 const undici_1 = require("undici");
 const account_store_1 = require("./account-store");
 const config_1 = require("./config");
 const state_1 = require("./state");
+const USAGE_CACHE_TTL_MS = 60 * 1000;
+const inflightUsageRefreshes = new Map();
 function normalizeResetAt(value, resetAfterSeconds) {
     if (typeof value === "number" && Number.isFinite(value)) {
         return value;
@@ -113,11 +117,53 @@ async function refreshAccountUsage(accountId) {
         fiveHourUsedPercent: payload.rate_limit?.primary_window?.used_percent ?? null,
         fiveHourResetAt: normalizeResetAt(payload.rate_limit?.primary_window?.reset_at, payload.rate_limit?.primary_window?.reset_after_seconds),
         weeklyUsedPercent: payload.rate_limit?.secondary_window?.used_percent ?? null,
-        weeklyResetAt: normalizeResetAt(payload.rate_limit?.secondary_window?.reset_at, payload.rate_limit?.secondary_window?.reset_after_seconds)
+        weeklyResetAt: normalizeResetAt(payload.rate_limit?.secondary_window?.reset_at, payload.rate_limit?.secondary_window?.reset_after_seconds),
+        refreshedAt: new Date().toISOString()
     };
     (0, state_1.setUsageCache)(result);
     return result;
 }
+/**
+ * 判断指定账号的额度缓存是否已经过期。
+ *
+ * @param accountId 账号标识。
+ * @returns `true` 表示不存在缓存或缓存已超过 TTL，需要重新刷新；`false` 表示缓存仍可直接复用。
+ */
+function isUsageCacheStale(accountId) {
+    const usageCache = (0, state_1.getUsageCache)(accountId);
+    if (!usageCache?.refreshedAt) {
+        return true;
+    }
+    const refreshedAt = Date.parse(usageCache.refreshedAt);
+    if (Number.isNaN(refreshedAt)) {
+        return true;
+    }
+    return Date.now() - refreshedAt > USAGE_CACHE_TTL_MS;
+}
+/**
+ * 在不阻塞主请求链路的前提下，按需异步刷新指定账号的额度缓存。
+ *
+ * @param accountId 账号标识。
+ * @returns 无返回值；若缓存仍在 TTL 内或已有刷新任务进行中则直接跳过。
+ */
+function refreshAccountUsageInBackgroundIfNeeded(accountId) {
+    if (!isUsageCacheStale(accountId) || inflightUsageRefreshes.has(accountId)) {
+        return;
+    }
+    // 同一账号同一时刻只保留一个后台刷新任务，避免高并发下重复打远端 usage 接口。
+    const refreshTask = (async () => {
+        try {
+            await refreshAccountUsage(accountId);
+        }
+        catch {
+            // 后台刷新失败时保留旧缓存，由正式转发请求中的错误处理继续兜底。
+        }
+        finally {
+            inflightUsageRefreshes.delete(accountId);
+        }
+    })();
+    inflightUsageRefreshes.set(accountId, refreshTask);
+}
 /**
  * 批量刷新所有受管账号的额度信息。
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openxiaobu/codexl",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "本地 Codex 多账号切换与状态管理工具",
   "type": "commonjs",
   "main": "dist/cli.js",