@mzzsfy/dsh-usage-panel 0.4.4 → 0.4.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-usage-panel",
   "description": "多平台 LLM 账号余额与额度面板:支持 DeepSeek/OpenRouter/Kimi/智谱/MiniMax/NewApi 及自定义端点,自动定期查询,趋势图与历史快照,用量/余额阈值与窗口重置多通道通知",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "type": "module",
   "main": "src/index.js",
   "exports": {

package/src/client.js

@@ -898,7 +898,7 @@ function DetailDialog(props) {
         ranges.map((r) => h('button', {
           key: r, className: 'up-btn', disabled: r === range,
           onClick: () => setRange(r),
-        }, r === 'all' ? '全部' : '近 ' + r)),
+        }, r === 'all' ? '全部' : '近 ' + ({ '7d': '7 天', '30d': '30 天' })[r])),
         h('button', { className: 'up-btn', onClick: props.onClose }, '关闭'),
       ),
       h(TrendChart, { label: props.label, points, onDetail: null }),

package/src/index.js

@@ -16,7 +16,7 @@ import {
 } from './parsers.mjs'
 import { readingToSnapshots, appendPoint, buildMonthSequence, newSequenceStore } from './history.mjs'
 import { createHistoryStore } from './historyStore.mjs'
-import { createBackoff, isShortWindowTier, tierIntervalSec, lastQuerySecOf, isDue } from './poller.mjs'
+import { createBackoff, isShortWindowTier, tierIntervalSec, lastQuerySecOf, isDue, runLimited } from './poller.mjs'
 import {
   DEFAULT_QUOTA_THRESHOLD_PCT,
   WEBHOOK_TIMEOUT_MS,
@@ -39,6 +39,9 @@ import {
 const FETCH_TIMEOUT_MS = 20 * 1000
 const BODY_MAX_BYTES = 256 * 1024
 const MAX_ACCOUNTS = 20
+// 单轮轮询的受限并发:串行执行时单账号 20s 超时即可拖满整轮(pollInFlight 互斥
+// 使后续 tick 全部跳过,轮询事实停摆),并发上限同时压住上游瞬时压力
+const POLL_CONCURRENCY = 4
 // 通知长轮询服务端挂起上限,与 turn-notify 同值;客户端超时须大于此值
 const LONG_POLL_WAIT_MS = 25 * 1000
 // 数据目录支持 env 注入(测试隔离);缺省落 ~/.dsh/dsh-usage-panel
@@ -756,10 +759,8 @@ export function apply(ctx) {
       pollInFlight = true
       ensureHistory()
         .then(async () => {
-          for (const account of due) {
-            // 单账号失败不中止本轮其余账号(broken 等持久态下尤为关键)
-            await runQuery(account).catch(() => {})
-          }
+          // 受限并发执行:单账号失败/超时不拖满整轮,后续 tick 不因互斥停摆
+          await runLimited(due, POLL_CONCURRENCY, (account) => runQuery(account).catch(() => {}))
           await persistConfig().catch(() => {})
         })
         .catch(() => {})

package/src/poller.mjs

@@ -58,3 +58,16 @@ export function isDue({ lastQuerySec, nowSec, intervalSec }) {
   if (lastQuerySec === null) return true
   return nowSec - lastQuerySec >= intervalSec
 }
+
+// 受限并发执行:worker 池共享游标逐项取号(取号同步完成,无交错),单任务
+// 失败/慢速只占用一个 worker 位,不拖满整轮;每任务结果经 task 感知,失败由
+// 调用方在 task 内消化(本函数恒 resolve)
+export async function runLimited(items, limit, task) {
+  let cursor = 0
+  const worker = async () => {
+    while (cursor < items.length) {
+      await task(items[cursor++])
+    }
+  }
+  await Promise.all(Array.from({ length: Math.min(limit, items.length) }, worker))
+}

package/test/poller.test.mjs

@@ -12,6 +12,7 @@ import {
   lastQuerySecOf,
   isDue,
   isShortWindowTier,
+  runLimited,
 } from '../src/poller.mjs'
 
 test('场景: 失败退避指数增长并封顶', () => {
@@ -86,3 +87,50 @@ test('场景: 短窗口档判定,从未成功(含最近失败)按短档,失败
   assert.equal(isShortWindowTier({ ok: false, reading: null }, readingHasShort), true, '失败不塌缩:含短窗账号保持短档节奏')
   assert.equal(isShortWindowTier({ ok: false, reading: null }, false), true, '失败的长窗账号也归短档:10 分钟节奏 + 退避压制重试')
 })
+
+test('场景: 受限并发执行——全项被处理,慢任务不阻塞其他 worker', async () => {
+  // Given 6 项任务,并发 2:每个任务挂起直到放行;并发内慢任务(后放行)只占 1 个 worker 位
+  const processed = []
+  const release = []
+  const task = async (item) => {
+    await new Promise((resolve) => release.push(resolve))
+    processed.push(item)
+  }
+  const done = runLimited([1, 2, 3, 4, 5, 6], 2, task)
+  // When 恰有 2 个任务在途(worker 数 = 并发上限)
+  assert.equal(release.length, 2, '并发上限决定在途任务数')
+  // 放行在途任务使其完成并取号下一项
+  release.splice(0).forEach((resolve) => resolve())
+  await new Promise((resolve) => setTimeout(resolve, 0))
+  assert.equal(release.length, 2, '完成后立即补位')
+  release.splice(0).forEach((resolve) => resolve())
+  await new Promise((resolve) => setTimeout(resolve, 0))
+  release.splice(0).forEach((resolve) => resolve())
+  await done
+  // Then 全部 6 项被处理,无重复无遗漏
+  assert.equal(processed.length, 6)
+  assert.deepEqual([...processed].sort((a, b) => a - b), [1, 2, 3, 4, 5, 6])
+})
+
+test('场景: 受限并发执行——单任务失败不中断其余任务(失败由 task 内消化)', async () => {
+  // Given task 对偶数项抛错但就地消化(生产用法:runQuery().catch 口径),runLimited 恒 resolve
+  const processed = []
+  const task = async (item) => {
+    try {
+      if (item % 2 === 0) throw new Error('boom-' + item)
+      processed.push(item)
+    } catch { /* 单项失败只占自己的 worker 位 */ }
+  }
+  // When 5 项、并发 2
+  await runLimited([1, 2, 3, 4, 5], 2, task)
+  // Then 奇数项全被处理
+  assert.deepEqual([...processed].sort((a, b) => a - b), [1, 3, 5])
+})
+
+test('场景: 受限并发执行——空列表与并发大于任务数', async () => {
+  const processed = []
+  await runLimited([], 4, async (item) => processed.push(item))
+  assert.deepEqual(processed, [])
+  await runLimited([1, 2], 8, async (item) => processed.push(item))
+  assert.deepEqual(processed, [1, 2])
+})