dsh-key-usage 0.1.2 → 0.1.4

package/lib/index.js

@@ -1,18 +1,85 @@
 /**
- * dsh-key-usage 服务端入口：挂载只读 HTTP 路由，向客户端提供
- * 用量台账、通道配置、余额快照与会话用量的聚合数据。
+ * dsh-key-usage 服务端入口：声明计费规则配置项、挂载只读 HTTP 路由，
+ * 向客户端提供用量台账、通道配置、余额快照与会话用量的聚合数据。
  *
  * 数据来源：
  * - 台账 / 快照 / 通道配置：本地文件只读；
  * - 项目、会话、按小时：宿主 sessionPersistence 的只读 handle；
  * - 余额与订阅窗口：优先查各通道官方接口（凭据经宿主 credentials seam 解析，
- *   不落盘、不进日志、不返回给客户端），失败时回落到本地快照。
+ *   不落盘、不进日志、不返回给客户端），失败时回落到本地快照；
+ * - 计费规则：宿主设置服务（宿主负责落盘，本插件不写任何文件）。
  */
+import z from '@deepseek-ai/schemastery';
 import { mountKeyUsageRoutes } from './routes.js';
 import { createLiveQuotaService } from './live-quota.js';
 import { createSessionSource } from './sessions.js';
+import { EMPTY_PRICING, normalizePricing } from './pricing.js';
 export const name = 'dsh-key-usage';
