@mzzsfy/dsh-usage-panel 0.7.1 → 0.8.0

package/README.md

@@ -130,3 +130,7 @@ node scripts/dev-link.mjs dsh-usage-panel   # 仓库根执行:归一 profile 依
 ```
 
 工作副本以 junction 挂进 profile,改代码保存即热重载(host 半区)或刷新页面生效(client 半区),无需发版;规约与全仓归一见仓库根 `node scripts/dev-link.mjs all`。
+
+## dsh 版本兼容
+
+三版本全部通过:用量面板渲染、激活 live。

package/package.json

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

package/src/client.js

@@ -565,6 +565,9 @@ function AccountCard(props) {
   const armed = props.deleteArmed === true
   const reading = account.last && account.last.ok ? account.last.reading : null
   const level = reading && (reading.level || reading.membership) ? levelLabel(reading.level || reading.membership) : null
+  const queriedAt = account.last && typeof account.last.queriedAt === 'number' && Number.isFinite(account.last.queriedAt)
+    ? account.last.queriedAt
+    : null
 
   return h('div', { className: 'up-card' },
     h('div', { className: 'up-card__row' },
@@ -572,6 +575,7 @@ function AccountCard(props) {
       h('span', { className: 'up-badge', 'data-type': account.type }, TYPE_LABELS[account.type] || account.type),
       level ? h('span', { className: 'up-badge', 'data-type': 'custom' }, level) : null,
       h('span', { className: 'up-spacer' }),
+      queriedAt !== null ? h('span', { className: 'up-meta', title: fmtTimeFull(queriedAt) }, '上次更新 ' + fmtTime(queriedAt)) : null,
       h('button', { className: 'up-btn', disabled: busy, onClick: props.onRefresh }, busy ? '查询中…' : '刷新'),
       h('button', { className: 'up-btn', disabled: busy, onClick: props.onEdit }, '编辑'),
       h('button', {

package/src/index.js

@@ -269,7 +269,7 @@ function normalizeAccounts(input) {
             ? lastSource.reading
             : null,
           error: typeof lastSource.error === 'string' ? lastSource.error : null,
-          queriedAt: Number.isFinite(Number(lastSource.queriedAt)) ? Number(lastSource.queriedAt) : null,
+          queriedAt: typeof lastSource.queriedAt === 'number' && Number.isFinite(lastSource.queriedAt) ? lastSource.queriedAt : null,
         }
       : null
     const id = typeof raw.id === 'string' && raw.id.length > 0 ? raw.id : 'acct-' + String(index)

package/src/notify.mjs

@@ -6,6 +6,9 @@ export const PROJECTION_CAPACITY = 20
 export const PROJECTION_TTL_MS = 60 * 1000
 export const CLAIM_LOCK_TTL_MS = 30 * 1000
 export const WEBHOOK_TIMEOUT_MS = 10 * 1000
+// 轮转判定容差:远小于最短真实窗口量级,远大于服务端毫秒级抖动;
+// 容差内视为同窗口静默跟随
+export const RESET_DRIFT_TOLERANCE_MS = 60 * 1000
 
 export const KIND_QUOTA = 'quota'
 export const KIND_BALANCE = 'balance'
@@ -63,6 +66,13 @@ export function normalizeNotifyState(raw) {
 
 const PERCENT_BASE = 100
 
+// 窗口轮转判定:resetsAt 数值差超容差才算轮转;parse 失败无法证伪,保守按轮转。
+// 容差内静默跟随,峰值与武装状态不重建
+function windowRotated(prevResetsAt, resetsAt) {
+  const driftMs = Math.abs(Date.parse(resetsAt) - Date.parse(prevResetsAt))
+  return !(Number.isFinite(driftMs) && driftMs < RESET_DRIFT_TOLERANCE_MS)
+}
+
 // 沿触发评估:刷新读数越过逻辑点(阈值穿越/窗口重置)时产出事件,返回新状态不改入参。
 // 仅在 last.ok 时由 host 调用;reading 缺失按无读数处理。
 export function evaluateAccount({ account, rule, state, seq, ts }) {
@@ -88,8 +98,9 @@ function evaluateQuota({ account, rule, state, reading, events, next }) {
     const prev = state.windows[label] || null
     let armed = prev === null ? true : prev.armed !== false
     let peak = prev === null ? null : prev.peak
-    // 窗口轮转:两侧 resetsAt 均有效且值不同;上一窗口峰值随 reset 事件上报
-    if (prev !== null && resetsAt !== null && prev.resetsAt !== null && prev.resetsAt !== resetsAt) {
+    // 窗口轮转:两侧 resetsAt 均有效、字符串不等且数值差超容差;上一窗口峰值随 reset 事件上报
+    if (prev !== null && resetsAt !== null && prev.resetsAt !== null && prev.resetsAt !== resetsAt
+      && windowRotated(prev.resetsAt, resetsAt)) {
       if (rule.resetNotice !== false && prev.peak !== null) {
         events.push({
           kind: KIND_RESET,

package/test/notify.test.mjs

@@ -23,6 +23,7 @@ import {
   KIND_QUOTA,
   KIND_BALANCE,
   KIND_RESET,
+  RESET_DRIFT_TOLERANCE_MS,
 } from '../src/notify.mjs'
 
 test('规则合并: 账号覆盖键生效, 其余继承全局', () => {
@@ -106,6 +107,50 @@ test('窗口重置: resetsAt 轮转产生 reset 事件报上一窗口峰值并
   assert.equal(again.events[0].kind, KIND_QUOTA)
 })
 
+test('窗口重置: 毫秒级服务端抖动视为同窗口不发事件且峰值保留', () => {
+  // Given 阈值 90, 首轮 utilization 40 以 ISO 时刻建立基线
+  const rule = { quotaThresholdPct: 90, balanceThreshold: null, resetNotice: true }
+  let state = createNotifyState()
+  state = evaluateAccount({ account: quotaAccount(quotaReading(40, '2026-10-17T09:10:04.999Z')), rule, state, seq: 1, ts: 1000 }).state
+  // When 次轮 resetsAt 仅漂移 1ms(智谱 TIME_LIMIT 实测抖动), utilization 回落
+  const next = evaluateAccount({ account: quotaAccount(quotaReading(30, '2026-10-17T09:10:04.998Z')), rule, state, seq: 2, ts: 2000 })
+  // Then 无事件, 峰值保留 40 不误报, 基线静默跟随新值
+  assert.equal(next.events.length, 0)
+  assert.equal(next.state.windows['5小时'].peak, 40)
+  assert.equal(next.state.windows['5小时'].resetsAt, '2026-10-17T09:10:04.998Z')
+})
+
+test('窗口重置: 超容差的 resetsAt 变化仍判定为轮转', () => {
+  // Given 阈值 90, 首轮 92 建立基线
+  const rule = { quotaThresholdPct: 90, balanceThreshold: null, resetNotice: true }
+  let state = createNotifyState()
+  state = evaluateAccount({ account: quotaAccount(quotaReading(92, '2026-10-17T09:10:04.999Z')), rule, state, seq: 1, ts: 1000 }).state
+  // When resetsAt 前移 1 小时(真实轮转)
+  const next = evaluateAccount({ account: quotaAccount(quotaReading(5, '2026-10-17T10:10:04.999Z')), rule, state, seq: 2, ts: 2000 })
+  // Then 产生 reset 事件报上一窗口峰值 92
+  assert.equal(next.events.length, 1)
+  assert.equal(next.events[0].kind, KIND_RESET)
+  assert.equal(next.events[0].text, '[dsh] 账号A 5小时窗口已重置,上一窗口峰值用量 92%')
+})
+
+test('窗口重置: 漂移恰好容差内静默, 达到容差即轮转', () => {
+  // Given 阈值 90, 基线 resetsAt 为固定时刻
+  const rule = { quotaThresholdPct: 90, balanceThreshold: null, resetNotice: true }
+  const baseMs = Date.parse('2026-10-17T09:10:04.999Z')
+  const isoOf = (ms) => new Date(ms).toISOString()
+  const baselineState = evaluateAccount({ account: quotaAccount(quotaReading(40, isoOf(baseMs))), rule, state: createNotifyState(), seq: 1, ts: 1000 }).state
+  // When 漂移为容差减 1ms(容差内)
+  const inside = evaluateAccount({ account: quotaAccount(quotaReading(40, isoOf(baseMs + RESET_DRIFT_TOLERANCE_MS - 1))), rule, state: baselineState, seq: 2, ts: 2000 })
+  // Then 无事件, 基线跟随
+  assert.equal(inside.events.length, 0)
+  assert.equal(inside.state.windows['5小时'].resetsAt, isoOf(baseMs + RESET_DRIFT_TOLERANCE_MS - 1))
+  // When 漂移恰好等于容差(边界,严格小于判定不吸收,独立从原始基线评估)
+  const boundary = evaluateAccount({ account: quotaAccount(quotaReading(40, isoOf(baseMs + RESET_DRIFT_TOLERANCE_MS))), rule, state: baselineState, seq: 3, ts: 3000 })
+  // Then 判定轮转产生 reset 事件
+  assert.equal(boundary.events.length, 1)
+  assert.equal(boundary.events[0].kind, KIND_RESET)
+})
+
 test('窗口重置: resetNotice 关闭时不产生 reset 事件但仍重建基线并重新武装', () => {
   // Given 阈值 90 已触发, 重置通知关闭
   const rule = { quotaThresholdPct: 90, balanceThreshold: null, resetNotice: false }