@feiyang666/dsh-usage-plugin 1.12.2 → 1.13.0

package/lib/index.js

@@ -22,6 +22,7 @@ import {
   matchesModelProvider,
   parseBalanceResponse,
   providerList,
+  missingCredentialError,
   resolveBalanceEndpoint
 } from './balance.js'
 
@@ -508,6 +509,11 @@ export default {
                 if (provider === 'digital-ocean' || provider === 'digitalocean') {
                   try { await refreshFxRate(false) } catch (e) {}
                 }
+                // 兼容性：DeepSeek 系 provider 的 usage 不单独上报 cacheWriteTokens
+                // （缓存写入发生在未命中时，即 cacheWriteTokens == inputTokens）。
+                // 当上游未提供该字段时，用未命中 token 数（inputTokens）兜底，避免
+                // "缓存写入"列长期为空。
+                const cacheWrite = usage.cacheWriteTokens || usage.inputTokens || 0
                 records.push({
                   time: startedAt,
                   model,
@@ -516,7 +522,7 @@ export default {
                   inputTokens: usage.inputTokens || 0,
                   outputTokens: usage.outputTokens || 0,
                   cacheReadTokens: usage.cacheReadTokens || 0,
-                  cacheWriteTokens: usage.cacheWriteTokens || 0,
+                  cacheWriteTokens: cacheWrite,
                   reasoningTokens: usage.reasoningTokens || 0,
                   finishReason,
                   usdCnyRate: (provider === 'digital-ocean' || provider === 'digitalocean') ? (FX.rate || 0) : 0,
@@ -798,6 +804,124 @@ export default {
           credentialName: DIGITALOCEAN_CREDENTIAL
         }
       }
+// ── Qwen / 百炼 Token Plan (console-token) ────────────────────────────
+      // 复用 bl CLI 保存的百炼控制台 OAuth access_token（~/.bailian/config.json），
+      // 调用百炼内部门户网关查询 Token Plan 配额用量，不需要阿里云 AccessKey。
+      const QWEN_GATEWAYS = {
+        'cn-beijing-domestic': { host: 'bailian-cs.console.aliyun.com', action: 'BroadScopeAspnGateway' },
+        'cn-beijing-international': { host: 'bailian-cs.console.alibabacloud.com', action: 'BroadScopeAspnGateway' },
+        'ap-southeast-1-domestic': { host: 'modelstudio-cs.console.aliyun.com', action: 'IntlBroadScopeAspnGateway' },
+        'ap-southeast-1-international': { host: 'bailian-singapore-cs.alibabacloud.com', action: 'IntlBroadScopeAspnGateway' }
+      }
+      const QWEN_API = 'zeldaHttp.apikeyMgr./tokenplan/personal/api/v2/usage'
+
+      function readBailianConfigPath() {
+        const base = process.env.BAILIAN_CONFIG_DIR || joinPath(os.homedir(), '.bailian')
+        return joinPath(base, 'config.json')
+      }
+
+      async function readQwenConsoleToken() {
+        const cfgPath = readBailianConfigPath()
+        let raw
+        try { raw = await nfsReadText(cfgPath) } catch (e) {
+          throw new Error('未找到 ' + cfgPath + '。请先运行 `bl auth login --console` 完成百炼控制台登录。')
+        }
+        let cfg
+        try { cfg = JSON.parse(raw) } catch (e) {
+          throw new Error(cfgPath + ' 不是合法的 JSON 配置')
+        }
+        let token = cfg.access_token || cfg.accessToken
+        const active = cfg.active_config || 'default'
+        const profile = cfg[active]
+        if (profile && typeof profile === 'object') {
+          token = token || profile.access_token || profile.accessToken
+        }
+        if (!token || !String(token).trim()) {
+          throw new Error('配置中没有 access_token，请先运行 `bl auth login --console` 完成百炼控制台登录。')
+        }
+        return { token: String(token).trim(), region: String(cfg.console_region || 'cn-beijing'), site: String(cfg.console_site || 'domestic') }
+      }
+
+      async function queryQwenTokenPlan() {
+        const { token, region, site } = await readQwenConsoleToken()
+        const gw = QWEN_GATEWAYS[region + '-' + site] || QWEN_GATEWAYS['cn-beijing-domestic']
+        if (!gw) throw new Error('不支持的控制台地域/站点：' + region + '/' + site)
+        const payload = {
+          Api: QWEN_API,
+          V: '1.0',
+          Data: {
+            cornerstoneParam: {
+              protocol: 'V2',
+              console: 'ONE_CONSOLE',
+              productCode: 'p_efm',
+              switchUserType: 3,
+              consoleSite: 'BAILIAN_ALIYUN'
+            }
+          }
+        }
+        const body = 'params=' + encodeURIComponent(JSON.stringify(payload)) + '&region=' + encodeURIComponent(region)
+        const url = 'https://' + gw.host + '/cli/api.json'
+          + '?action=' + encodeURIComponent(gw.action)
+          + '&product=sfm_bailian&api=' + encodeURIComponent(QWEN_API)
+        // 与 bl CLI 一致：用 undici 的 EnvHttpProxyAgent 自动读取 HTTPS_PROXY/https_proxy
+        // 环境变量，走代理转发；未设置代理时则直连（EnvHttpProxyAgent 内部处理）。
+        // 因为子进程不保证能按模块名解析到 undici，这里预先算出 undici 的绝对入口路径并传给子进程。
+        let undiciPath = ''
+        try {
+          undiciPath = new URL(import.meta.resolve('undici')).pathname
+        } catch (e) {
+          // undici 是插件依赖，正常安装后必然存在；这里留空交由子进程报清楚错误。
+          undiciPath = ''
+        }
+        const script = [
+          'const token=process.env.BAILIAN_TOKEN||"";',
+          'const url=process.env.BAILIAN_API_URL||"";',
+          'const body=process.env.BAILIAN_BODY||"";',
+          'const undiciPath=process.env.UNDICI_PATH||"";',
+          'if(!undiciPath){process.stdout.write(JSON.stringify({error:"undici 不可用，请确认插件依赖已安装"}));process.exit(0);}',
+          'const m=require(undiciPath);',
+          'try{m.setGlobalDispatcher(new m.EnvHttpProxyAgent())}catch(e){}',
+          'const timeout=setTimeout(()=>{process.stdout.write(JSON.stringify({error:"timeout"}));process.exit(0)},20000);',
+          '(async()=>{',
+          '  try{',
+          '    const res=await m.fetch(url,{method:"POST",headers:{Authorization:"Bearer "+token,Accept:"*/*","Content-Type":"application/x-www-form-urlencoded","User-Agent":"dsh-usage-plugin"},body:body});',
+          '    clearTimeout(timeout);',
+          '    const b=await res.text();',
+          '    process.stdout.write(JSON.stringify({statusCode:res.status,contentType:String(res.headers.get("content-type")||""),body:b}));',
+          '  }catch(e){',
+          '    clearTimeout(timeout);',
+          '    process.stdout.write(JSON.stringify({error:String(e&&e.message||e)}));',
+          '  }',
+          '})();'
+        ].join('\n')
+        const r = await spawnNode(script, null, {
+          BAILIAN_TOKEN: token,
+          BAILIAN_API_URL: url,
+          BAILIAN_BODY: body,
+          UNDICI_PATH: undiciPath
+        })
+        if (!r.ok) throw new Error(r.error || '请求失败')
+        let parsed
+        try { parsed = JSON.parse(r.out) } catch (e) { throw new Error('无法解析百炼网关输出') }
+        if (parsed.error) throw new Error(parsed.error)
+        if (parsed.statusCode !== 200) {
+          const hint = parsed.statusCode === 401 || parsed.statusCode === 403 ? ' 登录可能已过期，请重新运行 `bl auth login --console`。' : ''
+          throw new Error('接口返回 HTTP ' + parsed.statusCode + '：' + String(parsed.body || '').slice(0, 300) + hint)
+        }
+        // 网关返回的是带外层包装的 JSON（data.DataV2.data.data 才是配额字段），
+        // 这里解包后把扁平化的 JSON 文本交给 parseBalanceResponse。
+        let wrapper
+        try { wrapper = JSON.parse(parsed.body) } catch (e) { throw new Error('无法解析百炼网关响应') }
+        let inner = wrapper && wrapper.data
+        if (inner && inner.DataV2) {
+          const d2 = inner.DataV2.data
+          inner = (d2 && d2.data) != null ? d2.data : (d2 != null ? d2 : inner.DataV2)
+        } else if (inner) {
+          inner = inner.data || inner
+        }
+        if (!inner || typeof inner !== 'object') throw new Error('百炼网关响应格式不符合预期')
+        return JSON.stringify(inner)
+      }
 
       async function queryBalance(providerId) {
         const provider = getBalanceProvider(providerId)
@@ -805,6 +929,23 @@ export default {
         if (provider.queryMode === 'unsupported') {
           return balanceFailure(provider, 'AMD GPU Cloud 当前未公开可由推理 API Key 调用的余额查询端点；请在 AMD Developer Cloud 控制台查看 credits。', { unsupported: true, errorCode: 'unsupported' })
         }
+        if (provider.queryMode === 'console-token') {
+          try {
+            const bodyText = await queryQwenTokenPlan()
+            const normalized = parseBalanceResponse(provider.id, bodyText)
+            if (!normalized.ok) {
+              normalized.provider = provider.id
+              normalized.providerName = provider.name
+              normalized.credentialHelpUrl = provider.credentialHelpUrl || ''
+            } else {
+              normalized.credentialName = '百炼控制台 token'
+              normalized.credentialSource = readBailianConfigPath()
+            }
+            return normalized
+          } catch (e) {
+            return balanceFailure(provider, msg(e), { errorCode: 'console-token-error' })
+          }
+        }
         const credentials = ctx.get('credentials')
         if (!credentials) return balanceFailure(provider, '凭据服务不可用', { errorCode: 'credentials-unavailable' })
         const modelProfile = await configuredModelProvider(provider)
@@ -825,7 +966,7 @@ export default {
             ? '尚未保存 DigitalOcean 账户 Personal Access Token。请在此页面输入 dop_v1_ Token，保存后查询。'
             : provider.id === 'siliconflow'
               ? '模型提供商 ' + modelProfile.route + ' 引用了 ' + modelProfile.apiKeyEnv + '，但该凭据未配置。请在“设置 → 模型”中重新填写 API Key 并保存。'
-              : '未找到 ' + provider.credentialHint + '，请配置后重试'
+              : missingCredentialError(provider).error
           return balanceFailure(provider, message, { errorCode: 'missing-credential', modelProviderRoute: modelProfile ? modelProfile.route : '' })
         }
         const endpoint = resolveBalanceEndpoint(provider.id, modelProfile && modelProfile.baseURL)

package/package.json

@@ -1,77 +1,80 @@
-{
-  "name": "@feiyang666/dsh-usage-plugin",
-  "version": "1.12.2",
-  "description": "DeepSeek Harness usage & cost tracker plugin: per-call token/cache-hit stats, peak/off-peak billing, DeepSeek balance query, CSV/JSON/PNG export with custom destination, and persistent local storage. Ships a host half plus a web client half in one npm package; installs into a DSH profile as a dsh.bundle with one command (dsh plugin --profile web add @feiyang666/dsh-usage-plugin).",
-  "keywords": [
-    "deepseek",
-    "harness",
-    "dsh",
-    "plugin",
-    "usage",
-    "cost",
-    "tokens",
-    "cache",
-    "balance"
-  ],
-  "license": "MIT",
-  "type": "module",
-  "main": "lib/index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/feiyang-dev/dsh-usage-plugin.git"
-  },
-  "contributors": [
-    {
-      "name": "Martin-soaring-dev",
-      "url": "https://github.com/Martin-soaring-dev"
-    },
-    {
-      "name": "liu3734",
-      "url": "https://github.com/liu3734"
-    },
-    {
-      "name": "mumuer1024",
-      "url": "https://github.com/mumuer1024"
-    }
-  ],
-  "homepage": "https://github.com/feiyang-dev/dsh-usage-plugin#readme",
-  "bugs": {
-    "url": "https://github.com/feiyang-dev/dsh-usage-plugin/issues"
-  },
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-conversation"
-      ]
-    }
-  },
-  "files": [
-    "lib",
-    "scripts",
-    "cordis.patch.yml",
-    "README.md",
-    "README.zh.md",
-    "CHANGELOG.md"
-  ],
-  "scripts": {
-    "wire": "node scripts/wire.js",
-    "check": "node scripts/check-package.js",
-    "prepublishOnly": "node scripts/check-package.js",
-    "pack": "npm pack"
-  },
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1"
-  }
-}
+{
+  "name": "@feiyang666/dsh-usage-plugin",
+  "version": "1.13.0",
+  "description": "DeepSeek Harness usage & cost tracker plugin: per-call token/cache-hit stats, peak/off-peak billing, DeepSeek balance query, CSV/JSON/PNG export with custom destination, and persistent local storage. Ships a host half plus a web client half in one npm package; installs into a DSH profile as a dsh.bundle with one command (dsh plugin --profile web add @feiyang666/dsh-usage-plugin).",
+  "keywords": [
+    "deepseek",
+    "harness",
+    "dsh",
+    "plugin",
+    "usage",
+    "cost",
+    "tokens",
+    "cache",
+    "balance"
+  ],
+  "license": "MIT",
+  "type": "module",
+  "main": "lib/index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/feiyang-dev/dsh-usage-plugin.git"
+  },
+  "contributors": [
+    {
+      "name": "Martin-soaring-dev",
+      "url": "https://github.com/Martin-soaring-dev"
+    },
+    {
+      "name": "liu3734",
+      "url": "https://github.com/liu3734"
+    },
+    {
+      "name": "mumuer1024",
+      "url": "https://github.com/mumuer1024"
+    }
+  ],
+  "homepage": "https://github.com/feiyang-dev/dsh-usage-plugin#readme",
+  "bugs": {
+    "url": "https://github.com/feiyang-dev/dsh-usage-plugin/issues"
+  },
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=18"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-conversation"
+      ]
+    }
+  },
+  "files": [
+    "lib",
+    "scripts",
+    "cordis.patch.yml",
+    "README.md",
+    "README.zh.md",
+    "CHANGELOG.md"
+  ],
+  "scripts": {
+    "wire": "node scripts/wire.js",
+    "check": "node scripts/check-package.js",
+    "prepublishOnly": "node scripts/check-package.js",
+    "pack": "npm pack"
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1"
+  },
+  "dependencies": {
+    "undici": "^7.0.0"
+  }
+}