dsh-account-pool 0.1.1 → 0.1.2

package/lib/index.js

@@ -299,22 +299,41 @@ async function createRegionStack({ region, dshHome, config, logger, ctx }) {
   let creditsCache = { at: 0, value: null }
 
   /** 查各账号积分（带缓存）；单个账号失败不影响其他账号。 */
+  /**
+   * 查本区域各账号的积分（带 60 秒缓存）。
+   *
+   * 账号之间**并行**查询：每个账号是一次独立的上游请求，串行会让
+   * 设置页的等待时间等于所有账号之和（实测 3 个账号串行约 1.5s）。
+   * 并行后约等于最慢的那个。
+   *
+   * 单个账号失败只丢它自己的数据，不影响其他账号。
+   */
   const loadCredits = async (force = false) => {
     const now = Date.now()
     if (!force && creditsCache.value !== null && now - creditsCache.at < 60_000) {
       return creditsCache.value
     }
-    const out = {}
-    for (const account of await store.list()) {
+    const accounts = await store.list()
+
+    /** 查一个账号的积分；失败返回 undefined 而不是抛错。 */
+    const queryOne = async (account) => {
       try {
         const credential = await store.usable(account.id)
-        out[account.id] = await fetchRegionCredits(credential)
+        const credits = await fetchRegionCredits(credential)
         // 顺手把总积分喂给选号器，让加权用上真实余额。
-        picker.setCredits(account.id, out[account.id].total)
+        picker.setCredits(account.id, credits.total)
+        return [account.id, credits]
       } catch (error) {
         logger.warn(`账号 ${account.id} 查询积分失败：${error?.message ?? error}`)
+        return undefined
       }
     }
+
+    const settled = await Promise.all(accounts.map(queryOne))
+    const out = {}
+    for (const entry of settled) {
+      if (entry !== undefined) out[entry[0]] = entry[1]
+    }
     creditsCache = { at: now, value: out }
     return out
   }
@@ -625,34 +644,41 @@ export function apply(ctx, config = {}) {
         if (!loopbackOrigin(req)) { json(res, 403, { ok: false, error: '仅允许本机访问' }); return }
         try {
           const list = await ready
-          const out = {}
-          for (const stack of list) {
+
+          /**
+           * 取一个区域的状态。
+           *
+           * 区域之间**并行**：cn 与 trae 是两套独立上游，串行会让设置页
+           * 的等待时间变成两者之和（冷缓存实测约 1.5s）；并行后约等于
+           * 最慢的那个。
+           */
+          const regionState = async (stack) => {
             const snapshot = stack.picker.snapshot()
-            out[stack.region] = {
+            const listed = await stack.store.list()
+            const credits = await stack.loadCredits()
+            return [stack.region, {
               provider: stack.providerId,
               displayName: REGION_DISPLAY_NAMES[stack.region],
               models: stack.getCatalog().length,
-              accounts: (await (async () => {
-                const listed = await stack.store.list()
-                const credits = await stack.loadCredits()
-                return listed.map(account => ({
-                  id: account.id,
-                  nickname: account.nickname,
-                  uid: account.uid,
-                  domain: account.domain,
-                  expiresAtMs: account.expiresAtMs,
-                  ...snapshot[account.id],
-                  cooling: snapshot[account.id]?.cooling ?? false,
-                  // 积分：剩余 + 总量 + 套餐明细（界面展示用）。
-                  // size 供悬停提示展示「总量 / 已用 / 剩余」构成。
-                  credits: credits[account.id]?.total,
-                  creditsSize: credits[account.id]?.size,
-                  creditPackages: credits[account.id]?.packages?.slice(0, 5) ?? [],
-                }))
-              })()),
-            }
+              accounts: listed.map(account => ({
+                id: account.id,
+                nickname: account.nickname,
+                uid: account.uid,
+                domain: account.domain,
+                expiresAtMs: account.expiresAtMs,
+                ...snapshot[account.id],
+                cooling: snapshot[account.id]?.cooling ?? false,
+                // 积分：剩余 + 总量 + 套餐明细（界面展示用）。
+                // size 供悬停提示展示「总量 / 已用 / 剩余」构成。
+                credits: credits[account.id]?.total,
+                creditsSize: credits[account.id]?.size,
+                creditPackages: credits[account.id]?.packages?.slice(0, 5) ?? [],
+              })),
+            }]
           }
-          json(res, 200, { ok: true, regions: out })
+
+          const settled = await Promise.all(list.map(regionState))
+          json(res, 200, { ok: true, regions: Object.fromEntries(settled) })
         } catch (error) {
           json(res, 500, { ok: false, error: safeMessage(error) })
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-account-pool",
   "displayName": "Account Pool",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "把多个 WorkBuddy / Trae 账号汇成账号池接入 DeepSeek Harness：自动切换、限流熔断退避、凭证安全落盘",
   "type": "module",
   "license": "MIT",