opencode-usage 0.5.5 → 0.5.6

package/dist/index.js

@@ -341,7 +341,7 @@ function getAccountIdFromJwt(claims) {
   const auth = claims?.["https://api.openai.com/auth"];
   return auth?.chatgpt_account_id ?? null;
 }
-async function refreshSingleCodexToken(alias, account, storePath, store) {
+async function refreshSingleCodexToken(alias, account, storePath) {
   const refreshToken = account.refreshToken;
   if (typeof refreshToken !== "string" || !refreshToken) {
     console.log(`[proactiveRefresh] ${alias}: no refresh token, skipping`);
@@ -366,16 +366,21 @@ async function refreshSingleCodexToken(alias, account, storePath, store) {
     const accessClaims = decodeJwtPayload(tokens.access_token);
     const idClaims = tokens.id_token ? decodeJwtPayload(tokens.id_token) : null;
     const expiresAt = getExpiryFromJwt(accessClaims) ?? getExpiryFromJwt(idClaims) ?? Date.now() + tokens.expires_in * 1000;
-    account.accessToken = tokens.access_token;
-    if (tokens.refresh_token)
-      account.refreshToken = tokens.refresh_token;
-    if (tokens.id_token)
-      account.idToken = tokens.id_token;
-    account.expiresAt = expiresAt;
-    account.lastRefresh = new Date().toISOString();
-    account.accountId = getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims) ?? account.accountId;
-    account.authInvalid = false;
-    await Bun.write(storePath, JSON.stringify(store, null, 2));
+    const freshStore = JSON.parse(await Bun.file(storePath).text());
+    const freshAccounts = freshStore.accounts ?? {};
+    const freshAcct = freshAccounts[alias];
+    if (freshAcct) {
+      freshAcct.accessToken = tokens.access_token;
+      if (tokens.refresh_token)
+        freshAcct.refreshToken = tokens.refresh_token;
+      if (tokens.id_token)
+        freshAcct.idToken = tokens.id_token;
+      freshAcct.expiresAt = expiresAt;
+      freshAcct.lastRefresh = new Date().toISOString();
+      freshAcct.accountId = getAccountIdFromJwt(idClaims) ?? getAccountIdFromJwt(accessClaims) ?? freshAcct.accountId;
+      freshAcct.authInvalid = false;
+    }
+    await Bun.write(storePath, JSON.stringify(freshStore, null, 2));
     const daysLeft = ((expiresAt - Date.now()) / (24 * 60 * 60 * 1000)).toFixed(1);
     console.log(`[proactiveRefresh] ${alias}: refreshed in ${Date.now() - t0}ms, new expiry in ${daysLeft}d`);
     return true;
@@ -422,7 +427,7 @@ async function proactiveRefreshCodexTokens() {
     }
     const hoursStale = (timeSinceRefresh / (60 * 60 * 1000)).toFixed(1);
     console.log(`[proactiveRefresh] ${alias}: ${hoursStale}h since refresh, refreshing\u2026`);
-    const ok = await refreshSingleCodexToken(alias, account, storePath, store);
+    const ok = await refreshSingleCodexToken(alias, account, storePath);
     if (ok)
       refreshed++;
   }
@@ -537,8 +542,8 @@ async function clearStaleMetrics(provider, alias) {
           const rl = acct.rateLimits;
           for (const key of ["fiveHour", "weekly"]) {
             const w2 = rl[key];
-            if (w2?.resetAt && typeof w2.resetAt === "string") {
-              if (new Date(w2.resetAt).getTime() < now) {
+            if (w2?.resetAt && typeof w2.resetAt === "number") {
+              if (w2.resetAt < now) {
                 w2.remaining = w2.limit;
                 delete w2.resetAt;
                 changed = true;
@@ -31109,4 +31114,4 @@ async function main2() {
 var WATCH_INTERVAL_MS = 5 * 60 * 1000;
 main2().catch(console.error);
 
-//# debugId=DF21C38AB467E5FE64756E2164756E21
+//# debugId=79D8BC2A04D06ACC64756E2164756E21