dsh-consumption-badge 1.2.2 → 1.3.2

package/lib/index.js

@@ -27,6 +27,41 @@ let balanceCache = { at: 0, value: null }
 /** dsh-plugin-personalization 是否同时安装（null = 尚未探测）。 */
 let personalizationProbe = null
 
+/**
+ * 可选显示币种（报价表本身始终是人民币，浏览器半边只做展示换算）。
+ * 顺序即设置页下拉里的顺序。
+ */
+const CURRENCY_CODES = ['USD', 'EUR', 'GBP', 'JPY', 'HKD', 'TWD', 'KRW', 'SGD', 'AUD', 'CAD', 'CHF', 'INR', 'RUB', 'BRL', 'THB', 'MXN']
+
+/**
+ * 内置兜底汇率（1 CNY = n 目标币种），取自 2026-11-02 的 open.er-api.com。
+ * 只在取不到实时汇率（离线/被墙/接口改版）时使用，返回值里会标 `stale: true`。
+ */
+const FALLBACK_RATES = {
+  USD: 0.150131,
+  EUR: 0.134567,
+  GBP: 0.112169,
+  JPY: 23.670366,
+  HKD: 1.177898,
+  TWD: 4.889976,
+  KRW: 200.722601,
+  SGD: 0.191923,
+  AUD: 0.213732,
+  CAD: 0.2098,
+  CHF: 0.123863,
+  INR: 14.290818,
+  RUB: 12.180268,
+  BRL: 0.807624,
+  THB: 5.054541,
+  MXN: 2.816108,
+}
+const RATES_TTL_MS = 6 * 60 * 60 * 1000
+const RATES_SOURCES = [
+  'https://open.er-api.com/v6/latest/CNY',
+  'https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@latest/v1/currencies/cny.json',
+]
+let ratesCache = { at: 0, value: null }
+
 /**
  * 探测 dsh-plugin-personalization 是否与本插件共存于同一 profile 的 node_modules：
  * 只 import 它那个空的 host 入口（不调用 apply），失败即视为未安装。
@@ -69,12 +104,15 @@ function sanitizeKey(value) {
 
 /**
  * 折叠会话日志：assistant/message 上的 usage 按 turn 归并，轮次上下文取当时生效的路由。
+ * 同一遍扫描里再按 `message.id` 留一份**逐条消息**记录 —— 徽章要显示「这条回复自己」的用量，
+ * 而 turn 会合并同轮多步（多步一问一答时两者不相等）。
  * @param events 会话事件数组（SessionEvent[]）。
- * @returns 按 turn 升序的逐轮记录。
+ * @returns {{turns: object[], messages: object[]}} turns 按 turn 升序；messages 按日志顺序。
  */
