by codex: feat. General Improvements

lib/storage.ts

@@ -1,9 +1,13 @@
 import * as SecureStore from "expo-secure-store";
+import type { ClaudeUsageResponse } from "@/types/claude";
+import type { CodexUsageResponse } from "@/types/codex";
 
 const KEYS = {
   CODEX_AUTH: "codexbar_codex_auth",
   CLAUDE_SESSION_KEY: "codexbar_claude_session_key",
   CLAUDE_LAST_ACTIVE_ORG: "codexbar_claude_last_active_org",
+  CODEX_USAGE_CACHE: "codexbar_codex_usage_cache",
+  CLAUDE_USAGE_CACHE: "codexbar_claude_usage_cache",
   NOTIF_DAILY_ENABLED: "notifDailyEnabled",
   NOTIF_DAILY_HOUR: "notifDailyHour",
   NOTIF_DAILY_MINUTE: "notifDailyMinute",
@@ -12,6 +16,27 @@ const KEYS = {
   NOTIF_THRESHOLD_LAST_FIRED: "notifThresholdLastFired",
 } as const;
 
+export interface UsageCache<T> {
+  data: T;
+  lastFetchedAt: number;
+}
+
+async function loadJson<T>(key: string): Promise<T | null> {
+  const raw = await SecureStore.getItemAsync(key);
+  if (!raw) return null;
+
+  try {
+    return JSON.parse(raw) as T;
+  } catch {
+    await SecureStore.deleteItemAsync(key);
+    return null;
+  }
+}
+
+async function saveJson(key: string, value: unknown): Promise<void> {
+  await SecureStore.setItemAsync(key, JSON.stringify(value));
+}
+
 export interface NotifSettings {
   dailyEnabled: boolean;
   dailyHour: number;
@@ -60,20 +85,46 @@ export async function saveCodexAuth(auth: {
   accessToken: string;
   accountId?: string;
 }): Promise<void> {
-  await SecureStore.setItemAsync(KEYS.CODEX_AUTH, JSON.stringify(auth));
+  await saveJson(KEYS.CODEX_AUTH, auth);
 }
 
 export async function loadCodexAuth(): Promise<{
   accessToken: string;
   accountId?: string;
 } | null> {
-  const raw = await SecureStore.getItemAsync(KEYS.CODEX_AUTH);
-  if (!raw) return null;
-  return JSON.parse(raw) as { accessToken: string; accountId?: string };
+  return loadJson(KEYS.CODEX_AUTH);
+}
+
+export function loadCodexUsageCache(): Promise<UsageCache<CodexUsageResponse> | null> {
+  return loadJson(KEYS.CODEX_USAGE_CACHE);
+}
+
+export function saveCodexUsageCache(
+  cache: UsageCache<CodexUsageResponse>
+): Promise<void> {
+  return saveJson(KEYS.CODEX_USAGE_CACHE, cache);
+}
+
+export function clearCodexUsageCache(): Promise<void> {
+  return SecureStore.deleteItemAsync(KEYS.CODEX_USAGE_CACHE);
+}
+
+export function loadClaudeUsageCache(): Promise<UsageCache<ClaudeUsageResponse> | null> {
+  return loadJson(KEYS.CLAUDE_USAGE_CACHE);
+}
+
+export function saveClaudeUsageCache(
+  cache: UsageCache<ClaudeUsageResponse>
+): Promise<void> {
+  return saveJson(KEYS.CLAUDE_USAGE_CACHE, cache);
+}
+
+export function clearClaudeUsageCache(): Promise<void> {
+  return SecureStore.deleteItemAsync(KEYS.CLAUDE_USAGE_CACHE);
 }
 
 export async function saveClaudeSessionKey(key: string): Promise<void> {
-  await SecureStore.setItemAsync(KEYS.CLAUDE_SESSION_KEY, key);
+  await SecureStore.setItemAsync(KEYS.CLAUDE_SESSION_KEY, key.trim());
 }
 
 export async function loadClaudeSessionKey(): Promise<string | null> {
@@ -81,7 +132,7 @@ export async function loadClaudeSessionKey(): Promise<string | null> {
 }
 
 export async function saveClaudeLastActiveOrg(orgId: string): Promise<void> {
-  await SecureStore.setItemAsync(KEYS.CLAUDE_LAST_ACTIVE_ORG, orgId);
+  await SecureStore.setItemAsync(KEYS.CLAUDE_LAST_ACTIVE_ORG, orgId.trim());
 }
 
 export async function loadClaudeLastActiveOrg(): Promise<string | null> {
@@ -93,10 +144,16 @@ export async function clearClaudeLastActiveOrg(): Promise<void> {
 }
 
 export async function clearCodexAuth(): Promise<void> {
-  await SecureStore.deleteItemAsync(KEYS.CODEX_AUTH);
+  await Promise.all([
+    SecureStore.deleteItemAsync(KEYS.CODEX_AUTH),
+    clearCodexUsageCache(),
+  ]);
 }
 
 export async function clearClaudeSessionKey(): Promise<void> {
-  await SecureStore.deleteItemAsync(KEYS.CLAUDE_SESSION_KEY);
-  await SecureStore.deleteItemAsync(KEYS.CLAUDE_LAST_ACTIVE_ORG);
+  await Promise.all([
+    SecureStore.deleteItemAsync(KEYS.CLAUDE_SESSION_KEY),
+    SecureStore.deleteItemAsync(KEYS.CLAUDE_LAST_ACTIVE_ORG),
+    clearClaudeUsageCache(),
+  ]);
 }