@juspay/neurolink 10.4.2 → 10.4.4

package/dist/lib/proxy/tokenRefresh.js

@@ -1,12 +1,14 @@
 import { logger } from "../utils/logger.js";
 import { tokenStore } from "../auth/tokenStore.js";
+import { ANTHROPIC_TOKEN_URL, ANTHROPIC_TOKEN_URL_FALLBACK, CLAUDE_CLI_USER_AGENT, CLAUDE_CODE_CLIENT_ID, } from "../auth/anthropicOAuth.js";
 import { writeJsonSnapshotAtomically } from "./snapshotPersistence.js";
-const REFRESH_URL = "https://api.anthropic.com/v1/oauth/token";
-const REFRESH_URL_FALLBACK = "https://console.anthropic.com/v1/oauth/token";
-const CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
+import { withTimeout } from "../utils/async/withTimeout.js";
+import { redactUrlForError } from "../utils/logSanitize.js";
 const BUFFER_MS = 5 * 60 * 1000;
 const SUCCESS_CACHE_MS = 60_000;
-const USER_AGENT = "claude-cli/2.1.80 (external, cli)";
+// Bound the best-effort persisted-credential reconciliation read so a hung or
+// slow token-store decrypt can never stall (or abort) a live token refresh.
+const PEEK_TOKENS_TIMEOUT_MS = 2_000;
 const refreshesInFlight = new Map();
 export function needsRefresh(account) {
     return !!(account.expiresAt &&
@@ -23,28 +25,33 @@ async function performTokenRefresh(account) {
     if (!account.refreshToken) {
         return { success: false, error: "No refresh token available" };
     }
-    const formBody = new URLSearchParams({
+    // OAuth 2.0 token endpoints require an `application/x-www-form-urlencoded`
+    // request body (RFC 6749 §6); a JSON body is nonstandard for this grant and
+    // is rejected by RFC-compliant endpoints. Mirror the interactive auth flow
+    // in `anthropicOAuth.ts::_refreshAccessToken`.
+    const requestBody = new URLSearchParams({
         grant_type: "refresh_token",
         refresh_token: account.refreshToken,
-        client_id: CLIENT_ID,
+        client_id: CLAUDE_CODE_CLIENT_ID,
     }).toString();
     const headers = {
         "Content-Type": "application/x-www-form-urlencoded",
-        "User-Agent": USER_AGENT,
+        Accept: "application/json",
+        "User-Agent": CLAUDE_CLI_USER_AGENT,
     };
-    const urls = [REFRESH_URL, REFRESH_URL_FALLBACK];
+    const urls = [ANTHROPIC_TOKEN_URL, ANTHROPIC_TOKEN_URL_FALLBACK];
     let terminalFailure;
     for (const url of urls) {
         try {
             const resp = await fetch(url, {
                 method: "POST",
                 headers,
-                body: formBody,
+                body: requestBody,
                 signal: AbortSignal.timeout(10_000),
             });
             if (!resp.ok) {
                 const errorBody = await resp.text();
-                logger.warn(`[token-refresh] failed for ${account.label} at ${url}`, {
+                logger.warn(`[token-refresh] failed for ${account.label} at ${redactUrlForError(url)}`, {
                     status: resp.status,
                     error: errorBody.slice(0, 500),
                 });
@@ -57,7 +64,7 @@ async function performTokenRefresh(account) {
                     terminalFailure = failure;
                 }
                 // If primary URL returned a non-ok status, try fallback.
-                if (url === REFRESH_URL) {
+                if (url === ANTHROPIC_TOKEN_URL) {
                     continue;
                 }
                 return terminalFailure ?? failure;
@@ -75,11 +82,11 @@ async function performTokenRefresh(account) {
             return { success: true };
         }
         catch (e) {
-            logger.warn(`[token-refresh] exception for ${account.label} at ${url}`, {
+            logger.warn(`[token-refresh] exception for ${account.label} at ${redactUrlForError(url)}`, {
                 error: String(e),
             });
             // If primary URL threw, try fallback
-            if (url === REFRESH_URL) {
+            if (url === ANTHROPIC_TOKEN_URL) {
                 continue;
             }
             return terminalFailure ?? { success: false, error: String(e) };
@@ -151,6 +158,54 @@ export async function refreshToken(account) {
     }
     return shared.result;
 }
+async function reloadPersistedTokenStoreAccount(account, target) {
+    if (!target || typeof target === "string" || !("providerKey" in target)) {
+        return false;
+    }
+    // Best-effort, bounded reconciliation: this only adopts a newer persisted
+    // credential generation if one exists. A decryption/IO failure — or a hung
+    // read — must NOT abort the caller, which can still refresh with the
+    // already-loaded token. Swallow the failure and treat it as "no newer
+    // persisted generation found" so refresh proceeds instead of the account
+    // being spuriously disabled.
+    let stored;
+    try {
+        stored = await withTimeout(tokenStore.peekTokens(target.providerKey), PEEK_TOKENS_TIMEOUT_MS, "[token-refresh] peekTokens reconciliation timed out");
+    }
+    catch (err) {
+        logger.debug("[token-refresh] skipping persisted-state reconciliation (peek failed)", { error: err instanceof Error ? err.message : String(err) });
+        return false;
+    }
+    if (!stored ||
+        stored.expiresAt <= (account.expiresAt ?? 0) ||
+        (stored.accessToken === account.token &&
+            stored.refreshToken === account.refreshToken &&
+            stored.expiresAt === account.expiresAt)) {
+        return false;
+    }
+    account.token = stored.accessToken;
+    account.refreshToken = stored.refreshToken;
+    account.expiresAt = stored.expiresAt;
+    return true;
+}
+/**
+ * Refreshes against the latest persisted credential generation. Queued
+ * requests can otherwise reject a rotated refresh token and disable a newer
+ * login that was saved while they were waiting.
+ */
+export async function refreshTokenFromLatest(account, target) {
+    const reloadedBeforeRefresh = await reloadPersistedTokenStoreAccount(account, target);
+    if (reloadedBeforeRefresh && !needsRefresh(account)) {
+        return { success: true };
+    }
+    const result = await refreshToken(account);
+    if (result.success) {
+        return result;
+    }
+    return (await reloadPersistedTokenStoreAccount(account, target))
+        ? { success: true }
+        : result;
+}
 export function clearRefreshStateForTests() {
     refreshesInFlight.clear();
 }
@@ -183,7 +238,7 @@ async function persistLegacyCredentials(credPath, account) {
 }
 async function persistTokenStoreAccount(providerKey, account) {
     try {
-        const existing = await tokenStore.loadTokens(providerKey);
+        const existing = await withTimeout(tokenStore.peekTokens(providerKey), PEEK_TOKENS_TIMEOUT_MS, "[token-refresh] peekTokens for persistence timed out");
         const merged = {
             accessToken: account.token,
             refreshToken: account.refreshToken ?? existing?.refreshToken,
@@ -191,7 +246,7 @@ async function persistTokenStoreAccount(providerKey, account) {
             tokenType: existing?.tokenType ?? "Bearer",
             ...(existing?.scope ? { scope: existing.scope } : {}),
         };
-        await tokenStore.saveTokens(providerKey, merged);
+        await withTimeout(tokenStore.saveTokens(providerKey, merged), PEEK_TOKENS_TIMEOUT_MS, "[token-refresh] saveTokens timed out");
     }
     catch (err) {
         logger.warn("[token-refresh] Failed to persist TokenStore credentials", {

package/dist/lib/proxy/usageStats.d.ts

@@ -5,34 +5,49 @@
  * shared snapshot asynchronously, under a cross-process lock, so overlapping
  * rolling workers cannot overwrite each other's counters.
  */
-import type { AccountStats, ProxyStats, ProxyStatsPersistenceStatus, ProxyUsageStatsStoreOptions } from "../types/index.js";
+import type { AccountStats, ProxyTerminalErrorDetails, ProxyTerminalErrorJournal, ProxyStats, ProxyStatsPersistenceStatus, ProxyUsageStatsSnapshot, ProxyUsageStatsStoreOptions } from "../types/index.js";
 export declare class ProxyUsageStatsStore {
     private readonly now;
     private readonly flushIntervalMs;
     private readonly lockTimeoutMs;
     private readonly staleLockMs;
     private filePath?;
+    private terminalErrorsFilePath?;
     private stats;
     private pending;
+    private terminalErrors;
+    private pendingTerminalErrors;
     private pendingMutations;
     private inFlightMutations;
+    private pendingTerminalErrorMutations;
+    private inFlightTerminalErrorMutations;
     private revision;
+    private terminalErrorsRevision;
     private flushTimer;
     private readonly flushMutex;
     private lastFlushedAt?;
     private lastReconciledAt?;
     private lastRecoveryAt?;
     private lastError?;
+    private terminalErrorsLastFlushedAt?;
+    private terminalErrorsLastRecoveryAt?;
+    private terminalErrorsLastError?;
+    private snapshotVersion;
     constructor(options?: ProxyUsageStatsStoreOptions);
     initialize(filePath?: string): Promise<void>;
     recordAttempt(accountLabel: string, accountType: string): void;
     recordFinalSuccess(accountLabel?: string, accountType?: string): void;
     recordAttemptError(accountLabel: string, accountType: string, status: number, rateLimitKind?: "transient" | "quota"): void;
-    recordFinalError(_status: number, accountLabel?: string, accountType?: string): void;
+    recordFinalError(status: number, accountLabel?: string, accountType?: string, details?: ProxyTerminalErrorDetails): void;
     getStats(): ProxyStats;
     getAccountStats(label: string): AccountStats | undefined;
+    getTerminalErrors(): ProxyTerminalErrorJournal;
+    getUsageSnapshot(): ProxyUsageStatsSnapshot;
     getPersistenceStatus(): ProxyStatsPersistenceStatus;
     flush(): Promise<void>;
+    private persistStatsDelta;
+    private persistTerminalErrorDelta;
+    reconcileUsageSnapshot(): Promise<ProxyUsageStatsSnapshot>;
     reconcile(): Promise<ProxyStats>;
     resetMemory(): void;
     resetForTests(): Promise<void>;
@@ -41,13 +56,18 @@ export declare class ProxyUsageStatsStore {
     private applyFinalSuccess;
     private applyAttemptError;
     private applyFinalError;
+    private applyTerminalError;
     private ensureAccount;
     private scheduleFlush;
     private cancelFlushTimer;
     private readSnapshot;
+    private readTerminalErrorSnapshot;
     private applySnapshot;
+    private applyTerminalErrorSnapshot;
     private recoverCorruptSnapshot;
+    private recoverCorruptTerminalErrorSnapshot;
     private quarantineCorruptSnapshot;
+    private quarantineCorruptTerminalErrorSnapshot;
     private pruneCorruptSnapshots;
     private describeError;
 }
@@ -55,10 +75,12 @@ export declare function initUsageStats(filePath: string): Promise<void>;
 export declare function recordAttempt(accountLabel: string, accountType: string): void;
 export declare function recordFinalSuccess(accountLabel?: string, accountType?: string): void;
 export declare function recordAttemptError(accountLabel: string, accountType: string, status: number, rateLimitKind?: "transient" | "quota"): void;
-export declare function recordFinalError(_status: number, accountLabel?: string, accountType?: string): void;
+export declare function recordFinalError(status: number, accountLabel?: string, accountType?: string, details?: ProxyTerminalErrorDetails): void;
 export declare function getStats(): ProxyStats;
 export declare function getReconciledStats(): Promise<ProxyStats>;
+export declare function getReconciledUsageSnapshot(): Promise<ProxyUsageStatsSnapshot>;
 export declare function getAccountStats(label: string): AccountStats | undefined;
+export declare function getTerminalErrors(): ProxyTerminalErrorJournal;
 export declare function getUsageStatsPersistenceStatus(): ProxyStatsPersistenceStatus;
 export declare function flushUsageStats(): Promise<void>;
 /** Reset process-local counters while intentionally preserving durable state. */