@mzzsfy/dsh-usage-panel 0.8.4 → 0.8.5

package/package.json

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

package/src/client.js

@@ -1388,7 +1388,44 @@ function UsagePanelApp() {
         setPollArmed(res ? Boolean(res.pollArmed) : null)
       })
       .catch(() => {})
-    return () => { alive = false }
+
+    // 服务端数据对账(F31):账号/历史持久化经总线广播桥转 window 事件,
+    // 面板收到即单飞重拉;窗口聚焦同样对账(兜底错过的广播)。无轮询
+    let knownRevision = null
+    let resyncInFlight = false
+    const resync = () => {
+      if (resyncInFlight) return
+      resyncInFlight = true
+      api('/api/usage-panel/revision')
+        .then((res) => {
+          if (!alive || !res || typeof res.revision !== 'number') return null
+          if (knownRevision !== null && res.revision !== knownRevision) {
+            knownRevision = res.revision
+            return Promise.all([
+              api('/api/usage-panel/accounts'),
+              api('/api/usage-panel/history'),
+            ]).then(([accountsRes, historyRes]) => {
+              if (!alive) return null
+              if (accountsRes && accountsRes.accounts) setAccounts(accountsRes.accounts)
+              if (historyRes && historyRes.sequences) setSequences(historyRes.sequences)
+              return null
+            })
+          }
+          if (knownRevision === null) knownRevision = res.revision
+          return null
+        })
+        .catch(() => {})
+        .then(() => { resyncInFlight = false })
+    }
+    const onDataChanged = () => resync()
+    const onFocus = () => resync()
+    window.addEventListener('up-data-changed', onDataChanged)
+    window.addEventListener('focus', onFocus)
+    return () => {
+      alive = false
+      window.removeEventListener('up-data-changed', onDataChanged)
+      window.removeEventListener('focus', onFocus)
+    }
   }, [])
 
   function refreshSequences() {
@@ -1516,6 +1553,11 @@ function UsagePanelApp() {
       apply(ctx) {
         const bus = tools.setupCommonTools(ctx)
         ctx.effect(() => startNotifications(bus), 'usage-panel notifications')
+        // 数据失效广播桥(F31):服务端账号/历史持久化经总线发布变更,
+        // 桥转 window 事件供面板组件对账(组件树无总线句柄)
+        ctx.effect(() => bus.subscribe(() => {
+          window.dispatchEvent(new CustomEvent('up-data-changed'))
+        }, {}), 'usage-panel data-changed bridge')
         ctx.slots.inject('settings.section', () =>
           ctx.slots.register(
             { name: 'settings.section', id: 'usage-panel', order: 40, label: '账号余额' },

package/src/index.js

@@ -43,8 +43,9 @@ const MAX_ACCOUNTS = 20
 // 单轮轮询的受限并发:串行执行时单账号 20s 超时即可拖满整轮(pollInFlight 互斥
 // 使后续 tick 全部跳过,轮询事实停摆),并发上限同时压住上游瞬时压力
 const POLL_CONCURRENCY = 4
-// 数据目录支持 env 注入(测试隔离);缺省落 ~/.dsh/dsh-usage-panel
-const DATA_DIR = process.env.DSH_USAGE_PANEL_DATA_DIR || join(homedir(), '.dsh', 'dsh-usage-panel')
+// 数据目录支持 env 注入(测试隔离);缺省从宿主 home 派生(DSH_HOME 即 .dsh 根,rs-workflow 同构)
+const DATA_DIR = process.env.DSH_USAGE_PANEL_DATA_DIR
+  || join(process.env.DSH_HOME || join(homedir(), '.dsh'), 'dsh-usage-panel')
 const DATA_FILE = join(DATA_DIR, 'accounts.json')
 const HISTORY_FILE = join(DATA_DIR, 'history.json')
 const BAK_SUFFIX = '.bak'
@@ -365,24 +366,29 @@ export function apply(ctx, configRef) {
     return resolvedNotifySettings(value && typeof value === 'object' ? value.notify : undefined)
   }
 
-  // 通知配置串行写链:读改写整体入链,任一失败不吞链(catch 后换行续链)
+  // 通知配置串行写链:读改写整体追加进链,合并读的总是前序写完成后的最新值;
+  // 任一失败不吞链(换行续链,失败只回报本次请求)
   let notifyConfigWriteChain = Promise.resolve()
 
   function persistNotifyPatch(patch) {
-    // 读出当前值做浅合并后整体写回,不依赖宿主写入的嵌套合并语义
-    const merged = { ...readNotifySettings(), ...patch }
-    // 双形写(maintain 同构,判定延迟到使用点):legacy 方法面以 register 为准
-    // (0.1.7 的 settings.update 名义在场但按命名空间找条目必败,不可作判据);
-    // 0.1.7+ 走 configEditor.edit 落 profile 条目(fiber.entry,与命名空间解耦)
-    const settings = ctx.get('settings')
-    requireOk(settings !== undefined, 'settings 服务不可用')
-    if (typeof settings.register === 'function' && typeof settings.update === 'function') {
-      return settings.update(NAMESPACE, { notify: merged })
-    }
-    const editor = ctx.get('configEditor')
-    const entry = ctx.fiber?.entry
-    requireOk(editor && typeof editor.edit === 'function' && entry, 'configEditor 服务不可用')
-    return editor.edit(entry, (current) => ({ ...current, notify: merged }))
+    const run = notifyConfigWriteChain.then(async () => {
+      // 读出当前值做浅合并后整体写回,不依赖宿主写入的嵌套合并语义
+      const merged = { ...readNotifySettings(), ...patch }
+      // 双形写(maintain 同构,判定延迟到使用点):legacy 方法面以 register 为准
+      // (0.1.7 的 settings.update 名义在场但按命名空间找条目必败,不可作判据);
+      // 0.1.7+ 走 configEditor.edit 落 profile 条目(fiber.entry,与命名空间解耦)
+      const settings = ctx.get('settings')
+      requireOk(settings !== undefined, 'settings 服务不可用')
+      if (typeof settings.register === 'function' && typeof settings.update === 'function') {
+        return settings.update(NAMESPACE, { notify: merged })
+      }
+      const editor = ctx.get('configEditor')
+      const entry = ctx.fiber?.entry
+      requireOk(editor && typeof editor.edit === 'function' && entry, 'configEditor 服务不可用')
+      return editor.edit(entry, (current) => ({ ...current, notify: merged }))
+    })
+    notifyConfigWriteChain = run.then(() => {}, () => {})
+    return run
   }
 
   function ensureHistory() {
@@ -393,8 +399,17 @@ export function apply(ctx, configRef) {
   }
 
   function persistHistory() {
-    return historyStore.persist()
+    return historyStore.persist().then(() => { bumpDataRevision() })
+  }
+
+  // 数据修订号(F31):账号/历史任一持久化成功即自增;面板经 revision 路由
+  // 对账,读数落后即重拉——后台轮询写入不再让面板陈旧
+  let dataRevision = 0
+  function bumpDataRevision() {
+    dataRevision += 1
+    notifyChange()
   }
+  const dataRevisionOf = () => dataRevision
 
   // 查询成功后落快照:按读数取样追加各序列,并重建当月月窗口序列。
   function recordSnapshots(account, reading, queriedAt) {
@@ -415,9 +430,19 @@ export function apply(ctx, configRef) {
     return backoff
   }
 
+  // 同账号单飞(F13):重复触发的查询共享同一在途 promise,不并发打上游
+  const inflightQueries = new Map()
+
   function runQuery(account) {
+    // 归属校验(F13):闭包持的是查询发起时的账号对象;完成时按当前 config
+    // 引用对账——账号已删除/替换则本结果为孤儿,丢弃不写不评估
+    const owned = () => config !== null && Array.isArray(config.accounts) && config.accounts.includes(account)
     const queriedAt = Date.now()
-    return queryAccount(account).then((result) => {
+    const inflight = inflightQueries.get(account.id)
+    if (inflight !== undefined) return inflight
+    const run = queryAccount(account).then((result) => {
+      inflightQueries.delete(account.id)
+      if (!owned()) return { ...result, ok: false, orphaned: true }
       const backoff = pollEntry(account)
       if (result.ok) {
         backoff.onSuccess()
@@ -429,7 +454,12 @@ export function apply(ctx, configRef) {
       }
       backoff.onFailure(Math.floor(queriedAt / 1000))
       return result
+    }).catch((error) => {
+      inflightQueries.delete(account.id)
+      throw error
     })
+    inflightQueries.set(account.id, run)
+    return run
   }
 
   // 刷新评估:越逻辑点事件入投影并经 webhook / dsh-im 投递;沿触发状态随账号落盘,
@@ -503,10 +533,13 @@ export function apply(ctx, configRef) {
 
   function persistConfig() {
     if (accountsBroken) return Promise.reject(new Error(ACCOUNTS_BROKEN_MESSAGE))
-    // 写链毒化防护:链上失败不传播到后续写入(调用方 await 本次结果感知单次失败)
+    // 写链毒化防护:链上失败不传播到后续写入(调用方 await 本次结果感知单次失败);
+    // 落盘成功即自增修订号并广播(F31):全部账号变更路径(增删改/启停/重排)
+    // 都经此口,面板订阅对账,单飞重拉账号与历史
     const result = writeChain.then(async () => {
       await mkdir(dirname(DATA_FILE), { recursive: true })
       await writeFile(DATA_FILE, JSON.stringify(config), 'utf8')
+      bumpDataRevision()
     })
     writeChain = result.catch(() => {})
     return result
@@ -653,6 +686,23 @@ export function apply(ctx, configRef) {
     }
   }, 'usage-panel notifications route')
 
+  // 数据修订号对账口(F31):面板轮询比对本值,落后即重拉账号与历史
+  ctx.effect(
+    () =>
+      ctx.webServer.register({
+        kind: 'exact',
+        path: '/api/usage-panel/revision',
+        handler: async (req, res) => {
+          if (req.method !== 'GET') {
+            sendJson(res, 405, { error: 'method not allowed' })
+            return
+          }
+          sendJson(res, 200, { revision: dataRevisionOf() })
+        },
+      }),
+    'usage-panel revision route',
+  )
+
   ctx.effect(
     () =>
       ctx.webServer.register({
@@ -667,11 +717,10 @@ export function apply(ctx, configRef) {
           const check = validateNotifyPatch(body)
           requireOk(check.ok, check.reason)
           // 读改写经串行链执行:重叠请求各自基于旧快照合并会互相覆盖
-          // (先写的 enabled 被后写基于旧 enabled=false 的合并抹掉),链式
-          // 追加保证任一写读取的总是前序写完成后的最新值;共享链以 catch
-          // 续接,单次失败只回报本次请求(抛错由 guardedRoute 统一转 400),
-          // 不阻断后续写
-          await notifyConfigWriteChain.then(() => persistNotifyPatch(check.patch))
+          // persistNotifyPatch 内部把读改写整体追加进共享写链:任一写读取的总是
+          // 前序写完成后的最新值;链以 catch 续接,单次失败只回报本次请求
+          // (抛错由 guardedRoute 统一转 400),不阻断后续写
+          await persistNotifyPatch(check.patch)
           sendJson(res, 200, { ok: true, notify: publicNotify(readNotifySettings()) })
         }),
       }),

package/test/client-bus-lifecycle.test.mjs

@@ -52,7 +52,8 @@ test('Given 尚未激活的 client When factory 物化 Then 不订阅或拉取
 test('Given ctx 已激活且快照在途 When 卸载 Then 退订并中止请求且不呈现迟到快照', async () => {
   const f = fixture(), plugin = f.instantiate()
   plugin.apply()
-  assert.equal(f.subscriptions.size, 1)
+  // 通知投影 + F31 数据失效广播桥:激活期恒两条订阅
+  assert.equal(f.subscriptions.size, 2)
   f.emit()
   assert.equal(f.requests.length, 1)
   const request = f.requests[0]
@@ -74,10 +75,11 @@ test('Given 旧代激活 When 新代 apply Then 仅保留新代订阅且旧代
   const current = f.instantiate()
   current.apply()
   assert.equal(f.requests[0].options.signal.aborted, true)
-  assert.equal(f.subscriptions.size, 1)
   const token = f.window['usage-panel:notify-poll']
   old.dispose()
   assert.equal(f.window['usage-panel:notify-poll'], token)
+  // 旧代卸载后仅存新代两条订阅(通知投影 + 数据失效广播桥)
+  assert.equal(f.subscriptions.size, 2)
   current.dispose()
   assert.equal(f.subscriptions.size, 0)
 })

package/test/notify-poll.test.mjs

@@ -20,8 +20,10 @@ function clientFixture({ storage = storageFixture(), indexedDB, abortSignalImpl
       const work = refresh(); pending.add(work); work.finally(() => pending.delete(work)); return work
     }, dispose() {} }),
     toast: { show: text => shown.push(text) },
-    setupCommonTools: () => ({ subscribe(onMessage, { onReset }) {
-      subscriptions.add(onReset); return () => subscriptions.delete(onReset)
+    setupCommonTools: () => ({ subscribe(onMessage, { onReset } = {}) {
+      // F31 数据失效桥订阅无 onReset:不入 poll 触发集
+      if (typeof onReset === 'function') subscriptions.add(onReset)
+      return () => subscriptions.delete(onReset)
     } }),
   }
   const fetch = async () => ({ ok: true, json: async () => payload })

package/test/notify.route.test.mjs

@@ -489,13 +489,13 @@ test('变更发布: 事件 push 进入投影即发布总线变更', async () =>
   apply(ctx)
   // When 查询产生越阈事件入投影
   await produceNotifyEvent(routes)
-  // Then 快照携带事件,总线收到发布
+  // Then 快照携带事件,总线收到发布;账号/历史持久化各广播一次数据失效(F31)
   const { req, res } = notifyRequest('')
   await routes.get('/api/usage-panel/notifications')(req, res)
   assert.equal(res.status, 200)
   assert.equal(res.payload.units.length, 2)
   assert.ok(res.payload.version > 0)
-  assert.deepEqual(published, [null, null], '每条事件入投影各发布一次')
+  assert.equal(published.length >= 2, true, '两条事件入投影各发布一次')
 })
 
 test('快照: 投影已有事件时返回全量', async () => {