dsh-key-usage 0.1.2 → 0.1.4

package/lib/sessions.js

@@ -13,6 +13,15 @@ import { normalizeSessionId } from './session-meta.js';
  * 只有首次请求（或会话变化）才重新读取事件。
  */
 const MAX_SESSIONS = 200;
+/**
+ * 同时在读的会话数：宿主的 `open(id,"read")` 与随后的 `read(0)` 共用一条容量 2 的解析
+ * memo（后端注释写明「只装处于两步之间的会话」），2 路正好把两次「找路径 + 读文件」的
+ * 等待叠起来；3 路会把先到的会话挤出 memo、逼它整段重解压。
+ * 本机实测（133 会话 / 119 MB）：串行 7.4~7.9 s，2 路 6.0~6.4 s，3 路反而 7.8~8.2 s。
+ */
+const READ_CONCURRENCY = 2;
+/** 超过这个体积的会话改为串行：它们的耗时主要在主线程解压，叠不出等待，却会放大 memo 被第三方挤掉时的重解压代价。 */
+const SERIAL_SESSION_BYTES = 1024 * 1024;
 function firstString(...values) {
     for (const value of values) {
         if (typeof value === 'string' && value.trim() !== '')
@@ -49,7 +58,9 @@ export function createSessionSource(host) {
             .sort((first, second) => second.order - first.order)
             .slice(0, MAX_SESSIONS);
         const present = new Set();
-        let skipped = 0;
+        // 小会话两路并发、大会话串行：两条队列都不改变最终 records 的顺序（顺序由 ordered 决定）
+        const shared = [];
+        const alone = [];
         for (const { snapshot } of ordered) {
             const id = firstString(snapshot.header.id);
             if (id === null)
@@ -60,23 +71,36 @@ export function createSessionSource(host) {
             const cached = cache.get(id);
             if (cached !== undefined && cached.revision === revision && cached.eventCount === eventCount)
                 continue;
+            const size = typeof snapshot.sizeBytes === 'number' ? snapshot.sizeBytes : Number.POSITIVE_INFINITY;
+            const pending = { id, header: snapshot.header, revision, eventCount };
+            if (size <= SERIAL_SESSION_BYTES)
+                shared.push(pending);
+            else
+                alone.push(pending);
+        }
+        let skipped = 0;
+        const readSession = async ({ id, header, revision, eventCount }) => {
             let handle;
             try {
                 handle = await persistence.open?.(id, 'read');
                 if (handle === undefined) {
                     skipped += 1;
-                    continue;
+                    return;
                 }
                 const { events } = await handle.read(0);
                 const inherited = typeof handle.inheritedEventCount === 'number' ? handle.inheritedEventCount : 0;
                 if (!Number.isSafeInteger(inherited) || inherited < 0 || inherited > events.length) {
                     skipped += 1;
-                    continue;
+                    return;
                 }
-                // 继承前缀只用于建立模型归属，不计入本次用量
-                const inheritedHeaders = events.slice(0, inherited).filter((event) => event.type === 'request/header');
-                const fold = foldSessionEvents([...inheritedHeaders, ...events.slice(inherited)]);
-                const metadata = metadataOf(snapshot.header);
+                // 继承前缀只用于建立模型归属，不计入本次用量；无继承时直接用原数组，省一次整段拷贝
+                const fold = inherited === 0
+                    ? foldSessionEvents(events)
+                    : foldSessionEvents([
+                        ...events.slice(0, inherited).filter((event) => event.type === 'request/header'),
+                        ...events.slice(inherited),
+                    ]);
+                const metadata = metadataOf(header);
                 cache.set(id, {
                     revision,
                     eventCount,
@@ -97,7 +121,9 @@ export function createSessionSource(host) {
                     }
                 }
             }
-        }
+        };
+        await forEachWithLimit(shared, READ_CONCURRENCY, readSession);
+        await forEachWithLimit(alone, 1, readSession);
         for (const id of [...cache.keys()])
             if (!present.has(id))
                 cache.delete(id);
@@ -170,6 +196,23 @@ export function createSessionSource(host) {
     }
     return { collect };
 }
+/**
+ * 有界并发跑任务：worker 数即并发上限，按游标顺序取活，不预先建满 promise 列表。
+ * worker 自己吞掉异常（读取失败只影响该会话），所以这里不会提前中断其它会话。
+ */
+async function forEachWithLimit(items, limit, worker) {
+    let cursor = 0;
+    const runners = Array.from({ length: Math.min(limit, items.length) }, async () => {
+        for (;;) {
+            const index = cursor;
+            cursor += 1;
+            if (index >= items.length)
+                return;
+            await worker(items[index]);
+        }
+    });
+    await Promise.all(runners);
+}
 function coverageOf(totalSessions, countedSessions, skippedSessions) {
     if (countedSessions === 0 && totalSessions > 0) {
         return { status: 'unavailable', totalSessions, countedSessions, skippedSessions };
@@ -214,6 +257,53 @@ export function sessionRowsOf(records, knownProviders, meta = {}) {
     }))
         .sort((first, second) => (second.lastTime ?? 0) - (first.lastTime ?? 0));
 }
+export function modelRowsOf(records, knownProviders) {
+    const byModel = new Map();
+    for (const record of records) {
+        const sessionLastTime = record.summary.lastTime;
+        for (const model of attributedModels(record.summary.models, knownProviders)) {
+            const key = model.provider + '|' + model.model;
+            let accumulator = byModel.get(key);
+            if (accumulator === undefined) {
+                accumulator = {
+                    provider: model.provider, model: model.model, calls: 0,
+                    inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0, sessionCount: 0, lastTime: null,
+                };
+                byModel.set(key, accumulator);
+            }
+            accumulator.calls += model.calls;
+            accumulator.inputTokens += model.buckets.inputTokens;
+            accumulator.outputTokens += model.buckets.outputTokens;
+            accumulator.cacheReadTokens += model.buckets.cacheReadTokens;
+            accumulator.cacheWriteTokens += model.buckets.cacheWriteTokens;
+            accumulator.sessionCount += 1;
+            // 会话事件只有会话级时间戳，「最近活跃」只能取用到该模型的最晚会话时间，是近似值
+            if (sessionLastTime !== null && (accumulator.lastTime === null || sessionLastTime > accumulator.lastTime)) {
+                accumulator.lastTime = sessionLastTime;
+            }
+        }
+    }
+    return [...byModel.values()]
+        .map((accumulator) => {
+        const displayTokens = accumulator.inputTokens + accumulator.outputTokens + accumulator.cacheReadTokens;
+        return {
+            provider: accumulator.provider,
+            model: accumulator.model,
+            calls: accumulator.calls,
+            tokens: displayTokens,
+            cacheHitRate: displayTokens > 0 ? Math.round(accumulator.cacheReadTokens / displayTokens * 1000) / 10 : null,
+            sessionCount: accumulator.sessionCount,
+            lastTime: accumulator.lastTime,
+            buckets: {
+                inputTokens: accumulator.inputTokens,
+                outputTokens: accumulator.outputTokens,
+                cacheReadTokens: accumulator.cacheReadTokens,
+                cacheWriteTokens: accumulator.cacheWriteTokens,
+            },
+        };
+    })
+        .sort((first, second) => second.tokens - first.tokens);
+}
 export function projectRowsOf(records, knownProviders, meta = {}) {
     const archived = meta.archived ?? new Set();
     const byWorkspace = new Map();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-key-usage",
   "description": "DeepSeek Harness 侧边栏「使用情况」：按通道展示用量明细、活跃热力图、项目/会话用量与官方余额/配额（实时优先，失败回落快照）",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "license": "MIT",
   "type": "module",
   "keywords": [
@@ -27,6 +27,8 @@
     "LICENSE",
     "docs/images/usage-overview.png",
     "docs/images/usage-daily.png",
+    "docs/images/按模型.png",
+    "docs/images/项目总量.png",
     "docs/images/usage-quota.png"
   ],
   "repository": {
@@ -44,13 +46,9 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "scripts": {
-    "build:client": "tsdown && node scripts/normalize-client-banner.mjs",
-    "check": "node --check lib/index.js && node --check lib/ledger.js && node --check lib/collect.js && node --check lib/routes.js && node --check lib/sessions.js && node --check lib/session-usage.js && node --check lib/session-meta.js && node --check lib/merge.js && node --check lib/live-quota.js",
-    "test": "node test/ledger.test.mjs && node test/collect.test.mjs && node test/channels.test.mjs && node test/session-usage.test.mjs && node test/session-meta.test.mjs && node test/sessions.test.mjs && node test/merge.test.mjs && node test/live-quota.test.mjs && node test/routes.test.mjs"
-  },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1"
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/schemastery": "^3.18.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -65,7 +63,8 @@
       "platform": "web",
       "inject": [
         "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-slots"
+        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-settings"
       ]
     }
   },
@@ -76,5 +75,15 @@
     "react": "18.3.1",
     "tsdown": "0.22.14",
     "typescript": "7.0.2"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.server.json && tsdown && node scripts/normalize-client-banner.mjs",
+    "build:client": "tsdown && node scripts/normalize-client-banner.mjs",
+    "build:server": "tsc -p tsconfig.server.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "check": "node --check lib/index.js && node --check lib/ledger.js && node --check lib/collect.js && node --check lib/routes.js && node --check lib/sessions.js && node --check lib/session-usage.js && node --check lib/session-meta.js && node --check lib/quota-snapshots.js && node --check lib/merge.js && node --check lib/live-quota.js && node --check lib/pricing.js && node --check lib/pricing-catalog.js",
+    "test": "node test/ledger.test.mjs && node test/collect.test.mjs && node test/channels.test.mjs && node test/session-usage.test.mjs && node test/session-meta.test.mjs && node test/sessions.test.mjs && node test/merge.test.mjs && node test/live-quota.test.mjs && node test/pricing.test.mjs && node test/routes.test.mjs",
+    "verify": "npm run typecheck && npm run build && npm run check && npm run test",
+    "pack:dry": "npm pack --dry-run"
   }
-}
+}