-export function apply(ctx) {
+/**
+ * 计费规则存在宿主设置服务的这个命名空间里。
+ *
+ * 宿主的「设置」服务并不维护独立存储：命名空间就是 profile 里**本条目的 id**
+ * （`cordis.patch.yml` 的 `insert.id`，与本包同名），字段必须用 `.volatile()` 标记才会被
+ * 列出；写入由宿主的 config-editor 落到当前 profile 的 cordis patch 上并原地生效，
+ * 因此本插件不写文件、也不需要重启宿主。
+ */
+const SETTINGS_NAMESPACE = 'dsh-key-usage';
+/** 规则的 Config 形状；数值全部可改，默认空规则 = 沿用台账反推均价（与升级前行为一致）。 */
+const RulesSchema = z.array(z.object({
+    provider: z.string().default('*'),
+    model: z.string().default('*'),
+    unit: z.union(['perMillionTokens', 'perThousandTokens', 'perCall']).default('perMillionTokens'),
+    currency: z.string().default('CNY'),
+    input: z.number().default(0),
+    cacheRead: z.number().default(0),
+    cacheWrite: z.number().default(0),
+    output: z.number().default(0),
+    offPeak: z.object({
+        // `days`（ISO 1=周一 … 7=周日）缺省 = 每天适用；加它之前保存的规则没有这个字段，语义必须不变
+        windows: z.array(z.object({
+            from: z.string(),
+            to: z.string(),
+            days: z.array(z.number()).default([]),
+        })).default([]),
+        input: z.number().default(0),
+        cacheRead: z.number().default(0),
+        cacheWrite: z.number().default(0),
+        output: z.number().default(0),
+    }),
+    note: z.string().default(''),
+}));
+export const Config = z.object({
+    pricing: z.object({
+        version: z.number().default(1),
+        currency: z.string().default('CNY'),
+        rules: RulesSchema.default([]),
+    }).default(EMPTY_PRICING).volatile(),
+});
+/**
+ * 读当前规则：优先问宿主设置服务的实时投影（用户改完立即生效，无需重启宿主），
+ * 服务缺失（非桌面 / 未组配 dsh-settings）时退回插件自己的 Config 引用。
+ */
+function readPricing(ctx, configRef) {
+    const settings = (typeof ctx.get === 'function' ? ctx.get('settings') : undefined);
+    if (settings !== undefined && typeof settings.describe === 'function') {
+        try {
+            const rows = settings.describe({ redactSecrets: false });
+            const row = Array.isArray(rows) ? rows.find((candidate) => candidate?.ns === SETTINGS_NAMESPACE) : undefined;
+            if (row !== undefined) {
+                return {
+                    config: normalizePricing(row.value),
+                    writable: true,
+                    revision: typeof row.revision === 'number' ? row.revision : null,
+                };
+            }
+        }
+        catch {
+            // 设置服务尚未就绪（组合中或已停用）：静默退回本地 Config
+        }
+    }
+    return { config: normalizePricing(configRef), writable: false, revision: null };
+}
+export function apply(ctx, config) {
     // 会话服务是可选依赖：用 get 惰性取，缺了也只是会话相关页面显示空态
     const sessionSource = createSessionSource({
         get: (serviceName) => (typeof ctx.get === 'function' ? ctx.get(serviceName) : undefined),
@@ -40,6 +107,8 @@ export function apply(ctx) {
         host.effect(() => mountKeyUsageRoutes(host.webServer, sessionSource, liveQuota, {
             // workspaceRegistry 用来读官方归档集合（拿不到就回退本地 storages/workspace.json）
             get: (serviceName) => (typeof ctx.get === 'function' ? ctx.get(serviceName) : undefined),
+        }, {
+            current: () => readPricing(ctx, config?.pricing),
         }), 'dsh-key-usage: http routes');
     });
 }

package/lib/live-quota.js

@@ -11,7 +11,62 @@ function textOf(value) {
         return String(value);
     return null;
 }
-/** OpenCode Go：GET https://opencode.ai/zen/go/v1/usage → usage.rolling / weekly / monthly。 */
+/** 金额字段：官方既有字符串（DeepSeek）也有数字（Moonshot），两种都接受，统一输出原样字符串。 */
+function amountTextOf(value) {
+    if (typeof value === 'number')
+        return Number.isFinite(value) ? String(value) : null;
+    if (typeof value === 'string') {
+        const trimmed = value.trim();
+        return trimmed !== '' && Number.isFinite(Number(trimmed)) ? trimmed : null;
+    }
+    return null;
+}
+/** 金额 / 百分比的数值形态：接受 number 与数字字符串，其它一律 null。 */
+function amountOf(value) {
+    const text = amountTextOf(value);
+    if (text === null)
+        return null;
+    const parsed = Number(text);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+/** epoch → ISO：13 位按毫秒、10 位按秒；越界返回 null。 */
+function isoFromEpoch(value) {
+    const milliseconds = value >= 1e11 || value < 1e9 ? value : value * 1000;
+    const date = new Date(milliseconds);
+    return Number.isNaN(date.getTime()) ? null : date.toISOString();
+}
+/** 重置时间：官方为 ISO 字符串，兼容 epoch 毫秒 / 秒（数字或纯数字字符串）；识别不出时原样保留。 */
+function resetAtOf(value) {
+    if (typeof value === 'number')
+        return Number.isFinite(value) ? isoFromEpoch(value) : null;
+    if (typeof value !== 'string' || value === '')
+        return null;
+    const trimmed = value.trim();
+    if (/^\d{9,14}$/.test(trimmed))
+        return isoFromEpoch(Number(trimmed));
+    return value;
+}
+/** 接口没返回币种时的兜底：按站点判定（Z.AI 海外站按美元计价，BigModel / Moonshot 国内站按人民币）。 */
+function currencyFromHost(requestUrl, fallback) {
+    let host = '';
+    try {
+        host = new URL(requestUrl).hostname.toLowerCase();
+    }
+    catch {
+        return fallback;
+    }
+    if (host === 'z.ai' || host.endsWith('.z.ai'))
+        return 'USD';
+    if (host === 'bigmodel.cn' || host.endsWith('.bigmodel.cn'))
+        return 'CNY';
+    if (host === 'moonshot.cn' || host.endsWith('.moonshot.cn'))
+        return 'CNY';
+    return fallback;
+}
+/**
+ * OpenCode Go：GET https://opencode.ai/zen/go/v1/usage → usage.rolling / weekly / monthly。
+ * 该端点未收录于官方文档（opencode.ai/docs/go 只指向 console），字段结构取自社区实现，见 test/fixtures/providers/opencode-go。
+ */
 const OPENCODE_GO_SCHEME = {
     url: () => 'https://opencode.ai/zen/go/v1/usage',
     parse: (body) => {
@@ -24,13 +79,14 @@ const OPENCODE_GO_SCHEME = {
             const raw = usage[sourceKey];
             if (!isObject(raw))
                 continue;
-            const percent = typeof raw.percent === 'number' ? raw.percent : Number(raw.percent);
-            if (!Number.isFinite(percent))
+            // 社区实现里 percent 可能是字符串、resetsAt 可能是 epoch，两者都按漂移兼容处理
+            const percent = amountOf(raw.percent);
+            if (percent === null)
                 continue;
             windows.push({
                 key: windowKey,
                 percent,
-                resetsAt: textOf(raw.resetsAt),
+                resetsAt: resetAtOf(raw.resetsAt),
                 status: typeof raw.status === 'string' ? raw.status : null,
             });
         }
@@ -41,22 +97,26 @@ const OPENCODE_GO_SCHEME = {
 function balanceScheme(path, parse, fallbackOrigin) {
     return {
         url: (baseURL) => new URL(path, baseURL ?? fallbackOrigin).href,
-        parse: (body) => ({ balance: isObject(body) ? parse(body) : null, windows: null }),
+        parse: (body, requestUrl) => ({ balance: isObject(body) ? parse(body, requestUrl) : null, windows: null }),
     };
 }
 const SCHEMES = {
     'opencode-go': OPENCODE_GO_SCHEME,
     // DeepSeek: GET {origin}/user/balance → balance_infos[{currency,total_balance,granted_balance,topped_up_balance}]
     'deepseek-official': balanceScheme('/user/balance', (body) => {
-        const infos = Array.isArray(body.balance_infos) ? body.balance_infos : [];
-        const info = infos.find((entry) => isObject(entry) && entry.currency === 'CNY') ?? infos[0];
-        if (!isObject(info))
+        // 文档 balance_infos[].currency 只可能是 CNY / USD：没有 CNY 项时退回第一项，并如实保留它的币种
+        const infos = (Array.isArray(body.balance_infos) ? body.balance_infos : []).filter(isObject);
+        const info = infos.find((entry) => (textOf(entry.currency) ?? '').toUpperCase() === 'CNY') ?? infos[0];
+        if (info === undefined)
+            return null;
+        const total = amountTextOf(info.total_balance);
+        const granted = amountTextOf(info.granted_balance);
+        const toppedUp = amountTextOf(info.topped_up_balance);
+        // 三个金额全缺说明结构已经漂移，判 bad-json，不返回「只有币种」的空壳成功
+        if (total === null && granted === null && toppedUp === null)
             return null;
         const balance = {};
         const currency = textOf(info.currency);
-        const total = textOf(info.total_balance);
-        const granted = textOf(info.granted_balance);
-        const toppedUp = textOf(info.topped_up_balance);
         if (currency !== null)
             balance.currency = currency;
         if (total !== null)
@@ -65,29 +125,31 @@ const SCHEMES = {
             balance.giftBalance = granted;
         if (toppedUp !== null)
             balance.topUpBalance = toppedUp;
-        return Object.keys(balance).length > 0 ? balance : null;
+        return balance;
     }, 'https://api.deepseek.com'),
     // OpenRouter: GET {origin}/api/v1/credits（需要 Management Key）
     openrouter: balanceScheme('/api/v1/credits', (body) => {
         const data = isObject(body.data) ? body.data : null;
         if (data === null)
             return null;
-        const totalCredits = typeof data.total_credits === 'number' ? data.total_credits : null;
-        const totalUsage = typeof data.total_usage === 'number' ? data.total_usage : null;
+        const totalCredits = amountOf(data.total_credits);
+        const totalUsage = amountOf(data.total_usage);
         if (totalCredits === null || totalUsage === null)
             return null;
         return { currency: 'USD', totalBalance: (totalCredits - totalUsage).toFixed(2) };
     }, 'https://openrouter.ai'),
-    // Moonshot / Kimi: GET {origin}/v1/users/me/balance
-    moonshotai: balanceScheme('/v1/users/me/balance', (body) => {
+    // Moonshot / Kimi: GET {origin}/v1/users/me/balance（文档未定义 currency 字段，国内站按人民币计）
+    moonshotai: balanceScheme('/v1/users/me/balance', (body, requestUrl) => {
         const data = isObject(body.data) ? body.data : null;
         if (data === null)
             return null;
+        const available = amountTextOf(data.available_balance);
+        const cash = amountTextOf(data.cash_balance);
+        const voucher = amountTextOf(data.voucher_balance);
+        if (available === null && cash === null && voucher === null)
+            return null;
         const balance = {};
-        const currency = textOf(data.currency);
-        const available = textOf(data.available_balance);
-        const cash = textOf(data.cash_balance);
-        const voucher = textOf(data.voucher_balance);
+        const currency = textOf(data.currency) ?? currencyFromHost(requestUrl, null);
         if (currency !== null)
             balance.currency = currency;
         if (available !== null)
@@ -96,21 +158,23 @@ const SCHEMES = {
             balance.giftBalance = voucher;
         if (cash !== null)
             balance.topUpBalance = cash;
-        return Object.keys(balance).length > 0 ? balance : null;
+        return balance;
     }, 'https://api.moonshot.cn'),
-    // Z.AI / GLM: GET {origin}/api/paas/v4/balance
-    zai: balanceScheme('/api/paas/v4/balance', (body) => {
+    // Z.AI / GLM: GET {origin}/api/paas/v4/balance（官方文档未收录，接口自带 currency 时才采信）
+    zai: balanceScheme('/api/paas/v4/balance', (body, requestUrl) => {
         const data = isObject(body.data) ? body.data : null;
         if (data === null)
             return null;
-        const balance = { currency: 'CNY' };
-        const total = textOf(data.total_balance);
-        const available = textOf(data.available_balance);
+        const total = amountTextOf(data.total_balance);
+        const available = amountTextOf(data.available_balance);
+        if (total === null && available === null)
+            return null;
+        const balance = { currency: textOf(data.currency) ?? currencyFromHost(requestUrl, 'CNY') };
         if (total !== null)
             balance.totalBalance = total;
         if (available !== null)
             balance.availableBalance = available;
-        return Object.keys(balance).length > 1 ? balance : null;
+        return balance;
     }, 'https://api.z.ai'),
 };
 /** provider id → 方案 id（事件里的 provider 可能是路由名，先取末段）。 */
@@ -133,7 +197,8 @@ async function queryOne(schemeId, apiKey, baseURL, fetchImpl) {
     const controller = new AbortController();
     const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
     try {
-        const response = await fetchImpl(scheme.url(baseURL), {
+        const requestUrl = scheme.url(baseURL);
+        const response = await fetchImpl(requestUrl, {
             headers: { Authorization: 'Bearer ' + apiKey, Accept: 'application/json' },
             signal: controller.signal,
         });
@@ -142,7 +207,8 @@ async function queryOne(schemeId, apiKey, baseURL, fetchImpl) {
         if (!response.ok)
             return { balance: null, windows: null, error: 'http-' + String(response.status) };
         const raw = await response.text();
-        if (raw.length > MAX_RESPONSE_BYTES)
+        // 上限按**字节**算：raw.length 是 UTF-16 码元数，中文响应会因此超限仍被接受
+        if (Buffer.byteLength(raw, 'utf8') > MAX_RESPONSE_BYTES)
             return { balance: null, windows: null, error: 'too-large' };
         let body;
         try {
@@ -151,7 +217,7 @@ async function queryOne(schemeId, apiKey, baseURL, fetchImpl) {
         catch {
             return { balance: null, windows: null, error: 'bad-json' };
         }
-        const parsed = scheme.parse(body);
+        const parsed = scheme.parse(body, requestUrl);
         if (parsed.balance === null && parsed.windows === null)
             return { balance: null, windows: null, error: 'bad-json' };
         return { ...parsed, error: null };

package/lib/merge.js

@@ -14,6 +14,7 @@ export function sessionDayRows(records, knownProviders) {
                     inputTokens: model.buckets.inputTokens,
                     outputTokens: model.buckets.outputTokens,
                     cacheReadTokens: model.buckets.cacheReadTokens,
+                    cacheWriteTokens: model.buckets.cacheWriteTokens,
                 });
             }
         }
@@ -44,11 +45,13 @@ function synthesizeDay(date, rows) {
     let inputTokens = 0;
     let outputTokens = 0;
     let cacheReadTokens = 0;
+    let cacheWriteTokens = 0;
     for (const row of rows) {
         calls += row.calls;
         inputTokens += row.inputTokens;
         outputTokens += row.outputTokens;
         cacheReadTokens += row.cacheReadTokens;
+        cacheWriteTokens += row.cacheWriteTokens;
         const key = row.provider + '|' + row.model;
         const entry = byModel.get(key);
         if (entry === undefined) {
@@ -60,6 +63,7 @@ function synthesizeDay(date, rows) {
                 inputTokens: row.inputTokens,
                 outputTokens: row.outputTokens,
                 cacheReadTokens: row.cacheReadTokens,
+                cacheWriteTokens: row.cacheWriteTokens,
                 reasoningTokens: 0,
                 // 会话事件没有官方成本，成本列对这些天留 0，由界面按计费模式展示
                 cost: 0,
@@ -70,6 +74,7 @@ function synthesizeDay(date, rows) {
         entry.inputTokens += row.inputTokens;
         entry.outputTokens += row.outputTokens;
         entry.cacheReadTokens += row.cacheReadTokens;
+        entry.cacheWriteTokens += row.cacheWriteTokens;
     }
     const models = [...byModel.values()];
     return {
@@ -79,6 +84,7 @@ function synthesizeDay(date, rows) {
         inputTokens,
         outputTokens,
         cacheReadTokens,
+        cacheWriteTokens,
         reasoningTokens: 0,
         cost: 0,
         models: models.sort((first, second) => (second.inputTokens + second.outputTokens + second.cacheReadTokens)
@@ -120,12 +126,13 @@ export function mergeDailySeries(ledgerDays, sessionRows, from, to) {
 }
 /** 合并后的范围总计（展示口径 tokens 不含 cacheWrite）。 */
 export function totalsOfMerged(days) {
-    const totals = { date: '', calls: 0, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, reasoningTokens: 0, cost: 0 };
+    const totals = { date: '', calls: 0, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0, reasoningTokens: 0, cost: 0 };
     for (const day of days) {
         totals.calls += day.calls;
         totals.inputTokens += day.inputTokens;
         totals.outputTokens += day.outputTokens;
         totals.cacheReadTokens += day.cacheReadTokens;
+        totals.cacheWriteTokens += day.cacheWriteTokens;
         totals.reasoningTokens += day.reasoningTokens;
         totals.cost += day.cost;
     }