claude-usage-dashboard 1.4.0 → 1.4.2

package/server/credentials.js

@@ -1,112 +1,112 @@
-import fs from 'fs';
-import path from 'path';
-import os from 'os';
-import { execSync } from 'child_process';
-
-const CREDENTIALS_PATH = path.join(os.homedir(), '.claude', '.credentials.json');
-const KEYCHAIN_SERVICE = 'Claude Code-credentials';
-
-function readFromKeychain() {
-  if (process.platform !== 'darwin') return null;
-  try {
-    const raw = execSync(
-      `security find-generic-password -s "${KEYCHAIN_SERVICE}" -w`,
-      { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
-    ).trim();
-    const data = JSON.parse(raw);
-    return data.claudeAiOauth || null;
-  } catch {
-    return null;
-  }
-}
-
-function readFromWindowsCredentialManager() {
-  if (process.platform !== 'win32') return null;
-  try {
-    // Use PowerShell with Win32 CredRead API to read from Windows Credential Manager.
-    // Encode as UTF-16LE base64 for -EncodedCommand to avoid all shell escaping issues.
-    const psScript = [
-      'Add-Type -TypeDefinition @"',
-      'using System; using System.Runtime.InteropServices;',
-      'public class CredManager {',
-      '  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]',
-      '  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);',
-      '  [DllImport("advapi32.dll")] public static extern void CredFree(IntPtr cred);',
-      '  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]',
-      '  public struct CREDENTIAL {',
-      '    public int Flags; public int Type; public string TargetName; public string Comment;',
-      '    public long LastWritten; public int CredentialBlobSize; public IntPtr CredentialBlob;',
-      '    public int Persist; public int AttributeCount; public IntPtr Attributes;',
-      '    public string TargetAlias; public string UserName;',
-      '  }',
-      '}',
-      '"@',
-      '$ptr = [IntPtr]::Zero',
-      `if ([CredManager]::CredRead('${KEYCHAIN_SERVICE}', 1, 0, [ref]$ptr)) {`,
-      '  $c = [System.Runtime.InteropServices.Marshal]::PtrToStructure($ptr, [Type][CredManager+CREDENTIAL])',
-      '  $b = New-Object byte[] $c.CredentialBlobSize',
-      '  [System.Runtime.InteropServices.Marshal]::Copy($c.CredentialBlob, $b, 0, $c.CredentialBlobSize)',
-      '  [CredManager]::CredFree($ptr) | Out-Null',
-      '  [System.Text.Encoding]::UTF8.GetString($b)',
-      '}',
-    ].join('\n');
-    const buf = Buffer.alloc(psScript.length * 2);
-    for (let i = 0; i < psScript.length; i++) buf.writeUInt16LE(psScript.charCodeAt(i), i * 2);
-    const raw = execSync(
-      `powershell.exe -NoProfile -NonInteractive -EncodedCommand ${buf.toString('base64')}`,
-      { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], timeout: 5000 }
-    ).trim();
-    if (!raw) return null;
-    const data = JSON.parse(raw);
-    return data.claudeAiOauth || null;
-  } catch {
-    return null;
-  }
-}
-
-function readFromFile(credentialsPath) {
-  try {
-    const raw = fs.readFileSync(credentialsPath, 'utf-8');
-    const data = JSON.parse(raw);
-    return data.claudeAiOauth || null;
-  } catch {
-    return null;
-  }
-}
-
-function readFromSecureStore() {
-  if (process.platform === 'darwin') return readFromKeychain();
-  if (process.platform === 'win32') return readFromWindowsCredentialManager();
-  return null;
-}
-
-export function readCredentials(credentialsPath) {
-  if (credentialsPath) {
-    // Explicit path provided (e.g. tests) — skip secure store
-    return readFromFile(credentialsPath);
-  }
-  // Try platform secure store first, then fall back to default file
-  return readFromSecureStore() || readFromFile(CREDENTIALS_PATH);
-}
-
-export function getSubscriptionInfo(credentialsPath) {
-  const creds = readCredentials(credentialsPath);
-  if (!creds) return null;
-
-  const { subscriptionType, rateLimitTier } = creds;
-  const combined = `${subscriptionType || ''} ${rateLimitTier || ''}`.toLowerCase();
-
-  let plan = null;
-  if (combined.includes('20x')) plan = 'max20x';
-  else if (combined.includes('5x')) plan = 'max5x';
-  else if (combined.includes('pro')) plan = 'pro';
-
-  return { subscriptionType: subscriptionType || null, rateLimitTier: rateLimitTier || null, plan };
-}
-
-export function getAccessToken(credentialsPath) {
-  const creds = readCredentials(credentialsPath);
-  if (!creds || !creds.accessToken) return null;
-  if (creds.expiresAt && creds.expiresAt < Date.now()) return null;
-  return creds.accessToken;
-}
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { execSync } from 'child_process';
+
+const CREDENTIALS_PATH = path.join(os.homedir(), '.claude', '.credentials.json');
+const KEYCHAIN_SERVICE = 'Claude Code-credentials';
+
+function readFromKeychain() {
+  if (process.platform !== 'darwin') return null;
+  try {
+    const raw = execSync(
+      `security find-generic-password -s "${KEYCHAIN_SERVICE}" -w`,
+      { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }
+    ).trim();
+    const data = JSON.parse(raw);
+    return data.claudeAiOauth || null;
+  } catch {
+    return null;
+  }
+}
+
+function readFromWindowsCredentialManager() {
+  if (process.platform !== 'win32') return null;
+  try {
+    // Use PowerShell with Win32 CredRead API to read from Windows Credential Manager.
+    // Encode as UTF-16LE base64 for -EncodedCommand to avoid all shell escaping issues.
+    const psScript = [
+      'Add-Type -TypeDefinition @"',
+      'using System; using System.Runtime.InteropServices;',
+      'public class CredManager {',
+      '  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]',
+      '  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);',
+      '  [DllImport("advapi32.dll")] public static extern void CredFree(IntPtr cred);',
+      '  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]',
+      '  public struct CREDENTIAL {',
+      '    public int Flags; public int Type; public string TargetName; public string Comment;',
+      '    public long LastWritten; public int CredentialBlobSize; public IntPtr CredentialBlob;',
+      '    public int Persist; public int AttributeCount; public IntPtr Attributes;',
+      '    public string TargetAlias; public string UserName;',
+      '  }',
+      '}',
+      '"@',
+      '$ptr = [IntPtr]::Zero',
+      `if ([CredManager]::CredRead('${KEYCHAIN_SERVICE}', 1, 0, [ref]$ptr)) {`,
+      '  $c = [System.Runtime.InteropServices.Marshal]::PtrToStructure($ptr, [Type][CredManager+CREDENTIAL])',
+      '  $b = New-Object byte[] $c.CredentialBlobSize',
+      '  [System.Runtime.InteropServices.Marshal]::Copy($c.CredentialBlob, $b, 0, $c.CredentialBlobSize)',
+      '  [CredManager]::CredFree($ptr) | Out-Null',
+      '  [System.Text.Encoding]::UTF8.GetString($b)',
+      '}',
+    ].join('\n');
+    const buf = Buffer.alloc(psScript.length * 2);
+    for (let i = 0; i < psScript.length; i++) buf.writeUInt16LE(psScript.charCodeAt(i), i * 2);
+    const raw = execSync(
+      `powershell.exe -NoProfile -NonInteractive -EncodedCommand ${buf.toString('base64')}`,
+      { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], timeout: 5000 }
+    ).trim();
+    if (!raw) return null;
+    const data = JSON.parse(raw);
+    return data.claudeAiOauth || null;
+  } catch {
+    return null;
+  }
+}
+
+function readFromFile(credentialsPath) {
+  try {
+    const raw = fs.readFileSync(credentialsPath, 'utf-8');
+    const data = JSON.parse(raw);
+    return data.claudeAiOauth || null;
+  } catch {
+    return null;
+  }
+}
+
+function readFromSecureStore() {
+  if (process.platform === 'darwin') return readFromKeychain();
+  if (process.platform === 'win32') return readFromWindowsCredentialManager();
+  return null;
+}
+
+export function readCredentials(credentialsPath) {
+  if (credentialsPath) {
+    // Explicit path provided (e.g. tests) — skip secure store
+    return readFromFile(credentialsPath);
+  }
+  // Try platform secure store first, then fall back to default file
+  return readFromSecureStore() || readFromFile(CREDENTIALS_PATH);
+}
+
+export function getSubscriptionInfo(credentialsPath) {
+  const creds = readCredentials(credentialsPath);
+  if (!creds) return null;
+
+  const { subscriptionType, rateLimitTier } = creds;
+  const combined = `${subscriptionType || ''} ${rateLimitTier || ''}`.toLowerCase();
+
+  let plan = null;
+  if (combined.includes('20x')) plan = 'max20x';
+  else if (combined.includes('5x')) plan = 'max5x';
+  else if (combined.includes('pro')) plan = 'pro';
+
+  return { subscriptionType: subscriptionType || null, rateLimitTier: rateLimitTier || null, plan };
+}
+
+export function getAccessToken(credentialsPath) {
+  const creds = readCredentials(credentialsPath);
+  if (!creds || !creds.accessToken) return null;
+  if (creds.expiresAt && creds.expiresAt < Date.now()) return null;
+  return creds.accessToken;
+}