-function foldTurns(events) {
+function foldEvents(events) {
   const byTurn = new Map()
   const starts = new Map()
+  const messages = []
   let model = ''
   let provider = ''
   for (let i = 0; i < events.length; i += 1) {
@@ -119,6 +157,19 @@ function foldTurns(events) {
     rec.out += num(u.outputTokens)
     rec.steps += 1
     if (!rec.model && model) rec.model = model
+    // 逐条消息记录：id 来自 assistant/message 的 message.id（= 槽位给的 messageId）。
+    const message = d.message
+    const id = message && typeof message.id === 'string' ? message.id : ''
+    messages.push({
+      id: id,
+      turn: turn,
+      step: typeof d.step === 'number' ? d.step : 0,
+      hit: num(u.cacheReadTokens),
+      miss: num(u.inputTokens) + num(u.cacheWriteTokens),
+      out: num(u.outputTokens),
+      time: 0,
+      model: model || '',
+    })
   }
   const keys = []
   byTurn.forEach(function (_v, k) { keys.push(k) })
@@ -130,7 +181,12 @@ function foldTurns(events) {
     rec.time = typeof t0 === 'number' ? t0 : 0
     turns.push(rec)
   }
-  return turns
+  // 时间统一按「该轮请求开始的时刻」归属峰谷（与 turns 同口径）。
+  for (let i = 0; i < messages.length; i += 1) {
+    const t0 = starts.get(messages[i].turn)
+    messages[i].time = typeof t0 === 'number' ? t0 : 0
+  }
+  return { turns: turns, messages: messages }
 }
 
 /** 归一化 /user/balance 响应。 */
@@ -290,18 +346,22 @@ export function apply(ctx) {
 
   /** 逐轮用量（带 length 版本缓存，日志没变就不重折）。 */
   async function handleTurns(sessionId) {
-    if (!sessionId) return { ok: false, code: 'missing-session-id', error: 'missing sessionId', turns: [] }
+    if (!sessionId) return { ok: false, code: 'missing-session-id', error: 'missing sessionId', turns: [], messages: [] }
     const events = await readEvents(sessionId)
-    if (events === null) return { ok: false, code: 'log-unavailable', error: 'session log unavailable', turns: [] }
+    if (events === null) return { ok: false, code: 'log-unavailable', error: 'session log unavailable', turns: [], messages: [] }
     const cached = turnCache.get(sessionId)
-    if (cached && cached.length === events.length) return { ok: true, cached: true, turns: cached.turns }
-    const turns = foldTurns(events)
+    if (cached && cached.length === events.length) {
+      return { ok: true, cached: true, turns: cached.turns, messages: cached.messages }
+    }
+    const folded = foldEvents(events)
+    const turns = folded.turns
+    const messages = folded.messages
     if (turnCache.size >= TURN_CACHE_LIMIT && !turnCache.has(sessionId)) {
       const firstKey = turnCache.keys().next()
       if (!firstKey.done) turnCache.delete(firstKey.value)
     }
-    turnCache.set(sessionId, { length: events.length, turns: turns })
-    return { ok: true, cached: false, turns: turns }
+    turnCache.set(sessionId, { length: events.length, turns: turns, messages: messages })
+    return { ok: true, cached: false, turns: turns, messages: messages }
   }
 
   /** 当前模型（计价用），读不到就让浏览器回退 flash。 */
@@ -338,6 +398,93 @@ export function apply(ctx) {
     return out
   }
 
+  /**
+   * 取一次实时汇率（1 CNY = n 目标币种）。只取 CURRENCY_CODES 里那几种，避免整包塞给浏览器。
+   * 通道与本插件的余额请求一致（curl），另用全局 fetch 作为第二通道；
+   * 两个源都失败时回内置兜底表并标 `stale: true`（界面会说明这是兜底汇率）。
+   * @returns {{rates: object, source: string, fetchedAt: number, stale: boolean, error: string}}
+   */
+  async function fetchRates() {
+    const subprocess = ctx.get('subprocess')
+    let lastError = ''
+    for (let i = 0; i < RATES_SOURCES.length; i += 1) {
+      const url = RATES_SOURCES[i]
+      let text = ''
+      if (subprocess && typeof subprocess.spawn === 'function') {
+        try {
+          const handle = subprocess.spawn({
+            argv: ['curl', '-sS', '--max-time', '12', url],
+            cwd: process.cwd(),
+            stdio: { stdin: { data: '' }, stdout: { maxBytes: 262144 }, stderr: { maxBytes: 4096 } },
+            graceMs: 3000,
+          })
+          await handle.done
+          const collected = handle.collected || {}
+          const outRead = collected.stdout ? collected.stdout.readFrom(0) : null
+          text = outRead && typeof outRead.text === 'string' ? outRead.text.trim() : ''
+        } catch (e) {
+          lastError = errText(e)
+          text = ''
+        }
+      }
+      if (!text && typeof fetch === 'function') {
+        try {
+          const response = await fetch(url)
+          if (response && response.ok !== false) text = String(await response.text()).trim()
+        } catch (e) {
+          lastError = errText(e)
+          text = ''
+        }
+      }
+      if (!text) continue
+      let json = null
+      try {
+        json = JSON.parse(text)
+      } catch (e) {
+        lastError = 'bad rates payload'
+        continue
+      }
+      if (!json || typeof json !== 'object') continue
+      const raw = json.rates && typeof json.rates === 'object'
+        ? json.rates
+        : (json.cny && typeof json.cny === 'object' ? json.cny : null)
+      if (!raw) continue
+      const rates = {}
+      let found = 0
+      for (let k = 0; k < CURRENCY_CODES.length; k += 1) {
+        const code = CURRENCY_CODES[k]
+        const v = typeof raw[code] === 'number' ? raw[code] : raw[code.toLowerCase()]
+        if (typeof v === 'number' && Number.isFinite(v) && v > 0) {
+          rates[code] = v
+          found += 1
+        }
+      }
+      if (found === 0) continue
+      const stamp = typeof json.time_last_update_unix === 'number'
+        ? json.time_last_update_unix * 1000
+        : (typeof json.date === 'string' ? Date.parse(json.date) : 0)
+      return {
+        rates: rates,
+        source: url.indexOf('er-api') >= 0 ? 'open.er-api.com' : 'currency-api',
+        fetchedAt: Number.isFinite(stamp) && stamp > 0 ? stamp : 0,
+        stale: false,
+        error: '',
+      }
+    }
+    return { rates: FALLBACK_RATES, source: 'builtin', fetchedAt: 0, stale: true, error: lastError || 'live rates unavailable' }
+  }
+
+  /** 汇率入口：进程内缓存 6h，`?force=1` 强制刷新。 */
+  async function handleRates(force) {
+    const now = Date.now()
+    if (!force && ratesCache.value && now - ratesCache.at < RATES_TTL_MS) {
+      return Object.assign({ ok: true, base: 'CNY', codes: CURRENCY_CODES, cached: true }, ratesCache.value)
+    }
+    const fetched = await fetchRates()
+    ratesCache = { at: Date.now(), value: fetched }
+    return Object.assign({ ok: true, base: 'CNY', codes: CURRENCY_CODES, cached: false }, fetched)
+  }
+
   disposers.push(ctx.webServer.register({
     kind: 'exact',
     path: ROUTE_BASE + '/turns',
@@ -364,6 +511,19 @@ export function apply(ctx) {
     },
   }))
 
+  disposers.push(ctx.webServer.register({
+    kind: 'exact',
+    path: ROUTE_BASE + '/rates',
+    handler: async function (req, res) {
+      try {
+        const url = new URL(req.url || '/', 'http://127.0.0.1')
+        sendJson(res, 200, await handleRates(url.searchParams.get('force') === '1'))
+      } catch (e) {
+        sendJson(res, 500, { ok: false, error: errText(e) })
+      }
+    },
+  }))
+
   disposers.push(ctx.webServer.register({
     kind: 'exact',
     path: ROUTE_BASE + '/balance',
@@ -395,4 +555,4 @@ export function apply(ctx) {
       disposers.length = 0
     }
   })
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-consumption-badge",
-  "version": "1.2.2",
+  "version": "1.3.2",
   "description": "DSH Web UI plugin: a per-message consumption badge (tokens | estimated cost | peak/valley) plus a session detail modal with cumulative tokens, estimated cost, Beijing-time peak/off-peak pricing, a per-turn dual-axis chart, and the DeepSeek account balance",
   "keywords": [
     "deepseek-harness",