@angelyeye/dsh-cost-tracker 1.9.5 → 1.10.0

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/client.js CHANGED
@@ -927,6 +927,45 @@ window.__ModuleLoader__.load({
927
927
  : e("span", { className: "cost-hint" }, "峰谷时段(北京时间):" + peakWindows + " · 闲时半价"));
928
928
  }
929
929
 
930
+ // 余额金额的展示格式化。
931
+ // 账号登录态的钱包金额是 Platform 原样返回的十进制字符串,实测**16 位小数**
932
+ // (例如 "1234.5600000000000000")—— 直接拼进界面会显示成 16 位有效数字,
933
+ // 既难读也会让人误以为精度有意义。这里按 DSH 官方「账号与余额」页的口径:
934
+ // 正金额**截断**到分(不四舍五入,官方就是截断),不足一分的正金额显示 <0.01;
935
+ // 负数保留符号。API Key 态本来就是两位小数,走同一函数不改变结果。
936
+ function fmtBalanceAmount(v) {
937
+ let s = String(v === null || v === undefined ? "" : v).trim();
938
+ // 与运行时一致,接受省略整数/小数部分与十进制指数(Platform 会返回 "0E-16" 这类值)
939
+ const m = /^([+-]?)(\d*)(?:\.(\d*))?(?:[eE]([+-]?\d+))?$/.exec(s);
940
+ if (!m || (!m[2] && !m[3])) return s || "0";
941
+ const neg = m[1] === "-";
942
+ let intPart = m[2] || "";
943
+ let frac = m[3] || "";
944
+ const exp = m[4] ? parseInt(m[4], 10) : 0;
945
+ if (exp) {
946
+ // 展示用:把指数并进小数点位置;指数过大时不硬撑(返回原串,避免生成巨长字符串)
947
+ if (Math.abs(exp) > 30) return s;
948
+ const digits = intPart + frac;
949
+ const point = intPart.length + exp;
950
+ if (point <= 0) {
951
+ intPart = "0";
952
+ frac = "0".repeat(-point) + digits;
953
+ } else if (point >= digits.length) {
954
+ intPart = digits + "0".repeat(point - digits.length);
955
+ frac = "";
956
+ } else {
957
+ intPart = digits.slice(0, point);
958
+ frac = digits.slice(point);
959
+ }
960
+ }
961
+ intPart = intPart.replace(/^0+(?=\d)/, "") || "0";
962
+ const cents = (frac + "00").slice(0, 2);
963
+ const out = intPart + "." + cents;
964
+ // 正的不足一分:官方口径显示 <0.01(不能显示 0.00,那会被读成没余额)
965
+ if (!neg && out === "0.00" && /[1-9]/.test(frac)) return "<0.01";
966
+ return (neg ? "-" : "") + out;
967
+ }
968
+
930
969
  function statCards(dash, balance, viewCtl, planTotal) {
931
970
  const today = dash.today || { real: 0, calls: 0, tokens: 0, sub: 0, subCalls: 0, subTokens: 0 };
932
971
  const month = dash.month || { real: 0, calls: 0, tokens: 0, sub: 0, subCalls: 0, subTokens: 0 };
@@ -943,11 +982,19 @@ window.__ModuleLoader__.load({
943
982
  return base + (t.sub > 0 ? " · 订阅 ¥" + fmtMoney(t.sub) : "");
944
983
  };
945
984
  const planBadge = planTotal ? "(含 Plan)" : "";
946
- // 余额卡
947
- let balValue = "—", balSub = "查询中…";
985
+ // 余额卡:两种口径(v1.9.6)
986
+ // · 账号登录态(DSH 0.2.1-rc.2+,source="account"):Platform 钱包,
987
+ // 充值 / 赠金分离,没有官方的 is_available 标志(宿主 getBalance 不返回);
988
+ // · API Key 态(source="apikey"):api.deepseek.com/user/balance,带 is_available。
989
+ let balValue = "—", balSub = "查询中…", balTitle = "总余额(CNY)";
948
990
  if (balance && balance.ok) {
949
- balValue = "¥" + (balance.total || "0");
950
- balSub = (balance.available ? "可用" : "不可用") + " · 充值 ¥" + (balance.toppedUp || "0") + " · 赠送 ¥" + (balance.granted || "0") + " · " + (balance.keySource || "");
991
+ const isAccount = balance.source === "account";
992
+ const sym = balance.currency === "USD" ? "$" : "¥";
993
+ if (balance.currency) balTitle = "总余额(" + balance.currency + ")";
994
+ balValue = sym + fmtBalanceAmount(balance.total || "0");
995
+ balSub = isAccount
996
+ ? "账号登录 · 充值 " + sym + fmtBalanceAmount(balance.toppedUp || "0") + " · 赠金 " + sym + fmtBalanceAmount(balance.granted || "0")
997
+ : (balance.available ? "可用" : "不可用") + " · 充值 " + sym + fmtBalanceAmount(balance.toppedUp || "0") + " · 赠送 " + sym + fmtBalanceAmount(balance.granted || "0") + " · " + (balance.keySource || "");
951
998
  } else if (balance && balance.error) {
952
999
  balSub = balance.error;
953
1000
  }
@@ -969,7 +1016,7 @@ window.__ModuleLoader__.load({
969
1016
  "按量 " + fmtInt(all.calls) + " · 订阅 " + fmtInt(all.subCalls)),
970
1017
  statCard("Tokens", fmtInt(all.tokens + all.subTokens),
971
1018
  "按量 " + fmtCompact(all.tokens) + " · 订阅 " + fmtCompact(all.subTokens)),
972
- statCard("总余额(CNY)", balValue, balSub));
1019
+ statCard(balTitle, balValue, balSub));
973
1020
  }
