@leo000001/opencode-quota-sidebar 3.0.9 → 3.0.10

package/dist/providers/core/openai.js

@@ -1,5 +1,60 @@
 import { debug, debugError, isRecord, swallow } from '../../helpers.js';
-import { OPENAI_OAUTH_CLIENT_ID, configuredProviderEnabled, fetchWithTimeout, normalizePercent, parseRateLimitWindow, toIso, } from '../common.js';
+import { OPENAI_OAUTH_CLIENT_ID, asNumber, configuredProviderEnabled, fetchWithTimeout, toIso, windowLabel, } from '../common.js';
+function decodeJwtPayload(token) {
+    try {
+        const parts = token.split('.');
+        if (parts.length !== 3)
+            return undefined;
+        const payload = JSON.parse(Buffer.from(parts[1], 'base64url').toString('utf8'));
+        return isRecord(payload) ? payload : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function extractAccountIdFromJwt(token) {
+    const payload = decodeJwtPayload(token);
+    if (!payload)
+        return undefined;
+    const authClaim = payload['https://api.openai.com/auth'];
+    if (!isRecord(authClaim))
+        return undefined;
+    const accountID = authClaim.chatgpt_account_id;
+    return typeof accountID === 'string' && accountID ? accountID : undefined;
+}
+function normalizeOpenAIQuotaPercent(value) {
+    const numeric = asNumber(value);
+    if (numeric === undefined || Number.isNaN(numeric))
+        return undefined;
+    const expanded = numeric > 0 && numeric < 1 ? numeric * 100 : numeric;
+    if (expanded < 0)
+        return 0;
+    if (expanded > 100)
+        return 100;
+    return expanded;
+}
+function windowResetAt(win, fallback) {
+    const absolute = toIso(win.reset_at ?? fallback?.reset_at);
+    if (absolute)
+        return absolute;
+    const resetAfterSeconds = asNumber(win.reset_after_seconds) ?? asNumber(fallback?.reset_after_seconds);
+    if (resetAfterSeconds === undefined || resetAfterSeconds < 0)
+        return undefined;
+    return new Date(Date.now() + resetAfterSeconds * 1000).toISOString();
+}
+function parseOpenAIWindow(win, fallbackLabel) {
+    const usedPercent = normalizeOpenAIQuotaPercent(win.used_percent);
+    const remainingPercent = normalizeOpenAIQuotaPercent(win.remaining_percent) ??
+        (usedPercent === undefined ? undefined : 100 - usedPercent);
+    if (remainingPercent === undefined)
+        return undefined;
+    return {
+        label: windowLabel(win, fallbackLabel),
+        remainingPercent,
+        usedPercent,
+        resetAt: windowResetAt(win),
+    };
+}
 async function fetchOpenAIQuota(ctx) {
     const checkedAt = Date.now();
     const base = {
@@ -85,13 +140,15 @@ async function fetchOpenAIQuota(ctx) {
             }
         }
     }
+    const accountId = (typeof ctx.auth.accountId === 'string' && ctx.auth.accountId) ||
+        extractAccountIdFromJwt(access);
     const headers = new Headers({
         Authorization: `Bearer ${access}`,
         Accept: 'application/json',
         'User-Agent': 'opencode-quota-sidebar',
     });
-    if (typeof ctx.auth.accountId === 'string' && ctx.auth.accountId) {
-        headers.set('ChatGPT-Account-Id', ctx.auth.accountId);
+    if (accountId) {
+        headers.set('ChatGPT-Account-Id', accountId);
     }
     const response = await fetchWithTimeout('https://chatgpt.com/backend-api/wham/usage', { headers }, ctx.config.quota.requestTimeoutMs).catch(swallow('fetchOpenAIQuota:usage'));
     if (!response) {
@@ -123,18 +180,18 @@ async function fetchOpenAIQuota(ctx) {
     const primary = isRecord(rateLimit.primary_window)
         ? rateLimit.primary_window
         : {};
-    const usedPercent = normalizePercent(primary.used_percent);
-    const remainingPercent = normalizePercent(primary.remaining_percent) ??
+    const usedPercent = normalizeOpenAIQuotaPercent(primary.used_percent);
+    const remainingPercent = normalizeOpenAIQuotaPercent(primary.remaining_percent) ??
         (usedPercent === undefined ? undefined : 100 - usedPercent);
-    const resetAt = toIso(primary.reset_at ?? rateLimit.reset_at);
+    const resetAt = windowResetAt(primary, rateLimit);
     const windows = [];
     if (remainingPercent !== undefined) {
-        const primaryWin = parseRateLimitWindow(primary, '');
+        const primaryWin = parseOpenAIWindow(primary, '');
         if (primaryWin)
             windows.push(primaryWin);
     }
     if (isRecord(rateLimit.secondary_window)) {
-        const secondaryWin = parseRateLimitWindow(rateLimit.secondary_window, 'Weekly');
+        const secondaryWin = parseOpenAIWindow(rateLimit.secondary_window, 'Weekly');
         if (secondaryWin)
             windows.push(secondaryWin);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo000001/opencode-quota-sidebar",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "OpenCode plugin that shows quota and token usage in TUI sidebar panels and compact session titles",
   "type": "module",
   "main": "dist/index.js",