routstrd 0.3.3 → 0.3.5

package/dist/index.js

@@ -13876,9 +13876,6 @@ var init_constants = __esm(() => {
 // src/tui/usage/data.ts
 async function fetchStatus() {
   try {
-    const running = await isDaemonRunning();
-    if (!running)
-      return null;
     const result = await callDaemon("/status");
     if (result.error)
       return null;
@@ -13895,9 +13892,6 @@ async function fetchStatus() {
 }
 async function fetchBalance() {
   try {
-    const running = await isDaemonRunning();
-    if (!running)
-      return null;
     const result = await callDaemon("/keys/balance");
     if (result.error)
       return null;
@@ -13914,9 +13908,6 @@ async function fetchBalance() {
 }
 async function fetchUsageSummary() {
   try {
-    const running = await isDaemonRunning();
-    if (!running)
-      return null;
     const tz = new Date().getTimezoneOffset();
     const result = await callDaemon(`/usage/summary?tz=${tz}`);
     if (result.error)
@@ -13950,9 +13941,6 @@ function formatNumber(n) {
 }
 async function fetchClients() {
   try {
-    const running = await isDaemonRunning();
-    if (!running)
-      return [];
     const result = await callDaemon("/clients");
     if (result.error)
       return [];
@@ -14305,13 +14293,22 @@ function renderToday(stats, width) {
   const currentHour = new Date().getHours();
   const _now = new Date;
   const todayDateStr = `${_now.getFullYear()}-${String(_now.getMonth() + 1).padStart(2, "0")}-${String(_now.getDate()).padStart(2, "0")}`;
-  let todayStats;
-  let recentDays;
-  let hourlyMap;
+  let todayStats = {
+    date: todayDateStr,
+    requests: 0,
+    satsCost: 0,
+    promptTokens: 0,
+    completionTokens: 0,
+    totalTokens: 0
+  };
+  let recentDays = [];
+  let hourlyMap = new Map;
   if (stats.summary) {
     const { days, hoursToday } = stats.summary;
     const todayDayStat = days[0]?.date === todayDateStr ? days[0] : undefined;
-    todayStats = todayDayStat ? { date: todayDayStat.date, requests: todayDayStat.requests, satsCost: todayDayStat.satsCost, promptTokens: todayDayStat.promptTokens, completionTokens: todayDayStat.completionTokens, totalTokens: todayDayStat.totalTokens } : { date: todayDateStr, requests: 0, satsCost: 0, promptTokens: 0, completionTokens: 0, totalTokens: 0 };
+    if (todayDayStat) {
+      todayStats = { date: todayDayStat.date, requests: todayDayStat.requests, satsCost: todayDayStat.satsCost, promptTokens: todayDayStat.promptTokens, completionTokens: todayDayStat.completionTokens, totalTokens: todayDayStat.totalTokens };
+    }
     recentDays = days.filter((d) => d.date !== todayDateStr).slice(0, 6);
     hourlyMap = new Map(hoursToday.map((h) => [h.hour, { requests: h.requests, satsCost: h.satsCost }]));
   }
@@ -14606,10 +14603,9 @@ async function runUsageTui() {
   let clients = [];
   let visibleTabs = getVisibleTabs(false);
   let refreshInterval = null;
-  let shouldUpdate = true;
   let autoRefresh = true;
   let cleanedUp = false;
-  let rendering = false;
+  let fetching = false;
   if (isInteractive) {
     stdout.write(enterAlternateScreen() + hideCursor());
     stdin.setRawMode?.(true);
@@ -14633,55 +14629,70 @@ async function runUsageTui() {
   }
   process.on("SIGINT", () => cleanup(0));
   process.on("SIGTERM", () => cleanup(0));
-  async function render2(forceFetch = false) {
-    if (rendering)
+  async function fetchData() {
+    if (fetching)
       return;
-    rendering = true;
+    fetching = true;
     try {
-      const width = getWidth();
-      const height = getHeight();
-      if (forceFetch || shouldUpdate) {
-        stats = await fetchUsageSummary();
-        balance = await fetchBalance();
-        status = await fetchStatus();
-        clients = await fetchClients();
+      const running2 = await isDaemonRunning();
+      if (!running2) {
+        stats = null;
+      } else {
+        const [newStats, newBalance, newStatus, newClients] = await Promise.all([
+          fetchUsageSummary(),
+          fetchBalance(),
+          fetchStatus(),
+          fetchClients()
+        ]);
+        if (newStats)
+          stats = newStats;
+        if (newBalance)
+          balance = newBalance;
+        if (newStatus)
+          status = newStatus;
+        if (newClients && newClients.length > 0)
+          clients = newClients;
         const npubsVisible = hasAnyNpubs(clients);
         visibleTabs = getVisibleTabs(npubsVisible);
         if (currentTab === "npubs" && !npubsVisible) {
           currentTab = "clients";
           vimState.scrollPos = 0;
         }
-        shouldUpdate = false;
       }
-      if (!stats) {
-        stdout.write(moveCursor(1, 1) + eraseDown() + `${COLORS.red}Error: Could not fetch usage data.${COLORS.reset}
+      render2();
+    } finally {
+      fetching = false;
+    }
+  }
+  function render2() {
+    const width = getWidth();
+    const height = getHeight();
+    if (!stats) {
+      stdout.write(moveCursor(1, 1) + eraseDown() + `${COLORS.red}Error: Could not fetch usage data.${COLORS.reset}
 ` + `Make sure routstrd is running.
 ` + `
 Press Q to quit.`);
-        return;
-      }
-      const content = renderTabContent(currentTab, stats, balance, status, width, clients);
-      const footer = `${COLORS.dim}Press [Q] to quit, [R] to refresh, [A] to toggle auto-refresh${autoRefresh ? " (on)" : " (off)"}  scroll:${vimState.scrollPos}${COLORS.reset}${vimState.mode === "normal" ? `  ${COLORS.yellow}vim: hjkl/arrows, / search, g top, gg bottom${COLORS.reset}` : ""}`;
-      const chrome = renderHeader(currentTab, width, visibleTabs) + renderTabs(currentTab, visibleTabs) + renderSeparator(width) + renderSearchBar();
-      const chromeLines = chrome.split(`
+      return;
+    }
+    const content = renderTabContent(currentTab, stats, balance, status, width, clients);
+    const footer = `${COLORS.dim}Press [Q] to quit, [R] to refresh, [A] to toggle auto-refresh${autoRefresh ? " (on)" : " (off)"}  scroll:${vimState.scrollPos}${COLORS.reset}${vimState.mode === "normal" ? `  ${COLORS.yellow}vim: hjkl/arrows, / search, g top, gg bottom${COLORS.reset}` : ""}`;
+    const chrome = renderHeader(currentTab, width, visibleTabs) + renderTabs(currentTab, visibleTabs) + renderSeparator(width) + renderSearchBar();
+    const chromeLines = chrome.split(`
 `).length - 1;
-      const footerSeparator = renderSeparator(width);
-      const footerLines = footerSeparator.split(`
+    const footerSeparator = renderSeparator(width);
+    const footerLines = footerSeparator.split(`
 `).length - 1;
-      const contentViewportHeight = Math.max(1, height - chromeLines - footerLines - 1);
-      const visibleContent = applyScrollToContent(content, contentViewportHeight);
-      const footerBlock = (visibleContent ? `
+    const contentViewportHeight = Math.max(1, height - chromeLines - footerLines - 1);
+    const visibleContent = applyScrollToContent(content, contentViewportHeight);
+    const footerBlock = (visibleContent ? `
 ` : "") + footerSeparator + footer;
-      stdout.write(moveCursor(1, 1) + eraseDown() + chrome + visibleContent + footerBlock);
-    } finally {
-      rendering = false;
-    }
+    stdout.write(moveCursor(1, 1) + eraseDown() + chrome + visibleContent + footerBlock);
   }
   const handleKey = (key) => {
     if (vimState.isSearching) {
       if (key === "\x1B" || key === "\x1B[3~") {
         exitSearchMode();
-        render2(false);
+        render2();
         return;
       }
       if (key === "\r" || key === `
@@ -14689,117 +14700,115 @@ Press Q to quit.`);
         if (stats?.entries)
           performSearch(vimState.searchQuery, stats.entries);
         exitSearchMode();
-        render2(false);
+        render2();
         return;
       }
       if (key === "\x7F" || key === "\b") {
         vimState.searchQuery = vimState.searchQuery.slice(0, -1);
         if (stats?.entries)
           performSearch(vimState.searchQuery, stats.entries);
-        render2(false);
+        render2();
         return;
       }
       if (key === "\x03") {
         exitSearchMode();
-        render2(false);
+        render2();
         return;
       }
       if (key.length === 1 && key.charCodeAt(0) >= 32 && key.charCodeAt(0) < 127) {
         vimState.searchQuery += key;
         if (stats?.entries)
           performSearch(vimState.searchQuery, stats.entries);
-        render2(false);
+        render2();
       }
       return;
     }
     if (key === "q" || key === "Q" || key === "\x03")
       return cleanup(0);
     if (key === "r" || key === "R") {
-      shouldUpdate = true;
-      render2(true);
+      fetchData();
       return;
     }
     if (key === "a" || key === "A") {
       autoRefresh = !autoRefresh;
-      shouldUpdate = true;
-      render2(false);
+      render2();
       return;
     }
     if (key === "j" || key === "\x1B[B" || key === "\x1BOB") {
       scrollDown();
-      render2(false);
+      render2();
       return;
     }
     if (key === "k" || key === "\x1B[A" || key === "\x1BOA") {
       scrollUp();
-      render2(false);
+      render2();
       return;
     }
     if (key === "l" || key === "\x1B[C" || key === "\x1BOC") {
       const currentIdx = visibleTabs.findIndex((t) => t.id === currentTab);
       currentTab = visibleTabs[(currentIdx + 1) % visibleTabs.length].id;
       vimState.scrollPos = 0;
-      render2(false);
+      render2();
       return;
     }
     if (key === "h" || key === "\x1B[D" || key === "\x1BOD") {
       const currentIdx = visibleTabs.findIndex((t) => t.id === currentTab);
       currentTab = visibleTabs[(currentIdx - 1 + visibleTabs.length) % visibleTabs.length].id;
       vimState.scrollPos = 0;
-      render2(false);
+      render2();
       return;
     }
     if (key === "g") {
       if (vimState.lastKey === "g" && Date.now() - vimState.lastKeyTime < 300) {
         scrollToBottom();
         vimState.lastKey = "";
-        render2(false);
+        render2();
         return;
       }
       vimState.lastKey = "g";
       vimState.lastKeyTime = Date.now();
       scrollToTop();
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x02") {
       pageUp();
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x06") {
       pageDown();
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x15") {
       scrollUp(10);
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x04") {
       scrollDown(10);
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x1B[H" || key === "\x1B[1~" || key === "\x1BOH") {
       scrollToTop();
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x1B[F" || key === "\x1B[4~" || key === "\x1BOF") {
       scrollToBottom();
-      render2(false);
+      render2();
       return;
     }
     if (key === "/") {
       startSearch(false);
-      render2(false);
+      render2();
       return;
     }
     if (key === "?") {
       startSearch(true);
-      render2(false);
+      render2();
       return;
     }
     if (key === "n") {
@@ -14807,7 +14816,7 @@ Press Q to quit.`);
         prevSearchResult(stats?.entries.length || 0);
       else
         nextSearchResult(stats?.entries.length || 0);
-      render2(false);
+      render2();
       return;
     }
     if (key === "N") {
@@ -14815,28 +14824,27 @@ Press Q to quit.`);
         nextSearchResult(stats?.entries.length || 0);
       else
         prevSearchResult(stats?.entries.length || 0);
-      render2(false);
+      render2();
       return;
     }
     if (key === "\x1B") {
       scrollToTop();
-      render2(false);
+      render2();
       return;
     }
     const tab = visibleTabs.find((t) => t.key === key);
     if (tab) {
       currentTab = tab.id;
       vimState.scrollPos = 0;
-      render2(false);
+      render2();
     }
   };
   if (isInteractive)
     stdin.on("data", handleKey);
-  await render2(true);
+  await fetchData();
   refreshInterval = setInterval(() => {
     if (autoRefresh) {
-      shouldUpdate = true;
-      render2(true);
+      fetchData();
     }
   }, 2000);
 }
@@ -15588,7 +15596,7 @@ async function isCocodInstalled(cocodPath) {
 // package.json
 var package_default = {
   name: "routstrd",
-  version: "0.3.3",
+  version: "0.3.5",
   module: "src/index.ts",
   type: "module",
   private: false,
@@ -15612,7 +15620,7 @@ var package_default = {
   },
   dependencies: {
     "@cashu/cashu-ts": "^4.3.0",
-    "@routstr/sdk": "^0.3.11",
+    "@routstr/sdk": "^0.3.14",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "applesauce-wallet-connect": "^6.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "routstrd",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "module": "src/index.ts",
   "type": "module",
   "private": false,
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@cashu/cashu-ts": "^4.3.0",
-    "@routstr/sdk": "^0.3.11",
+    "@routstr/sdk": "^0.3.14",
     "applesauce-core": "^5.1.0",
     "applesauce-relay": "^5.1.0",
     "applesauce-wallet-connect": "^6.0.0",

package/src/daemon/http/usage-summary.test.ts

@@ -6,15 +6,27 @@ import { getUsageSummary, __resetUsageSummaryCacheForTest } from "./usage-summar
 
 // ─── Test fixtures ────────────────────────────────────────────────────────────
 //
-// All timestamps fall within 30 days of 2026-06-02 (today as of this writing).
+// All timestamps are computed relative to "now" so the fixtures never age
+// out of getUsageSummary's 30-day rolling window. We anchor to a recent UTC
+// midnight ~10 days ago and keep the same hour-of-day structure the
+// tz-bucketing assertions depend on.
+//
 // tz = 300 (UTC-5 / EST). After shifting by -300min, UTC dates become:
-//   d1: 2026-05-20T10:00Z → shifted 2026-05-20T05:00Z → local day "2026-05-20", hour 05
-//   d2: 2026-05-21T03:00Z → shifted 2026-05-20T22:00Z → local day "2026-05-20", hour 22
-//   d3: 2026-05-21T06:00Z → shifted 2026-05-21T01:00Z → local day "2026-05-21", hour 01
-
-const D1 = new Date("2026-05-20T10:00:00Z").getTime(); // local 2026-05-20, hour 05
-const D2 = new Date("2026-05-21T03:00:00Z").getTime(); // local 2026-05-20, hour 22
-const D3 = new Date("2026-05-21T06:00:00Z").getTime(); // local 2026-05-21, hour 01
+//   d1: <anchor> 10:00Z → local <anchor> 05:00 → local day "<anchor>"
+//   d2: <anchor+1d> 03:00Z → local <anchor> 22:00 → local day "<anchor>"
+//   d3: <anchor+1d> 06:00Z → local <anchor+1d> 01:00 → local day "<anchor+1d>"
+
+const _BASE_UTC_MIDNIGHT = Math.floor(Date.now() / 86_400_000) * 86_400_000;
+const _ANCHOR_MS = _BASE_UTC_MIDNIGHT - 10 * 86_400_000; // 10 days ago UTC
+const D1 = _ANCHOR_MS + 10 * 3_600_000; // 10:00Z → local day <anchor>
+const D2 = _ANCHOR_MS + 1 * 86_400_000 + 3 * 3_600_000; // 03:00Z next day → local day <anchor>
+const D3 = _ANCHOR_MS + 1 * 86_400_000 + 6 * 3_600_000; // 06:00Z next day → local day <anchor+1d>
+
+/** Compute the local-day date string the same way the SDK's day grouping does. */
+function localDayDateStr(ts: number, tzOffsetMinutes: number): string {
+  const d = new Date(ts - tzOffsetMinutes * 60_000);
+  return `${d.getUTCFullYear()}-${String(d.getUTCMonth() + 1).padStart(2, "0")}-${String(d.getUTCDate()).padStart(2, "0")}`;
+}
 
 const BASE_ENTRY: Omit<UsageTrackingEntry, "id" | "timestamp" | "modelId" | "client" | "totalTokens"> = {
   baseUrl: "https://api.openai.com/",
@@ -152,23 +164,24 @@ describe("getUsageSummary", () => {
     const summary = await getUsageSummary(driver, CLIENTS, TZ);
     const { days } = summary;
 
-    // D1 (10:00Z) → local 2026-05-20, D2 (03:00Z) → local 2026-05-20, D3 (06:00Z) → local 2026-05-21
-    // So: day 2026-05-20 has e1+e2, day 2026-05-21 has e3+e4
+    // D1 (10:00Z) and D2 (next day 03:00Z) both bucket to local day <anchor>;
+    // D3 (next day 06:00Z) buckets to local day <anchor+1d>.
+    // So: day <anchor> has e1+e2, day <anchor+1d> has e3+e4
     expect(days.length).toBeGreaterThanOrEqual(2);
 
-    // Most-recent-first: 2026-05-21 first
-    expect(days[0]!.date).toBe("2026-05-21");
+    // Most-recent-first: <anchor+1d> first
+    expect(days[0]!.date).toBe(localDayDateStr(D3, TZ));
     expect(days[0]!.requests).toBe(2); // e3, e4
     expect(days[0]!.satsCost).toBe(8 + 50);
 
-    expect(days[1]!.date).toBe("2026-05-20");
+    expect(days[1]!.date).toBe(localDayDateStr(D1, TZ));
     expect(days[1]!.requests).toBe(2); // e1, e2
     expect(days[1]!.satsCost).toBe(10 + 20);
   });
 
   it("returns empty hoursToday (test entries are not today)", async () => {
     const summary = await getUsageSummary(driver, CLIENTS, TZ);
-    // Test entries are in May 2026, not today (June 2026)
+    // Test entries are ~10 days ago, not today
     expect(summary.hoursToday).toHaveLength(0);
   });