package/server/index.js

@@ -1,45 +1,45 @@
-import express from 'express';
-import path from 'path';
-import os from 'os';
-import { createRequire } from 'module';
-import { fileURLToPath } from 'url';
-import { createApiRouter } from './routes/api.js';
-import { syncLocalToShared } from './sync.js';
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const require = createRequire(import.meta.url);
-const PORT = process.env.PORT || 3000;
-const LOG_DIR = path.join(os.homedir(), '.claude', 'projects');
-const SYNC_DIR = process.env.CLAUDE_DASH_SYNC_DIR || null;
-const MACHINE_NAME = process.env.CLAUDE_DASH_MACHINE_NAME || os.hostname();
-
-// Startup sync
-if (SYNC_DIR) {
-  console.log(`Syncing local data to shared folder: ${SYNC_DIR} (machine: ${MACHINE_NAME})`);
-  await syncLocalToShared(LOG_DIR, SYNC_DIR, MACHINE_NAME);
-}
-
-// Resolve d3 via Node module resolution so it works when dependencies are hoisted (e.g. npx)
-const d3Dir = path.join(path.dirname(require.resolve('d3')), '..', 'dist');
-
-const app = express();
-app.use('/lib/d3', express.static(d3Dir));
-app.use(express.static(path.join(__dirname, '..', 'public')));
-app.use('/api', createApiRouter(LOG_DIR, { syncDir: SYNC_DIR, machineName: MACHINE_NAME }));
-
-const server = app.listen(PORT, () => {
-  console.log(`Claude Usage Dashboard running at http://localhost:${PORT}`);
-  if (SYNC_DIR) {
-    console.log(`Sync mode: reading from ${SYNC_DIR} (machine: ${MACHINE_NAME})`);
-  }
-  console.log('Press Ctrl+C to stop.');
-});
-
-process.on('SIGINT', () => {
-  console.log('\nShutting down...');
-  server.close(() => process.exit(0));
-});
-
-process.on('SIGTERM', () => {
-  server.close(() => process.exit(0));
-});
+import express from 'express';
+import path from 'path';
+import os from 'os';
+import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
+import { createApiRouter } from './routes/api.js';
+import { syncLocalToShared } from './sync.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+const PORT = process.env.PORT || 3000;
+const LOG_DIR = path.join(os.homedir(), '.claude', 'projects');
+const SYNC_DIR = process.env.CLAUDE_DASH_SYNC_DIR || null;
+const MACHINE_NAME = process.env.CLAUDE_DASH_MACHINE_NAME || os.hostname();
+
+// Startup sync
+if (SYNC_DIR) {
+  console.log(`Syncing local data to shared folder: ${SYNC_DIR} (machine: ${MACHINE_NAME})`);
+  await syncLocalToShared(LOG_DIR, SYNC_DIR, MACHINE_NAME);
+}
+
+// Resolve d3 via Node module resolution so it works when dependencies are hoisted (e.g. npx)
+const d3Dir = path.join(path.dirname(require.resolve('d3')), '..', 'dist');
+
+const app = express();
+app.use('/lib/d3', express.static(d3Dir));
+app.use(express.static(path.join(__dirname, '..', 'public')));
+app.use('/api', createApiRouter(LOG_DIR, { syncDir: SYNC_DIR, machineName: MACHINE_NAME }));
+
+const server = app.listen(PORT, () => {
+  console.log(`Claude Usage Dashboard running at http://localhost:${PORT}`);
+  if (SYNC_DIR) {
+    console.log(`Sync mode: reading from ${SYNC_DIR} (machine: ${MACHINE_NAME})`);
+  }
+  console.log('Press Ctrl+C to stop.');
+});
+
+process.on('SIGINT', () => {
+  console.log('\nShutting down...');
+  server.close(() => process.exit(0));
+});
+
+process.on('SIGTERM', () => {
+  server.close(() => process.exit(0));
+});