974
1021
 
975
1022
  function mainPanel(dash, tab, setTab, scheme, setScheme, planTotal) {
@@ -1168,16 +1215,21 @@ window.__ModuleLoader__.load({
1168
1215
  } else if (!balance.ok) {
1169
1216
  body = e("div", { className: "cost-err" }, "余额查询失败:" + (balance.error || "未知错误"));
1170
1217
  } else {
1218
+ // 账号登录态:Platform 钱包(充值 / 赠金分开列示,与 DSH 官方「账号与余额」页口径一致)
1219
+ const isAccount = balance.source === "account";
1220
+ const sym = balance.currency === "USD" ? "$" : "¥";
1171
1221
  body = e("div", { className: "cost-row", style: { gap: "4px" } },
1172
- kv("总余额", "¥" + balance.total),
1173
- kv("充值余额", "¥" + balance.toppedUp),
1174
- kv("赠送余额", "¥" + balance.granted),
1175
- kv("状态", balance.available ? "可用" : "不可用"),
1176
- e("span", { className: "cost-hint" }, "Key 来源:" + balance.keySource));
1222
+ kv(isAccount ? "账号总余额" : "总余额", sym + fmtBalanceAmount(balance.total)),
1223
+ kv("充值余额", sym + fmtBalanceAmount(balance.toppedUp)),
1224
+ kv(isAccount ? "赠金余额" : "赠送余额", sym + fmtBalanceAmount(balance.granted)),
1225
+ kv("状态", isAccount ? "账号登录" : (balance.available ? "可用" : "不可用")),
1226
+ e("span", { className: "cost-hint" }, isAccount ? "来源:DeepSeek 账号登录(Platform 钱包)" : "Key 来源:" + balance.keySource));
1177
1227
  }
1178
1228
  return e("div", { className: "cost-panel" },
1179
1229
  e("div", { className: "cost-row" }, e("span", { className: "cost-panel-title" }, "账户余额 · DeepSeek")),
1180
1230
  e("div", { style: { marginTop: "8px" } }, body),
1231
+ e("div", { className: "cost-hint", style: { marginTop: "6px" } },
1232
+ "已登录 DeepSeek 账号时显示 Platform 钱包(充值 / 赠金);手动填入 API Key 则按 api.deepseek.com 的账户余额查询。"),
1181
1233
  e("div", { className: "cost-row", style: { marginTop: "10px" } },
1182
1234
  e("input", { className: "cost-input", placeholder: "手动输入 DeepSeek API Key(sk-…)", value: manualKey, onChange: ev => setManualKey(ev.target.value) }),
1183
1235
  e("button", { className: "cost-btn", onClick: () => onQuery(manualKey) }, "查询")));
@@ -2669,8 +2721,16 @@ window.__ModuleLoader__.load({
2669
2721
  else setUsageErr(v && v.error ? String(v.error) : "数据加载失败");
2670
2722
  }).catch(err => setUsageErr(String(err && err.message ? err.message : err)));
2671
2723
  }
2724
+ // 账号余额查询的 client 元数据:DSH 0.2.1-rc.2 的 deepseekAccount.getBalance(client)
2725
+ // 把这三个字段直接拼进 x-client-* 请求头,缺一个就抛 TypeError。
2726
+ // locale 用浏览器语言、时区偏移用浏览器时区(宿主侧也有兜底,这里给更准的值)。
2727
+ function balanceClientMeta() {
2728
+ let locale = "";
2729
+ try { locale = (window.navigator && window.navigator.language) || ""; } catch (e) {}
2730
+ return { locale: locale, timezoneOffsetSeconds: -new Date().getTimezoneOffset() * 60 };
2731
+ }
2672
2732
  function loadBalance(key) {
2673
- apiCall("balance", key ? { apiKey: key } : {}).then(v => setBalance(v)).catch(() => {});
2733
+ apiCall("balance", Object.assign(balanceClientMeta(), key ? { apiKey: key } : {})).then(v => setBalance(v)).catch(() => {});
2674
2734
  }
2675
2735
  function onExport() {
2676
2736
  setBusy(true); setMsg("导出中…");
@@ -2689,7 +2749,7 @@ window.__ModuleLoader__.load({
2689
2749
  apiCall("kimi-usage", { force: false }).then(v => setKimi(v)).catch(() => {});
2690
2750
  apiCall("volcengine-usage", { force: false }).then(v => setVolc(v)).catch(() => {});
2691
2751
  loadCloudUsage(view);
2692
- apiCall("balance", {}).then(v => { setBalance(v); setBusy(false); }).catch(() => setBusy(false));
2752
+ apiCall("balance", balanceClientMeta()).then(v => { setBalance(v); setBusy(false); }).catch(() => setBusy(false));
2693
2753
  }
2694
2754
 
2695
2755
  useEffect(() => { loadDash(days); }, [days]);
@@ -39,7 +39,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39
39
  SOFTWARE.
40
40
  ```
41
41
 
42
- > 目录中的单价来自各厂商公开定价页(每条带 `sourceUrl` / `checkedAt` 便于溯源),
42
+ > 目录初始数据改编自 `dsh-cost-meter`(MIT);**2026-10-25 起**由本项目按各厂商官方定价页(OpenAI / Anthropic / Google / Moonshot / z-ai / xAI / Alibaba / MiniMax / Tencent / Xiaomi / Upstage / NVIDIA / Mistral / Meta / OpenCode)逐条复核刷新,官方页不可达时才使用网关价并在 `notes` 标注。每条都带 `sourceUrl` / `checkedAt` 便于溯源,
43
43
  > 仅作**参考折算**用途;实际账单请以各厂商控制台为准。
44
44
 
45
45
  ---