@mzzsfy/dsh-usage-panel 0.4.4 → 0.5.0

package/README.md

@@ -73,7 +73,7 @@ usage-panel:
     balanceThreshold: null        # 余额阈值,null 为不启用
     resetNotice: true             # 窗口重置时通知上一窗口峰值
     toast: true                   # 页内 toast 通道
-    webhookUrl: ''                # 凭据,留空禁用;面板只写不回显
+    webhookUrl: ''                # webhook 目标 URL,留空禁用;面板原文回显
     imTargets: []                 # dsh-im 投递目标 [{botId, targetId}]
 ```
 
@@ -88,7 +88,7 @@ usage-panel:
 ### 通知接口
 
 - `GET /api/usage-panel/notifications`:通知投影长轮询;`cursor` 缺省=首拉立即返回全量,`cursor` 等于当前版本时挂起至事件或超时,落后或超前(宿主重启版本回退)立即返回全量,客户端以响应 version 重置游标自愈;响应 `{units, version}`
-- `GET|POST /api/usage-panel/notify-config`:全局通知规则;`webhookUrl` 属凭据任何响应不回传原文,仅 `webhookConfigured` 标志
+- `GET|POST /api/usage-panel/notify-config`:全局通知规则;`webhookUrl` 原文随响应回显
 - `POST /api/usage-panel/test-webhook` / `POST /api/usage-panel/test-im`:测试投递,返回真实结果
 - `GET /api/usage-panel/im-targets?botId=`:列出 dsh-im 该 bot 已保存投递目标
 

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.5.0",
   "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 }),
@@ -992,6 +992,7 @@ function NotifyConfigCard() {
       .then((res) => {
         if (!alive) return
         setConfig(res && res.notify ? res.notify : {})
+        setWebhookUrl(res && res.notify && typeof res.notify.webhookUrl === 'string' ? res.notify.webhookUrl : '')
         setImAvailable(res ? res.imAvailable === true : false)
       })
       .catch((err) => { if (alive) setError('读取通知配置失败:' + (err && err.message ? err.message : String(err))) })
@@ -1097,6 +1098,9 @@ function NotifyConfigCard() {
   }
   const targets = Array.isArray(config.imTargets) ? config.imTargets : []
   const boundBots = imBoundBotIds(targets)
+  // 已配置态与测试/保存分流均由 webhookUrl 派生;草稿编辑中不被其他 patch 回执重置
+  const savedWebhookUrl = typeof config.webhookUrl === 'string' ? config.webhookUrl.trim() : ''
+  const webhookDirty = webhookUrl.trim() !== savedWebhookUrl
   // 通知配置一次即久,默认折叠:summary 摘要行常显状态,展开才是完整配置
   return h('details', { className: 'up-card up-fold' },
     h('summary', { className: 'up-fold__summary' },
@@ -1104,7 +1108,7 @@ function NotifyConfigCard() {
       h('span', { className: 'up-dot' + (config.enabled === true ? '' : ' up-dot--off') }),
       h('span', { className: 'up-meta' }, config.enabled === true ? '已启用' : '已关闭'),
       targets.length > 0 ? h('span', { className: 'up-meta' }, targets.length + ' 个 IM 目标') : null,
-      config.webhookConfigured === true ? h('span', { className: 'up-meta' }, 'webhook 已配置') : null,
+      savedWebhookUrl.length > 0 ? h('span', { className: 'up-meta' }, 'webhook 已配置') : null,
     ),
     h('div', { className: 'up-card__row' },
       h(Switch, {
@@ -1156,29 +1160,37 @@ function NotifyConfigCard() {
         onChange: (checked) => patch({ toast: checked }),
       }),
       h('div', { className: 'up-card__row' },
-        h('span', { className: 'up-field__label', title: 'host 直发的 Slack 兼容 JSON 通知;填新地址保存后自动发送测试' }, 'Webhook'),
-        config.webhookConfigured === true ? h('span', { className: 'up-dot', title: '已配置' }) : null,
+        h('span', { className: 'up-field__label', title: 'host 直发的 Slack 兼容 JSON 通知;URL 原文回显,改动保存后自动发送测试' }, 'Webhook'),
+        savedWebhookUrl.length > 0 ? h('span', { className: 'up-dot', title: '已配置' }) : null,
         h('span', { className: 'up-field' },
           h('input', {
-            type: 'password', style: { width: '260px' },
+            type: 'text', style: { width: '260px' },
             value: webhookUrl,
             onChange: (e) => setWebhookUrl(e.target.value),
-            placeholder: config.webhookConfigured === true ? '已配置,留空保持不变' : 'https://hooks.example.com/…',
+            placeholder: 'https://hooks.example.com/…',
           })),
         h('button', {
           className: 'up-btn',
           onClick: () => {
-            if (webhookUrl.trim().length === 0) {
-              if (config.webhookConfigured !== true) { notify('请先填写 webhook URL', 'error'); return }
+            if (!webhookDirty) {
+              if (savedWebhookUrl.length === 0) { notify('请先填写 webhook URL', 'error'); return }
               testWebhook()
               return
             }
-            const part = { webhookUrl: webhookUrl.trim() }
-            api('/api/usage-panel/notify-config', { method: 'POST', body: JSON.stringify(part) })
-              .then((res) => { apply(res); setWebhookUrl(''); testWebhook() })
+            // 草稿与已保存值不同即保存(含清空=禁用);清空保存后通道关闭,不再自动测试误导报错
+            const disabling = webhookUrl.trim().length === 0
+            api('/api/usage-panel/notify-config', { method: 'POST', body: JSON.stringify({ webhookUrl: webhookUrl.trim() }) })
+              .then((res) => {
+                if (res && res.notify) {
+                  setConfig(res.notify)
+                  setWebhookUrl(typeof res.notify.webhookUrl === 'string' ? res.notify.webhookUrl : '')
+                }
+                notify(disabling ? 'webhook 已禁用' : '通知配置已保存', 'ok')
+                if (!disabling) testWebhook()
+              })
               .catch(fail)
           },
-        }, webhookUrl.trim().length > 0 ? '保存并测试' : '测试'),
+        }, webhookDirty ? '保存并测试' : '测试'),
       ),
       // IM 通道:目标来自 dsh-im 已保存目录,勾选即自动保存;新建与平台测试在 dsh-im 设置页完成
       imAvailable ? null : h('span', { className: 'up-meta' }, 'dsh-im 未安装,IM 通道不可用'),

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/notify.mjs

@@ -405,7 +405,7 @@ export function resolvedNotifySettings(raw) {
   }
 }
 
-// 面板可见配置:webhookUrl 属凭据不出主机,仅回是否已配置。
+// 面板可见配置:webhookUrl 原文随响应回显,面板所见即所存。
 export function publicNotify(resolved) {
   return {
     enabled: resolved.enabled,
@@ -414,7 +414,7 @@ export function publicNotify(resolved) {
     resetNotice: resolved.resetNotice,
     toast: resolved.toast,
     imTargets: resolved.imTargets,
-    webhookConfigured: resolved.webhookUrl.trim().length > 0,
+    webhookUrl: resolved.webhookUrl,
   }
 }
 

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/notify.route.test.mjs

@@ -176,22 +176,22 @@ test('评估接线: custom 账号 extract 规则驱动 balance 读数全链路(
   }
 })
 
-test('notify-config: GET 不回显 webhookUrl 原文, 仅回是否已配置', async () => {
+test('notify-config: GET 回显 webhookUrl 原文', async () => {
   // Given 已配置 webhook 的 settings
   const { ctx, routes } = makeCtx({ settingsValue: { notify: { enabled: true, webhookUrl: 'https://hooks.example.com/private' } } })
   apply(ctx)
   // When 读取通知配置
   const res = await call(routes, '/api/usage-panel/notify-config', makeReq('GET'))
-  // Then 原文不出主机
+  // Then 原文随响应回显, webhookConfigured 已移除
   assert.equal(res.status, 200)
-  assert.equal(res.payload.notify.webhookUrl, undefined)
-  assert.equal(res.payload.notify.webhookConfigured, true)
+  assert.equal(res.payload.notify.webhookUrl, 'https://hooks.example.com/private')
+  assert.equal('webhookConfigured' in res.payload.notify, false)
   assert.equal(res.payload.imAvailable, false)
 })
 
 test('notify-config: 非法补丁 400, 合法补丁合并生效', async () => {
-  // Given 合法 ctx
-  const { ctx, routes } = makeCtx({ settingsValue: { notify: { enabled: true } } })
+  // Given 合法 ctx,已配置 webhook
+  const { ctx, routes } = makeCtx({ settingsValue: { notify: { enabled: true, webhookUrl: 'https://hooks.example.com/keep' } } })
   apply(ctx)
   // When 提交越界阈值
   const bad = await call(routes, '/api/usage-panel/notify-config', makeReq('POST', { quotaThresholdPct: 0 }))
@@ -199,12 +199,13 @@ test('notify-config: 非法补丁 400, 合法补丁合并生效', async () => {
   assert.equal(bad.status, 400)
   // When 提交合法补丁(仅改阈值与余额阈值)
   const good = await call(routes, '/api/usage-panel/notify-config', makeReq('POST', { quotaThresholdPct: 80, balanceThreshold: 20 }))
-  // Then 生效且未提供的键保持原值
+  // Then 生效且未提供的键保持原值(部分补丁不得清掉已存 webhook)
   assert.equal(good.status, 200)
   const view = await call(routes, '/api/usage-panel/notify-config', makeReq('GET'))
   assert.equal(view.payload.notify.quotaThresholdPct, 80)
   assert.equal(view.payload.notify.balanceThreshold, 20)
   assert.equal(view.payload.notify.enabled, true)
+  assert.equal(view.payload.notify.webhookUrl, 'https://hooks.example.com/keep')
 })
 
 test('test-webhook: 返回真实投递结果而非谎报成功', async () => {

package/test/notify.test.mjs

@@ -418,14 +418,14 @@ test('读侧归一: 残缺配置回退默认值', () => {
   assert.equal(resolved.webhookUrl, '')
 })
 
-test('凭据脱敏: publicNotify 不回显 webhookUrl 原文, 仅回是否已配置', () => {
+test('面板回显: publicNotify 返回 webhookUrl 原文', () => {
   // Given 已配置 webhook 的归一配置
   const resolved = resolvedNotifySettings({ webhookUrl: 'https://hooks.example.com/private' })
   // When 转面板可见形态
   const view = publicNotify(resolved)
-  // Then 原文不出主机, webhookConfigured 为 true
-  assert.equal(view.webhookUrl, undefined)
-  assert.equal(view.webhookConfigured, true)
+  // Then 原文随响应回显, webhookConfigured 已移除
+  assert.equal(view.webhookUrl, 'https://hooks.example.com/private')
+  assert.equal('webhookConfigured' in view, false)
   assert.equal(view.toast, true)
 })
 

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])
+})