package/server/parser.js

@@ -1,129 +1,129 @@
-import fs from 'fs';
-import path from 'path';
-
-export function deriveProjectName(dirName) {
-  // Strip drive prefix like "C--" at the start
-  const clean = dirName.replace(/^[A-Za-z]--/, '');
-
-  // Known parent directory markers (case-insensitive search)
-  // Match the last occurrence of common parent dirs to get the project folder name
-  const lower = clean.toLowerCase();
-  const markers = ['-workspace-', '-projects-', '-repos-', '-src-', '-home-', '-desktop-', '-documents-', '-downloads-'];
-  let bestIdx = -1;
-  let bestLen = 0;
-  for (const m of markers) {
-    const idx = lower.lastIndexOf(m);
-    if (idx > bestIdx) {
-      bestIdx = idx;
-      bestLen = m.length;
-    }
-  }
-  if (bestIdx !== -1) {
-    const result = clean.slice(bestIdx + bestLen);
-    // Handle worktree subdirs: "project--claude-worktrees-branch-name" → "project"
-    const wtIdx = result.indexOf('--claude-worktrees');
-    return wtIdx !== -1 ? result.slice(0, wtIdx) : result;
-  }
-
-  // Fallback: strip Users-username prefix, return the rest
-  const userMatch = clean.match(/^Users-[^-]+-(.+)$/);
-  if (userMatch) {
-    const rest = userMatch[1];
-    const wtIdx = rest.indexOf('--claude-worktrees');
-    return wtIdx !== -1 ? rest.slice(0, wtIdx) : rest;
-  }
-
-  return clean;
-}
-
-export function parseLogFile(filePath) {
-  const content = fs.readFileSync(filePath, 'utf-8');
-  const lines = content.split('\n').filter(line => line.trim());
-  const records = [];
-
-  for (const line of lines) {
-    let entry;
-    try {
-      entry = JSON.parse(line);
-    } catch {
-      continue;
-    }
-
-    if (entry.type !== 'assistant') continue;
-
-    const model = entry.message?.model;
-    if (!model || model === '<synthetic>') continue;
-
-    const usage = entry.message?.usage;
-    if (!usage) continue;
-
-    records.push({
-      sessionId: entry.sessionId,
-      timestamp: entry.timestamp,
-      model,
-      input_tokens: usage.input_tokens || 0,
-      output_tokens: usage.output_tokens || 0,
-      cache_creation_tokens: usage.cache_creation_input_tokens || 0,
-      cache_read_tokens: usage.cache_read_input_tokens || 0,
-    });
-  }
-
-  return records;
-}
-
-export function parseLogDirectory(baseDir) {
-  const allRecords = [];
-
-  let projectDirs;
-  try {
-    projectDirs = fs.readdirSync(baseDir, { withFileTypes: true })
-      .filter(d => d.isDirectory());
-  } catch {
-    return allRecords;
-  }
-
-  for (const dir of projectDirs) {
-    const projectName = deriveProjectName(dir.name);
-    const projectPath = path.join(baseDir, dir.name);
-
-    let files;
-    try {
-      files = fs.readdirSync(projectPath)
-        .filter(f => f.endsWith('.jsonl'));
-    } catch {
-      continue;
-    }
-
-    for (const file of files) {
-      const filePath = path.join(projectPath, file);
-      const records = parseLogFile(filePath);
-      for (const record of records) {
-        record.project = projectName;
-        record.projectDirName = dir.name;
-      }
-      allRecords.push(...records);
-    }
-  }
-
-  return allRecords;
-}
-
-export function parseMultiMachineDirectory(syncDir) {
-  const allRecords = [];
-
-  let machineDirs;
-  try {
-    machineDirs = fs.readdirSync(syncDir, { withFileTypes: true })
-      .filter(d => d.isDirectory() && !d.isSymbolicLink());
-  } catch {
-    return allRecords;
-  }
-
-  for (const machineDir of machineDirs) {
-    const machinePath = path.join(syncDir, machineDir.name);
-    const records = parseLogDirectory(machinePath);
-    allRecords.push(...records);
-  }
-
-  return allRecords;
-}
+import fs from 'fs';
+import path from 'path';
+
+export function deriveProjectName(dirName) {
+  // Strip drive prefix like "C--" at the start
+  const clean = dirName.replace(/^[A-Za-z]--/, '');
+
+  // Known parent directory markers (case-insensitive search)
+  // Match the last occurrence of common parent dirs to get the project folder name
+  const lower = clean.toLowerCase();
+  const markers = ['-workspace-', '-projects-', '-repos-', '-src-', '-home-', '-desktop-', '-documents-', '-downloads-'];
+  let bestIdx = -1;
+  let bestLen = 0;
+  for (const m of markers) {
+    const idx = lower.lastIndexOf(m);
+    if (idx > bestIdx) {
+      bestIdx = idx;
+      bestLen = m.length;
+    }
+  }
+  if (bestIdx !== -1) {
+    const result = clean.slice(bestIdx + bestLen);
+    // Handle worktree subdirs: "project--claude-worktrees-branch-name" → "project"
+    const wtIdx = result.indexOf('--claude-worktrees');
+    return wtIdx !== -1 ? result.slice(0, wtIdx) : result;
+  }
+
+  // Fallback: strip Users-username prefix, return the rest
+  const userMatch = clean.match(/^Users-[^-]+-(.+)$/);
+  if (userMatch) {
+    const rest = userMatch[1];
+    const wtIdx = rest.indexOf('--claude-worktrees');
+    return wtIdx !== -1 ? rest.slice(0, wtIdx) : rest;
+  }
+
+  return clean;
+}
+
+export function parseLogFile(filePath) {
+  const content = fs.readFileSync(filePath, 'utf-8');
+  const lines = content.split('\n').filter(line => line.trim());
+  const records = [];
+
+  for (const line of lines) {
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      continue;
+    }
+
+    if (entry.type !== 'assistant') continue;
+
+    const model = entry.message?.model;
+    if (!model || model === '<synthetic>') continue;
+
+    const usage = entry.message?.usage;
+    if (!usage) continue;
+
+    records.push({
+      sessionId: entry.sessionId,
+      timestamp: entry.timestamp,
+      model,
+      input_tokens: usage.input_tokens || 0,
+      output_tokens: usage.output_tokens || 0,
+      cache_creation_tokens: usage.cache_creation_input_tokens || 0,
+      cache_read_tokens: usage.cache_read_input_tokens || 0,
+    });
+  }
+
+  return records;
+}
+
+export function parseLogDirectory(baseDir) {
+  const allRecords = [];
+
+  let projectDirs;
+  try {
+    projectDirs = fs.readdirSync(baseDir, { withFileTypes: true })
+      .filter(d => d.isDirectory());
+  } catch {
+    return allRecords;
+  }
+
+  for (const dir of projectDirs) {
+    const projectName = deriveProjectName(dir.name);
+    const projectPath = path.join(baseDir, dir.name);
+
+    let files;
+    try {
+      files = fs.readdirSync(projectPath)
+        .filter(f => f.endsWith('.jsonl'));
+    } catch {
+      continue;
+    }
+
+    for (const file of files) {
+      const filePath = path.join(projectPath, file);
+      const records = parseLogFile(filePath);
+      for (const record of records) {
+        record.project = projectName;
+        record.projectDirName = dir.name;
+      }
+      allRecords.push(...records);
+    }
+  }
+
+  return allRecords;
+}
+
+export function parseMultiMachineDirectory(syncDir) {
+  const allRecords = [];
+
+  let machineDirs;
+  try {
+    machineDirs = fs.readdirSync(syncDir, { withFileTypes: true })
+      .filter(d => d.isDirectory() && !d.isSymbolicLink());
+  } catch {
+    return allRecords;
+  }
+
+  for (const machineDir of machineDirs) {
+    const machinePath = path.join(syncDir, machineDir.name);
+    const records = parseLogDirectory(machinePath);
+    allRecords.push(...records);
+  }
+
+  return allRecords;
+}