routstrd 0.1.0 → 0.1.3

package/src/start-daemon.ts

@@ -1,7 +1,14 @@
-import { LOG_FILE } from "./utils/config";
 import { logger } from "./utils/logger";
-import { existsSync, mkdirSync } from "fs";
-import { dirname, join } from "path";
+import { existsSync } from "fs";
+import { LOGS_DIR } from "./utils/config";
+
+function getTodayLogFile(): string {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, "0");
+  const day = String(now.getDate()).padStart(2, "0");
+  return `${LOGS_DIR}/${year}-${month}-${day}.log`;
+}
 
 export async function startDaemon(
   options: { port?: string; provider?: string } = {},
@@ -33,16 +40,14 @@ export async function startDaemon(
     args.push("--provider", options.provider);
   }
 
-  // Ensure log directory exists
-  const logDir = dirname(LOG_FILE);
-  if (!existsSync(logDir)) {
-    mkdirSync(logDir, { recursive: true });
+  // Ensure logs directory exists (logger handles date-based files)
+  if (!existsSync(LOGS_DIR)) {
+    await Bun.$`mkdir -p ${LOGS_DIR}`;
   }
 
-  // Use shell redirection to append stdout/stderr to log file
-  // Bun.file() overwrites, so we need shell >> for appending
-  const daemonScript = `${import.meta.dir}/daemon/index.ts`;
-  const shellCmd = `bun run "${daemonScript}" ${args.map(a => `'${a}'`).join(" ")} >> "${LOG_FILE}" 2>&1`;
+  const daemonScript = new URL("./daemon/index.js", import.meta.url).pathname;
+  const todayLogFile = getTodayLogFile();
+  const shellCmd = `bun run "${daemonScript}" ${args.map(a => `'${a}'`).join(" ")} >> "${todayLogFile}" 2>&1`;
 
   const proc = Bun.spawn(["sh", "-c", shellCmd], {
     stdout: "inherit",
@@ -64,7 +69,7 @@ export async function startDaemon(
 
     if (exitCode !== null) {
       throw new Error(
-        `Daemon process exited early with code ${exitCode}. Check logs at ${LOG_FILE}`,
+        `Daemon process exited early with code ${exitCode}. Check logs in ${LOGS_DIR}`,
       );
     }
 
@@ -85,6 +90,6 @@ export async function startDaemon(
   }
 
   throw new Error(
-    `Daemon failed to start within ${Math.round(startupTimeoutMs / 1000)} seconds. Check logs at ${LOG_FILE}`,
+    `Daemon failed to start within ${Math.round(startupTimeoutMs / 1000)} seconds. Check logs in ${LOGS_DIR}`,
   );
 }

package/src/tui/usage/app.ts

@@ -87,7 +87,7 @@ export async function runUsageTui(): Promise<void> {
       const height = getHeight();
 
       if (forceFetch || shouldUpdate) {
-        stats = await fetchUsage(1000);
+        stats = await fetchUsage(10000);
         balance = await fetchBalance();
         status = await fetchStatus();
         shouldUpdate = false;

package/src/tui/usage/data.ts

@@ -74,7 +74,7 @@ export async function fetchBalance(): Promise<BalanceInfo | null> {
   }
 }
 
-export async function fetchUsage(limit = 1000): Promise<UsageStats | null> {
+export async function fetchUsage(limit = 10000): Promise<UsageStats | null> {
   try {
     const running = await isDaemonRunning();
     if (!running) return null;
@@ -82,20 +82,27 @@ export async function fetchUsage(limit = 1000): Promise<UsageStats | null> {
     const result = await callDaemon(`/usage?limit=${limit}`);
     if (result.error) return null;
 
-    const output = result.output as {
-      entries?: UsageTrackingEntry[];
-      totalEntries?: number;
-      totalSatsCost?: number;
-      recentSatsCost?: number;
-      limit?: number;
-    };
+    // The daemon returns { output: [...] } where output is the entries array directly
+    const entries = result.output as UsageTrackingEntry[] | undefined;
+    const entriesArray = Array.isArray(entries) ? entries : [];
+
+    // Calculate totals from entries
+    const totals = entriesArray.reduce(
+      (acc, entry) => ({
+        promptTokens: acc.promptTokens + entry.promptTokens,
+        completionTokens: acc.completionTokens + entry.completionTokens,
+        totalTokens: acc.totalTokens + entry.totalTokens,
+        satsCost: acc.satsCost + entry.satsCost,
+      }),
+      { promptTokens: 0, completionTokens: 0, totalTokens: 0, satsCost: 0 },
+    );
 
     return {
-      entries: output?.entries || [],
-      totalEntries: output?.totalEntries || 0,
-      totalSatsCost: output?.totalSatsCost || 0,
-      recentSatsCost: output?.recentSatsCost || 0,
-      limit: output?.limit || limit,
+      entries: entriesArray,
+      totalEntries: entriesArray.length,
+      totalSatsCost: totals.satsCost,
+      recentSatsCost: totals.satsCost, // For now, recent = total since we don't have time window
+      limit,
     };
   } catch {
     return null;
@@ -215,7 +222,10 @@ export function getClientStats(entries: UsageTrackingEntry[]): ClientStats[] {
   return Array.from(clients.values()).sort((a, b) => b.satsCost - a.satsCost);
 }
 
-export function getTotals(entries: UsageTrackingEntry[]) {
+export function getTotals(entries: UsageTrackingEntry[] | undefined) {
+  if (!entries || !Array.isArray(entries)) {
+    return { promptTokens: 0, completionTokens: 0, totalTokens: 0, satsCost: 0 };
+  }
   return entries.reduce(
     (acc, entry) => ({
       promptTokens: acc.promptTokens + entry.promptTokens,

package/src/tui/usage/render.ts

@@ -116,15 +116,16 @@ export function renderBarChart(
 
 
 export function renderOverview(stats: UsageStats, balance: BalanceInfo | null, status: StatusInfo | null, width: number): string {
+  // Use the server-calculated totals (all entries) instead of summing limited entries
   const totals = getTotals(stats.entries);
-  const entryCount = stats.entries.length;
-  const totalVisibleCost = totals.satsCost;
-  const avgCost = entryCount > 0 ? totalVisibleCost / entryCount : 0;
-  const avgTokens = entryCount > 0 ? totals.totalTokens / entryCount : 0;
+  const totalRequests = stats.totalEntries; // Use server's total count, not entries.length
+  const totalVisibleCost = stats.totalSatsCost; // <-- Use server's total, not client-side sum of limited entries
+  const avgCost = totalRequests > 0 ? totalVisibleCost / totalRequests : 0;
+  const avgTokens = totalRequests > 0 ? totals.totalTokens / totalRequests : 0;
 
   const leftBox = [
     `${COLORS.bold}Total Spent:${COLORS.reset} ${COLORS.green}${formatCost(totalVisibleCost)} sats${COLORS.reset}`,
-    `${COLORS.bold}Total Requests:${COLORS.reset} ${formatReqs(entryCount)}`,
+    `${COLORS.bold}Total Requests:${COLORS.reset} ${formatReqs(totalRequests)}`,
     `${COLORS.bold}Avg Cost/Req:${COLORS.reset} ${formatCost(avgCost)} sats`,
   ];
 
@@ -344,7 +345,8 @@ export function renderModels(stats: UsageStats, width: number): string {
   const modelStats = getModelStats(stats.entries);
   if (modelStats.length === 0) return renderBox(["No model data available"], width, "Models");
 
-  const totalCost = getTotals(stats.entries).satsCost;
+  // Use totalSatsCost (all-time) for percentage calculations to match header
+  const totalCost = stats.totalSatsCost;
   const maxCost = modelStats[0]!.satsCost;
   const maxModelLabel = Math.max(...modelStats.map((m) => m.modelId.length));
   const lines: string[] = [];
@@ -431,7 +433,8 @@ export function renderClients(stats: UsageStats, width: number): string {
   const clientStats = getClientStats(stats.entries);
   if (clientStats.length === 0) return renderBox(["No client data available (API key auth not used)"], width, "Client Breakdown");
 
-  const totalCost = getTotals(stats.entries).satsCost;
+  // Use totalSatsCost (all-time) for percentage calculations to match header
+  const totalCost = stats.totalSatsCost;
   const maxCost = clientStats[0]!.satsCost;
   const lines: string[] = [];
 

package/src/utils/config.ts

@@ -5,7 +5,7 @@ export const SOCKET_PATH = process.env.ROUTSTRD_SOCKET || `${CONFIG_DIR}/routstr
 export const PID_FILE = process.env.ROUTSTRD_PID || `${CONFIG_DIR}/routstrd.pid`;
 export const DB_PATH = `${CONFIG_DIR}/routstr.db`;
 export const CONFIG_FILE = `${CONFIG_DIR}/config.json`;
-export const LOG_FILE = `${CONFIG_DIR}/routstrd.log`;
+export const LOGS_DIR = `${CONFIG_DIR}/logs`;
 
 export interface RoutstrdConfig {
   port: number;

package/src/utils/logger.ts

@@ -4,11 +4,18 @@ import { join } from "path";
 
 const HOME = process.env.HOME || process.env.USERPROFILE || "";
 const LOG_DIR = process.env.ROUTSTRD_DIR || `${HOME}/.routstrd`;
-const LOG_FILE = join(LOG_DIR, "routstrd.log");
+const LOGS_DIR = join(LOG_DIR, "logs");
+
+function getLogFileForDate(date: Date = new Date()): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return join(LOGS_DIR, `${year}-${month}-${day}.log`);
+}
 
 async function ensureLogDir() {
-  if (!existsSync(LOG_DIR)) {
-    await mkdir(LOG_DIR, { recursive: true });
+  if (!existsSync(LOGS_DIR)) {
+    await mkdir(LOGS_DIR, { recursive: true });
   }
 }
 
@@ -31,8 +38,9 @@ async function writeLog(level: string, ...args: unknown[]) {
     })
     .join(" ");
   const line = `[${timestamp}] [${level}] ${message}\n`;
+  const logFile = getLogFileForDate(new Date(timestamp));
   try {
-    await appendFile(LOG_FILE, line);
+    await appendFile(logFile, line);
   } catch (error) {
     console.error("Failed to write log:", error);
   }
@@ -43,6 +51,9 @@ export const logger = {
     console.log(...args);
     writeLog("INFO", ...args);
   },
+  debug: (...args: unknown[]) => {
+    writeLog("DEBUG", ...args);
+  },
   error: (...args: unknown[]) => {
     console.error(...args);
     writeLog("ERROR", ...args);

package/test_chat.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+AUTH="Bearer sk-a2d0981bd84ebf214f4bfb861a273873bfe3e10e6af97533"
+BASE_URL="http://localhost:8008/v1/chat/completions"
+
+echo "=== Testing GPT-4 ==="
+curl -s "$BASE_URL" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: $AUTH" \
+  -d '{
+    "model": "gpt-4",
+    "messages": [
+      {"role": "user", "content": "Hello, how are you?"}
+    ],
+    "max_tokens": 128
+  }' | python3 -m json.tool
+
+echo ""
+echo "=== Testing GLM-4.7 ==="
+curl -s "$BASE_URL" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: $AUTH" \
+  -d '{
+    "model": "glm-4.7",
+    "messages": [
+      {"role": "user", "content": "Hello, how are you?"}
+    ],
+    "max_tokens": 128
+  }' | python3 -m json.tool

package/src/daemon/sse.ts

@@ -1,98 +0,0 @@
-import { Transform } from "stream";
-import type { UsageData } from "./types";
-
-export function createSSEParserTransform(
-  onUsage: (usage: UsageData) => void,
-  onResponseId?: (responseId: string) => void,
-): Transform {
-  let buffer = "";
-
-  const maybeCaptureUsageFromJson = (jsonText: string): void => {
-    try {
-      const data = JSON.parse(jsonText) as any;
-      const responseId = data.id;
-      if (typeof responseId === "string" && responseId.trim().length > 0) {
-        onResponseId?.(responseId.trim());
-      }
-
-      if (data.usage) {
-        const usageCost = data.usage.cost;
-        const cost =
-          typeof usageCost === "number"
-            ? usageCost
-            : usageCost?.total_usd ??
-              data.metadata?.routstr?.cost?.total_usd ??
-              0;
-        const msats =
-          data.metadata?.routstr?.cost?.total_msats ??
-          (typeof data.usage.cost_sats === "number"
-            ? data.usage.cost_sats * 1000
-            : 0);
-        onUsage({
-          promptTokens: data.usage.prompt_tokens ?? 0,
-          completionTokens: data.usage.completion_tokens ?? 0,
-          totalTokens: data.usage.total_tokens ?? 0,
-          cost,
-          satsCost: msats / 1000,
-        });
-      }
-    } catch {
-      // Ignore non-JSON lines/events.
-    }
-  };
-
-  const processLine = (self: Transform, line: string): void => {
-    const trimmed = line.trim();
-    if (!trimmed) {
-      return;
-    }
-
-    if (trimmed === "data: [DONE]" || trimmed === "[DONE]") {
-      self.push("data: [DONE]\n\n");
-      return;
-    }
-
-    if (trimmed.startsWith("data:")) {
-      const dataStr = trimmed.startsWith("data: ")
-        ? trimmed.slice(6)
-        : trimmed.slice(5).trimStart();
-      if (dataStr === "[DONE]") {
-        self.push("data: [DONE]\n\n");
-        return;
-      }
-      maybeCaptureUsageFromJson(dataStr);
-      self.push(`data: ${dataStr}\n\n`);
-      return;
-    }
-
-    if (trimmed.startsWith("{")) {
-      maybeCaptureUsageFromJson(trimmed);
-      self.push(`data: ${trimmed}\n\n`);
-      return;
-    }
-
-    self.push(line + "\n");
-  };
-
-  return new Transform({
-    transform(chunk, encoding, callback) {
-      buffer += chunk.toString();
-
-      const lines = buffer.split(/\r?\n/);
-      buffer = lines.pop() || "";
-
-      for (const line of lines) {
-        processLine(this, line);
-      }
-
-      callback();
-    },
-    flush(callback) {
-      if (buffer.trim()) {
-        processLine(this, buffer);
-      }
-      buffer = "";
-      callback();
-    },
-  });
-}