dsh-desktop-statusbar 2.0.0 → 2.0.2

package/lib/index.js

@@ -22,6 +22,7 @@
  * @module dsh-desktop-statusbar
  */
 import { z } from 'zod'
+import { adapterFor } from './balance-api.js'
 import { holidayHtmlToText, parseHolidayNotice } from './holiday.js'
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
@@ -340,6 +341,12 @@ const timingViewSchema = z.object({
   slowestTtft: timingMark.nullable(),
   fastestTps: timingMark.nullable(),
   slowestTps: timingMark.nullable(),
+  /* 本轮累计：气泡里"本轮平均首字 / 本轮平均速度"要用（官方投影只有会话累计值） */
+  turn: z.number().nullable(),
+  turnTtftMs: z.number().nonnegative(),
+  turnTtftSamples: z.number().int().nonnegative(),
+  turnDecodeMs: z.number().nonnegative(),
+  turnDecodeTokens: z.number().nonnegative(),
 }).strict()
 
 const sessionTimingSchema = timingViewSchema.extend({ openStep: timingStep.nullable() }).strict()
@@ -417,12 +424,25 @@ const sessionTimingProjection = {
     slowestTtft: null,
     fastestTps: null,
     slowestTps: null,
+    turn: null,
+    turnTtftMs: 0,
+    turnTtftSamples: 0,
+    turnDecodeMs: 0,
+    turnDecodeTokens: 0,
     openStep: null,
   }),
   apply: (state, event) => {
     if (event.type === 'step/start') {
+      /* 换轮就把本轮累计清零：气泡里的"本轮平均…"只算当前这一轮 */
+      const turn = event.data.turn
+      const sameTurn = state.turn === turn
       return {
         ...state,
+        turn: turn,
+        turnTtftMs: sameTurn ? state.turnTtftMs : 0,
+        turnTtftSamples: sameTurn ? state.turnTtftSamples : 0,
+        turnDecodeMs: sameTurn ? state.turnDecodeMs : 0,
+        turnDecodeTokens: sameTurn ? state.turnDecodeTokens : 0,
         openStep: {
           turn: event.data.turn, step: event.data.step, startTime: event.time,
           firstTokenTime: null, firstTokenTool: false,
@@ -451,6 +471,8 @@ const sessionTimingProjection = {
       next.samples = state.samples + 1
       next.fastestTtft = pickSmaller(state.fastestTtft, { value: ttft, at: event.time, model })
       next.slowestTtft = pickLarger(state.slowestTtft, { value: ttft, at: event.time, model })
+      next.turnTtftMs = state.turnTtftMs + ttft
+      next.turnTtftSamples = state.turnTtftSamples + 1
       const output = stepOutputTokens(event.data.usage)
       const decode = Math.max(0, event.time - first.time)
       /* 纯工具调用的步骤不进速度极值：分片时间戳挤在同一刻，算出来是假值（首字照旧统计） */
@@ -458,6 +480,8 @@ const sessionTimingProjection = {
         const speed = { value: output / (decode / 1000), at: event.time, model }
         next.fastestTps = pickLarger(state.fastestTps, speed)
         next.slowestTps = pickSmaller(state.slowestTps, speed)
+        next.turnDecodeMs = state.turnDecodeMs + decode
+        next.turnDecodeTokens = state.turnDecodeTokens + output
       }
       return next
     }
@@ -475,9 +499,14 @@ const sessionTimingProjection = {
       slowestTtft: state.slowestTtft,
       fastestTps: state.fastestTps,
       slowestTps: state.slowestTps,
+      turn: state.turn,
+      turnTtftMs: state.turnTtftMs,
+      turnTtftSamples: state.turnTtftSamples,
+      turnDecodeMs: state.turnDecodeMs,
+      turnDecodeTokens: state.turnDecodeTokens,
     }),
   },
-  stateVersion: 2,
+  stateVersion: 3,
 }
 
 /* ---------------------------------------------------------------- 余额查询 */
@@ -612,6 +641,82 @@ function keyFromCredentialStore(ctx) {
   return null
 }
 
+/**
+ * 按适配器的凭据引用名逐个解析 key。用 credentials 服务的 resolve()（子代理核实：
+ * describe() 只回答"配了没"，resolve() 才给出真实值 { value, source }）。
+ * ref 在运行时就是普通字符串 —— credentialRef() 只做编译期品牌标记，所以不必 import 它。
+ */
+async function resolveAdapterKey(ctx, adapter) {
+  const credentials = ctx !== null && ctx !== undefined && typeof ctx.get === 'function' ? ctx.get('credentials') : null
+  if (credentials !== null && credentials !== undefined && typeof credentials.resolve === 'function') {
+    for (let i = 0; i < adapter.refs.length; i += 1) {
+      try {
+        const hit = await credentials.resolve(adapter.refs[i])
+        if (hit !== undefined && hit !== null && typeof hit.value === 'string' && hit.value.length > 0) {
+          return { key: hit.value, source: adapter.refs[i] }
+        }
+      } catch (error) {
+        /* 换下一个引用名 */
+      }
+    }
+  }
+  /* 没挂凭据服务时的旧路径：环境变量 / .credentials.yaml */
+  const fallback = findApiKey(ctx)
+  return { key: fallback.key, source: fallback.source }
+}
+
+/** 用适配器查第三方平台的余额，返回与 DeepSeek 那条路一致的形状。 */
+/** 从适配器返回的 parts 里按 label 取金额；没有这个 label 就返回 undefined（气泡少一行）。 */
+function partAmount(parts, label) {
+  const list = Array.isArray(parts) ? parts : []
+  for (let i = 0; i < list.length; i += 1) {
+    if (list[i] !== null && list[i] !== undefined && list[i].label === label) return list[i].amount
+  }
+  return undefined
+}
+
+async function queryWithAdapter(ctx, adapter, now) {
+  const found = await resolveAdapterKey(ctx, adapter)
+  if (found.key === null) {
+    logHost(ctx, 'balance(' + adapter.id + '): 没取到 key，试过 ' + adapter.refs.join(' / '))
+    return { ok: false, at: now, reason: 'no-credential', provider: adapter.id }
+  }
+  const spec = adapter.request(found.key)
+  try {
+    const response = await fetch(spec.url, {
+      method: 'GET',
+      headers: spec.headers,
+      signal: AbortSignal.timeout(10000),
+    })
+    if (!response.ok) {
+      logHost(ctx, 'balance(' + adapter.id + '): HTTP ' + String(response.status))
+      return { ok: false, at: now, reason: 'http-' + String(response.status), source: found.source, provider: adapter.id }
+    }
+    const parsed = adapter.parse(await response.json())
+    if (parsed === null) {
+      logHost(ctx, 'balance(' + adapter.id + '): 响应里解析不出余额')
+      return { ok: false, at: now, reason: 'no-balance-info', source: found.source, provider: adapter.id }
+    }
+    return {
+      ok: true,
+      at: now,
+      source: found.source,
+      provider: adapter.id,
+      currency: parsed.currency,
+      total: parsed.total,
+      isPercent: parsed.isPercent === true,
+      parts: parsed.parts,
+      /* 余额气泡那几行读的是顶层字段（与 DeepSeek 那条路保持同一形状），这里按 label 摊平 */
+      toppedUp: partAmount(parsed.parts, 'toppedUp'),
+      granted: partAmount(parsed.parts, 'granted'),
+      spent: partAmount(parsed.parts, 'spent'),
+    }
+  } catch (error) {
+    logHost(ctx, 'balance(' + adapter.id + '): ' + String(error === null || error === undefined ? 'unknown' : error.message))
+    return { ok: false, at: now, reason: 'network', source: found.source, provider: adapter.id }
+  }
+}
+
 function findApiKey(ctx) {
   const fromEnv = keyFromEnv()
   if (fromEnv !== null) return { key: fromEnv, source: 'env' }
@@ -702,12 +807,21 @@ async function queryAccountBalance(ctx) {
   }
 }
 
-async function queryBalance(ctx, force) {
+async function queryBalance(ctx, force, provider, model) {
   const now = Date.now()
   if (force !== true && balanceCache.value !== null && now - balanceCache.at < BALANCE_TTL_MS) {
     return balanceCache.value
   }
 
+  /* 当前会话用的是第三方平台就交给适配器：每个平台有自己的端点、鉴权与字段。
+     DeepSeek（含识别不出来的情况）继续走下面的账号服务 + API key 老路。 */
+  const adapter = adapterFor(provider, model)
+  if (adapter !== null && adapter.id !== 'deepseek') {
+    const third = await queryWithAdapter(ctx, adapter, now)
+    balanceCache = { at: now, value: third, provider: adapter.id }
+    return third
+  }
+
   /* 先问官方账号服务：与设置页同一份数据（充值 + 赠金），拿不到才走下面的 API key 查询 */
   const fromAccount = await queryAccountBalance(ctx)
   if (fromAccount !== null) {
@@ -908,7 +1022,7 @@ export function apply(ctx) {
         return
       }
       const force = url.searchParams.get('force') === '1'
-      const value = await queryBalance(ctx, force)
+      const value = await queryBalance(ctx, force, url.searchParams.get('provider'), url.searchParams.get('model'))
       sendJson(res, 200, Object.assign({}, value, { probe: accountProbeNote }))
     },
   }), 'dsh-desktop-statusbar: balance api')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-desktop-statusbar",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "type": "module",
   "description": "把 DSH 桌面端对话区底部的统计行换成可配置状态栏：9 个字段可选可排序，按官方峰谷口径估算费用，支持自定义模型单价与账户余额。",
   "license": "PolyForm-Noncommercial-1.0.0",