@kenz1117/dsh-ui-usage-billing 1.4.0 → 1.4.2

package/lib/index.js

@@ -6,6 +6,7 @@ import { SessionLogOffset } from "@deepseek-ai/dsh-session/types";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
+import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import z from "@deepseek-ai/schemastery";
 import { createHash, createHmac } from "node:crypto";
 //#region lib/types/client/plan-knowledge.js
@@ -316,7 +317,7 @@ function tierAtWithBounds(timeMs, bounds) {
 }
 /** 时刻是否落在北京时间周末（周六/周日）。 */
 function isBeijingWeekend(timeMs) {
-	const day = new Date(timeMs + 8 * 36e5).getUTCDay();
+	const day = new Date(timeMs + 288e5).getUTCDay();
 	return day === 0 || day === 6;
 }
 /** 峰谷切换边界（北京时间的当日分钟数）：09:00 / 12:00 / 14:00 / 18:00。 */
@@ -328,7 +329,7 @@ const TIER_BOUNDARY_MINUTES = [
 ];
 /** 北京时间的当日毫秒数（0–86,400,000）。 */
 function beijingMillisOfDay(timeMs) {
-	return ((timeMs + 8 * 36e5) % 864e5 + 864e5) % 864e5;
+	return ((timeMs + 288e5) % 864e5 + 864e5) % 864e5;
 }
 /**
 * Built-in catalog of current mainstream models as of 2026-08-16, priced from
@@ -445,6 +446,18 @@ const MODEL_CATALOG = [
 			note: "限时 5 折"
 		}
 	},
+	{
+		key: "glm-5.3-flashx",
+		name: "GLM-5.3-FlashX",
+		provider: "智谱 AI",
+		colorVar: "dsw-static-blue-300",
+		price: {
+			currency: "CNY",
+			input: 2,
+			cacheHit: .57,
+			output: 7
+		}
+	},
 	{
 		key: "glm-4.6",
 		name: "GLM-4.6",
@@ -881,6 +894,18 @@ const MODEL_CATALOG = [
 			output: 4
 		}
 	},
+	{
+		key: "hunyuan-hy4-preview",
+		name: "混元 Hy4 Preview",
+		provider: "腾讯混元",
+		colorVar: "dsw-static-amber-400",
+		price: {
+			currency: "CNY",
+			input: 6,
+			cacheHit: .3,
+			output: 18
+		}
+	},
 	{
 		key: "hunyuan-t1",
 		name: "混元 T1",
@@ -1479,6 +1504,8 @@ const MODEL_KEY_ALIASES = {
 	"glm-5-turbo": "glm-5-turbo",
 	"glm-5.1": "glm-5.1",
 	"glm-5.3-flash": "glm-5.3-flash",
+	"glm-5.3-flashx": "glm-5.3-flashx",
+	"glm-5.3-flash-x": "glm-5.3-flashx",
 	"glm-5v-turbo": "glm-5v-turbo",
 	"glm-5v.1": "glm-5v-turbo",
 	"claude-opus-4-6": "claude-opus-4-6",
@@ -1500,6 +1527,10 @@ const MODEL_KEY_ALIASES = {
 	"command-r-08-2024": "command-r-08-2024",
 	"command-r": "command-r-08-2024",
 	"hy3": "hunyuan",
+	"hy4-preview": "hunyuan-hy4-preview",
+	"hy4": "hunyuan-hy4-preview",
+	"hunyuan-hy4-preview": "hunyuan-hy4-preview",
+	"hunyuan-hy4": "hunyuan-hy4-preview",
 	"longcat-2.0": "longcat-2.0",
 	"longcat-2": "longcat-2.0",
 	"minicpm-v-4.5": "minicpm-v-4.5",
@@ -1530,6 +1561,7 @@ const MODEL_KEY_ALIASES = {
 	"glm-5.2f": "glm-5.2-fast",
 	"kimi-k3-fast": "kimi-k3-fast",
 	"kimi-k3f": "kimi-k3-fast",
+	"kimi-for-coding": "kimi-k2.8-preview",
 	"kimi-k2.7-code-fast": "kimi-k2.7-code-fast",
 	"kimi-k2.7-code-f": "kimi-k2.7-code-fast",
 	"kimi-k2.6-fast": "kimi-k2.6-fast",
@@ -3084,8 +3116,8 @@ function createUsageAggregator(persistence, options = {}) {
 		};
 		const toModelDayRecord = (map) => Object.fromEntries([...map].map(([day, models]) => [day, Object.fromEntries(models)]));
 		const toModelDaySiteRecord = (map) => Object.fromEntries([...map].map(([day, models]) => [day, Object.fromEntries([...models].map(([model, sites]) => [model, Object.fromEntries(sites)]))]));
-		const modelKeys = new Set([...perfModel.keys(), ...perfModelDigest.keys()]);
-		const hourKeys = new Set([...perfHourModel.keys(), ...perfHourDigest.keys()]);
+		const modelKeys = /* @__PURE__ */ new Set([...perfModel.keys(), ...perfModelDigest.keys()]);
+		const hourKeys = /* @__PURE__ */ new Set([...perfHourModel.keys(), ...perfHourDigest.keys()]);
 		const perf = modelKeys.size === 0 && hourKeys.size === 0 ? void 0 : {
 			byModel: Object.fromEntries([...modelKeys].map((model) => {
 				const live = perfModel.get(model);
@@ -3096,7 +3128,7 @@ function createUsageAggregator(persistence, options = {}) {
 			byHourModel: Object.fromEntries([...hourKeys].sort().map((hour) => {
 				const liveModels = perfHourModel.get(hour);
 				const digestModels = perfHourDigest.get(hour);
-				const modelKeysInHour = new Set([...liveModels?.keys() ?? [], ...digestModels?.keys() ?? []]);
+				const modelKeysInHour = /* @__PURE__ */ new Set([...liveModels?.keys() ?? [], ...digestModels?.keys() ?? []]);
 				return [hour, Object.fromEntries([...modelKeysInHour].map((model) => {
 					const live = liveModels?.get(model);
 					const restored = digestModels?.get(model);
@@ -3299,7 +3331,11 @@ function tc3Authorization(secretId, secretKey, payload, timestamp) {
 	const canonicalRequest = `POST\n/\n\n${`content-type:application/json; charset=utf-8\nhost:${TOKENHUB_HOST}\n`}\ncontent-type;host\n${createHash("sha256").update(payload).digest("hex")}`;
 	const hashedCanonical = createHash("sha256").update(canonicalRequest).digest("hex");
 	const stringToSign = `TC3-HMAC-SHA256\n${String(timestamp)}\n${date}/${TOKENHUB_SERVICE}/tc3_request\n${hashedCanonical}`;
-	return `TC3-HMAC-SHA256 Credential=${secretId}/${date}/${TOKENHUB_SERVICE}/tc3_request, SignedHeaders=content-type;host, Signature=${createHmac("sha256", createHmac("sha256", createHmac("sha256", createHmac("sha256", date).update(secretKey).digest()).update(TOKENHUB_SERVICE).digest()).update("tc3_request").digest()).update(stringToSign).digest("hex")}`;
+	const kDate = createHmac("sha256", date).update(secretKey).digest();
+	const kService = createHmac("sha256", kDate).update(TOKENHUB_SERVICE).digest();
+	const kSigning = createHmac("sha256", kService).update("tc3_request").digest();
+	const signature = createHmac("sha256", kSigning).update(stringToSign).digest("hex");
+	return `TC3-HMAC-SHA256 Credential=${secretId}/${date}/${TOKENHUB_SERVICE}/tc3_request, SignedHeaders=content-type;host, Signature=${signature}`;
 }
 /**
 * 调用一次 TokenHub 管控面接口：TC3 签名 + 超时保护，返回响应 JSON 的 `Response`。
@@ -4063,7 +4099,7 @@ const declaredGate = createCooldownGate({
 	cooldownMs: 6e4
 });
 /** 会触及原型链的路径段：一律拒绝（读结果不是文档自带字段）。 */
-const FORBIDDEN_SEGMENTS = new Set([
+const FORBIDDEN_SEGMENTS = /* @__PURE__ */ new Set([
 	"__proto__",
 	"constructor",
 	"prototype"
@@ -4613,7 +4649,7 @@ function asPrice(value) {
 */
 function buildExtraModels(data) {
 	if (data === null || typeof data !== "object") return [];
-	const catalogKeys = new Set([...MODEL_CATALOG.map((entry) => entry.key.toLowerCase()), ...Object.keys(MODEL_KEY_ALIASES).map((key) => MODEL_KEY_ALIASES[key]?.toLowerCase() ?? key.toLowerCase())]);
+	const catalogKeys = /* @__PURE__ */ new Set([...MODEL_CATALOG.map((entry) => entry.key.toLowerCase()), ...Object.keys(MODEL_KEY_ALIASES).map((key) => MODEL_KEY_ALIASES[key]?.toLowerCase() ?? key.toLowerCase())]);
 	const extras = [];
 	for (const [providerId, providerDoc] of Object.entries(data)) {
 		if (providerDoc === null || typeof providerDoc !== "object") continue;
@@ -5463,7 +5499,7 @@ const relayGate = createCooldownGate({
 /** Abort a relay fetch when the upstream hangs beyond this budget. */
 const FETCH_TIMEOUT_MS = 8e3;
 /** 指纹识别缓存 TTL（毫秒）：识别结果低频变化，5 分钟内同 origin 不再重复探测。 */
-const FINGERPRINT_TTL_MS = 300 * 1e3;
+const FINGERPRINT_TTL_MS = 3e5;
 /** 每 origin 的识别结果缓存：`kind` 是识别出的中转站程序，`at` 是探测时刻。 */
 const fingerprintCache = /* @__PURE__ */ new Map();
 /** Number, or null when the value is not a finite number (nor numeric string). */
@@ -5599,7 +5635,7 @@ function originOf(baseURL) {
 * 子路径只会得到 404/非中转站格式，因而面板应排除它们，避免误判为
 * 「未识别」。中转站面板只列真正的第三方中转程序。
 */
-const OFFICIAL_HOSTS = new Set([
+const OFFICIAL_HOSTS = /* @__PURE__ */ new Set([
 	"api.deepseek.com",
 	"api.openai.com",
 	"open.bigmodel.cn",
@@ -5852,13 +5888,13 @@ const usageBillingSettingsNs = validateSettingsNamespace(BILLING_SETTINGS_NAMESP
 /** 该命名空间的 wire schema：`enableUsageStatsTool` 布尔，默认关闭（issue 诉求）。 */
 const UsageBillingSettingsSchema = z.object({ [ENABLE_USAGE_STATS_TOOL_FIELD]: z.boolean().default(false) });
 /** 实时定价的后台刷新间隔（毫秒）：汇率/模型价低频变化，6 小时一次足够。 */
-const PRICING_REFRESH_INTERVAL_MS = 360 * 60 * 1e3;
+const PRICING_REFRESH_INTERVAL_MS = 216e5;
 /** 历史回放预热的延迟：等宿主启动高峰（插件加载 / 路由挂载）过去再全量折叠，
 *  避免抢启动期的 CPU；纯延迟不阻塞任何请求，面板提前打开也只会提前聚合。 */
 const WARMUP_DELAY_MS = 3e3;
 /** 订阅套餐额度缓存时长（毫秒）：上游配额 API 低频变化，5 分钟足够。 */
-const SUBSCRIPTION_CACHE_MS = 300 * 1e3;
-const BALANCE_CACHE_MS = 300 * 1e3;
+const SUBSCRIPTION_CACHE_MS = 3e5;
+const BALANCE_CACHE_MS = 3e5;
 /** DeepSeek 余额查询的默认凭据引用（与 llm-deepseek 的默认引用一致）。 */
 const DEFAULT_BALANCE_API_KEY_ENV = "DEEPSEEK_API_KEY";
 /**
@@ -5875,7 +5911,7 @@ const SNAPSHOT_INTERVAL_MS = 3e5;
 *  轻量用户暖缓存下的聚合是毫秒级，预算几乎不会触发。 */
 const RESPONSE_BUDGET_MS = 1500;
 /** 鉴权失败告警冷却（毫秒）：同一 provider 在窗口内只提示一次，避免 30 秒轮询刷屏。 */
-const AUTH_WARN_COOLDOWN_MS = 1800 * 1e3;
+const AUTH_WARN_COOLDOWN_MS = 18e5;
 /**
 * 鉴权失败分类告警（P1-5）：余额 / 订阅查询返回 unauthorized 时，按
 * `source:provider` 去重并冷却告警，提示检查 llm-pi-ai 里该 provider 的 apiKeyEnv。
@@ -6209,9 +6245,10 @@ function adaptSessionPersistence(raw) {
 function apply(ctx, config = {}) {
 	let usageSettingsScope;
 	const cwd = process.cwd();
-	const snapshotPath = config.snapshotPath ?? join(homedir(), ".dsh/.dsh-usage-stats.json");
-	const ledgerStore = createFileUsageLedgerStore(config.ledgerPath ?? join(homedir(), ".dsh/.dsh-usage-ledger.json"));
-	const reconcilePath = config.reconcilePath ?? join(homedir(), ".dsh/.dsh-usage-reconcile.json");
+	const dshHome = resolveDshHome();
+	const snapshotPath = config.snapshotPath ?? join(dshHome, ".dsh-usage-stats.json");
+	const ledgerStore = createFileUsageLedgerStore(config.ledgerPath ?? join(dshHome, ".dsh-usage-ledger.json"));
+	const reconcilePath = config.reconcilePath ?? join(dshHome, ".dsh-usage-reconcile.json");
 	let reconcileRef = null;
 	(async () => {
 		try {
@@ -6224,7 +6261,8 @@ function apply(ctx, config = {}) {
 	})();
 	const persistReconcileRef = () => {
 		if (reconcileRef === null) return;
-		writeFileAtomic(reconcilePath, JSON.stringify({ ref: reconcileRef }), {
+		const payload = JSON.stringify({ ref: reconcileRef });
+		writeFileAtomic(reconcilePath, payload, {
 			mode: 384,
 			dirMode: 448
 		}).catch(() => {});

package/lib/types/index.d.ts

@@ -31,13 +31,14 @@ export declare function guardLoopback(req: IncomingMessage, res: ServerResponse)
 export interface UsageBillingConfig {
     /** Absolute path to a `.dsh-usage-stats.json` fallback file. */
     statsPath?: string;
-    /** 统计快照的持久化路径；默认 `~/.dsh/.dsh-usage-stats.json`。
+    /** 统计快照的持久化路径；默认 `<harness home>/.dsh-usage-stats.json`
+     *  （harness home = `DSH_HOME` 环境变量或 `~/.dsh`，见 resolveDshHome）。
      *  测试注入临时目录以隔离真实家目录（聚合失败回退与快照落盘都走此路径）。 */
     snapshotPath?: string;
-    /** 独立持久用量账本的绝对路径；默认 `~/.dsh/.dsh-usage-ledger.json`。
+    /** 独立持久用量账本的绝对路径；默认 `<harness home>/.dsh-usage-ledger.json`。
      *  账本与会话日志解耦，因此永久删除会话不会抹掉已经观测到的用量。 */
     ledgerPath?: string;
-    /** 余额差对账基准的持久化路径；默认 `~/.dsh/.dsh-usage-reconcile.json`。 */
+    /** 余额差对账基准的持久化路径；默认 `<harness home>/.dsh-usage-reconcile.json`。 */
     reconcilePath?: string;
     /** 订阅制（coding / token / agent plan）provider id 列表；默认 kimi-coding、xiaomi-token-plan-cn。 */
     subscriptionProviders?: string[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kenz1117/dsh-ui-usage-billing",
   "description": "Usage billing dashboard for DeepSeek Harness: sidebar cost metrics plus a full dashboard modal, priced from a current multi-provider catalog with real usage aggregated from session logs.",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "keywords": [
     "deepseek-harness",
     "deepseek",
@@ -65,7 +65,9 @@
         "0.1.5-alpha.1": "compatible",
         "0.1.5-alpha.2": "compatible",
         "0.1.5-rc.1": "compatible",
-        "0.1.5-rc.2": "compatible"
+        "0.1.5-rc.2": "compatible",
+        "0.1.6-alpha.1": "compatible",
+        "0.1.6-alpha.2": "compatible"
       }
     }
   },
@@ -93,6 +95,7 @@
     "@deepseek-ai/dsh-client-ui-slots": "*",
     "@deepseek-ai/dsh-credentials": "*",
     "@deepseek-ai/dsh-host-webserver": "*",
+    "@deepseek-ai/dsh-home-paths": "*",
     "@deepseek-ai/dsh-invariants": "*",
     "@deepseek-ai/dsh-llm": "*",
     "@deepseek-ai/dsh-session": "*",
@@ -122,6 +125,7 @@
     "@deepseek-ai/dsh-client-ui-slots": "0.1.2-rc.1",
     "@deepseek-ai/dsh-credentials": "0.1.2-rc.1",
     "@deepseek-ai/dsh-host-webserver": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-home-paths": "0.1.2-rc.1",
     "@deepseek-ai/dsh-invariants": "0.1.2-rc.1",
     "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
     "@deepseek-ai/dsh-scope": "0.1.2-rc.1",