dsh-cost-meter 1.7.10 → 1.7.13

package/lib/custom-balance.js

@@ -8,9 +8,16 @@ import { credentialRef } from '@deepseek-ai/dsh-credentials'
 // ESM 环上再加一条边,DSH Desktop 的加载顺序下爆发 TDZ。net.js 是零本地
 // 依赖底层,从它导入即断环。
 import { fetchWithRetry, looksLikeSecretHeaderValue } from './net.js'
+import { ALIYUN_BALANCE_CREDENTIAL_VARS, queryAliyunBalance } from './aliyun-balance.js'
 
 export const CUSTOM_BALANCE_ADAPTER_ID = 'custom'
 
+export function customBalanceCredentialVars(entry) {
+  if (entry?.adapter === 'aliyun') return [...ALIYUN_BALANCE_CREDENTIAL_VARS]
+  return [...new Set(Object.values(entry?.request?.headers ?? {}).flatMap(value =>
+    typeof value === 'string' ? [...value.matchAll(/\{\{\s*([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g)].map(match => match[1]) : []))]
+}
+
 /**
  * 按点路径取响应 JSON 的字段(v1.6.8 加自有属性守卫)。
  * 只在**自有属性**上取值:`current[segment]` 会沿原型链上溯,`__proto__`/`constructor`
@@ -143,6 +150,7 @@ export async function queryCustomBalance(ctx, config) {
     error.soft = true
     throw error
   }
+  if (custom.adapter === 'aliyun') return queryAliyunBalance(ctx, config)
   const request = custom.request
   if (request === null || typeof request !== 'object' || typeof request.url !== 'string' || request.url.length === 0) {
     throw new Error('customBalance.request.url is required')

package/lib/gateway-quota-adapters.js

@@ -403,8 +403,8 @@ function codexWindowMeta(seconds) {
     ? seconds
     : typeof seconds === 'string' && seconds.trim() !== '' ? Number(seconds.trim()) : NaN
   if (!Number.isFinite(value) || value <= 0) return null
-  if (value === FIVE_HOUR_SECONDS) return { id: 'five-hour', label: '5 小时', periodHours: 5 }
-  if (value === WEEK_SECONDS) return { id: 'weekly', label: '每周', periodHours: 168 }
+  if (value === FIVE_HOUR_SECONDS) return { id: 'five-hour', label: '5h', periodHours: 5 }
+  if (value === WEEK_SECONDS) return { id: 'weekly', label: '周', periodHours: 168 }
   if (value >= MIN_MONTH_SECONDS && value <= MAX_MONTH_SECONDS) {
     return { id: 'monthly', label: '月度', periodHours: Math.round(value / 3600) }
   }
@@ -453,15 +453,16 @@ export function parseCodexUsage(payload, ctx = {}) {
     const resetAt = absoluteResetAt(pickField(window, 'reset_at', 'resetAt'))
       || relativeResetAt(pickField(window, 'reset_after_seconds', 'resetAfterSeconds'), now())
     seen.add(id)
-    windows.push(makeWindow(id, `${groupLabel} · ${meta.label}`, percent, resetAt, meta.periodHours, scope))
+    // 组标签为空时直接用窗口标签(主限额组不叠加前缀,窄栏标签列放不下会竖排换行)。
+    windows.push(makeWindow(id, groupLabel ? `${groupLabel} · ${meta.label}` : meta.label, percent, resetAt, meta.periodHours, scope))
   }
 
   const source = payload === null || typeof payload !== 'object' ? {} : payload
 
   const mainGroup = pickField(source, 'rate_limit', 'rateLimit')
   if (mainGroup !== null && typeof mainGroup === 'object' && !Array.isArray(mainGroup)) {
-    pushWindow('primary', 'account', pickField(mainGroup, 'primary_window', 'primaryWindow'), 0, '主力')
-    pushWindow('primary', 'account', pickField(mainGroup, 'secondary_window', 'secondaryWindow'), 1, '主力')
+    pushWindow('primary', 'account', pickField(mainGroup, 'primary_window', 'primaryWindow'), 0, '')
+    pushWindow('primary', 'account', pickField(mainGroup, 'secondary_window', 'secondaryWindow'), 1, '')
   }
 
   const codeReviewGroup = pickField(source, 'code_review_rate_limit', 'codeReviewRateLimit')

package/lib/gateway-quotas.js

@@ -208,9 +208,33 @@ function retryAfterMs(response) {
   return Number.isFinite(date) ? Math.min(5000, Math.max(0, date - Date.now())) : 0
 }
 
+// CPA 是一个本地管理端点加上上游 Provider 的双跳链路。管理端或上游
+// 偶发过载时，只有这些暂态 HTTP 状态才适合重试；认证/策略/解析失败必须立刻报错。
+const RETRYABLE_GATEWAY_HTTP_STATUSES = new Set([408, 429, 500, 502, 503, 504])
+const GATEWAY_RESPONSE_ATTEMPTS = 2
+const GATEWAY_RETRY_DELAY_MS = 300
+
+function isRetryableGatewayStatus(status) {
+  return RETRYABLE_GATEWAY_HTTP_STATUSES.has(Number(status))
+}
+
+function gatewayRetryDelay(response) {
+  return retryAfterMs(response) || GATEWAY_RETRY_DELAY_MS
+}
+
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+async function discardResponse(response) {
+  // 重试前释放未消费的错误响应，避免多账号轮询占住连接池。
+  try { await response?.body?.cancel() } catch { /* 清理失败不掩盖原始 HTTP 错误。 */ }
+}
+
 async function readJsonResponse(response, phase, { maxBytes = MAX_BODY_BYTES } = {}) {
   if (!response || typeof response.ok !== 'boolean') throw errorOf('CPA_RESPONSE_INVALID', `${phase} response is invalid`)
-  if (!response.ok) throw responseStatusError(response, phase)
+  if (!response.ok) {
+    await discardResponse(response)
+    throw responseStatusError(response, phase)
+  }
   let body
   try {
     const length = safeNumber(headerValue(response.headers, 'content-length'))
@@ -250,7 +274,7 @@ async function fetchManagement(source, path, managementKey, options = {}) {
     'Content-Type': 'application/json',
     'X-Management-Key': managementKey,
   }
-  for (let rateAttempt = 0; rateAttempt < 2; rateAttempt++) {
+  for (let attempt = 0; attempt < GATEWAY_RESPONSE_ATTEMPTS; attempt++) {
     let response
     try {
       response = await fetchWithRetry(url, { method: 'GET', headers, redirect: 'manual' }, {
@@ -261,14 +285,15 @@ async function fetchManagement(source, path, managementKey, options = {}) {
       throw errorOf('CPA_OUTER_HTTP_ERROR', 'management request failed', { status: 0 })
     }
     if (response.status >= 300 && response.status < 400) throw errorOf('CPA_REDIRECT_REFUSED', 'CPA redirect refused', { status: response.status })
-    if (response.status === 429 && rateAttempt === 0) {
-      const delay = retryAfterMs(response)
-      if (delay > 0) await new Promise(resolve => setTimeout(resolve, delay))
+    // 管理端临时过载/限流时按 Retry-After 或短退避再试一次。
+    if (isRetryableGatewayStatus(response.status) && attempt + 1 < GATEWAY_RESPONSE_ATTEMPTS) {
+      await discardResponse(response)
+      await sleep(gatewayRetryDelay(response))
       continue
     }
     return { payload: await readJsonResponse(response, path), serverVersion: headerValue(response.headers, 'x-cpa-version') }
   }
-  throw errorOf('CPA_OUTER_HTTP_ERROR', 'management request rate limited', { status: 429 })
+  throw errorOf('CPA_OUTER_HTTP_ERROR', 'management request failed', { status: 0 })
 }
 
 /** Resolve only the management key value, never returning it to callers' state. */
@@ -408,21 +433,41 @@ async function apiCall(source, managementKey, account, request, options = {}) {
   if (projectId && request.url.includes('cloudcode-pa')) {
     body.data = request.data || JSON.stringify({ project: projectId })
   }
-  let response
-  try {
-    response = await fetchWithRetry(endpoint(source, GATEWAY_MANAGEMENT_PATHS.apiCall), {
-      method: 'POST',
-      headers: { Accept: 'application/json', 'Content-Type': 'application/json', 'X-Management-Key': managementKey },
-      body: JSON.stringify(body),
-      redirect: 'manual',
-    }, { attempts: 2, timeoutMs: 30_000, fetchImpl })
-  } catch (error) {
-    if (error?.code) throw error
-    throw errorOf('CPA_OUTER_HTTP_ERROR', 'CPA api-call failed')
+  for (let attempt = 0; attempt < GATEWAY_RESPONSE_ATTEMPTS; attempt++) {
+    let response
+    try {
+      response = await fetchWithRetry(endpoint(source, GATEWAY_MANAGEMENT_PATHS.apiCall), {
+        method: 'POST',
+        headers: { Accept: 'application/json', 'Content-Type': 'application/json', 'X-Management-Key': managementKey },
+        body: JSON.stringify(body),
+        redirect: 'manual',
+      }, { attempts: 2, timeoutMs: 30_000, fetchImpl })
+    } catch (error) {
+      if (error?.code) throw error
+      throw errorOf('CPA_OUTER_HTTP_ERROR', 'CPA api-call failed')
+    }
+    if (response.status >= 300 && response.status < 400) throw errorOf('CPA_REDIRECT_REFUSED', 'CPA redirect refused', { status: response.status })
+    // api-call 是副作用闸门已校验的只读额度请求；仅对暂态管理端状态重放一次。
+    if (isRetryableGatewayStatus(response.status) && attempt + 1 < GATEWAY_RESPONSE_ATTEMPTS) {
+      await discardResponse(response)
+      await sleep(gatewayRetryDelay(response))
+      continue
+    }
+    try {
+      const envelope = await readJsonResponse(response, 'api-call')
+      return normalizeInnerEnvelope(envelope, 'api-call')
+    } catch (error) {
+      // CPA 把上游 HTTP 状态装进 JSON envelope。429/5xx 同样属于暂态，
+      // 但认证、策略与格式错误绝不重试。
+      if (error?.code === 'CPA_INNER_HTTP_ERROR' && isRetryableGatewayStatus(error.status)
+        && attempt + 1 < GATEWAY_RESPONSE_ATTEMPTS) {
+        await sleep(GATEWAY_RETRY_DELAY_MS)
+        continue
+      }
+      throw error
+    }
   }
-  if (response.status >= 300 && response.status < 400) throw errorOf('CPA_REDIRECT_REFUSED', 'CPA redirect refused', { status: response.status })
-  const envelope = await readJsonResponse(response, 'api-call')
-  return normalizeInnerEnvelope(envelope, 'api-call')
+  throw errorOf('CPA_OUTER_HTTP_ERROR', 'CPA api-call retry exhausted', { status: 0 })
 }
 
 async function queryApiAccount(source, managementKey, account, options = {}) {

package/lib/index.js

@@ -29,6 +29,7 @@ import { recordSamples, buildPlanStats, canonicalWindowKey, periodStartOf, aggre
 import { fetchWithRetry } from './net.js'
 import { queryGatewayQuota, emptyGatewayQuota, managementKeyVarOf, gatewaySourceFingerprint } from './gateway-quotas.js'
 import { stateSchema } from './typert.host.js'
+import { customBalanceCredentialVars } from './custom-balance.js'
 
 export const name = 'cost-meter'
 
@@ -982,13 +983,8 @@ async function buildState(ledger, balance = emptyBalance(), goQuota = emptyGoQuo
   {
     const credentials = ctx?.get?.('credentials')
     const names = new Set()
-    for (const headers of (Array.isArray(ledger.config?.customBalances) ? ledger.config.customBalances : [])
-      .map(entry => entry?.request?.headers)
-      .filter(h => h !== null && typeof h === 'object' && !Array.isArray(h))) {
-      for (const value of Object.values(headers)) {
-        if (typeof value !== 'string') continue
-        for (const match of value.matchAll(/\{\{\s*([A-Za-z_][A-Za-z0-9_]*)\s*\}\}/g)) names.add(match[1])
-      }
+    for (const entry of (Array.isArray(ledger.config?.customBalances) ? ledger.config.customBalances : [])) {
+      for (const name of customBalanceCredentialVars(entry)) names.add(name)
     }
     for (const source of (Array.isArray(ledger.config?.gatewayQuotas?.sources) ? ledger.config.gatewayQuotas.sources : [])) {
       names.add(managementKeyVarOf(source))
@@ -1439,9 +1435,7 @@ function createService(ctx, ledger) {
     const entries = customBalanceConfigs()
     for (const key of Object.keys(customBalanceCaches)) {
       const index = Number(key)
-      const headers = entries[index]?.request?.headers
-      if (headers === null || typeof headers !== 'object' || Array.isArray(headers)) continue
-      const uses = Object.values(headers).some(value => typeof value === 'string' && value.includes(`{{${varName}}}`))
+      const uses = customBalanceCredentialVars(entries[index]).includes(varName)
       if (uses) customBalanceCaches[index] = { fetchedAt: 0, value: emptyCustomBalance() }
     }
   }

package/lib/store.js

@@ -744,6 +744,7 @@ const VALIDATION_MESSAGES = {
     balanceBudgetCap: 'balance.budgetCap 必须是非负数或 null',
     goQuota: 'goQuota 非法',
     customBalance: 'customBalance 非法',
+    customBalanceAdapter: 'customBalance.adapter 必须是 custom / aliyun',
     customBalanceEnabled: 'customBalance.enabled 必须是布尔值',
     customBalanceDisplay: 'customBalance.display 必须是 sidebar / settings / both / off',
     customBalanceRefresh: 'customBalance.refreshMinutes 必须是 1-1440 的整数',
@@ -839,6 +840,7 @@ const VALIDATION_MESSAGES = {
     balanceBudgetCap: 'balance.budgetCap must be a non-negative number or null',
     goQuota: 'Invalid goQuota',
     customBalance: 'Invalid customBalance',
+    customBalanceAdapter: 'customBalance.adapter must be custom / aliyun',
     customBalanceEnabled: 'customBalance.enabled must be a boolean',
     customBalanceDisplay: 'customBalance.display must be sidebar / settings / both / off',
     customBalanceRefresh: 'customBalance.refreshMinutes must be an integer from 1 to 1440',
@@ -1158,6 +1160,7 @@ export function applyConfigPatch(current, rawPatch) {
       return
     }
     if (typeof entry.enabled !== 'boolean') errors.push(vmsg(locale, fieldPrefix + 'Enabled'))
+    if (entry.adapter !== undefined && !['custom', 'aliyun'].includes(entry.adapter)) errors.push(vmsg(locale, fieldPrefix + 'Adapter'))
     if (!['sidebar', 'settings', 'both', 'off'].includes(entry.display)) errors.push(vmsg(locale, fieldPrefix + 'Display'))
     const refreshMinutes = Number(entry.refreshMinutes)
     if (!Number.isInteger(refreshMinutes) || refreshMinutes < 1 || refreshMinutes > 1440) errors.push(vmsg(locale, fieldPrefix + 'Refresh'))
@@ -1452,6 +1455,7 @@ export function sanitizeConfig(raw) {
   const sanitizeCustomEntry = (raw, baseEntry) => {
     const entry = raw ?? {}
     const clean = {
+      ...(entry.adapter === 'aliyun' ? { adapter: 'aliyun' } : {}),
       enabled: entry.enabled === true,
       display: oneOf(entry.display, ['sidebar', 'settings', 'both', 'off'], 'both'),
       refreshMinutes: Math.min(1440, Math.max(1, Math.floor(Number(entry.refreshMinutes) || 15))),

package/lib/typert.host.js

@@ -184,6 +184,7 @@ const configSchema = z.object({
     keySource: z.string().optional(),
   }),
   customBalance: z.object({
+    adapter: z.enum(['custom', 'aliyun']).optional(),
     enabled: z.boolean(),
     label: z.string(),
     labelEn: z.string().optional(),
@@ -202,6 +203,7 @@ const configSchema = z.object({
   // 多配置形态(v1.7.0,issue #79):自定义 Provider 余额多条并行,数组为运行期
   // 真源;customBalance 单配置键仅为旧客户端兼容保留(= entries[0] 的镜像)。
   customBalances: z.array(z.object({
+    adapter: z.enum(['custom', 'aliyun']).optional(),
     enabled: z.boolean(),
     label: z.string(),
     labelEn: z.string().optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.7.10",
+  "version": "1.7.13",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(9 家,含 SCNet Token Plan 本地 Credits 计量与火山方舟 Volcano Ark Coding Plan AK/SK 签名查询)、自定义 Provider 余额查询(可配任意 HTTP 端点)与余额进度条、峰谷计价时段显示与切换前弹窗/系统通知提醒(位置/提前量/类型可配),界面中英双语。Session cost tracking plugin for DeepSeek Harness: per-conversation cost, daily totals, history and official price sync, with multi-vendor model pricing (built-in 90+ model catalog with auto-matching), Coding Plan quota queries & display for 9 vendors (incl. local credits metering for the SCNet Token Plan and Volcano Ark Coding Plan via AK/SK signature), plan/API dual-track billing with per-1% & full-window Token Plan usage estimates, custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, plus peak/off-peak pricing display with pre-switch popup & system-notification alerts (position / lead time / type configurable), in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",
@@ -17,11 +17,15 @@
     "./package.json": "./package.json"
   },
   "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web"
+    "bundle": {"patch": "./cordis.patch.yml"},
+    "client": {"platform": "web"},
+    "compatibility": {
+      "dsh": ">=0.1.0-rc.5",
+      "dshReleases": {
+        "0.1.2-alpha.3": "compatible",
+        "0.1.2-alpha.4": "compatible",
+        "0.1.2-alpha.5": "compatible"
+      }
     }
   },
   "dshhub": {
@@ -65,7 +69,8 @@
         "https://api.commandcode.ai",
         "https://ax.ac.sugon.com",
         "https://platform.qianwenai.com",
-        "https://platform-home.qianwenai.com"
+        "https://platform-home.qianwenai.com",
+        "https://business.aliyuncs.com"
       ]
     }
   },
@@ -104,6 +109,7 @@
   "engines": {
     "node": ">=20"
   },
+  "os": ["darwin", "linux", "win32"],
   "scripts": {
     "build": "node scripts/build.mjs",
     "test": "node test/verify.mjs"