@kenz1117/dsh-ui-usage-billing 1.4.7 → 1.4.8

package/lib/index.js

@@ -318,7 +318,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。 */
@@ -330,7 +330,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;
 }
 /**
 * 内置目录与别名表的运行时注入态：数据本体在 src/builtin-catalog.ts（仅随 node
@@ -3275,8 +3275,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);
@@ -3287,7 +3287,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);
@@ -3491,7 +3491,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`。
@@ -4255,7 +4259,7 @@ const declaredGate = createCooldownGate({
 	cooldownMs: 6e4
 });
 /** 会触及原型链的路径段：一律拒绝（读结果不是文档自带字段）。 */
-const FORBIDDEN_SEGMENTS = new Set([
+const FORBIDDEN_SEGMENTS = /* @__PURE__ */ new Set([
 	"__proto__",
 	"constructor",
 	"prototype"
@@ -4833,7 +4837,7 @@ function asPrice(value) {
 /** models.dev 常把同一模型收录在多个 provider 下（厂商 + 转售）。这些 id 是模型
 *  自身的厂商，其报价视为权威：转售可能加价，也可能省略 cache_read 而落到下方
 *  `input * 0.1` 的猜测值。去重时优先采用。 */
-const FIRST_PARTY_PRICE_SOURCES = new Set([
+const FIRST_PARTY_PRICE_SOURCES = /* @__PURE__ */ new Set([
 	"anthropic",
 	"openai",
 	"google",
@@ -4862,7 +4866,7 @@ const FIRST_PARTY_PRICE_SOURCES = new Set([
 */
 function buildExtraModels(data) {
 	if (data === null || typeof data !== "object") return [];
-	const catalogKeys = new Set([...BUILTIN_MODEL_CATALOG.map((entry) => entry.key.toLowerCase()), ...Object.keys(BUILTIN_MODEL_KEY_ALIASES).map((key) => BUILTIN_MODEL_KEY_ALIASES[key]?.toLowerCase() ?? key.toLowerCase())]);
+	const catalogKeys = /* @__PURE__ */ new Set([...BUILTIN_MODEL_CATALOG.map((entry) => entry.key.toLowerCase()), ...Object.keys(BUILTIN_MODEL_KEY_ALIASES).map((key) => BUILTIN_MODEL_KEY_ALIASES[key]?.toLowerCase() ?? key.toLowerCase())]);
 	const offers = /* @__PURE__ */ new Map();
 	const familyVendorVotes = /* @__PURE__ */ new Map();
 	for (const [providerId, providerDoc] of Object.entries(data)) {
@@ -5785,7 +5789,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). */
@@ -5921,7 +5925,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",
@@ -6191,13 +6195,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";
 /**
@@ -6214,7 +6218,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。
@@ -6565,7 +6569,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(() => {});
@@ -6692,7 +6697,9 @@ function apply(ctx, config = {}) {
 		}
 	}), "usage-billing: notify-claim route");
 	ctx.inject(["settings"], (sctx) => {
-		const scope = sctx.settings.register(usageBillingSettingsNs, UsageBillingSettingsSchema, { base: { enableUsageStatsTool: config.enableUsageStatsTool ?? false } });
+		const legacy = sctx.settings;
+		if (typeof legacy.register !== "function") return;
+		const scope = legacy.register(usageBillingSettingsNs, UsageBillingSettingsSchema, { base: { enableUsageStatsTool: config.enableUsageStatsTool ?? false } });
 		usageSettingsScope = scope;
 		ctx.inject(["tools"], (toolsCtx) => {
 			if (scope.get().enableUsageStatsTool) toolsCtx.tools.register(defineTool({

package/lib/types/index.d.ts

@@ -15,10 +15,18 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import type { Context } from '@deepseek-ai/cordis';
 import type { CredentialProvider } from '@deepseek-ai/dsh-credentials';
-import type { SettingsProvider } from '@deepseek-ai/dsh-settings';
 import { type UsageLedgerStore, type UsagePersistence } from './aggregate.ts';
 import type { CustomBalanceConfig, DeclaredEndpointConfig, SubscriptionPlanConfig } from './pricing-shared.ts';
 import { type IdentifiedSubscriptionPlan, type SubscriptionKeys } from './subscriptions.ts';
+/** 设置服务的读取面：两代宿主运行时都提供 describe（条目键为 profile entry id）。 */
+interface SettingsReader {
+    describe(options?: {
+        redactSecrets?: boolean;
+    }): readonly {
+        ns: string;
+        value: unknown;
+    }[];
+}
 /** 校验 Host 头是本机回环（精确 127.0.0.0/8 / ::1 / localhost 或空，供 curl 不带 Host 的极简请求）。
  *  拒绝 `127.0.0.1.attacker.com` 这类以 `127.` 开头但解析到外部的 DNS rebinding 域名：
  *  只用 `startsWith('127.')` 会被它穿透，必须精确匹配回环 IP 的字面量。 */
@@ -127,7 +135,7 @@ export interface PiAiProviderRoute {
  * @param settings - the settings service (reads the llm-pi-ai namespace).
  * @returns `<route> → { baseURL? }`；命名空间不可读时返回空。
  */
-export declare function readPiAiProviderRoutes(settings: SettingsProvider): Readonly<Record<string, {
+export declare function readPiAiProviderRoutes(settings: SettingsReader): Readonly<Record<string, {
     baseURL?: string;
 }>>;
 /**
@@ -137,7 +145,7 @@ export declare function readPiAiProviderRoutes(settings: SettingsProvider): Read
  * @param settings - the settings service (reads the llm-pi-ai namespace).
  * @param credentials - the credentials service (resolves the env refs).
  */
-export declare function resolveSubscriptionKeys(settings: SettingsProvider, credentials: CredentialProvider): Promise<{
+export declare function resolveSubscriptionKeys(settings: SettingsReader, credentials: CredentialProvider): Promise<{
     keys: SubscriptionKeys;
     identified: IdentifiedSubscriptionPlan[];
 }>;
@@ -159,4 +167,5 @@ export declare function adaptSessionPersistence(raw: unknown): UsagePersistence;
  * @param config - optional statsPath override.
  */
 export declare function apply(ctx: Context, config?: UsageBillingConfig): void;
+export {};
 //# sourceMappingURL=index.d.ts.map

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.7",
+  "version": "1.4.8",
   "keywords": [
     "deepseek-harness",
     "deepseek",
@@ -66,8 +66,12 @@
         "0.1.5-alpha.2": "compatible",
         "0.1.5-rc.1": "compatible",
         "0.1.5-rc.2": "compatible",
+        "0.1.5-rc.3": "compatible",
         "0.1.6-alpha.1": "compatible",
-        "0.1.6-alpha.2": "compatible"
+        "0.1.6-alpha.2": "compatible",
+        "0.1.7-alpha.1": "compatible",
+        "0.1.7-alpha.2": "compatible",
+        "0.1.7-rc.1": "compatible"
       }
     }
   },
@@ -112,43 +116,69 @@
     "@deepseek-ai/cordis": "*",
     "@deepseek-ai/cordis-plugin-include": "^1.0.7",
     "@deepseek-ai/cordis-plugin-loader": "^1.0.3",
-    "@deepseek-ai/dsh-api-gateway": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-api-remotes": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-api-session-controller": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-atomic-write": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-locale": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-store": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.2-rc.1",
-    "@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",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
-    "@deepseek-ai/dsh-typert-protocol": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-api-gateway": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-remotes": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-api-session-controller": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-atomic-write": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-agent": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-locale": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-store": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-credentials": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-host-webserver": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-home-paths": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-invariants": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-ptc-runtime": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-sandbox": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-sandbox-policy": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-scope": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-session-persistence": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-settings": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-tools": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-typert-protocol": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-user-approval": "0.1.7-rc.1",
+    "@deepseek-ai/dsh-util-workspace-path": "0.1.7-rc.1",
     "@deepseek-ai/schemastery": "^3.18.2",
+    "@shikijs/langs": "^4.3.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.1.0",
     "@types/node": "^22.20.0",
     "@types/react": "~18.3.1",
     "@types/react-dom": "^19.2.7",
+    "immer": "^10.1.1",
+    "anser": "^2.3.5",
+    "diff": "^9.0.0",
     "jsdom": "^26.1.0",
+    "katex": "^0.16.47",
     "lightningcss": "^1.32.0",
+    "mdast-util-from-markdown": "^2.0.3",
+    "mdast-util-gfm": "^3.1.0",
+    "mdast-util-math": "^3.0.0",
+    "micromark-core-commonmark": "^2.0.3",
+    "micromark-extension-gfm": "^3.0.0",
+    "micromark-extension-math": "^3.1.0",
+    "micromark-factory-space": "^2.0.1",
+    "micromark-util-character": "^2.1.1",
+    "micromark-util-classify-character": "^2.0.1",
+    "micromark-util-sanitize-uri": "^2.0.1",
+    "micromark-util-symbol": "^2.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "semver": "^7.7.2",
+    "shiki": "^4.3.1",
+    "simple-icons": "^16.32.0",
     "tsdown": "^0.22.2",
     "typescript": "^6.0.3",
     "use-sync-external-store": "1.2.0",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.8",
+    "zustand": "~4.4.7"
   },
   "files": [
     "lib/index.js",