@angelyeye/dsh-cost-tracker 1.8.14 → 1.8.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +74 -0
- package/README.en.md +11 -0
- package/README.md +11 -0
- package/client.js +101 -13
- package/index.js +137 -27
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,80 @@
|
|
|
2
2
|
|
|
3
3
|
本文件用中文记录 dsh-cost-tracker 的版本变更。
|
|
4
4
|
|
|
5
|
+
## v1.8.15(2026-09-26)
|
|
6
|
+
|
|
7
|
+
**修复:火山方舟配额面板「没有配置入口」+「拿推理 Key 当 AK」+ 两个失败路径缺陷**
|
|
8
|
+
|
|
9
|
+
真机现场:用户装了 v1.8.14 后,设置页出现「订阅套餐用量 · 火山方舟 Coding Plan」面板,
|
|
10
|
+
但显示 `配额查询不可用:火山方舟凭据无效或无权限访问 GetPersonalPlan(HTTP 401)`,
|
|
11
|
+
且面板上**没有任何可填写凭据的地方** —— 只有一句「需要 AK/SK」,无从下手。
|
|
12
|
+
|
|
13
|
+
### 一、面板自带凭据输入框(用户直接提出的问题)
|
|
14
|
+
|
|
15
|
+
- 面板内新增一行输入:`AccessKeyID`(明文回显,控制台里本就可见)+ `SecretAccessKey`
|
|
16
|
+
(`type=password`,**从不回显**;已保存过时 placeholder 变为「已保存,留空则不改」)。
|
|
17
|
+
- 三个动作:
|
|
18
|
+
- **查询** —— 用输入框里的值直接查一次,**不落盘**,便于先验证凭据对不对;
|
|
19
|
+
- **保存** —— 写入 `~/.dsh/storages/cost-tracker-config.json`,重启不丢;
|
|
20
|
+
- **清除凭据** —— 显式清空(仅在有凭据时出现)。
|
|
21
|
+
- 工具栏新增**「火山方舟配额」按钮**作为入口。此前面板只在「存在火山订阅调用」时渲染,
|
|
22
|
+
新用户既看不到面板、也没有入口 —— 等于功能不存在。
|
|
23
|
+
- 面板标题旁新增来源徽标:`已保存凭据` / `临时凭据` / `环境变量`,一眼看出当前用的是哪套。
|
|
24
|
+
|
|
25
|
+
### 二、修复:推理 API Key 被当成 AccessKeyID(401 的真正根因)
|
|
26
|
+
|
|
27
|
+
配了 baseURL 指向 `ark.cn-beijing.volces.com/api/coding/v3` 的 provider 时,其 `apiKeyEnv`
|
|
28
|
+
(如 `BYTEBLUS_CODING_PLAN_CN_API_KEY`)是**推理用的 API Key**,而配额查询要的是 IAM 的
|
|
29
|
+
`AccessKeyID + SecretAccessKey` —— 两套完全不同的凭据。
|
|
30
|
+
|
|
31
|
+
早先 `volcengineEnvCandidates()` 把这个 apiKeyEnv 也塞进 AK 候选,于是出现跨来源拼凑:
|
|
32
|
+
|
|
33
|
+
```
|
|
34
|
+
AK = BYTEBLUS_CODING_PLAN_CN_API_KEY(推理 Key,UUID 形态)
|
|
35
|
+
SK = VOLC_SECRETKEY(凭据库里的真 SK)
|
|
36
|
+
```
|
|
37
|
+
|
|
38
|
+
用这对假凭据去签名,服务端必然 401;而 401 在本插件里是「软失败」,只报「凭据无效或
|
|
39
|
+
无权限」,**根因完全查不出来**(真机上就表现为那一行误导性报错)。
|
|
40
|
+
|
|
41
|
+
现在:
|
|
42
|
+
- AK 与 SK 必须**同源配对** —— 先按候选名取到 AK,再用**同名推导出的** SECRET 变体取 SK,
|
|
43
|
+
绝不跨来源拼接;
|
|
44
|
+
- 用命名识别推理 Key(含 `API_KEY`/`APIKEY`/`TOKEN` 且不含 `ACCESSKEY`/`SECRETKEY`/
|
|
45
|
+
`SECRET`),把这类候选**排除**在 AK 之外,并在提示里点名:
|
|
46
|
+
「你配置的 X 是推理用的 ARK API Key,不是配额凭据,插件不会拿它去签名」;
|
|
47
|
+
- 缺凭据时明确区分「都缺 / 缺 AK / 缺 SK」。
|
|
48
|
+
|
|
49
|
+
### 三、修复:两个失败路径缺陷
|
|
50
|
+
|
|
51
|
+
- **`ReferenceError`(TDZ)把软失败变成 500**:`keyEnv` 原先声明在 `try` 内却在 `catch`
|
|
52
|
+
里引用。任何一次查询失败(401 / 网络异常 / 结构变化)都会在错误处理里再抛一次
|
|
53
|
+
`keyEnv is not defined`,被路由层兜成 **HTTP 500** —— 恰好把所有失败路径都打穿了。
|
|
54
|
+
现声明在 `try` 之外。(由新增的失败路径断言抓到。)
|
|
55
|
+
- **`keyEnv` 永远显示「未知」**:`resolveApiKey()` 只返回 `{ value, source }`,`env` 是
|
|
56
|
+
`resolveAnyEnv()` 才加的字段;误取 `rid.env` 得到 `undefined`,于是面板从不显示
|
|
57
|
+
「该去改哪个环境变量」。现直接用循环变量名。
|
|
58
|
+
|
|
59
|
+
### 四、防呆:空串不等于清空
|
|
60
|
+
|
|
61
|
+
因为 SK 从不回显,跨浏览器 / 重开面板时 SK 输入框**必然是空的**。若把空串当作「清空」,
|
|
62
|
+
用户只改一下 AK 就会把已存好的 SK 一起写空 —— 静默丢凭据。现在:
|
|
63
|
+
|
|
64
|
+
| 请求 | 行为 |
|
|
65
|
+
| --- | --- |
|
|
66
|
+
| `{volcengineAccessKeyId:'新AK'}` | 只改 AK,**SK 原样保留** |
|
|
67
|
+
| `{volcengineSecretAccessKey:'新SK'}` | 只改 SK |
|
|
68
|
+
| `{volcengineAccessKeyId:'', volcengineSecretAccessKey:''}` | **不动**(空串不是指令) |
|
|
69
|
+
| `{clear:true}` | 显式清空两者 |
|
|
70
|
+
|
|
71
|
+
响应回显 `volcengineAccessKeyId`(非敏感)与 `volcengineHasKeys`,**永不回显 SK**。
|
|
72
|
+
|
|
73
|
+
### 五、测试
|
|
74
|
+
|
|
75
|
+
`test/volcengine-host.test.js` 从 36 条扩到 **48 条**,新增四组:
|
|
76
|
+
推理 Key 不得被当作 AK(真实故障回归,复刻用户的 provider 配置)/ 空串不覆盖已存 SK /
|
|
77
|
+
只改 AK 后仍可用 / `clear` 才清空。全量测试通过。
|
|
78
|
+
|
|
5
79
|
## v1.8.14(2026-09-26)
|
|
6
80
|
|
|
7
81
|
**新增:火山方舟 Coding Plan 订阅支持(配额监控 + 等效费用);并修掉两个此前静默存在的缺陷**
|
package/README.en.md
CHANGED
|
@@ -261,6 +261,17 @@ Example: `curl -X POST http://127.0.0.1:3080/api/cost-tracker/summary -d '{}'`
|
|
|
261
261
|
|
|
262
262
|
> Highlights only — the full version-by-version history lives in [`CHANGELOG.md`](./CHANGELOG.md) (Chinese).
|
|
263
263
|
|
|
264
|
+
### v1.8.15 (2026-09-26)
|
|
265
|
+
|
|
266
|
+
**Fixed: the Volcengine quota panel had no place to enter credentials, and an inference API key was being used as the AccessKeyID**
|
|
267
|
+
|
|
268
|
+
- **The panel now has its own credential inputs (the main fix).** Previously credentials could only be set through the plugin-config card or by hand-writing environment variables — the panel itself offered **nowhere to type**, so users saw only "credentials invalid" with no way forward. It now provides `AccessKeyID` / `SecretAccessKey` fields plus three actions: **Query** (verifies without persisting), **Save** (persists to disk) and **Clear**. The AccessKeyID is echoed back for confirmation; the SecretAccessKey is never echoed (when one is stored, the field hints "leave blank to keep"). A **"Volcengine quota"** button was added to the toolbar as an entry point — otherwise the panel stays hidden by default and users can never reach it.
|
|
269
|
+
- **Fixed: an inference API key was being used as the AccessKeyID — the real cause of the 401s.** When a provider's baseURL points at the Ark coding endpoint, its `apiKeyEnv` is an **inference** API key, while quota queries need an IAM `AccessKeyID + SecretAccessKey`. The old discovery chain fed that value into the AK candidates, producing a cross-source Frankenstein pair (inference key as AK + an unrelated SK from the credential file). Signing with it always returns 401, and a 401 is a *soft failure* here, so the plugin only reported "credentials invalid or no permission" — the root cause was undiagnosable. Now AK and SK must come from the **same source**; inference keys are recognised by name (`API_KEY`/`TOKEN` without `ACCESSKEY`/`SECRETKEY`) and excluded; and the message explicitly names the offending variable as an inference key.
|
|
270
|
+
- **Fixed: a `ReferenceError` (TDZ) turned soft failures into HTTP 500.** `keyEnv` was declared inside `try` but referenced in `catch`, so *every* failure path (401 / network error / changed shape) threw again during error handling and surfaced as a 500. It is now declared outside.
|
|
271
|
+
- **Fixed: `keyEnv` always showed "unknown"** — `resolveApiKey()` returns `{value, source}` only, and `env` is added by `resolveAnyEnv()`, so the panel never told you which environment variable to fix.
|
|
272
|
+
- **Safety: an empty string no longer clears a stored secret.** Because the secret is never echoed, its field is necessarily blank whenever the panel is reopened; treating that as "clear" would silently wipe a stored secret the moment someone edited only the AK. Only a **non-empty** secret overwrites, and clearing requires an explicit `clear:true`.
|
|
273
|
+
- Tests: `test/volcengine-host.test.js` grew to **48 assertions**, adding four groups: inference keys must not be treated as AKs (a regression test replicating the real provider config), an empty string must not overwrite a stored secret, editing only the AK still works, and only `clear` clears.
|
|
274
|
+
|
|
264
275
|
### v1.8.14 (2026-09-26)
|
|
265
276
|
|
|
266
277
|
**New: Volcengine Ark Coding Plan support (quota monitoring + equivalent cost)**
|
package/README.md
CHANGED
|
@@ -262,6 +262,17 @@ POST /api/cost-tracker/export 导出 CSV
|
|
|
262
262
|
|
|
263
263
|
> 这里只列重要版本;逐版完整记录见 [`CHANGELOG.md`](./CHANGELOG.md)。
|
|
264
264
|
|
|
265
|
+
### v1.8.15(2026-09-26)
|
|
266
|
+
|
|
267
|
+
**修复:火山方舟配额面板「没有配置入口」与「拿推理 Key 当 AK」两个缺陷**
|
|
268
|
+
|
|
269
|
+
- **面板自带凭据输入框(主要修复)**:此前只能去「设置 → 插件 → 插件配置」卡片或手写环境变量,面板上**根本没有填写的地方** —— 用户看到的只有一句「凭据无效」,无从下手。现在面板内直接提供 `AccessKeyID` / `SecretAccessKey` 输入框与「查询」(先验证、不落盘)/「保存」(落盘持久化)/「清除凭据」三个动作;AK 明文回显便于确认,SK 从不回显(已保存时输入框提示「留空则不改」)。工具栏另加「火山方舟配额」按钮作为入口 —— 否则面板默认不显示,用户永远找不到。
|
|
270
|
+
- **修复:把「推理 API Key」当成 AccessKeyID 去签名(静默 401 的真正原因)**。配了 baseURL 指向方舟 coding 端点的 provider 时,其 `apiKeyEnv` 是**推理用** API Key,而配额查询要的是 IAM 的 AK/SK。早先的候选链把它也塞进 AK 候选,于是出现「推理 Key 当 AK + 凭据库里的 SK」这种**跨来源拼凑**的假凭据:签名必然 401,报错却只说「凭据无效或无权限」,根因完全查不出来。现在 AK 与 SK 必须**同源配对**,且按命名识别推理 Key(含 `API_KEY`/`TOKEN` 且不含 `ACCESSKEY`/`SECRETKEY`)并明确提示「这条是推理 Key,不是配额凭据」。
|
|
271
|
+
- **修复:失败路径抛 `ReferenceError`(TDZ)导致 500**。`keyEnv` 原先声明在 `try` 内却在 `catch` 里引用,任何一次查询失败(401 / 网络异常 / 结构变化)都会把「软失败」升级成 HTTP 500。现声明在 `try` 之外。
|
|
272
|
+
- **修复:`keyEnv` 永远显示「未知」**。`resolveApiKey()` 只返回 `{value, source}`,误取了 `rid.env`(那是 `resolveAnyEnv` 才加的字段),于是面板从不显示该去改哪个环境变量。现正确回传真实变量名。
|
|
273
|
+
- **防呆:空串不等于清空**。因为从不回显 SK,重开面板时 SK 输入框必然是空的;若把空串当作「清空」,用户只改一下 AK 就会把已存好的 SK 一起抹掉(静默丢凭据)。现在只有 **非空** SK 才覆盖,清空必须显式传 `clear:true`。
|
|
274
|
+
- 测试:`test/volcengine-host.test.js` 扩到 48 条断言,新增「推理 Key 不得被当作 AK(真实故障回归)」「空串不覆盖已存 SecretAccessKey」「只改 AK 后仍可用」「clear 才清空」四组。
|
|
275
|
+
|
|
265
276
|
### v1.8.14(2026-09-26)
|
|
266
277
|
|
|
267
278
|
**新增:火山方舟 Coding Plan 订阅支持(配额监控 + 等效费用)**
|
package/client.js
CHANGED
|
@@ -763,7 +763,7 @@ window.__ModuleLoader__.load({
|
|
|
763
763
|
const mergeDash = VIEW.mergeDash;
|
|
764
764
|
const mergeUsageHeat = VIEW.mergeUsageHeat || vMergeUsageHeat;
|
|
765
765
|
|
|
766
|
-
function filterRow(days, setDays, onExport, onRefresh, msg, busy, peakWindows, viewCtl) {
|
|
766
|
+
function filterRow(days, setDays, onExport, onRefresh, msg, busy, peakWindows, viewCtl, onOpenVolc) {
|
|
767
767
|
const views = viewCtl && viewCtl.available ? BOARD_VIEWS : [BOARD_VIEWS[0]];
|
|
768
768
|
return e("div", { className: "cost-row" },
|
|
769
769
|
e("select", { className: "cost-select", value: String(days), onChange: ev => setDays(parseInt(ev.target.value, 10)) },
|
|
@@ -781,6 +781,10 @@ window.__ModuleLoader__.load({
|
|
|
781
781
|
? e("select", { className: "cost-select", value: viewCtl.dimension, onChange: ev => viewCtl.setDimension(ev.target.value), title: "维度:查看合计,或按机器 / Agent / 模型 / 项目拆分" },
|
|
782
782
|
BOARD_DIMS.map(d => e("option", { key: d.id, value: d.id }, d.label)))
|
|
783
783
|
: null,
|
|
784
|
+
// 火山方舟配额面板的入口:没配过凭据时面板默认不显示,没这个按钮用户就找不到入口
|
|
785
|
+
onOpenVolc
|
|
786
|
+
? e("button", { className: "cost-btn", title: "配置火山方舟 AccessKeyID / SecretAccessKey 并查看 Coding Plan 配额", onClick: onOpenVolc }, "火山方舟配额")
|
|
787
|
+
: null,
|
|
784
788
|
e("button", { className: "cost-btn", onClick: onExport, disabled: busy }, "导出 CSV"),
|
|
785
789
|
e("button", { className: "cost-btn", onClick: onRefresh, disabled: busy }, busy ? "刷新中…" : "刷新"),
|
|
786
790
|
msg ? e("span", { className: "cost-hint" }, msg) : null,
|
|
@@ -937,7 +941,33 @@ window.__ModuleLoader__.load({
|
|
|
937
941
|
resetsAt ? e("div", { className: "cost-hint", style: { marginTop: "4px" } }, countdown(resetsAt, now)) : null);
|
|
938
942
|
}
|
|
939
943
|
|
|
940
|
-
|
|
944
|
+
// 火山方舟凭据输入区(面板自带,不必去翻插件配置卡片或手写环境变量)。
|
|
945
|
+
// AK 明文回显(控制台里本就可见);SK 从不回显,已存过时只提示「已保存」。
|
|
946
|
+
function volcCredForm(cred, hasSecret, onQuery, onSave, onClear) {
|
|
947
|
+
const busy = cred.busy;
|
|
948
|
+
return e("div", { style: { marginTop: "10px" } },
|
|
949
|
+
e("div", { className: "cost-row", style: { gap: "6px", flexWrap: "wrap" } },
|
|
950
|
+
e("input", {
|
|
951
|
+
className: "cost-input", placeholder: "火山引擎 AccessKeyID",
|
|
952
|
+
value: cred.id, spellCheck: false, autoComplete: "off",
|
|
953
|
+
onChange: ev => cred.setId(ev.target.value),
|
|
954
|
+
}),
|
|
955
|
+
e("input", {
|
|
956
|
+
className: "cost-input", type: "password", spellCheck: false, autoComplete: "new-password",
|
|
957
|
+
placeholder: hasSecret ? "SecretAccessKey(已保存,留空则不改)" : "火山引擎 SecretAccessKey",
|
|
958
|
+
value: cred.secret,
|
|
959
|
+
onChange: ev => cred.setSecret(ev.target.value),
|
|
960
|
+
}),
|
|
961
|
+
e("button", { className: "cost-btn", disabled: busy, onClick: onQuery }, busy ? "查询中…" : "查询"),
|
|
962
|
+
e("button", { className: "cost-btn", disabled: busy, onClick: onSave }, "保存"),
|
|
963
|
+
hasSecret || cred.id ? e("button", { className: "cost-btn", disabled: busy, onClick: onClear }, "清除凭据") : null),
|
|
964
|
+
e("div", { className: "cost-hint", style: { marginTop: "4px" } },
|
|
965
|
+
"配额查询走方舟**管控面** OpenAPI,需要 IAM 的 AccessKeyID / SecretAccessKey"
|
|
966
|
+
+ "(子用户授予 ArkReadOnlyAccess + BillingCenterReadOnlyAccess);"
|
|
967
|
+
+ "它与推理用的 ARK API Key 是**两套不同凭据**。保存后写入本机插件配置,重启不丢。"));
|
|
968
|
+
}
|
|
969
|
+
|
|
970
|
+
function volcenginePanel(volc, dash, now, onForce, credForm) {
|
|
941
971
|
const ok = volc && volc.ok;
|
|
942
972
|
let body;
|
|
943
973
|
if (!volc) {
|
|
@@ -945,11 +975,10 @@ window.__ModuleLoader__.load({
|
|
|
945
975
|
} else if (!volc.ok) {
|
|
946
976
|
body = e("div", { style: { marginTop: "8px" } },
|
|
947
977
|
e("div", { className: "cost-err" }, "配额查询不可用:" + (volc.error || "未知错误")),
|
|
948
|
-
|
|
949
|
-
"
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
+ "(来源:" + (volc.keySource || "无") + ")。"));
|
|
978
|
+
volc.keyEnv && volc.keySource !== "none"
|
|
979
|
+
? e("div", { className: "cost-hint", style: { marginTop: "4px" } },
|
|
980
|
+
"本次尝试的凭据来源:" + volc.keyEnv + "(" + volc.keySource + ")。")
|
|
981
|
+
: null);
|
|
953
982
|
} else {
|
|
954
983
|
const list = volc.windowList || [];
|
|
955
984
|
if (list.length === 0) {
|
|
@@ -965,9 +994,11 @@ window.__ModuleLoader__.load({
|
|
|
965
994
|
e("div", { className: "cost-row" },
|
|
966
995
|
e("span", { className: "cost-panel-title" }, "订阅套餐用量 · 火山方舟 Coding Plan"),
|
|
967
996
|
ok && volc.action ? e("span", { className: "cost-badge" }, volc.action) : null,
|
|
997
|
+
ok ? e("span", { className: "cost-badge" }, volc.keySource === "config" ? "已保存凭据" : volc.keySource === "manual" ? "临时凭据" : "环境变量") : null,
|
|
968
998
|
e("span", { className: "cost-spacer" }),
|
|
969
999
|
e("button", { className: "cost-btn", onClick: onForce }, "刷新配额")),
|
|
970
1000
|
body,
|
|
1001
|
+
credForm,
|
|
971
1002
|
e("div", { className: "cost-hint", style: { marginTop: "10px" } },
|
|
972
1003
|
"订阅用量统计:" + stats + "(订阅已覆盖,等效费用仅供参考)"));
|
|
973
1004
|
}
|
|
@@ -1729,6 +1760,11 @@ window.__ModuleLoader__.load({
|
|
|
1729
1760
|
const [dashErr, setDashErr] = useState("");
|
|
1730
1761
|
const [kimi, setKimi] = useState(null);
|
|
1731
1762
|
const [volc, setVolc] = useState(null);
|
|
1763
|
+
// 火山方舟凭据输入(面板自带):AK 回显、SK 不回显、busy 只管自己这块
|
|
1764
|
+
const [volcId, setVolcId] = useState("");
|
|
1765
|
+
const [volcSecret, setVolcSecret] = useState("");
|
|
1766
|
+
const [volcHasSecret, setVolcHasSecret] = useState(false);
|
|
1767
|
+
const [volcBusy, setVolcBusy] = useState(false);
|
|
1732
1768
|
const [balance, setBalance] = useState(null);
|
|
1733
1769
|
const [tab, setTab] = useState("period");
|
|
1734
1770
|
const [scheme, setSchemeState] = useState(() => {
|
|
@@ -1767,6 +1803,8 @@ window.__ModuleLoader__.load({
|
|
|
1767
1803
|
try { localStorage.setItem("dsh-cost-tracker-dim", d) } catch (e) {}
|
|
1768
1804
|
}
|
|
1769
1805
|
const viewInitRef = useRef(false);
|
|
1806
|
+
// 凭据一次回填即可,之后以输入框为准(不然用户刚改完就被 sync 轮询覆盖回去)
|
|
1807
|
+
const volcCredInitRef = useRef(false);
|
|
1770
1808
|
|
|
1771
1809
|
function loadDash(d) {
|
|
1772
1810
|
apiCall("dashboard", { days: d }).then(v => {
|
|
@@ -1778,6 +1816,12 @@ window.__ModuleLoader__.load({
|
|
|
1778
1816
|
apiCall("sync", {}).then(v => {
|
|
1779
1817
|
if (!v) return;
|
|
1780
1818
|
setSync(v);
|
|
1819
|
+
// 面板凭据回显:AK 明文(与云端看板同口径),SK 只回「是否已保存」
|
|
1820
|
+
if (typeof v.volcengineAccessKeyId === "string" && v.volcengineAccessKeyId) {
|
|
1821
|
+
volcCredInitRef.current = true;
|
|
1822
|
+
setVolcId(prev => prev || v.volcengineAccessKeyId);
|
|
1823
|
+
}
|
|
1824
|
+
setVolcHasSecret(!!v.volcengineHasSecret);
|
|
1781
1825
|
// 首次进入:以配置里的视图为准(三态开关的权威值在配置,便于多机一致)
|
|
1782
1826
|
if (!viewInitRef.current && (v.view === "local" || v.view === "local+cloud" || v.view === "cloud")) {
|
|
1783
1827
|
viewInitRef.current = true;
|
|
@@ -1825,6 +1869,38 @@ window.__ModuleLoader__.load({
|
|
|
1825
1869
|
function loadVolc(force) {
|
|
1826
1870
|
apiCall("volcengine-usage", { force: !!force }).then(v => setVolc(v)).catch(() => {});
|
|
1827
1871
|
}
|
|
1872
|
+
// 面板自带的凭据输入:AK 明文回显、SK 从不回显(只提示已保存)
|
|
1873
|
+
function volcSaveCred() {
|
|
1874
|
+
const patch = {};
|
|
1875
|
+
if (volcId.trim()) patch.volcengineAccessKeyId = volcId.trim();
|
|
1876
|
+
if (volcSecret.trim()) patch.volcengineSecretAccessKey = volcSecret.trim();
|
|
1877
|
+
if (!Object.keys(patch).length) { setMsg("请先填写 AccessKeyID 与 SecretAccessKey"); return; }
|
|
1878
|
+
apiCall("volcengine-config", patch).then(v => {
|
|
1879
|
+
setVolcHasSecret(!!(v && v.volcengineHasSecret) || !!volcSecret.trim());
|
|
1880
|
+
setVolcSecret("");
|
|
1881
|
+
setMsg(v && v.volcengineHasKeys ? "火山方舟凭据已保存" : "已保存(仍缺一半,请补全)");
|
|
1882
|
+
loadVolc(true);
|
|
1883
|
+
}).catch(err => setMsg("保存失败:" + String(err && err.message ? err.message : err)));
|
|
1884
|
+
}
|
|
1885
|
+
function volcClearCred() {
|
|
1886
|
+
apiCall("volcengine-config", { clear: true }).then(() => {
|
|
1887
|
+
setVolcId(""); setVolcSecret(""); setVolcHasSecret(false);
|
|
1888
|
+
setMsg("火山方舟凭据已清除");
|
|
1889
|
+
loadVolc(true);
|
|
1890
|
+
}).catch(() => {});
|
|
1891
|
+
}
|
|
1892
|
+
// 用输入框里的凭据直接查一次(不落盘,便于先验证再保存)
|
|
1893
|
+
function volcQueryWithCred() {
|
|
1894
|
+
const payload = { force: true };
|
|
1895
|
+
if (volcId.trim()) payload.accessKeyId = volcId.trim();
|
|
1896
|
+
if (volcSecret.trim()) payload.secretAccessKey = volcSecret.trim();
|
|
1897
|
+
setVolcBusy(true);
|
|
1898
|
+
apiCall("volcengine-usage", payload).then(v => {
|
|
1899
|
+
setVolc(v); setVolcBusy(false);
|
|
1900
|
+
if (v && v.ok) setVolcHasSecret(!!(volcHasSecret || volcSecret.trim()));
|
|
1901
|
+
else setMsg("查询失败:" + String((v && v.error) || "未知错误").slice(0, 200));
|
|
1902
|
+
}).catch(err => { setVolcBusy(false); setMsg("查询失败:" + String(err && err.message ? err.message : err)); });
|
|
1903
|
+
}
|
|
1828
1904
|
function loadUsage() {
|
|
1829
1905
|
apiCall("usage", {}).then(v => {
|
|
1830
1906
|
if (v && v.ok) { setUsage(v); setUsageErr(""); }
|
|
@@ -1895,14 +1971,23 @@ window.__ModuleLoader__.load({
|
|
|
1895
1971
|
pending: sync ? sync.pending : 0,
|
|
1896
1972
|
};
|
|
1897
1973
|
|
|
1898
|
-
//
|
|
1899
|
-
//
|
|
1900
|
-
//
|
|
1901
|
-
|
|
1974
|
+
// 火山方舟面板的显示条件(按「用不用得上」):
|
|
1975
|
+
// · 已有窗口数据(volc 非空)—— 查过就会显示,含失败(失败也要能就地改凭据);
|
|
1976
|
+
// · 宿主判定存在火山订阅调用(summary.volcengineActive);
|
|
1977
|
+
// · 已经保存过凭据 —— 用户显然在用,必须一直可见,否则保存完就找不到入口了;
|
|
1978
|
+
// · 用户主动打开过(本地标记)—— 首次使用时的入口,避免「必须先调用过才看得到配置」。
|
|
1979
|
+
let volcOpened = false;
|
|
1980
|
+
try { volcOpened = localStorage.getItem("dsh-cost-tracker-volc-open") === "1" } catch (e) {}
|
|
1981
|
+
const showVolc = !!(volc || volcOpened || volcHasSecret || volcId
|
|
1982
|
+
|| (viewDash && viewDash.volcengineActive === true));
|
|
1983
|
+
function openVolc() {
|
|
1984
|
+
try { localStorage.setItem("dsh-cost-tracker-volc-open", "1") } catch (e) {}
|
|
1985
|
+
loadVolc(true);
|
|
1986
|
+
}
|
|
1902
1987
|
|
|
1903
1988
|
return e("div", { className: "cost-wrap" },
|
|
1904
1989
|
e("div", { className: "cost-h1" }, pluginIcon(18), "花费统计"),
|
|
1905
|
-
filterRow(days, setDays, onExport, onRefresh, msg, busy, dash ? dash.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00(周末全天闲时)", viewCtl),
|
|
1990
|
+
filterRow(days, setDays, onExport, onRefresh, msg, busy, dash ? dash.peakWindows : "周一至周五 9:00-12:00 · 14:00-18:00(周末全天闲时)", viewCtl, openVolc),
|
|
1906
1991
|
!cloudAvailable
|
|
1907
1992
|
? e("div", { className: "cost-hint", style: { marginTop: "4px" } },
|
|
1908
1993
|
"仅显示本机数据。在多台电脑/多个 Agent 之间汇总:到「设置 → 插件 → 插件配置 → 花费统计」填写云端服务地址与令牌。")
|
|
@@ -1933,7 +2018,10 @@ window.__ModuleLoader__.load({
|
|
|
1933
2018
|
: usageErr ? e("div", { className: "cost-err" }, "加载失败:" + usageErr)
|
|
1934
2019
|
: e("div", { className: "cost-hint" }, "加载中…"))),
|
|
1935
2020
|
subPanel(kimi, viewDash, now, () => loadKimi(true)),
|
|
1936
|
-
showVolc ? volcenginePanel(volc, viewDash, now, () => loadVolc(true)
|
|
2021
|
+
showVolc ? volcenginePanel(volc, viewDash, now, () => loadVolc(true), volcCredForm({
|
|
2022
|
+
id: volcId, secret: volcSecret, busy: volcBusy,
|
|
2023
|
+
setId: setVolcId, setSecret: setVolcSecret,
|
|
2024
|
+
}, volcHasSecret, volcQueryWithCred, volcSaveCred, volcClearCred)) : null,
|
|
1937
2025
|
balancePanel(balance, manualKey, setManualKey, k => loadBalance(k)),
|
|
1938
2026
|
viewDash ? modelSections(viewDash) : null,
|
|
1939
2027
|
viewDash ? recentPanel(viewDash) : null,
|
package/index.js
CHANGED
|
@@ -24,7 +24,7 @@ import { createSyncEngine, setPluginVersion, SOURCE as SYNC_SOURCE, SYNC_VERSION
|
|
|
24
24
|
import { Schema } from './schema.js'
|
|
25
25
|
|
|
26
26
|
/** 插件版本(写入上报信封,便于云端排查版本差异) */
|
|
27
|
-
const PLUGIN_VERSION = '1.8.
|
|
27
|
+
const PLUGIN_VERSION = '1.8.15'
|
|
28
28
|
setPluginVersion(PLUGIN_VERSION)
|
|
29
29
|
|
|
30
30
|
/** 「设置 → 插件 → 插件配置」里的卡片字段(与 settings 命名空间一致) */
|
|
@@ -639,9 +639,34 @@ export default {
|
|
|
639
639
|
// 与 kimi 的差别:方舟配额走管控面 OpenAPI,需 AccessKeyID + SecretAccessKey
|
|
640
640
|
// 成对做 HMAC 签名(不是 Bearer),签名与解析在 volcengine.js 里(纯函数可单测)。
|
|
641
641
|
|
|
642
|
-
/**
|
|
642
|
+
/**
|
|
643
|
+
* 疑似「方舟推理 API Key」的环境变量名(**不能**当 AK 用)。
|
|
644
|
+
*
|
|
645
|
+
* 用户配了 baseURL 指向方舟 coding 端点的 provider 时,它的 `apiKeyEnv` 是
|
|
646
|
+
* **推理用的 API Key**(形如 UUID),而配额查询要的是 IAM 的
|
|
647
|
+
* AccessKeyID + SecretAccessKey —— 两套完全不同的凭据。早先的候选链把
|
|
648
|
+
* provider 的 apiKeyEnv 也塞进 AK 候选,于是出现「拿推理 Key 当 AK、再配上
|
|
649
|
+
* 凭据库里的 SK」这种**跨来源拼凑**的假凭据,签名必然 401,而报错只显示
|
|
650
|
+
* 「凭据无效或无权限」,查不出真正原因(真机上就是这么表现的)。
|
|
651
|
+
*
|
|
652
|
+
* 判据:环境变量名里含 API_KEY / APIKEY / TOKEN,且不含 ACCESSKEY / SECRETKEY
|
|
653
|
+
* 等「管控面密钥」特征词 —— 这正是两套凭据的命名分界。
|
|
654
|
+
*/
|
|
655
|
+
function looksLikeInferenceKeyEnv(name) {
|
|
656
|
+
const n = toStr(name).toLowerCase()
|
|
657
|
+
if (!n) return false
|
|
658
|
+
if (/accesskey|access_key|secretkey|secret_key|secret/.test(n)) return false
|
|
659
|
+
return /api_?key|_key$|token/.test(n)
|
|
660
|
+
}
|
|
661
|
+
|
|
662
|
+
/**
|
|
663
|
+
* 收集方舟相关 provider 的候选环境变量名。
|
|
664
|
+
* 返回值区分两类:`keys` 是**管控面** AK/SK 候选,`inference` 是推理 Key
|
|
665
|
+
* (只用于提示用户「这个不是配额凭据」,绝不参与签名)。
|
|
666
|
+
*/
|
|
643
667
|
function volcengineEnvCandidates() {
|
|
644
|
-
const
|
|
668
|
+
const keys = []
|
|
669
|
+
const inference = []
|
|
645
670
|
const settings = ctx.get('settings')
|
|
646
671
|
if (settings) {
|
|
647
672
|
try {
|
|
@@ -653,11 +678,15 @@ export default {
|
|
|
653
678
|
const looksArkCoding = /ark\.cn-beijing\.volces\.com\/api\/coding/i.test(base)
|
|
654
679
|
const looksVolc = /volcengine/i.test(id) || /volces\.com/i.test(base)
|
|
655
680
|
if (!looksArkCoding && !looksVolc) continue
|
|
656
|
-
|
|
681
|
+
const env = p.apiKeyEnv ? String(p.apiKeyEnv) : ''
|
|
682
|
+
if (!env) continue
|
|
683
|
+
// 推理 Key 只登记到 inference(用于给出「你配的是推理 Key」这种有价值的提示)
|
|
684
|
+
if (looksLikeInferenceKeyEnv(env)) inference.push(env)
|
|
685
|
+
else keys.push(env)
|
|
657
686
|
}
|
|
658
687
|
} catch (e) {}
|
|
659
688
|
}
|
|
660
|
-
return
|
|
689
|
+
return { keys, inference }
|
|
661
690
|
}
|
|
662
691
|
|
|
663
692
|
/** 在候选名单里逐个查凭据库 + .credentials.yaml,返回首个命中 */
|
|
@@ -699,32 +728,83 @@ export default {
|
|
|
699
728
|
|
|
700
729
|
/**
|
|
701
730
|
* 查询火山方舟 Coding Plan 配额。
|
|
702
|
-
*
|
|
731
|
+
*
|
|
732
|
+
* 凭据发现链(按优先级):
|
|
733
|
+
* 1. 面板 / 配置卡片里填的 AK + SK(两者都在才用,落盘持久化);
|
|
734
|
+
* 2. 环境变量 / 凭据库里**配成对**的 AK + SK —— 关键点:AK 与 SK 必须来自
|
|
735
|
+
* **同一个来源**(同名同源),否则就是跨来源拼凑的假凭据;
|
|
736
|
+
* 3. 都没有则软失败,并明确告知「缺哪一半」以及「你配的那条是推理 Key」。
|
|
737
|
+
*
|
|
738
|
+
* @param {{force?:boolean, accessKeyId?:string, secretAccessKey?:string}} [args]
|
|
739
|
+
* accessKeyId / secretAccessKey:面板临时提交的凭据(只在本次查询生效,
|
|
740
|
+
* 不落盘;面板另有「保存」走 volcengine-config 落盘)。
|
|
703
741
|
* 全部失败一律软失败(ok:false + 中文原因),绝不抛到路由层。
|
|
704
742
|
* **返回值只含 keySource/keyEnv,绝不回显 AK/SK 本身。**
|
|
705
743
|
*/
|
|
706
|
-
async function volcengineUsage(
|
|
744
|
+
async function volcengineUsage(args) {
|
|
745
|
+
const a = args || {}
|
|
746
|
+
const force = a.force === true
|
|
747
|
+
const manualId = typeof a.accessKeyId === 'string' ? a.accessKeyId.trim() : ''
|
|
748
|
+
const manualSecret = typeof a.secretAccessKey === 'string' ? a.secretAccessKey.trim() : ''
|
|
707
749
|
const now = Date.now()
|
|
708
|
-
|
|
709
|
-
const
|
|
710
|
-
|
|
750
|
+
// 带临时凭据的请求不读缓存:用户刚粘贴的 Key 必须立刻被验证
|
|
751
|
+
const useCache = !force && !manualId && !manualSecret
|
|
752
|
+
if (useCache && volcengineCache && now - volcengineCache.fetchedAt < 120000) return volcengineCache.data
|
|
753
|
+
|
|
754
|
+
const cand = volcengineEnvCandidates()
|
|
755
|
+
const allKeyEnvs = cand.keys.concat(VOLCENGINE_KEY_ENVS)
|
|
756
|
+
const allSecretEnvs = cand.keys.concat(VOLCENGINE_SECRET_ENVS)
|
|
757
|
+
const inferenceHint = cand.inference.length > 0 ? cand.inference[0] : ''
|
|
711
758
|
let data
|
|
759
|
+
// 声明在 try 之外:catch 里要把「用的是哪一对凭据」一并回传,
|
|
760
|
+
// 否则报错时既看不到来源、还会因 TDZ 抛 ReferenceError(把软失败变成 500)。
|
|
761
|
+
let keySource = 'none'
|
|
762
|
+
let keyEnv = 'VOLC_ACCESSKEY'
|
|
712
763
|
try {
|
|
713
764
|
let id = String(volcengineConfig.volcengineAccessKeyId || '')
|
|
714
765
|
let secret = String(volcengineConfig.volcengineSecretAccessKey || '')
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
if (
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
766
|
+
keySource = id && secret ? 'config' : 'none'
|
|
767
|
+
// 面板临时凭据优先于一切(用户显式操作,意图最明确)
|
|
768
|
+
if (manualId && manualSecret) {
|
|
769
|
+
id = manualId; secret = manualSecret
|
|
770
|
+
keySource = 'manual'; keyEnv = '(面板输入)'
|
|
771
|
+
} else if (!id || !secret) {
|
|
772
|
+
// 逐候选查找,但要求 AK 与 SK **同源**:先找到 AK 的候选名,再用同名的
|
|
773
|
+
// SECRET 变体去取 SK。这样绝不会把 A 来源的 AK 与 B 来源的 SK 拼在一起。
|
|
774
|
+
for (const envName of allKeyEnvs) {
|
|
775
|
+
if (!envName) continue
|
|
776
|
+
const rid = await resolveApiKey(envName)
|
|
777
|
+
if (!rid.value) continue
|
|
778
|
+
// 同一个 env 名对应的 secret 候选:按名替换关键词,逐个试。
|
|
779
|
+
const secretNames = []
|
|
780
|
+
const swapped = envName
|
|
781
|
+
.replace(/ACCESS_?KEY_?ID/i, 'SECRET_ACCESS_KEY')
|
|
782
|
+
.replace(/ACCESS_?KEY/i, 'SECRETKEY')
|
|
783
|
+
if (swapped !== envName) secretNames.push(swapped)
|
|
784
|
+
for (const s of VOLCENGINE_SECRET_ENVS) if (secretNames.indexOf(s) < 0) secretNames.push(s)
|
|
785
|
+
const rsec = await resolveAnyEnv(secretNames)
|
|
786
|
+
if (!rsec.value) continue
|
|
787
|
+
id = rid.value; secret = rsec.value
|
|
788
|
+
// 注意:resolveApiKey 只返回 { value, source },**没有 env 字段**
|
|
789
|
+
// (env 是 resolveAnyEnv 加的)。这里要报告的是「AK 取自哪个变量名」,
|
|
790
|
+
// 直接用循环变量 envName —— 早先误写成 rid.env,导致面板永远显示
|
|
791
|
+
// 「未知变量」,排查时看不到该去改哪个环境变量。
|
|
792
|
+
keySource = rid.source
|
|
793
|
+
keyEnv = envName
|
|
794
|
+
break
|
|
795
|
+
}
|
|
722
796
|
}
|
|
723
797
|
if (!id || !secret) {
|
|
798
|
+
const missing = !id && !secret ? 'AccessKeyID 与 SecretAccessKey 都缺'
|
|
799
|
+
: (!id ? '缺 AccessKeyID' : '缺 SecretAccessKey')
|
|
800
|
+
const hint = inferenceHint
|
|
801
|
+
? ' 注意:你配置的 ' + inferenceHint + ' 是**推理用的 ARK API Key**,'
|
|
802
|
+
+ '不是配额凭据,插件不会拿它去签名。'
|
|
803
|
+
: ''
|
|
724
804
|
data = emptyVolcengine(
|
|
725
|
-
'
|
|
726
|
-
+ '
|
|
727
|
-
+ '
|
|
805
|
+
'未找到火山引擎访问密钥(' + missing + ')。配额查询走方舟**管控面**,'
|
|
806
|
+
+ '需要 IAM 的 AccessKeyID + SecretAccessKey(授予 ArkReadOnlyAccess + BillingCenterReadOnlyAccess)。'
|
|
807
|
+
+ hint + ' 请在下方输入框直接填写,或设置环境变量 VOLC_ACCESSKEY / VOLC_SECRETKEY。',
|
|
728
808
|
keySource, keyEnv,
|
|
729
809
|
)
|
|
730
810
|
} else {
|
|
@@ -739,11 +819,15 @@ export default {
|
|
|
739
819
|
updateTime: 0,
|
|
740
820
|
fetchedAt: Date.now(),
|
|
741
821
|
keySource, keyEnv,
|
|
822
|
+
inferenceHint,
|
|
742
823
|
}
|
|
743
824
|
}
|
|
744
825
|
} catch (e) {
|
|
745
|
-
|
|
826
|
+
// 401/403 之类的软失败:把「用的是哪一对凭据」一并回传,便于定位是不是拼错了
|
|
827
|
+
data = emptyVolcengine(toStr(e && e.message ? e.message : e), 'none', keyEnv || 'VOLC_ACCESSKEY')
|
|
828
|
+
data.inferenceHint = inferenceHint
|
|
746
829
|
}
|
|
830
|
+
if (manualId || manualSecret) return data // 临时凭据不进缓存
|
|
747
831
|
volcengineCache = { fetchedAt: now, data }
|
|
748
832
|
return data
|
|
749
833
|
}
|
|
@@ -1042,7 +1126,7 @@ export default {
|
|
|
1042
1126
|
// 火山的预热条件与 kimi 同源:当前选中的是火山订阅,或最近一次调用就走火山。
|
|
1043
1127
|
// 面板自己也会主动拉取(volcengine-usage),这里只是让它在「正在用」时自动出数。
|
|
1044
1128
|
if (isVolc || isVolcengineProvider(lastProviderSeen)) {
|
|
1045
|
-
if (!volcengineCache || now - volcengineCache.fetchedAt >= 120000) volcengineUsage(
|
|
1129
|
+
if (!volcengineCache || now - volcengineCache.fetchedAt >= 120000) volcengineUsage({}).catch(() => {})
|
|
1046
1130
|
}
|
|
1047
1131
|
return {
|
|
1048
1132
|
sessionCost: r4(sessionCost), sessionCalls,
|
|
@@ -1394,7 +1478,7 @@ export default {
|
|
|
1394
1478
|
summary: (args) => buildSummary(args),
|
|
1395
1479
|
dashboard: (args) => buildDashboard(args),
|
|
1396
1480
|
'kimi-usage': (args) => kimiUsage(!!(args && args.force)),
|
|
1397
|
-
'volcengine-usage': (args) => volcengineUsage(
|
|
1481
|
+
'volcengine-usage': (args) => volcengineUsage(args || {}),
|
|
1398
1482
|
balance: (args) => balance(args),
|
|
1399
1483
|
export: () => exportCsv(),
|
|
1400
1484
|
prices: () => prices(),
|
|
@@ -1404,13 +1488,39 @@ export default {
|
|
|
1404
1488
|
'peak-config': (args) => setPeakConfig(args),
|
|
1405
1489
|
// 界面显示三开关(设置卡片的「界面显示」分组):patch 里只带这几个键,写回后原样回显
|
|
1406
1490
|
'ui-config': (args) => Object.assign({ ok: true }, setUiConfig(args || {})),
|
|
1407
|
-
//
|
|
1491
|
+
// 火山方舟配额凭据:只回显「是否已配置」与 AccessKeyID,**绝不回显 SecretAccessKey 明文**
|
|
1492
|
+
//
|
|
1493
|
+
// 语义(防呆,避免一次误保存就把已存好的密钥清空):
|
|
1494
|
+
// · accessKeyId :传了就更新,没传就不动;
|
|
1495
|
+
// · secretAccessKey :**只有非空**才更新(空串视为「我没改」,不是「清空」);
|
|
1496
|
+
// · clear:true :显式清空两者(面板的「清除」按钮走这条)。
|
|
1497
|
+
// 否则跨浏览器 / 重开面板时 Secret 输入框必然是空的(我们从不回显它),
|
|
1498
|
+
// 用户只改 AK 一保存就会把 Secret 一起写空 —— 那是静默丢失凭据。
|
|
1408
1499
|
'volcengine-config': (args) => {
|
|
1409
|
-
|
|
1410
|
-
|
|
1500
|
+
const a = args || {}
|
|
1501
|
+
const patch = {}
|
|
1502
|
+
if (a.clear === true) {
|
|
1503
|
+
patch.volcengineAccessKeyId = ''
|
|
1504
|
+
patch.volcengineSecretAccessKey = ''
|
|
1505
|
+
} else {
|
|
1506
|
+
if (typeof a.volcengineAccessKeyId === 'string') patch.volcengineAccessKeyId = a.volcengineAccessKeyId
|
|
1507
|
+
if (typeof a.volcengineSecretAccessKey === 'string' && a.volcengineSecretAccessKey.trim() !== '') {
|
|
1508
|
+
patch.volcengineSecretAccessKey = a.volcengineSecretAccessKey
|
|
1509
|
+
}
|
|
1510
|
+
}
|
|
1511
|
+
setVolcengineConfig(patch)
|
|
1512
|
+
return Object.assign({
|
|
1513
|
+
ok: true,
|
|
1514
|
+
volcengineHasKeys: !!(volcengineConfig.volcengineAccessKeyId && volcengineConfig.volcengineSecretAccessKey),
|
|
1515
|
+
volcengineAccessKeyId: volcengineConfig.volcengineAccessKeyId,
|
|
1516
|
+
})
|
|
1411
1517
|
},
|
|
1412
1518
|
// 同步状态里一并带上界面显示开关:配置卡片只需一次往返就能初始化表单
|
|
1413
|
-
sync: () => Object.assign({}, syncEngine.status(), uiConfig
|
|
1519
|
+
sync: () => Object.assign({}, syncEngine.status(), uiConfig, {
|
|
1520
|
+
// 面板初始化要用的凭据回显:AK 明文(非敏感,控制台里本就可见)+ 是否已存 SK
|
|
1521
|
+
volcengineAccessKeyId: volcengineConfig.volcengineAccessKeyId,
|
|
1522
|
+
volcengineHasSecret: !!volcengineConfig.volcengineSecretAccessKey,
|
|
1523
|
+
}),
|
|
1414
1524
|
'sync-now': async (args) => {
|
|
1415
1525
|
const result = await syncEngine.runOnce({ manual: true, full: !!(args && args.full) })
|
|
1416
1526
|
return Object.assign({ ok: result.ok !== false || !result.error, result }, syncEngine.status())
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angelyeye/dsh-cost-tracker",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.15",
|
|
4
4
|
"description": "DeepSeek Harness (DSH) plugin: LLM token usage & cost tracking with a settings dashboard, agent tools, HTTP API, persistent storage and multi-device cloud sync.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|