ccstatusline-usage 2.0.39 → 2.0.40

package/dist/ccstatusline.js

@@ -51450,7 +51450,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils";
-var PACKAGE_VERSION = "2.0.39";
+var PACKAGE_VERSION = "2.0.40";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -54487,49 +54487,99 @@ class ClaudeSessionIdWidget {
   }
 }
 // src/widgets/ApiUsage.tsx
-import { execSync as execSync8, spawnSync } from "child_process";
+import {
+  execSync as execSync8,
+  spawnSync
+} from "child_process";
 import * as fs7 from "fs";
 import * as path6 from "path";
 var CACHE_FILE = path6.join(process.env.HOME ?? "", ".cache", "ccstatusline-api.json");
+var LOCK_FILE = path6.join(process.env.HOME ?? "", ".cache", "ccstatusline-api.lock");
 var CACHE_MAX_AGE = 180;
+var LOCK_MAX_AGE = 30;
+var TOKEN_CACHE_MAX_AGE = 3600;
 var cachedData = null;
 var cacheTime = 0;
+var cachedToken = null;
+var tokenCacheTime = 0;
 function getToken() {
+  const now = Math.floor(Date.now() / 1000);
+  if (cachedToken && now - tokenCacheTime < TOKEN_CACHE_MAX_AGE) {
+    return cachedToken;
+  }
   try {
     const isMac = process.platform === "darwin";
     if (isMac) {
       const result = execSync8('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
       const parsed = JSON.parse(result);
-      return parsed?.claudeAiOauth?.accessToken ?? null;
+      const token = parsed?.claudeAiOauth?.accessToken ?? null;
+      if (token) {
+        cachedToken = token;
+        tokenCacheTime = now;
+      }
+      return token;
     } else {
       const credFile = path6.join(process.env.HOME ?? "", ".claude", ".credentials.json");
-      if (fs7.existsSync(credFile)) {
-        const creds = JSON.parse(fs7.readFileSync(credFile, "utf8"));
-        return creds?.claudeAiOauth?.accessToken ?? null;
+      const creds = JSON.parse(fs7.readFileSync(credFile, "utf8"));
+      const token = creds?.claudeAiOauth?.accessToken ?? null;
+      if (token) {
+        cachedToken = token;
+        tokenCacheTime = now;
       }
+      return token;
     }
-  } catch {}
-  return null;
+  } catch {
+    return null;
+  }
+}
+function readStaleCache() {
+  try {
+    return JSON.parse(fs7.readFileSync(CACHE_FILE, "utf8"));
+  } catch {
+    return null;
+  }
 }
 function fetchApiData() {
   const now = Math.floor(Date.now() / 1000);
-  if (cachedData && now - cacheTime < CACHE_MAX_AGE) {
+  if (cachedData && !cachedData.error && now - cacheTime < CACHE_MAX_AGE) {
     return cachedData;
   }
   try {
-    if (fs7.existsSync(CACHE_FILE)) {
-      const stat = fs7.statSync(CACHE_FILE);
-      const fileAge = now - Math.floor(stat.mtimeMs / 1000);
-      if (fileAge < CACHE_MAX_AGE) {
-        cachedData = JSON.parse(fs7.readFileSync(CACHE_FILE, "utf8"));
+    const stat = fs7.statSync(CACHE_FILE);
+    const fileAge = now - Math.floor(stat.mtimeMs / 1000);
+    if (fileAge < CACHE_MAX_AGE) {
+      const fileData = JSON.parse(fs7.readFileSync(CACHE_FILE, "utf8"));
+      if (!fileData.error) {
+        cachedData = fileData;
         cacheTime = now;
-        return cachedData;
+        return fileData;
       }
     }
   } catch {}
+  try {
+    const lockStat = fs7.statSync(LOCK_FILE);
+    const lockAge = now - Math.floor(lockStat.mtimeMs / 1000);
+    if (lockAge < LOCK_MAX_AGE) {
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "timeout" };
+    }
+  } catch {}
+  try {
+    const lockDir = path6.dirname(LOCK_FILE);
+    if (!fs7.existsSync(lockDir)) {
+      fs7.mkdirSync(lockDir, { recursive: true });
+    }
+    fs7.writeFileSync(LOCK_FILE, "");
+  } catch {}
   const token = getToken();
-  if (!token)
-    return null;
+  if (!token) {
+    const stale = readStaleCache();
+    if (stale && !stale.error)
+      return stale;
+    return { error: "no-credentials" };
+  }
   try {
     const curlResult = spawnSync("curl", [
       "-s",
@@ -54540,12 +54590,15 @@ function fetchApiData() {
       `Authorization: Bearer ${token}`,
       "-H",
       "anthropic-beta: oauth-2025-04-20"
-    ], { encoding: "utf8", timeout: 5000 });
-    if (curlResult.error || curlResult.status !== 0)
-      return null;
-    const result = curlResult.stdout;
-    const data = JSON.parse(result);
-    let apiData = {};
+    ], { encoding: "utf8", timeout: 6000 });
+    if (curlResult.error || curlResult.status !== 0 || !curlResult.stdout) {
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "api-error" };
+    }
+    const data = JSON.parse(curlResult.stdout);
+    const apiData = {};
     if (data.five_hour) {
       apiData.sessionUsage = data.five_hour.utilization;
       apiData.sessionResetAt = data.five_hour.reset_at;
@@ -54553,6 +54606,12 @@ function fetchApiData() {
     if (data.seven_day) {
       apiData.weeklyUsage = data.seven_day.utilization;
     }
+    if (apiData.sessionUsage === undefined && apiData.weeklyUsage === undefined) {
+      const stale = readStaleCache();
+      if (stale && !stale.error)
+        return stale;
+      return { error: "parse-error" };
+    }
     try {
       const cacheDir = path6.dirname(CACHE_FILE);
       if (!fs7.existsSync(cacheDir)) {
@@ -54564,7 +54623,22 @@ function fetchApiData() {
     cacheTime = now;
     return apiData;
   } catch {
-    return null;
+    const stale = readStaleCache();
+    if (stale && !stale.error)
+      return stale;
+    return { error: "parse-error" };
+  }
+}
+function getErrorMessage(error43) {
+  switch (error43) {
+    case "no-credentials":
+      return "[No credentials]";
+    case "timeout":
+      return "[Timeout]";
+    case "api-error":
+      return "[API Error]";
+    case "parse-error":
+      return "[Parse Error]";
   }
 }
 function makeProgressBar(percent, width = 15) {
@@ -54583,23 +54657,24 @@ class SessionUsageWidget {
   getDisplayName() {
     return "Session Usage";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "Session: [███░░░░░░░░░░░░] 20%";
     const data = fetchApiData();
-    if (!data || data.sessionUsage === undefined) {
+    if (data.error)
+      return getErrorMessage(data.error);
+    if (data.sessionUsage === undefined)
       return null;
-    }
     const percent = data.sessionUsage;
     return `Session: ${makeProgressBar(percent)} ${percent.toFixed(1)}%`;
   }
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }
@@ -54614,23 +54689,24 @@ class WeeklyUsageWidget {
   getDisplayName() {
     return "Weekly Usage";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "Weekly: [██░░░░░░░░░░░░░] 12%";
     const data = fetchApiData();
-    if (!data || data.weeklyUsage === undefined) {
+    if (data.error)
+      return getErrorMessage(data.error);
+    if (data.weeklyUsage === undefined)
       return null;
-    }
     const percent = data.weeklyUsage;
     return `Weekly: ${makeProgressBar(percent)} ${percent.toFixed(1)}%`;
   }
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }
@@ -54645,16 +54721,17 @@ class ResetTimerWidget {
   getDisplayName() {
     return "Reset Timer";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "4:30 hr";
     const data = fetchApiData();
-    if (!data || !data.sessionResetAt) {
+    if (data.error)
+      return getErrorMessage(data.error);
+    if (!data.sessionResetAt)
       return null;
-    }
     try {
       const resetTime = new Date(data.sessionResetAt).getTime();
       const now = Date.now();
@@ -54671,7 +54748,7 @@ class ResetTimerWidget {
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }
@@ -54686,10 +54763,10 @@ class ContextBarWidget {
   getDisplayName() {
     return "Context Bar";
   }
-  getEditorDisplay() {
+  getEditorDisplay(item) {
     return { displayText: this.getDisplayName() };
   }
-  render(item, context) {
+  render(item, context, settings) {
     if (context.isPreview)
       return "Context: [████░░░░░░░░░░░] 50k/200k (25%)";
     const cw = context.data?.context_window;
@@ -54713,7 +54790,7 @@ class ContextBarWidget {
   supportsRawValue() {
     return false;
   }
-  supportsColors() {
+  supportsColors(item) {
     return true;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.0.39",
+  "version": "2.0.40",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",