codex-team 0.0.9 → 0.0.10

package/dist/cli.cjs

@@ -13,7 +13,7 @@ var __webpack_modules__ = {
         const utc_js_namespaceObject = require("dayjs/plugin/utc.js");
         var utc_js_default = /*#__PURE__*/ __webpack_require__.n(utc_js_namespaceObject);
         var package_namespaceObject = {
-            rE: "0.0.9"
+            rE: "0.0.10"
         };
         const external_node_crypto_namespaceObject = require("node:crypto");
         const promises_namespaceObject = require("node:fs/promises");
@@ -226,6 +226,9 @@ var __webpack_modules__ = {
         const external_node_util_namespaceObject = require("node:util");
         const DEFAULT_CHATGPT_BASE_URL = "https://chatgpt.com";
         const USER_AGENT = "codexm/0.1";
+        const USAGE_FETCH_ATTEMPTS = 3;
+        const USAGE_FETCH_RETRY_DELAY_MS = 250;
+        const USAGE_FETCH_TIMEOUT_MS = 15000;
         function quota_client_isRecord(value) {
             return "object" == typeof value && null !== value && !Array.isArray(value);
         }
@@ -323,8 +326,6 @@ var __webpack_modules__ = {
             const normalizedBaseUrl = baseUrl.replace(/\/+$/u, "");
             const candidates = [
                 `${normalizedBaseUrl}/backend-api/wham/usage`,
-                `${normalizedBaseUrl}/wham/usage`,
-                `${normalizedBaseUrl}/api/codex/usage`,
                 "https://chatgpt.com/backend-api/wham/usage"
             ];
             return [
@@ -334,6 +335,19 @@ var __webpack_modules__ = {
         function normalizeFetchError(error) {
             return error instanceof Error ? error.message : String(error);
         }
+        async function delay(milliseconds) {
+            await new Promise((resolve)=>setTimeout(resolve, milliseconds));
+        }
+        function isTransientUsageStatus(status) {
+            return 408 === status || 429 === status || status >= 500 && status <= 599;
+        }
+        function isLastAttempt(attempt) {
+            return attempt >= USAGE_FETCH_ATTEMPTS;
+        }
+        function formatUsageAttemptError(url, attempt, message) {
+            const retryContext = USAGE_FETCH_ATTEMPTS > 1 ? ` attempt ${attempt}/${USAGE_FETCH_ATTEMPTS}` : "";
+            return `${url}${retryContext} -> ${message}`;
+        }
         function shouldRetryWithTokenRefresh(message) {
             const normalized = message.toLowerCase();
             return normalized.includes("401") || normalized.includes("403") || normalized.includes("unauthorized") || normalized.includes("invalid_token") || normalized.includes("deactivated_workspace");
@@ -389,7 +403,9 @@ var __webpack_modules__ = {
             const urls = await resolveUsageUrls(options.homeDir);
             const now = (options.now ?? new Date()).toISOString();
             const errors = [];
-            for (const url of urls){
+            for (const url of urls)for(let attempt = 1; attempt <= USAGE_FETCH_ATTEMPTS; attempt += 1){
+                const abortController = new AbortController();
+                const timeout = setTimeout(()=>abortController.abort(), USAGE_FETCH_TIMEOUT_MS);
                 let response;
                 try {
                     response = await fetchImpl(url, {
@@ -399,23 +415,35 @@ var __webpack_modules__ = {
                             "ChatGPT-Account-Id": extracted.accountId,
                             Accept: "application/json",
                             "User-Agent": USER_AGENT
-                        }
+                        },
+                        signal: abortController.signal
                     });
                 } catch (error) {
-                    errors.push(`${url} -> ${normalizeFetchError(error)}`);
-                    continue;
+                    clearTimeout(timeout);
+                    const message = abortController.signal.aborted ? `timed out after ${USAGE_FETCH_TIMEOUT_MS}ms` : normalizeFetchError(error);
+                    errors.push(formatUsageAttemptError(url, attempt, message));
+                    if (!isLastAttempt(attempt)) {
+                        await delay(USAGE_FETCH_RETRY_DELAY_MS * attempt);
+                        continue;
+                    }
+                    break;
                 }
+                clearTimeout(timeout);
                 if (!response.ok) {
                     const body = await response.text();
-                    errors.push(`${url} -> ${response.status}: ${body.slice(0, 140).replace(/\s+/gu, " ").trim()}`);
-                    continue;
+                    errors.push(formatUsageAttemptError(url, attempt, `${response.status}: ${body.slice(0, 140).replace(/\s+/gu, " ").trim()}`));
+                    if (isTransientUsageStatus(response.status) && !isLastAttempt(attempt)) {
+                        await delay(USAGE_FETCH_RETRY_DELAY_MS * attempt);
+                        continue;
+                    }
+                    break;
                 }
                 let payload;
                 try {
                     payload = await response.json();
                 } catch (error) {
-                    errors.push(`${url} -> failed to parse JSON: ${normalizeFetchError(error)}`);
-                    continue;
+                    errors.push(formatUsageAttemptError(url, attempt, `failed to parse JSON: ${normalizeFetchError(error)}`));
+                    break;
                 }
                 return mapUsagePayload(payload, extracted.planType, now);
             }

package/dist/main.cjs

@@ -43,7 +43,7 @@ var timezone_js_default = /*#__PURE__*/ __webpack_require__.n(timezone_js_namesp
 const utc_js_namespaceObject = require("dayjs/plugin/utc.js");
 var utc_js_default = /*#__PURE__*/ __webpack_require__.n(utc_js_namespaceObject);
 var package_namespaceObject = {
-    rE: "0.0.9"
+    rE: "0.0.10"
 };
 const external_node_crypto_namespaceObject = require("node:crypto");
 const promises_namespaceObject = require("node:fs/promises");
@@ -256,6 +256,9 @@ const external_node_child_process_namespaceObject = require("node:child_process"
 const external_node_util_namespaceObject = require("node:util");
 const DEFAULT_CHATGPT_BASE_URL = "https://chatgpt.com";
 const USER_AGENT = "codexm/0.1";
+const USAGE_FETCH_ATTEMPTS = 3;
+const USAGE_FETCH_RETRY_DELAY_MS = 250;
+const USAGE_FETCH_TIMEOUT_MS = 15000;
 function quota_client_isRecord(value) {
     return "object" == typeof value && null !== value && !Array.isArray(value);
 }
@@ -353,8 +356,6 @@ async function resolveUsageUrls(homeDir) {
     const normalizedBaseUrl = baseUrl.replace(/\/+$/u, "");
     const candidates = [
         `${normalizedBaseUrl}/backend-api/wham/usage`,
-        `${normalizedBaseUrl}/wham/usage`,
-        `${normalizedBaseUrl}/api/codex/usage`,
         "https://chatgpt.com/backend-api/wham/usage"
     ];
     return [
@@ -364,6 +365,19 @@ async function resolveUsageUrls(homeDir) {
 function normalizeFetchError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+async function delay(milliseconds) {
+    await new Promise((resolve)=>setTimeout(resolve, milliseconds));
+}
+function isTransientUsageStatus(status) {
+    return 408 === status || 429 === status || status >= 500 && status <= 599;
+}
+function isLastAttempt(attempt) {
+    return attempt >= USAGE_FETCH_ATTEMPTS;
+}
+function formatUsageAttemptError(url, attempt, message) {
+    const retryContext = USAGE_FETCH_ATTEMPTS > 1 ? ` attempt ${attempt}/${USAGE_FETCH_ATTEMPTS}` : "";
+    return `${url}${retryContext} -> ${message}`;
+}
 function shouldRetryWithTokenRefresh(message) {
     const normalized = message.toLowerCase();
     return normalized.includes("401") || normalized.includes("403") || normalized.includes("unauthorized") || normalized.includes("invalid_token") || normalized.includes("deactivated_workspace");
@@ -419,7 +433,9 @@ async function requestUsage(snapshot, options) {
     const urls = await resolveUsageUrls(options.homeDir);
     const now = (options.now ?? new Date()).toISOString();
     const errors = [];
-    for (const url of urls){
+    for (const url of urls)for(let attempt = 1; attempt <= USAGE_FETCH_ATTEMPTS; attempt += 1){
+        const abortController = new AbortController();
+        const timeout = setTimeout(()=>abortController.abort(), USAGE_FETCH_TIMEOUT_MS);
         let response;
         try {
             response = await fetchImpl(url, {
@@ -429,23 +445,35 @@ async function requestUsage(snapshot, options) {
                     "ChatGPT-Account-Id": extracted.accountId,
                     Accept: "application/json",
                     "User-Agent": USER_AGENT
-                }
+                },
+                signal: abortController.signal
             });
         } catch (error) {
-            errors.push(`${url} -> ${normalizeFetchError(error)}`);
-            continue;
+            clearTimeout(timeout);
+            const message = abortController.signal.aborted ? `timed out after ${USAGE_FETCH_TIMEOUT_MS}ms` : normalizeFetchError(error);
+            errors.push(formatUsageAttemptError(url, attempt, message));
+            if (!isLastAttempt(attempt)) {
+                await delay(USAGE_FETCH_RETRY_DELAY_MS * attempt);
+                continue;
+            }
+            break;
         }
+        clearTimeout(timeout);
         if (!response.ok) {
             const body = await response.text();
-            errors.push(`${url} -> ${response.status}: ${body.slice(0, 140).replace(/\s+/gu, " ").trim()}`);
-            continue;
+            errors.push(formatUsageAttemptError(url, attempt, `${response.status}: ${body.slice(0, 140).replace(/\s+/gu, " ").trim()}`));
+            if (isTransientUsageStatus(response.status) && !isLastAttempt(attempt)) {
+                await delay(USAGE_FETCH_RETRY_DELAY_MS * attempt);
+                continue;
+            }
+            break;
         }
         let payload;
         try {
             payload = await response.json();
         } catch (error) {
-            errors.push(`${url} -> failed to parse JSON: ${normalizeFetchError(error)}`);
-            continue;
+            errors.push(formatUsageAttemptError(url, attempt, `failed to parse JSON: ${normalizeFetchError(error)}`));
+            break;
         }
         return mapUsagePayload(payload, extracted.planType, now);
     }

package/dist/main.js

@@ -9,7 +9,7 @@ import { basename, dirname, join } from "node:path";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 var package_namespaceObject = {
-    rE: "0.0.9"
+    rE: "0.0.10"
 };
 function isRecord(value) {
     return "object" == typeof value && null !== value && !Array.isArray(value);
@@ -216,6 +216,9 @@ function decodeJwtPayload(token) {
 }
 const DEFAULT_CHATGPT_BASE_URL = "https://chatgpt.com";
 const USER_AGENT = "codexm/0.1";
+const USAGE_FETCH_ATTEMPTS = 3;
+const USAGE_FETCH_RETRY_DELAY_MS = 250;
+const USAGE_FETCH_TIMEOUT_MS = 15000;
 function quota_client_isRecord(value) {
     return "object" == typeof value && null !== value && !Array.isArray(value);
 }
@@ -313,8 +316,6 @@ async function resolveUsageUrls(homeDir) {
     const normalizedBaseUrl = baseUrl.replace(/\/+$/u, "");
     const candidates = [
         `${normalizedBaseUrl}/backend-api/wham/usage`,
-        `${normalizedBaseUrl}/wham/usage`,
-        `${normalizedBaseUrl}/api/codex/usage`,
         "https://chatgpt.com/backend-api/wham/usage"
     ];
     return [
@@ -324,6 +325,19 @@ async function resolveUsageUrls(homeDir) {
 function normalizeFetchError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+async function delay(milliseconds) {
+    await new Promise((resolve)=>setTimeout(resolve, milliseconds));
+}
+function isTransientUsageStatus(status) {
+    return 408 === status || 429 === status || status >= 500 && status <= 599;
+}
+function isLastAttempt(attempt) {
+    return attempt >= USAGE_FETCH_ATTEMPTS;
+}
+function formatUsageAttemptError(url, attempt, message) {
+    const retryContext = USAGE_FETCH_ATTEMPTS > 1 ? ` attempt ${attempt}/${USAGE_FETCH_ATTEMPTS}` : "";
+    return `${url}${retryContext} -> ${message}`;
+}
 function shouldRetryWithTokenRefresh(message) {
     const normalized = message.toLowerCase();
     return normalized.includes("401") || normalized.includes("403") || normalized.includes("unauthorized") || normalized.includes("invalid_token") || normalized.includes("deactivated_workspace");
@@ -379,7 +393,9 @@ async function requestUsage(snapshot, options) {
     const urls = await resolveUsageUrls(options.homeDir);
     const now = (options.now ?? new Date()).toISOString();
     const errors = [];
-    for (const url of urls){
+    for (const url of urls)for(let attempt = 1; attempt <= USAGE_FETCH_ATTEMPTS; attempt += 1){
+        const abortController = new AbortController();
+        const timeout = setTimeout(()=>abortController.abort(), USAGE_FETCH_TIMEOUT_MS);
         let response;
         try {
             response = await fetchImpl(url, {
@@ -389,23 +405,35 @@ async function requestUsage(snapshot, options) {
                     "ChatGPT-Account-Id": extracted.accountId,
                     Accept: "application/json",
                     "User-Agent": USER_AGENT
-                }
+                },
+                signal: abortController.signal
             });
         } catch (error) {
-            errors.push(`${url} -> ${normalizeFetchError(error)}`);
-            continue;
+            clearTimeout(timeout);
+            const message = abortController.signal.aborted ? `timed out after ${USAGE_FETCH_TIMEOUT_MS}ms` : normalizeFetchError(error);
+            errors.push(formatUsageAttemptError(url, attempt, message));
+            if (!isLastAttempt(attempt)) {
+                await delay(USAGE_FETCH_RETRY_DELAY_MS * attempt);
+                continue;
+            }
+            break;
         }
+        clearTimeout(timeout);
         if (!response.ok) {
             const body = await response.text();
-            errors.push(`${url} -> ${response.status}: ${body.slice(0, 140).replace(/\s+/gu, " ").trim()}`);
-            continue;
+            errors.push(formatUsageAttemptError(url, attempt, `${response.status}: ${body.slice(0, 140).replace(/\s+/gu, " ").trim()}`));
+            if (isTransientUsageStatus(response.status) && !isLastAttempt(attempt)) {
+                await delay(USAGE_FETCH_RETRY_DELAY_MS * attempt);
+                continue;
+            }
+            break;
         }
         let payload;
         try {
             payload = await response.json();
         } catch (error) {
-            errors.push(`${url} -> failed to parse JSON: ${normalizeFetchError(error)}`);
-            continue;
+            errors.push(formatUsageAttemptError(url, attempt, `failed to parse JSON: ${normalizeFetchError(error)}`));
+            break;
         }
         return mapUsagePayload(payload, extracted.planType, now);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-team",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Manage multiple Codex ChatGPT auth snapshots and quota usage from the command line.",
   "license": "MIT",
   "type": "module",