@lyk308/dsh-token-dashboard 0.1.3 → 0.1.4

package/lib/index.js

@@ -139,8 +139,11 @@ function zstdDecompressToText(buf) {
 	return Buffer.concat(parts).toString("utf8");
 }
 
-/** Normalize a token-usage event into our source-neutral shape. */
-function usagesFromEvent(obj, acc, currentModel, timeMs) {
+/** Normalize a token-usage event into our source-neutral shape.
+ * @param {boolean} inRange - false skips aggregation (used for window filtering).
+ */
+function usagesFromEvent(obj, acc, currentModel, timeMs, inRange) {
+	if (inRange === false) return;
 	if (!obj || typeof obj !== "object") return;
 	const data = obj.data;
 	if (!data) return;
@@ -199,24 +202,37 @@ function findSessionLogs(root) {
 	return out;
 }
 
-/** Aggregate token stats across all session logs under `root`. */
-function aggregateTokens(root) {
+/** Aggregate token stats across all session logs under `root`.
+ * @param {string} root - sessions directory.
+ * @param {number|null} days - if set, byModel/byWorkspace/byDay/bySession are
+ *   filtered to events within the last `days` days, while total/cost/today/
+ *   thisMonth remain full-window (those are cardinal period facts).
+ */
+function aggregateTokens(root, days) {
 	const acc = {
 		total: 0, input: 0, output: 0, cacheRead: 0, reasoning: 0, cost: 0,
 		events: 0, req: 0, cacheHits: 0, sessions: 0, files: 0,
-		byModel: {}, byDay: {}, byWorkspace: {}
+		byModel: {}, byDay: {}, byWorkspace: {}, bySession: {}
 	};
 	const files = findSessionLogs(root);
 	acc.files = files.length;
 	const now = new Date();
 	const todayKey = now.toISOString().slice(0, 10);
 	const monthKey = todayKey.slice(0, 7);
+	// Range cutoff (epoch ms): events older than this are excluded from the
+	// per-group aggregates when `days` is provided. null = no filtering.
+	const cutoff = (days && days > 0) ? Date.now() - days * 86400 * 1000 : null;
 	for (const file of files) {
 		let bytes;
 		try { bytes = readFileSync(file); } catch { continue; }
 		const text = file.endsWith(".zstd") ? zstdDecompressToText(bytes) : bytes.toString("utf8");
 		if (!text) continue;
 		acc.sessions += 1;
+		// Session id: the parent directory name of each session.jsonl[.zstd].
+		// Path shape: .../sessions/<workspace>/<session-id>/session.jsonl[.zstd]
+		let sessionId = basename(dirname(file));
+		let sRec = acc.bySession[sessionId];
+		if (sRec === undefined) { sRec = acc.bySession[sessionId] = { id: sessionId, total: 0, cost: 0, req: 0, first: null, last: null, model: null, workspace: "unknown" }; }
 		const lines = text.split("\n");
 		let ws = "unknown";
 		let currentModel = null;
@@ -224,7 +240,7 @@ function aggregateTokens(root) {
 			if (!line) continue;
 			let o;
 			try { o = JSON.parse(line); } catch { continue; }
-			if (o.type === "session" && o.cwd) ws = o.cwd;
+			if (o.type === "session" && o.cwd) { ws = o.cwd; sRec.workspace = ws; const t0 = o.createdAt; if (t0 && (sRec.first === null || t0 < sRec.first)) sRec.first = t0; }
 			// Track the active model. DSH records it on:
 			//  - request/header: data.header.config.model  (authoritative)
 			//  - request/context: data.model
@@ -232,6 +248,7 @@ function aggregateTokens(root) {
 			if (o.type === "request/header") {
 				const m = o.data?.header?.config?.model || o.data?.model || null;
 				if (m) currentModel = m;
+				if (m && (sRec.model === null || currentModel)) sRec.model = m;
 			} else if (o.type === "assistant/message") {
 				const m = o.data?.usage?.model || o.data?.model || null;
 				if (m) currentModel = m;
@@ -239,6 +256,10 @@ function aggregateTokens(root) {
 				const m = o.data?.model || null;
 				if (m) currentModel = m;
 			}
+			// Whether this event falls within the requested window (computed once so
+			// both the usageBlock branch and usagesFromEvent can use it).
+			const evT = o.time ?? o.createdAt;
+			const inRange = cutoff === null || (evT && evT >= cutoff);
 			// Per-day + per-workspace accumulation must happen per event BEFORE the
 			// generic usagesFromEvent bump, so we mirror the same broken-down shape.
 			const usageBlock = o.data?.chunk?.usage;
@@ -252,8 +273,9 @@ function aggregateTokens(root) {
 				const day = t ? new Date(t).toISOString().slice(0, 10) : null;
 				// cost of this single event (peak/off-peak aware, model-aware)
 				const cost = costOf({ input: inTok, output: outTok, cacheRead: cTok, reasoning: rTok }, t, currentModel || "unknown");
-				acc.cost += cost;
-				if (day !== null) {
+				// Whether this event is within the requested window (reuse outer inRange).
+				if (inRange) acc.cost += cost;
+				if (day !== null && inRange) {
 					let d = acc.byDay[day];
 					if (d === undefined) { d = acc.byDay[day] = { total: 0, input: 0, output: 0, cacheRead: 0, cost: 0 }; }
 					d.total += sum;
@@ -261,21 +283,33 @@ function aggregateTokens(root) {
 					d.output += outTok;
 					d.cacheRead += cTok;
 					d.cost += cost;
+				}
+				// today / thisMonth are cardinal period facts (全量, independent of window)
+				if (day !== null) {
 					if (day === todayKey) { acc.today = (acc.today || 0) + sum; acc.todayCost = (acc.todayCost || 0) + cost; }
 					if (day.slice(0, 7) === monthKey) { acc.thisMonth = (acc.thisMonth || 0) + sum; acc.thisMonthCost = (acc.thisMonthCost || 0) + cost; }
 				}
 				// per-workspace broken-down counters
-				let w = acc.byWorkspace[ws];
-				if (w === undefined) { w = acc.byWorkspace[ws] = { req: 0, input: 0, output: 0, cacheRead: 0, reasoning: 0, total: 0, cost: 0 }; }
-				w.req += 1;
-				w.input += inTok;
-				w.output += outTok;
-				w.cacheRead += cTok;
-				w.reasoning += rTok;
-				w.total += sum;
-				w.cost += cost;
+				if (inRange) {
+					let w = acc.byWorkspace[ws];
+					if (w === undefined) { w = acc.byWorkspace[ws] = { req: 0, input: 0, output: 0, cacheRead: 0, reasoning: 0, total: 0, cost: 0 }; }
+					w.req += 1;
+					w.input += inTok;
+					w.output += outTok;
+					w.cacheRead += cTok;
+					w.reasoning += rTok;
+					w.total += sum;
+					w.cost += cost;
+					// per-session accumulation
+					sRec.total += sum;
+					sRec.cost += cost;
+					sRec.req += 1;
+					sRec.model = currentModel || sRec.model;
+					const evTime = o.time ?? o.createdAt;
+					if (evTime) { if (sRec.first === null || evTime < sRec.first) sRec.first = evTime; if (sRec.last === null || evTime > sRec.last) sRec.last = evTime; }
+				}
 			}
-			usagesFromEvent(o, acc, currentModel, o.time ?? o.createdAt);
+			usagesFromEvent(o, acc, currentModel, o.time ?? o.createdAt, inRange);
 		}
 	}
 	return acc;
@@ -328,24 +362,10 @@ export function apply(ctx, config) {
 	// blank" symptom. Caching makes the request path O(1) and defers the costly
 	// scan to a background refresh that never blocks a response.
 	const STATS_TTL_MS = 60_000;
-	let statsCache = { at: 0, payload: null, computing: false };
+	// Cache keyed by window (days): { [days]: { at, payload, computing } }.
+	let statsCache = {};
 
-	function scheduleStatsRefresh() {
-		if (statsCache.computing) return; // already running; back off
-		statsCache.computing = true;
-		// Defer to the next tick so the current handler / event loop is not held.
-		setImmediate(() => {
-			try {
-				const s = aggregateTokens(sessionsRoot);
-				statsCache = { at: Date.now(), payload: s, computing: false };
-			} catch (error) {
-				ctx.logger.warn(error instanceof Error ? error : new Error(String(error)));
-				statsCache = { ...statsCache, computing: false };
-			}
-		});
-	}
-	// Warm the cache once on boot so the first open returns data immediately.
-	scheduleStatsRefresh();
+	// (stats cache is filled lazily on the first /stats request, synchronously.)
 
 	// --- route: token stats (served from cache; never blocks the event loop) ---
 	ctx.webServer.register({
@@ -355,16 +375,26 @@ export function apply(ctx, config) {
 			try {
 				const url = new URL(req.url ?? "/", "http://x");
 				const force = url.searchParams.get("refresh") === "1";
-				if (force) scheduleStatsRefresh();
-				else if (!statsCache.computing && Date.now() - statsCache.at > STATS_TTL_MS) scheduleStatsRefresh();
-				const cached = statsCache.payload;
-				if (cached) {
-					sendJson(res, 200, { ...cached, cached: true });
+				const days = Number(url.searchParams.get("days"));
+				const winDays = (days > 0) ? days : null;
+				const key = winDays || 0;
+				let cell = statsCache[key];
+				// Serve from cache if fresh; otherwise compute synchronously (first call
+				// after a window switch blocks ~1.5s to fill the cache, then it's instant).
+				if (force || !cell || (Date.now() - cell.at > STATS_TTL_MS && !cell.computing)) {
+					const s = aggregateTokens(sessionsRoot, winDays);
+					statsCache[key] = { at: Date.now(), payload: s, computing: false };
+					cell = statsCache[key];
+				}
+				if (cell && cell.payload) {
+					sendJson(res, 200, { ...cell.payload, cached: true, windowDays: winDays });
+					return;
+				}
+				if (cell && cell.error) {
+					sendJson(res, 500, { status: "error", message: cell.error, windowDays: winDays });
 					return;
 				}
-				// No cache yet (first request after boot, scan still warming). Return
-				// immediately with a "computing" marker instead of blocking on the scan.
-				sendJson(res, 200, { status: "computing", cached: false });
+				sendJson(res, 200, { status: "computing", cached: false, windowDays: winDays });
 			} catch (error) {
 				ctx.logger.warn(error instanceof Error ? error : new Error(String(error)));
 				sendJson(res, 500, { status: "error", message: String(error) });

package/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "@lyk308/dsh-token-dashboard",
-  "version": "0.1.3",
-  "description": "DeepSeek Harness 实时看板：账户余额 + Token 使用量（按模型/工作区/缓存命中），本地读取会话日志 + DeepSeek /user/balance。",
-  "type": "module",
-  "main": "lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale",
-        "@deepseek-ai/dsh-client-ui-slots",
-        "@deepseek-ai/dsh-client-ui-primitives"
-      ],
-      "platform": "web"
-    }
-  },
-  "files": [
-    "lib/index.js",
-    "lib/client.js",
-    "cordis.patch.yml",
-    "README.md",
-    "README.zh.md",
-    "LICENSE",
-    "docs"
-  ],
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "plugin",
-    "token",
-    "balance",
-    "usage",
-    "dashboard"
-  ],
-  "license": "MIT"
-}
+{
+  "name": "@lyk308/dsh-token-dashboard",
+  "version": "0.1.4",
+  "description": "DeepSeek Harness 实时看板：账户余额 + Token 使用量（按模型/工作区/缓存命中），本地读取会话日志 + DeepSeek /user/balance。",
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-slots",
+        "@deepseek-ai/dsh-client-ui-primitives"
+      ],
+      "platform": "web"
+    }
+  },
+  "files": [
+    "lib/index.js",
+    "lib/client.js",
+    "cordis.patch.yml",
+    "README.md",
+    "README.zh.md",
+    "LICENSE",
+    "docs"
+  ],
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "plugin",
+    "token",
+    "balance",
+    "usage",
+    "dashboard"
+  ],
+  "license": "MIT"
+}