balance-dsh 1.0.9 → 1.0.10

package/lib/index.js

@@ -401,16 +401,35 @@ function recentDayKeys(days, now = Date.now()) {
 }
 
 async function buildUsageStats(ctx, config) {
-  const persistence = typeof ctx.get === "function" ? ctx.get("sessionPersistence") : void 0;
-  if (persistence == null || typeof persistence.list !== "function" || typeof persistence.inspect !== "function") {
-    throw new Error("会话持久化服务不可用");
-  }
+  const getService = typeof ctx.get === "function" ? ctx.get.bind(ctx) : null;
+  const controller = getService?.("sessionController");
+  const persistence = getService?.("sessionPersistence");
   const now = Date.now();
   const cutoffMs = now - (STATS_DAYS - 1) * 24 * 60 * 60 * 1000;
-  const headers = await persistence.list();
-  const selected = [...headers]
-    .filter((header) => header && typeof header.id === "string")
-    .sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))
+  // 列举会话要跨 DSH 版本：新版 sessionController.list() 返回 { items:[{ sessionId, updatedAt }] }
+  // （已按活动降序，字段叫 sessionId）；旧版 sessionPersistence.list() 返回 [{ id, createdAt }]
+  // （字段叫 id）。旧版 persistence 还提供 inspect()，新版改成 handle-based 的 open()，
+  // 所以读取一律走已做三级兼容的 inspectPersistedSession，不再直接调 persistence.inspect。
+  let sessionIds = [];
+  let availableSessions = 0;
+  if (typeof controller?.list === "function") {
+    const listed = await controller.list({});
+    const items = Array.isArray(listed) ? listed : (listed?.items ?? []);
+    sessionIds = items.map((item) => (item && typeof item === "object" ? item.sessionId ?? item.id : void 0));
+    availableSessions = sessionIds.length;
+  } else if (typeof persistence?.list === "function") {
+    const headers = await persistence.list();
+    const list = Array.isArray(headers) ? headers : [];
+    availableSessions = list.length;
+    sessionIds = [...list]
+      .filter((header) => header && typeof header.id === "string")
+      .sort((a, b) => Number(b.createdAt ?? 0) - Number(a.createdAt ?? 0))
+      .map((header) => header.id);
+  } else {
+    throw new Error("会话持久化服务不可用");
+  }
+  const selected = sessionIds
+    .filter((id) => typeof id === "string" && id !== "")
     .slice(0, STATS_MAX_SESSIONS);
   const daily = new Map();
   let cursor = 0;
@@ -418,16 +437,16 @@ async function buildUsageStats(ctx, config) {
   let failedSessions = 0;
   const worker = async () => {
     while (cursor < selected.length) {
-      const header = selected[cursor++];
+      const sessionId = selected[cursor++];
       try {
-        const inspected = await persistence.inspect(header.id);
+        const inspected = await inspectPersistedSession(ctx, sessionId);
         collectDailyUsage(
           inspected?.events ?? [],
           config,
           detectModel({ requestHeader: () => void 0, requestContext: () => void 0, events: inspected?.events ?? [] }),
           cutoffMs,
           daily,
-          header.id,
+          sessionId,
         );
         scannedSessions++;
       } catch {
@@ -468,8 +487,8 @@ async function buildUsageStats(ctx, config) {
     rangeDays: STATS_DAYS,
     scannedSessions,
     failedSessions,
-    availableSessions: headers.length,
-    limited: headers.length > selected.length,
+    availableSessions,
+    limited: availableSessions > selected.length,
     generatedAt: now,
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balance-dsh",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "查询 DeepSeek 余额并显示当前会话 token 消耗。DeepSeek 账户余额 + 会话 token/费用显示，含高峰/空闲峰谷计费。",
   "author": "Rannist",
   "type": "module",