codex-multi-auth 1.2.1 → 1.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +55 -21
- package/dist/index.js.map +1 -1
- package/dist/lib/accounts.d.ts +11 -0
- package/dist/lib/accounts.d.ts.map +1 -1
- package/dist/lib/accounts.js +320 -70
- package/dist/lib/accounts.js.map +1 -1
- package/dist/lib/circuit-breaker.d.ts +4 -0
- package/dist/lib/circuit-breaker.d.ts.map +1 -1
- package/dist/lib/circuit-breaker.js +33 -1
- package/dist/lib/circuit-breaker.js.map +1 -1
- package/dist/lib/codex-manager/commands/forecast.d.ts +2 -1
- package/dist/lib/codex-manager/commands/forecast.d.ts.map +1 -1
- package/dist/lib/codex-manager/commands/forecast.js +92 -2
- package/dist/lib/codex-manager/commands/forecast.js.map +1 -1
- package/dist/lib/codex-manager/commands/report.d.ts +3 -1
- package/dist/lib/codex-manager/commands/report.d.ts.map +1 -1
- package/dist/lib/codex-manager/commands/report.js +102 -12
- package/dist/lib/codex-manager/commands/report.js.map +1 -1
- package/dist/lib/codex-manager.d.ts.map +1 -1
- package/dist/lib/codex-manager.js +50 -40
- package/dist/lib/codex-manager.js.map +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +172 -17
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/forecast.d.ts.map +1 -1
- package/dist/lib/forecast.js +1 -19
- package/dist/lib/forecast.js.map +1 -1
- package/dist/lib/health.d.ts +1 -0
- package/dist/lib/health.d.ts.map +1 -1
- package/dist/lib/health.js +6 -2
- package/dist/lib/health.js.map +1 -1
- package/dist/lib/parallel-probe.d.ts +1 -1
- package/dist/lib/parallel-probe.d.ts.map +1 -1
- package/dist/lib/parallel-probe.js +5 -2
- package/dist/lib/parallel-probe.js.map +1 -1
- package/dist/lib/preemptive-quota-scheduler.d.ts.map +1 -1
- package/dist/lib/preemptive-quota-scheduler.js +6 -3
- package/dist/lib/preemptive-quota-scheduler.js.map +1 -1
- package/dist/lib/proactive-refresh.d.ts +1 -1
- package/dist/lib/proactive-refresh.d.ts.map +1 -1
- package/dist/lib/proactive-refresh.js +14 -5
- package/dist/lib/proactive-refresh.js.map +1 -1
- package/dist/lib/refresh-guardian.d.ts +3 -0
- package/dist/lib/refresh-guardian.d.ts.map +1 -1
- package/dist/lib/refresh-guardian.js +142 -52
- package/dist/lib/refresh-guardian.js.map +1 -1
- package/dist/lib/request/fetch-helpers.d.ts.map +1 -1
- package/dist/lib/request/fetch-helpers.js +180 -43
- package/dist/lib/request/fetch-helpers.js.map +1 -1
- package/dist/lib/rotation.d.ts +14 -11
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +36 -30
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/runtime/account-check.d.ts +4 -0
- package/dist/lib/runtime/account-check.d.ts.map +1 -1
- package/dist/lib/runtime/account-check.js +15 -10
- package/dist/lib/runtime/account-check.js.map +1 -1
- package/dist/lib/runtime/account-state.d.ts +1 -12
- package/dist/lib/runtime/account-state.d.ts.map +1 -1
- package/dist/lib/runtime/account-state.js +1 -37
- package/dist/lib/runtime/account-state.js.map +1 -1
- package/dist/lib/runtime/verify-flagged.d.ts +4 -0
- package/dist/lib/runtime/verify-flagged.d.ts.map +1 -1
- package/dist/lib/runtime/verify-flagged.js +32 -23
- package/dist/lib/runtime/verify-flagged.js.map +1 -1
- package/dist/lib/storage/flagged-load-entry.d.ts +2 -0
- package/dist/lib/storage/flagged-load-entry.d.ts.map +1 -1
- package/dist/lib/storage/flagged-load-entry.js +1 -0
- package/dist/lib/storage/flagged-load-entry.js.map +1 -1
- package/dist/lib/storage/flagged-storage-file.d.ts +4 -0
- package/dist/lib/storage/flagged-storage-file.d.ts.map +1 -1
- package/dist/lib/storage/flagged-storage-file.js +1 -1
- package/dist/lib/storage/flagged-storage-file.js.map +1 -1
- package/dist/lib/storage/flagged-storage-io.d.ts +1 -0
- package/dist/lib/storage/flagged-storage-io.d.ts.map +1 -1
- package/dist/lib/storage/flagged-storage-io.js +130 -5
- package/dist/lib/storage/flagged-storage-io.js.map +1 -1
- package/dist/lib/storage/identity.d.ts +6 -0
- package/dist/lib/storage/identity.d.ts.map +1 -1
- package/dist/lib/storage/identity.js +14 -3
- package/dist/lib/storage/identity.js.map +1 -1
- package/dist/lib/storage/path-state.d.ts +1 -0
- package/dist/lib/storage/path-state.d.ts.map +1 -1
- package/dist/lib/storage/path-state.js +3 -0
- package/dist/lib/storage/path-state.js.map +1 -1
- package/dist/lib/storage/paths.d.ts.map +1 -1
- package/dist/lib/storage/paths.js +3 -2
- package/dist/lib/storage/paths.js.map +1 -1
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +7 -0
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/unified-settings.d.ts.map +1 -1
- package/dist/lib/unified-settings.js +226 -28
- package/dist/lib/unified-settings.js.map +1 -1
- package/package.json +8 -3
- package/scripts/codex-bin-resolver.js +99 -0
- package/scripts/codex.js +709 -81
- package/dist/lib/codex-manager/best.d.ts +0 -26
- package/dist/lib/codex-manager/best.d.ts.map +0 -1
- package/dist/lib/codex-manager/best.js +0 -249
- package/dist/lib/codex-manager/best.js.map +0 -1
- package/dist/lib/codex-manager/config-explain.d.ts +0 -2
- package/dist/lib/codex-manager/config-explain.d.ts.map +0 -1
- package/dist/lib/codex-manager/config-explain.js +0 -62
- package/dist/lib/codex-manager/config-explain.js.map +0 -1
- package/dist/lib/codex-manager/config-template.d.ts +0 -2
- package/dist/lib/codex-manager/config-template.d.ts.map +0 -1
- package/dist/lib/codex-manager/config-template.js +0 -112
- package/dist/lib/codex-manager/config-template.js.map +0 -1
- package/dist/lib/codex-manager/debug-bundle.d.ts +0 -2
- package/dist/lib/codex-manager/debug-bundle.d.ts.map +0 -1
- package/dist/lib/codex-manager/debug-bundle.js +0 -128
- package/dist/lib/codex-manager/debug-bundle.js.map +0 -1
- package/dist/lib/codex-manager/doctor.d.ts +0 -20
- package/dist/lib/codex-manager/doctor.d.ts.map +0 -1
- package/dist/lib/codex-manager/doctor.js +0 -546
- package/dist/lib/codex-manager/doctor.js.map +0 -1
- package/dist/lib/codex-manager/fix.d.ts +0 -26
- package/dist/lib/codex-manager/fix.d.ts.map +0 -1
- package/dist/lib/codex-manager/fix.js +0 -366
- package/dist/lib/codex-manager/fix.js.map +0 -1
- package/dist/lib/codex-manager/forecast.d.ts +0 -26
- package/dist/lib/codex-manager/forecast.d.ts.map +0 -1
- package/dist/lib/codex-manager/forecast.js +0 -218
- package/dist/lib/codex-manager/forecast.js.map +0 -1
- package/dist/lib/codex-manager/info.d.ts +0 -11
- package/dist/lib/codex-manager/info.d.ts.map +0 -1
- package/dist/lib/codex-manager/info.js +0 -91
- package/dist/lib/codex-manager/info.js.map +0 -1
- package/dist/lib/codex-manager/login.d.ts +0 -40
- package/dist/lib/codex-manager/login.d.ts.map +0 -1
- package/dist/lib/codex-manager/login.js +0 -1041
- package/dist/lib/codex-manager/login.js.map +0 -1
- package/dist/lib/codex-manager/report.d.ts +0 -39
- package/dist/lib/codex-manager/report.d.ts.map +0 -1
- package/dist/lib/codex-manager/report.js +0 -243
- package/dist/lib/codex-manager/report.js.map +0 -1
- package/dist/lib/codex-manager/switch.d.ts +0 -31
- package/dist/lib/codex-manager/switch.d.ts.map +0 -1
- package/dist/lib/codex-manager/switch.js +0 -103
- package/dist/lib/codex-manager/switch.js.map +0 -1
- package/dist/lib/codex-manager/verify-flagged.d.ts +0 -20
- package/dist/lib/codex-manager/verify-flagged.d.ts.map +0 -1
- package/dist/lib/codex-manager/verify-flagged.js +0 -316
- package/dist/lib/codex-manager/verify-flagged.js.map +0 -1
- package/dist/lib/request/trace-mode.d.ts +0 -9
- package/dist/lib/request/trace-mode.d.ts.map +0 -1
- package/dist/lib/request/trace-mode.js +0 -14
- package/dist/lib/request/trace-mode.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parallel-probe.js","sourceRoot":"","sources":["../../lib/parallel-probe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parallel-probe.js","sourceRoot":"","sources":["../../lib/parallel-probe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preemptive-quota-scheduler.d.ts","sourceRoot":"","sources":["../../lib/preemptive-quota-scheduler.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,oBAAoB,CAAC;IAC9B,SAAS,EAAE,oBAAoB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,YAAY,GAAG,uBAAuB,CAAC;CAChD;AAED,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gCAAgC,CAAC,EAAE,MAAM,CAAC;IAC1C,kCAAkC,CAAC,EAAE,MAAM,CAAC;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AA+ED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,sBAAsB,GAAG,IAAI,CAqB5H;AAED,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,kCAAkC,CAAS;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,GAAE,qBAA0B;IAQ/C,SAAS,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI;IA2CpD,OAAO,CAAC,UAAU;IAMlB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAM3D,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"preemptive-quota-scheduler.d.ts","sourceRoot":"","sources":["../../lib/preemptive-quota-scheduler.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,oBAAoB,CAAC;IAC9B,SAAS,EAAE,oBAAoB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACrC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,YAAY,GAAG,uBAAuB,CAAC;CAChD;AAED,MAAM,WAAW,qBAAqB;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gCAAgC,CAAC,EAAE,MAAM,CAAC;IAC1C,kCAAkC,CAAC,EAAE,MAAM,CAAC;IAC5C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB;AA+ED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,sBAAsB,GAAG,IAAI,CAqB5H;AAED,qBAAa,wBAAwB;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6C;IACvE,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,gCAAgC,CAAS;IACjD,OAAO,CAAC,kCAAkC,CAAS;IACnD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,WAAW,CAAK;gBAEZ,OAAO,GAAE,qBAA0B;IAQ/C,SAAS,CAAC,OAAO,GAAE,qBAA0B,GAAG,IAAI;IA2CpD,OAAO,CAAC,UAAU;IAMlB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAM3D,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,IAAI;IAoB1E,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,qBAAqB;IAyCjE,KAAK,CAAC,GAAG,SAAa,GAAG,MAAM;CAW/B"}
|
|
@@ -161,14 +161,17 @@ export class PreemptiveQuotaScheduler {
|
|
|
161
161
|
if (!key)
|
|
162
162
|
return;
|
|
163
163
|
const waitMs = Number.isFinite(retryAfterMs) ? Math.max(0, Math.floor(retryAfterMs)) : 0;
|
|
164
|
+
const existing = this.snapshots.get(key);
|
|
165
|
+
const existingResetAtMs = Math.max(existing?.primary.resetAtMs ?? 0, existing?.secondary.resetAtMs ?? 0);
|
|
166
|
+
const nextResetAtMs = Math.max(existingResetAtMs, now + waitMs);
|
|
164
167
|
this.snapshots.set(key, {
|
|
165
168
|
status: 429,
|
|
166
169
|
primary: {
|
|
167
170
|
usedPercent: 100,
|
|
168
|
-
resetAtMs:
|
|
171
|
+
resetAtMs: nextResetAtMs,
|
|
169
172
|
},
|
|
170
|
-
secondary: {},
|
|
171
|
-
updatedAt: now,
|
|
173
|
+
secondary: existing?.secondary ? { ...existing.secondary } : {},
|
|
174
|
+
updatedAt: Math.max(existing?.updatedAt ?? 0, now),
|
|
172
175
|
});
|
|
173
176
|
}
|
|
174
177
|
getDeferral(key, now = Date.now()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preemptive-quota-scheduler.js","sourceRoot":"","sources":["../../lib/preemptive-quota-scheduler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"preemptive-quota-scheduler.js","sourceRoot":"","sources":["../../lib/preemptive-quota-scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ export declare function proactiveRefreshAccount(account: ManagedAccount, bufferM
|
|
|
53
53
|
* @param bufferMs - Time buffer before expiry to trigger refresh
|
|
54
54
|
* @returns Map of account index to refresh result
|
|
55
55
|
*/
|
|
56
|
-
export declare function refreshExpiringAccounts(accounts: ManagedAccount[], bufferMs?: number): Promise<Map<number, ProactiveRefreshResult>>;
|
|
56
|
+
export declare function refreshExpiringAccounts(accounts: ManagedAccount[], bufferMs?: number, onResult?: (account: ManagedAccount, result: ProactiveRefreshResult) => Promise<void> | void): Promise<Map<number, ProactiveRefreshResult>>;
|
|
57
57
|
/**
|
|
58
58
|
* Updates a ManagedAccount with fresh token data from a successful refresh.
|
|
59
59
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proactive-refresh.d.ts","sourceRoot":"","sources":["../../lib/proactive-refresh.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"proactive-refresh.d.ts","sourceRoot":"","sources":["../../lib/proactive-refresh.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAU9C,4EAA4E;AAC5E,eAAO,MAAM,2BAA2B,QAAgB,CAAC;AAEzD,mEAAmE;AACnE,eAAO,MAAM,uBAAuB,QAAY,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,MAAM,EAAE,YAAY,GAAG,kBAAkB,GAAG,SAAS,GAAG,QAAQ,CAAC;CACjE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,cAAc,EACvB,QAAQ,GAAE,MAAoC,GAC5C,OAAO,CAoBT;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAKlE;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC5C,OAAO,EAAE,cAAc,EACvB,QAAQ,GAAE,MAAoC,GAC5C,OAAO,CAAC,sBAAsB,CAAC,CAoCjC;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC5C,QAAQ,EAAE,cAAc,EAAE,EAC1B,QAAQ,GAAE,MAAoC,EAC9C,QAAQ,CAAC,EAAE,CACV,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,sBAAsB,KAC1B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GACvB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CA2C9C;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,GAC/C,IAAI,CAeN"}
|
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
import { queuedRefresh } from "./refresh-queue.js";
|
|
13
13
|
import { createLogger } from "./logger.js";
|
|
14
|
+
import { extractAccountEmail, extractAccountId, sanitizeEmail, shouldUpdateAccountIdFromToken, } from "./auth/token-utils.js";
|
|
14
15
|
const log = createLogger("proactive-refresh");
|
|
15
16
|
/** Default buffer before expiry to trigger proactive refresh (5 minutes) */
|
|
16
17
|
export const DEFAULT_PROACTIVE_BUFFER_MS = 5 * 60 * 1000;
|
|
@@ -24,14 +25,14 @@ export const MIN_PROACTIVE_BUFFER_MS = 30 * 1000;
|
|
|
24
25
|
* @returns True if token is approaching expiry and should be refreshed
|
|
25
26
|
*/
|
|
26
27
|
export function shouldRefreshProactively(account, bufferMs = DEFAULT_PROACTIVE_BUFFER_MS) {
|
|
27
|
-
// No expiry set - can't determine if refresh is needed
|
|
28
|
-
if (account.expires === undefined) {
|
|
29
|
-
return false;
|
|
30
|
-
}
|
|
31
28
|
// No access token - definitely needs refresh
|
|
32
29
|
if (!account.access) {
|
|
33
30
|
return true;
|
|
34
31
|
}
|
|
32
|
+
// No expiry set - can't determine if refresh is needed
|
|
33
|
+
if (account.expires === undefined) {
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
35
36
|
// Clamp buffer to minimum
|
|
36
37
|
const safeBufferMs = Math.max(MIN_PROACTIVE_BUFFER_MS, bufferMs);
|
|
37
38
|
// Check if token expires within buffer window
|
|
@@ -98,7 +99,7 @@ export async function proactiveRefreshAccount(account, bufferMs = DEFAULT_PROACT
|
|
|
98
99
|
* @param bufferMs - Time buffer before expiry to trigger refresh
|
|
99
100
|
* @returns Map of account index to refresh result
|
|
100
101
|
*/
|
|
101
|
-
export async function refreshExpiringAccounts(accounts, bufferMs = DEFAULT_PROACTIVE_BUFFER_MS) {
|
|
102
|
+
export async function refreshExpiringAccounts(accounts, bufferMs = DEFAULT_PROACTIVE_BUFFER_MS, onResult) {
|
|
102
103
|
const results = new Map();
|
|
103
104
|
const accountsToRefresh = accounts.filter((a) => shouldRefreshProactively(a, bufferMs));
|
|
104
105
|
if (accountsToRefresh.length === 0) {
|
|
@@ -109,6 +110,7 @@ export async function refreshExpiringAccounts(accounts, bufferMs = DEFAULT_PROAC
|
|
|
109
110
|
// Refresh in parallel for efficiency
|
|
110
111
|
const refreshPromises = accountsToRefresh.map(async (account) => {
|
|
111
112
|
const result = await proactiveRefreshAccount(account, bufferMs);
|
|
113
|
+
await onResult?.(account, result);
|
|
112
114
|
return { index: account.index, result };
|
|
113
115
|
});
|
|
114
116
|
const outcomes = await Promise.all(refreshPromises);
|
|
@@ -139,5 +141,12 @@ export function applyRefreshResult(account, result) {
|
|
|
139
141
|
if (result.refresh !== account.refreshToken) {
|
|
140
142
|
account.refreshToken = result.refresh;
|
|
141
143
|
}
|
|
144
|
+
const tokenAccountId = extractAccountId(result.access)?.trim() || undefined;
|
|
145
|
+
if (tokenAccountId &&
|
|
146
|
+
shouldUpdateAccountIdFromToken(account.accountIdSource, account.accountId)) {
|
|
147
|
+
account.accountId = tokenAccountId;
|
|
148
|
+
account.accountIdSource = "token";
|
|
149
|
+
}
|
|
150
|
+
account.email = sanitizeEmail(extractAccountEmail(result.access)) ?? account.email;
|
|
142
151
|
}
|
|
143
152
|
//# sourceMappingURL=proactive-refresh.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proactive-refresh.js","sourceRoot":"","sources":["../../lib/proactive-refresh.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"proactive-refresh.js","sourceRoot":"","sources":["../../lib/proactive-refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,9 @@ export declare class RefreshGuardian {
|
|
|
26
26
|
stop(): void;
|
|
27
27
|
getStats(): RefreshGuardianStats;
|
|
28
28
|
private classifyFailureReason;
|
|
29
|
+
private getNetworkFailureCooldownMs;
|
|
30
|
+
private getAuthFailureCooldownMs;
|
|
31
|
+
private applyRefreshOutcome;
|
|
29
32
|
tick(): Promise<void>;
|
|
30
33
|
}
|
|
31
34
|
//# sourceMappingURL=refresh-guardian.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-guardian.d.ts","sourceRoot":"","sources":["../../lib/refresh-guardian.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"refresh-guardian.d.ts","sourceRoot":"","sources":["../../lib/refresh-guardian.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAUpD,MAAM,WAAW,sBAAsB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAKD,qBAAa,eAAe;IAC3B,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA8B;IAChE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAUX;gBAGD,iBAAiB,EAAE,MAAM,cAAc,GAAG,IAAI,EAC9C,OAAO,GAAE,sBAA2B;IAOrC,KAAK,IAAI,IAAI;IAcb,IAAI,IAAI,IAAI;IAMZ,QAAQ,IAAI,oBAAoB;IAIhC,OAAO,CAAC,qBAAqB;IAmB7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,wBAAwB;YAKlB,mBAAmB;IAoJ3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAoD3B"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { createLogger } from "./logger.js";
|
|
2
|
-
import {
|
|
2
|
+
import { refreshExpiringAccounts } from "./proactive-refresh.js";
|
|
3
|
+
import { ACCOUNT_LIMITS } from "./constants.js";
|
|
4
|
+
import { CodexAuthError } from "./errors.js";
|
|
3
5
|
const log = createLogger("refresh-guardian");
|
|
6
|
+
const REFRESH_HEALTH_FAMILY = "codex";
|
|
4
7
|
const DEFAULT_INTERVAL_MS = 60_000;
|
|
8
|
+
const NETWORK_FAILURE_COOLDOWN_MS = 6_000;
|
|
5
9
|
export class RefreshGuardian {
|
|
6
10
|
getAccountManager;
|
|
7
11
|
intervalMs;
|
|
@@ -66,6 +70,128 @@ export class RefreshGuardian {
|
|
|
66
70
|
}
|
|
67
71
|
return "network-error";
|
|
68
72
|
}
|
|
73
|
+
getNetworkFailureCooldownMs() {
|
|
74
|
+
return Math.min(this.bufferMs, NETWORK_FAILURE_COOLDOWN_MS);
|
|
75
|
+
}
|
|
76
|
+
getAuthFailureCooldownMs(failureCount) {
|
|
77
|
+
const streak = Math.max(1, Math.floor(failureCount));
|
|
78
|
+
return Math.min(this.bufferMs, ACCOUNT_LIMITS.AUTH_FAILURE_COOLDOWN_MS * streak);
|
|
79
|
+
}
|
|
80
|
+
async applyRefreshOutcome(manager, sourceAccount, result) {
|
|
81
|
+
switch (result.reason) {
|
|
82
|
+
case "success": {
|
|
83
|
+
if (result.tokenResult?.type !== "success") {
|
|
84
|
+
const account = manager.getAccountByIdentity(sourceAccount);
|
|
85
|
+
if (!account)
|
|
86
|
+
return false;
|
|
87
|
+
manager.clearAuthFailures(account);
|
|
88
|
+
manager.markAccountCoolingDown(account, this.getNetworkFailureCooldownMs(), "network-error");
|
|
89
|
+
manager.recordFailure(account, REFRESH_HEALTH_FAMILY);
|
|
90
|
+
this.stats.failed += 1;
|
|
91
|
+
this.stats.networkFailed += 1;
|
|
92
|
+
return true;
|
|
93
|
+
}
|
|
94
|
+
const refreshedAuth = {
|
|
95
|
+
type: "oauth",
|
|
96
|
+
access: result.tokenResult.access,
|
|
97
|
+
refresh: result.tokenResult.refresh,
|
|
98
|
+
expires: result.tokenResult.expires,
|
|
99
|
+
multiAccount: true,
|
|
100
|
+
};
|
|
101
|
+
try {
|
|
102
|
+
const committedAccount = await manager.commitRefreshedAuth(sourceAccount, refreshedAuth);
|
|
103
|
+
if (!committedAccount) {
|
|
104
|
+
const account = manager.getAccountByIdentity(sourceAccount, refreshedAuth) ??
|
|
105
|
+
manager.getAccountByIdentity(sourceAccount);
|
|
106
|
+
if (account) {
|
|
107
|
+
manager.clearAuthFailures(account);
|
|
108
|
+
manager.markAccountCoolingDown(account, this.getNetworkFailureCooldownMs(), "network-error");
|
|
109
|
+
manager.recordFailure(account, REFRESH_HEALTH_FAMILY);
|
|
110
|
+
}
|
|
111
|
+
this.stats.failed += 1;
|
|
112
|
+
this.stats.networkFailed += 1;
|
|
113
|
+
return !!account;
|
|
114
|
+
}
|
|
115
|
+
manager.recordSuccess(committedAccount, REFRESH_HEALTH_FAMILY);
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
log.warn("Refresh guardian commit failed", {
|
|
119
|
+
sourceIndex: sourceAccount.index,
|
|
120
|
+
error: error instanceof Error ? error.message : String(error),
|
|
121
|
+
});
|
|
122
|
+
const account = manager.getAccountByIdentity(sourceAccount, refreshedAuth) ??
|
|
123
|
+
manager.getAccountByIdentity(sourceAccount);
|
|
124
|
+
const cooldownReason = error instanceof CodexAuthError && !error.retryable
|
|
125
|
+
? "auth-failure"
|
|
126
|
+
: "network-error";
|
|
127
|
+
if (account) {
|
|
128
|
+
if (cooldownReason === "auth-failure") {
|
|
129
|
+
const failureCount = manager.incrementAuthFailures(account);
|
|
130
|
+
manager.markAccountCoolingDown(account, this.getAuthFailureCooldownMs(failureCount), cooldownReason);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
manager.clearAuthFailures(account);
|
|
134
|
+
manager.markAccountCoolingDown(account, this.getNetworkFailureCooldownMs(), cooldownReason);
|
|
135
|
+
}
|
|
136
|
+
manager.recordFailure(account, REFRESH_HEALTH_FAMILY);
|
|
137
|
+
}
|
|
138
|
+
this.stats.failed += 1;
|
|
139
|
+
if (cooldownReason === "auth-failure")
|
|
140
|
+
this.stats.authFailed += 1;
|
|
141
|
+
else
|
|
142
|
+
this.stats.networkFailed += 1;
|
|
143
|
+
return !!account;
|
|
144
|
+
}
|
|
145
|
+
this.stats.refreshed += 1;
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
148
|
+
case "failed": {
|
|
149
|
+
const account = manager.getAccountByIdentity(sourceAccount);
|
|
150
|
+
if (!account)
|
|
151
|
+
return false;
|
|
152
|
+
const cooldownReason = this.classifyFailureReason(result.tokenResult);
|
|
153
|
+
if (cooldownReason === "rate-limit") {
|
|
154
|
+
manager.clearAuthFailures(account);
|
|
155
|
+
manager.markRateLimited(account, this.bufferMs, "codex");
|
|
156
|
+
manager.recordRateLimit(account, REFRESH_HEALTH_FAMILY);
|
|
157
|
+
}
|
|
158
|
+
else if (cooldownReason === "auth-failure") {
|
|
159
|
+
const failureCount = manager.incrementAuthFailures(account);
|
|
160
|
+
manager.markAccountCoolingDown(account, this.getAuthFailureCooldownMs(failureCount), cooldownReason);
|
|
161
|
+
manager.recordFailure(account, REFRESH_HEALTH_FAMILY);
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
manager.clearAuthFailures(account);
|
|
165
|
+
manager.markAccountCoolingDown(account, this.getNetworkFailureCooldownMs(), cooldownReason);
|
|
166
|
+
manager.recordFailure(account, REFRESH_HEALTH_FAMILY);
|
|
167
|
+
}
|
|
168
|
+
this.stats.failed += 1;
|
|
169
|
+
if (cooldownReason === "rate-limit")
|
|
170
|
+
this.stats.rateLimited += 1;
|
|
171
|
+
else if (cooldownReason === "auth-failure")
|
|
172
|
+
this.stats.authFailed += 1;
|
|
173
|
+
else
|
|
174
|
+
this.stats.networkFailed += 1;
|
|
175
|
+
return true;
|
|
176
|
+
}
|
|
177
|
+
case "not_needed":
|
|
178
|
+
this.stats.notNeeded += 1;
|
|
179
|
+
return false;
|
|
180
|
+
case "no_refresh_token": {
|
|
181
|
+
const account = manager.getAccountByIdentity(sourceAccount);
|
|
182
|
+
if (!account)
|
|
183
|
+
return false;
|
|
184
|
+
const failureCount = manager.incrementAuthFailures(account);
|
|
185
|
+
manager.markAccountCoolingDown(account, this.getAuthFailureCooldownMs(failureCount), "auth-failure");
|
|
186
|
+
manager.recordFailure(account, REFRESH_HEALTH_FAMILY);
|
|
187
|
+
manager.setAccountEnabled(account.index, false);
|
|
188
|
+
this.stats.noRefreshToken += 1;
|
|
189
|
+
this.stats.failed += 1;
|
|
190
|
+
this.stats.authFailed += 1;
|
|
191
|
+
return true;
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
69
195
|
async tick() {
|
|
70
196
|
if (this.running)
|
|
71
197
|
return;
|
|
@@ -78,63 +204,27 @@ export class RefreshGuardian {
|
|
|
78
204
|
if (snapshot.length === 0) {
|
|
79
205
|
return;
|
|
80
206
|
}
|
|
81
|
-
const
|
|
82
|
-
if (
|
|
207
|
+
const eligibleSnapshot = snapshot.filter((account) => !manager.isAccountCoolingDown(account));
|
|
208
|
+
if (eligibleSnapshot.length === 0) {
|
|
83
209
|
this.stats.runs += 1;
|
|
84
210
|
this.stats.lastRunAt = Date.now();
|
|
85
211
|
return;
|
|
86
212
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
const sourceAccount = snapshotByIndex.get(accountIndex);
|
|
93
|
-
if (!sourceAccount)
|
|
94
|
-
continue;
|
|
95
|
-
const liveAccounts = manager.getAccountsSnapshot();
|
|
96
|
-
const resolvedIndex = liveAccounts.findIndex((candidate) => candidate.refreshToken === sourceAccount.refreshToken);
|
|
97
|
-
const account = resolvedIndex >= 0 ? manager.getAccountByIndex(resolvedIndex) : null;
|
|
98
|
-
if (!account)
|
|
99
|
-
continue;
|
|
100
|
-
switch (result.reason) {
|
|
101
|
-
case "success":
|
|
102
|
-
if (result.tokenResult?.type === "success") {
|
|
103
|
-
applyRefreshResult(account, result.tokenResult);
|
|
104
|
-
manager.clearAuthFailures(account);
|
|
105
|
-
this.stats.refreshed += 1;
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
108
|
-
manager.markAccountCoolingDown(account, this.bufferMs, "network-error");
|
|
109
|
-
this.stats.failed += 1;
|
|
110
|
-
this.stats.networkFailed += 1;
|
|
111
|
-
}
|
|
112
|
-
break;
|
|
113
|
-
case "failed": {
|
|
114
|
-
const cooldownReason = this.classifyFailureReason(result.tokenResult);
|
|
115
|
-
manager.markAccountCoolingDown(account, this.bufferMs, cooldownReason);
|
|
116
|
-
this.stats.failed += 1;
|
|
117
|
-
if (cooldownReason === "rate-limit")
|
|
118
|
-
this.stats.rateLimited += 1;
|
|
119
|
-
else if (cooldownReason === "auth-failure")
|
|
120
|
-
this.stats.authFailed += 1;
|
|
121
|
-
else
|
|
122
|
-
this.stats.networkFailed += 1;
|
|
123
|
-
break;
|
|
124
|
-
}
|
|
125
|
-
case "not_needed":
|
|
126
|
-
this.stats.notNeeded += 1;
|
|
127
|
-
break;
|
|
128
|
-
case "no_refresh_token":
|
|
129
|
-
manager.markAccountCoolingDown(account, this.bufferMs, "auth-failure");
|
|
130
|
-
manager.setAccountEnabled(account.index, false);
|
|
131
|
-
this.stats.noRefreshToken += 1;
|
|
132
|
-
this.stats.failed += 1;
|
|
133
|
-
this.stats.authFailed += 1;
|
|
134
|
-
break;
|
|
213
|
+
let requiresSave = false;
|
|
214
|
+
const refreshResults = await refreshExpiringAccounts(eligibleSnapshot, this.bufferMs, async (sourceAccount, result) => {
|
|
215
|
+
const saveNeeded = await this.applyRefreshOutcome(manager, sourceAccount, result);
|
|
216
|
+
if (saveNeeded) {
|
|
217
|
+
requiresSave = true;
|
|
135
218
|
}
|
|
219
|
+
});
|
|
220
|
+
if (refreshResults.size === 0) {
|
|
221
|
+
this.stats.runs += 1;
|
|
222
|
+
this.stats.lastRunAt = Date.now();
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
if (requiresSave) {
|
|
226
|
+
manager.saveToDiskDebounced();
|
|
136
227
|
}
|
|
137
|
-
manager.saveToDiskDebounced();
|
|
138
228
|
this.stats.runs += 1;
|
|
139
229
|
this.stats.lastRunAt = Date.now();
|
|
140
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh-guardian.js","sourceRoot":"","sources":["../../lib/refresh-guardian.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"refresh-guardian.js","sourceRoot":"","sources":["../../lib/refresh-guardian.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch-helpers.d.ts","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAKvD,OAAO,EAIN,KAAK,wBAAwB,EAC7B,MAAM,0BAA0B,CAAC;AAMlC,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"fetch-helpers.d.ts","sourceRoot":"","sources":["../../../lib/request/fetch-helpers.ts"],"names":[],"mappings":"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"}
|