opencode-openai-codex-multi-auth 4.5.5 → 4.5.9
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 +10 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +356 -48
- package/dist/index.js.map +1 -1
- package/dist/lib/account-matching.d.ts.map +1 -1
- package/dist/lib/account-matching.js +3 -37
- package/dist/lib/account-matching.js.map +1 -1
- package/dist/lib/accounts.d.ts +22 -1
- package/dist/lib/accounts.d.ts.map +1 -1
- package/dist/lib/accounts.js +291 -56
- package/dist/lib/accounts.js.map +1 -1
- package/dist/lib/auth/auth.d.ts +5 -0
- package/dist/lib/auth/auth.d.ts.map +1 -1
- package/dist/lib/auth/auth.js +19 -1
- package/dist/lib/auth/auth.js.map +1 -1
- package/dist/lib/cli.d.ts +7 -1
- package/dist/lib/cli.d.ts.map +1 -1
- package/dist/lib/cli.js +57 -3
- package/dist/lib/cli.js.map +1 -1
- package/dist/lib/config.d.ts +8 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +35 -0
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/formatting.d.ts +9 -0
- package/dist/lib/formatting.d.ts.map +1 -0
- package/dist/lib/formatting.js +71 -0
- package/dist/lib/formatting.js.map +1 -0
- package/dist/lib/oauth-success.html +1 -1
- package/dist/lib/rate-limit.d.ts +36 -0
- package/dist/lib/rate-limit.d.ts.map +1 -0
- package/dist/lib/rate-limit.js +78 -0
- package/dist/lib/rate-limit.js.map +1 -0
- package/dist/lib/refresh-queue.d.ts +37 -0
- package/dist/lib/refresh-queue.d.ts.map +1 -0
- package/dist/lib/refresh-queue.js +83 -0
- package/dist/lib/refresh-queue.js.map +1 -0
- package/dist/lib/rotation.d.ts +1 -1
- package/dist/lib/rotation.d.ts.map +1 -1
- package/dist/lib/rotation.js +15 -3
- package/dist/lib/rotation.js.map +1 -1
- package/dist/lib/storage.d.ts +20 -0
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +502 -108
- package/dist/lib/storage.js.map +1 -1
- package/dist/lib/types.d.ts +45 -0
- package/dist/lib/types.d.ts.map +1 -1
- package/package.json +11 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../lib/auth/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAY,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzG,eAAO,MAAM,SAAS,iCAAiC,CAAC;AACxD,eAAO,MAAM,aAAa,4CAA4C,CAAC;AACvE,eAAO,MAAM,SAAS,wCAAwC,CAAC;AAC/D,eAAO,MAAM,YAAY,wCAAwC,CAAC;AAClE,eAAO,MAAM,KAAK,wCAAwC,CAAC;AAE3D;;;GAGG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAwBtE;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC9C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,WAAW,GAAE,MAAqB,GAChC,OAAO,CAAC,WAAW,CAAC,CAsCtB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../lib/auth/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAY,iBAAiB,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzG,eAAO,MAAM,SAAS,iCAAiC,CAAC;AACxD,eAAO,MAAM,aAAa,4CAA4C,CAAC;AACvE,eAAO,MAAM,SAAS,wCAAwC,CAAC;AAC/D,eAAO,MAAM,YAAY,wCAAwC,CAAC;AAClE,eAAO,MAAM,KAAK,wCAAwC,CAAC;AAE3D;;;GAGG;AACH,wBAAgB,WAAW,IAAI,MAAM,CAEpC;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,CAwBtE;AAED,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,SAAS,GAAG,UAAU,CAAC;AAEpE,wBAAgB,kBAAkB,CACjC,aAAa,EAAE,MAAM,EACrB,aAAa,CAAC,EAAE,MAAM,GACpB,oBAAoB,CAMtB;AAED,wBAAgB,8BAA8B,CAC7C,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,GACnB,eAAe,GAAG;IAAE,WAAW,EAAE,oBAAoB,CAAA;CAAE,CAMzD;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAC9C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,WAAW,GAAE,MAAqB,GAChC,OAAO,CAAC,WAAW,CAAC,CAsCtB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAW1D;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAoDnF;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAiB1E"}
|
package/dist/lib/auth/auth.js
CHANGED
|
@@ -43,6 +43,22 @@ export function parseAuthorizationInput(input) {
|
|
|
43
43
|
}
|
|
44
44
|
return { code: value };
|
|
45
45
|
}
|
|
46
|
+
export function validateOAuthState(expectedState, receivedState) {
|
|
47
|
+
const expected = (expectedState || "").trim();
|
|
48
|
+
const received = (receivedState || "").trim();
|
|
49
|
+
if (!expected)
|
|
50
|
+
return "missing";
|
|
51
|
+
if (!received)
|
|
52
|
+
return "missing";
|
|
53
|
+
return received === expected ? "match" : "mismatch";
|
|
54
|
+
}
|
|
55
|
+
export function parseAuthorizationInputForFlow(input, expectedState) {
|
|
56
|
+
const parsed = parseAuthorizationInput(input);
|
|
57
|
+
return {
|
|
58
|
+
...parsed,
|
|
59
|
+
stateStatus: validateOAuthState(expectedState, parsed.state),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
46
62
|
/**
|
|
47
63
|
* Exchange authorization code for access and refresh tokens
|
|
48
64
|
* @param code - Authorization code from OAuth flow
|
|
@@ -93,7 +109,9 @@ export function decodeJWT(token) {
|
|
|
93
109
|
if (parts.length !== 3)
|
|
94
110
|
return null;
|
|
95
111
|
const payload = parts[1];
|
|
96
|
-
|
|
112
|
+
if (!/^[A-Za-z0-9_-]+={0,2}$/.test(payload))
|
|
113
|
+
return null;
|
|
114
|
+
const decoded = Buffer.from(payload, "base64url").toString("utf-8");
|
|
97
115
|
return JSON.parse(decoded);
|
|
98
116
|
}
|
|
99
117
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../lib/auth/auth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../lib/auth/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/cli.d.ts
CHANGED
|
@@ -3,8 +3,14 @@ export interface ExistingAccountLabel {
|
|
|
3
3
|
email?: string;
|
|
4
4
|
plan?: string;
|
|
5
5
|
accountId?: string;
|
|
6
|
+
enabled?: boolean;
|
|
6
7
|
}
|
|
7
|
-
export declare function promptLoginMode(existing: ExistingAccountLabel[]): Promise<"add" | "fresh">;
|
|
8
|
+
export declare function promptLoginMode(existing: ExistingAccountLabel[]): Promise<"add" | "fresh" | "manage">;
|
|
9
|
+
export declare function promptManageAccounts(existing: ExistingAccountLabel[]): Promise<number | null>;
|
|
10
|
+
export declare function promptRepairAccounts(details: {
|
|
11
|
+
legacyCount: number;
|
|
12
|
+
corruptCount: number;
|
|
13
|
+
}): Promise<boolean>;
|
|
8
14
|
export declare function promptAddAnotherAccount(currentCount: number, maxAccounts: number): Promise<boolean>;
|
|
9
15
|
export declare function promptOAuthCallbackValue(message: string): Promise<string>;
|
|
10
16
|
//# sourceMappingURL=cli.d.ts.map
|
package/dist/lib/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../lib/cli.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,oBAAoB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../lib/cli.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,oBAAoB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAsB,eAAe,CACpC,QAAQ,EAAE,oBAAoB,EAAE,GAC9B,OAAO,CAAC,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC,CA6BrC;AAED,wBAAsB,oBAAoB,CACzC,QAAQ,EAAE,oBAAoB,EAAE,GAC9B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgCxB;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,OAAO,CAAC,CAoBnB;AAED,wBAAsB,uBAAuB,CAC5C,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAalB;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS/E"}
|
package/dist/lib/cli.js
CHANGED
|
@@ -9,19 +9,22 @@ export async function promptLoginMode(existing) {
|
|
|
9
9
|
console.log(`\n${existing.length} account(s) saved:`);
|
|
10
10
|
for (const account of existing) {
|
|
11
11
|
const label = formatAccountLabel({ email: account.email, plan: account.plan, accountId: account.accountId }, account.index);
|
|
12
|
-
|
|
12
|
+
const status = account.enabled === false ? " (disabled)" : "";
|
|
13
|
+
console.log(` ${account.index + 1}. ${label}${status}`);
|
|
13
14
|
}
|
|
14
15
|
console.log("");
|
|
15
16
|
while (true) {
|
|
16
17
|
const answer = (await rl
|
|
17
|
-
.question("(a)dd
|
|
18
|
+
.question("(a)dd, (f)resh start, or (m)anage accounts? [a/f/m]: "))
|
|
18
19
|
.trim()
|
|
19
20
|
.toLowerCase();
|
|
20
21
|
if (answer === "a" || answer === "add")
|
|
21
22
|
return "add";
|
|
22
23
|
if (answer === "f" || answer === "fresh")
|
|
23
24
|
return "fresh";
|
|
24
|
-
|
|
25
|
+
if (answer === "m" || answer === "manage")
|
|
26
|
+
return "manage";
|
|
27
|
+
console.log("Please enter 'a', 'f', or 'm'.");
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
finally {
|
|
@@ -29,6 +32,57 @@ export async function promptLoginMode(existing) {
|
|
|
29
32
|
}
|
|
30
33
|
});
|
|
31
34
|
}
|
|
35
|
+
export async function promptManageAccounts(existing) {
|
|
36
|
+
return await withTerminalModeRestored(async () => {
|
|
37
|
+
const rl = createInterface({ input: stdin, output: stdout });
|
|
38
|
+
try {
|
|
39
|
+
console.log("\nManage accounts (toggle enabled):");
|
|
40
|
+
for (const account of existing) {
|
|
41
|
+
const label = formatAccountLabel({ email: account.email, plan: account.plan, accountId: account.accountId }, account.index);
|
|
42
|
+
const status = account.enabled === false ? "disabled" : "enabled";
|
|
43
|
+
console.log(` ${account.index + 1}. ${label} (${status})`);
|
|
44
|
+
}
|
|
45
|
+
console.log("");
|
|
46
|
+
while (true) {
|
|
47
|
+
const answer = (await rl
|
|
48
|
+
.question("Toggle which account? (Enter to finish): "))
|
|
49
|
+
.trim()
|
|
50
|
+
.toLowerCase();
|
|
51
|
+
if (!answer)
|
|
52
|
+
return null;
|
|
53
|
+
const parsed = Number.parseInt(answer, 10);
|
|
54
|
+
if (!Number.isFinite(parsed) || parsed < 1 || parsed > existing.length) {
|
|
55
|
+
console.log(`Enter a number between 1 and ${existing.length}, or press Enter to finish.`);
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
return parsed - 1;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
finally {
|
|
62
|
+
rl.close();
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
export async function promptRepairAccounts(details) {
|
|
67
|
+
return await withTerminalModeRestored(async () => {
|
|
68
|
+
const rl = createInterface({ input: stdin, output: stdout });
|
|
69
|
+
try {
|
|
70
|
+
const parts = [];
|
|
71
|
+
if (details.legacyCount > 0) {
|
|
72
|
+
parts.push(`${details.legacyCount} legacy account(s)`);
|
|
73
|
+
}
|
|
74
|
+
if (details.corruptCount > 0) {
|
|
75
|
+
parts.push(`${details.corruptCount} corrupt entr${details.corruptCount === 1 ? "y" : "ies"}`);
|
|
76
|
+
}
|
|
77
|
+
const summary = parts.length > 0 ? parts.join(" and ") : "issues";
|
|
78
|
+
const answer = await rl.question(`Detected ${summary}. Repair now? [y/N]: `);
|
|
79
|
+
return answer.trim().toLowerCase().startsWith("y");
|
|
80
|
+
}
|
|
81
|
+
finally {
|
|
82
|
+
rl.close();
|
|
83
|
+
}
|
|
84
|
+
});
|
|
85
|
+
}
|
|
32
86
|
export async function promptAddAnotherAccount(currentCount, maxAccounts) {
|
|
33
87
|
if (currentCount >= maxAccounts)
|
|
34
88
|
return false;
|
package/dist/lib/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../lib/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../lib/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/config.d.ts
CHANGED
|
@@ -22,4 +22,12 @@ export declare function getRateLimitToastDebounceMs(pluginConfig: PluginConfig):
|
|
|
22
22
|
export declare function getRetryAllAccountsRateLimited(pluginConfig: PluginConfig): boolean;
|
|
23
23
|
export declare function getRetryAllAccountsMaxWaitMs(pluginConfig: PluginConfig): number;
|
|
24
24
|
export declare function getRetryAllAccountsMaxRetries(pluginConfig: PluginConfig): number;
|
|
25
|
+
export declare function getSchedulingMode(pluginConfig: PluginConfig): "cache_first" | "balance" | "performance_first";
|
|
26
|
+
export declare function getMaxCacheFirstWaitSeconds(pluginConfig: PluginConfig): number;
|
|
27
|
+
export declare function getSwitchOnFirstRateLimit(pluginConfig: PluginConfig): boolean;
|
|
28
|
+
export declare function getRateLimitDedupWindowMs(pluginConfig: PluginConfig): number;
|
|
29
|
+
export declare function getRateLimitStateResetMs(pluginConfig: PluginConfig): number;
|
|
30
|
+
export declare function getDefaultRetryAfterMs(pluginConfig: PluginConfig): number;
|
|
31
|
+
export declare function getMaxBackoffMs(pluginConfig: PluginConfig): number;
|
|
32
|
+
export declare function getRequestJitterMaxMs(pluginConfig: PluginConfig): number;
|
|
25
33
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAyD/C;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,YAAY,CAsB/C;AAuCD;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAEhE;AAED,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,YAAY,GACnE,QAAQ,GACR,aAAa,GACb,QAAQ,CAIV;AAED,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAMvE;AAED,wBAAgB,YAAY,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAEhE;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAOxE;AAED,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAO9E;AAED,wBAAgB,8BAA8B,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAMlF;AAED,wBAAgB,4BAA4B,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAO/E;AAED,wBAAgB,6BAA6B,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAOhF;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GACzD,aAAa,GACb,SAAS,GACT,mBAAmB,CAIrB;AAED,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAO9E;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAM7E;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAO5E;AAED,wBAAgB,wBAAwB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAO3E;AAED,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAOzE;AAED,wBAAgB,eAAe,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAOlE;AAED,wBAAgB,qBAAqB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAOxE"}
|
package/dist/lib/config.js
CHANGED
|
@@ -45,6 +45,14 @@ const DEFAULT_CONFIG = {
|
|
|
45
45
|
retryAllAccountsMaxRetries: 1,
|
|
46
46
|
tokenRefreshSkewMs: 60_000,
|
|
47
47
|
rateLimitToastDebounceMs: 60_000,
|
|
48
|
+
schedulingMode: "cache_first",
|
|
49
|
+
maxCacheFirstWaitSeconds: 60,
|
|
50
|
+
switchOnFirstRateLimit: true,
|
|
51
|
+
rateLimitDedupWindowMs: 2000,
|
|
52
|
+
rateLimitStateResetMs: 120_000,
|
|
53
|
+
defaultRetryAfterMs: 60_000,
|
|
54
|
+
maxBackoffMs: 120_000,
|
|
55
|
+
requestJitterMaxMs: 1000,
|
|
48
56
|
};
|
|
49
57
|
/**
|
|
50
58
|
* Load plugin configuration from ~/.config/opencode/openai-codex-auth-config.json
|
|
@@ -139,4 +147,31 @@ export function getRetryAllAccountsMaxWaitMs(pluginConfig) {
|
|
|
139
147
|
export function getRetryAllAccountsMaxRetries(pluginConfig) {
|
|
140
148
|
return resolveNumberSetting("CODEX_AUTH_RETRY_ALL_MAX_RETRIES", pluginConfig.retryAllAccountsMaxRetries, 1, { min: 0 });
|
|
141
149
|
}
|
|
150
|
+
export function getSchedulingMode(pluginConfig) {
|
|
151
|
+
const env = process.env.CODEX_AUTH_SCHEDULING_MODE;
|
|
152
|
+
if (env === "cache_first" || env === "balance" || env === "performance_first")
|
|
153
|
+
return env;
|
|
154
|
+
return pluginConfig.schedulingMode ?? "cache_first";
|
|
155
|
+
}
|
|
156
|
+
export function getMaxCacheFirstWaitSeconds(pluginConfig) {
|
|
157
|
+
return resolveNumberSetting("CODEX_AUTH_MAX_CACHE_FIRST_WAIT_SECONDS", pluginConfig.maxCacheFirstWaitSeconds, 60, { min: 0 });
|
|
158
|
+
}
|
|
159
|
+
export function getSwitchOnFirstRateLimit(pluginConfig) {
|
|
160
|
+
return resolveBooleanSetting("CODEX_AUTH_SWITCH_ON_FIRST_RATE_LIMIT", pluginConfig.switchOnFirstRateLimit, true);
|
|
161
|
+
}
|
|
162
|
+
export function getRateLimitDedupWindowMs(pluginConfig) {
|
|
163
|
+
return resolveNumberSetting("CODEX_AUTH_RATE_LIMIT_DEDUP_WINDOW_MS", pluginConfig.rateLimitDedupWindowMs, 2000, { min: 0 });
|
|
164
|
+
}
|
|
165
|
+
export function getRateLimitStateResetMs(pluginConfig) {
|
|
166
|
+
return resolveNumberSetting("CODEX_AUTH_RATE_LIMIT_STATE_RESET_MS", pluginConfig.rateLimitStateResetMs, 120_000, { min: 0 });
|
|
167
|
+
}
|
|
168
|
+
export function getDefaultRetryAfterMs(pluginConfig) {
|
|
169
|
+
return resolveNumberSetting("CODEX_AUTH_DEFAULT_RETRY_AFTER_MS", pluginConfig.defaultRetryAfterMs, 60_000, { min: 0 });
|
|
170
|
+
}
|
|
171
|
+
export function getMaxBackoffMs(pluginConfig) {
|
|
172
|
+
return resolveNumberSetting("CODEX_AUTH_MAX_BACKOFF_MS", pluginConfig.maxBackoffMs, 120_000, { min: 0 });
|
|
173
|
+
}
|
|
174
|
+
export function getRequestJitterMaxMs(pluginConfig) {
|
|
175
|
+
return resolveNumberSetting("CODEX_AUTH_REQUEST_JITTER_MAX_MS", pluginConfig.requestJitterMaxMs, 1000, { min: 0 });
|
|
176
|
+
}
|
|
142
177
|
//# sourceMappingURL=config.js.map
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EACZ,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,GACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,MAAM,WAAW,GAAG,+BAA+B,CAAC;AAEpD,SAAS,oBAAoB;IAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;IAClD,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,EAAE,EAAE,WAAW,CAAC,CAAC;AAC9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AAErE,SAAS,2BAA2B;IACnC,IAAI,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO;IACpC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAAE,OAAO;IAE5C,IAAI,CAAC;QACJ,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC;YACJ,UAAU,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;YAC5C,OAAO;QACR,CAAC;QAAC,MAAM,CAAC;YACR,YAAY,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;YAC9C,UAAU,CAAC,kBAAkB,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;IAAC,MAAM,CAAC;QACR,iCAAiC;IAClC,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,MAAM,cAAc,GAAiB;IACpC,SAAS,EAAE,IAAI;IACf,wBAAwB,EAAE,QAAQ;IAClC,gBAAgB,EAAE,IAAI;IACtB,SAAS,EAAE,KAAK;IAChB,2BAA2B,EAAE,KAAK;IAClC,yBAAyB,EAAE,MAAM;IACjC,0BAA0B,EAAE,CAAC;IAC7B,kBAAkB,EAAE,MAAM;IAC1B,wBAAwB,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EACZ,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,GACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,MAAM,WAAW,GAAG,+BAA+B,CAAC;AAEpD,SAAS,oBAAoB;IAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;IAClD,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,EAAE,EAAE,WAAW,CAAC,CAAC;AAC9D,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AAErE,SAAS,2BAA2B;IACnC,IAAI,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO;IACpC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC;QAAE,OAAO;IAE5C,IAAI,CAAC;QACJ,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC;YACJ,UAAU,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;YAC5C,OAAO;QACR,CAAC;QAAC,MAAM,CAAC;YACR,YAAY,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;YAC9C,UAAU,CAAC,kBAAkB,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;IAAC,MAAM,CAAC;QACR,iCAAiC;IAClC,CAAC;AACF,CAAC;AAED;;;GAGG;AACH,MAAM,cAAc,GAAiB;IACpC,SAAS,EAAE,IAAI;IACf,wBAAwB,EAAE,QAAQ;IAClC,gBAAgB,EAAE,IAAI;IACtB,SAAS,EAAE,KAAK;IAChB,2BAA2B,EAAE,KAAK;IAClC,yBAAyB,EAAE,MAAM;IACjC,0BAA0B,EAAE,CAAC;IAC7B,kBAAkB,EAAE,MAAM;IAC1B,wBAAwB,EAAE,MAAM;IAChC,cAAc,EAAE,aAAa;IAC7B,wBAAwB,EAAE,EAAE;IAC5B,sBAAsB,EAAE,IAAI;IAC5B,sBAAsB,EAAE,IAAI;IAC5B,qBAAqB,EAAE,OAAO;IAC9B,mBAAmB,EAAE,MAAM;IAC3B,YAAY,EAAE,OAAO;IACrB,kBAAkB,EAAE,IAAI;CACxB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB;IAC/B,IAAI,CAAC;QACJ,2BAA2B,EAAE,CAAC;QAC9B,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9B,OAAO,cAAc,CAAC;QACvB,CAAC;QAED,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAA0B,CAAC;QAEpE,sBAAsB;QACtB,OAAO;YACN,GAAG,cAAc;YACjB,GAAG,UAAU;SACb,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,IAAI,CACX,oDAAoD,WAAW,GAAG,EACjE,KAAe,CAAC,OAAO,CACxB,CAAC;QACF,OAAO,cAAc,CAAC;IACvB,CAAC;AACF,CAAC;AAED,SAAS,eAAe,CAAC,KAAyB;IACjD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IACnD,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IACrD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,cAAc,CAAC,KAAyB;IAChD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,SAAS,CAAC;IAC/C,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,qBAAqB,CAC7B,OAAe,EACf,WAAgC,EAChC,YAAqB;IAErB,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,OAAO,WAAW,IAAI,YAAY,CAAC;AACpC,CAAC;AAED,SAAS,oBAAoB,CAC5B,OAAe,EACf,WAA+B,EAC/B,YAAoB,EACpB,OAA0B;IAE1B,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,QAAQ,IAAI,WAAW,IAAI,YAAY,CAAC;IAC1D,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,CAAC;IACzB,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACvD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,YAA0B;IACtD,OAAO,qBAAqB,CAAC,YAAY,EAAE,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,YAA0B;IAIrE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC;IAC9D,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IAC9E,OAAO,YAAY,CAAC,wBAAwB,IAAI,QAAQ,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,YAA0B;IAC7D,OAAO,qBAAqB,CAC3B,+BAA+B,EAC/B,YAAY,CAAC,gBAAgB,EAC7B,IAAI,CACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,YAA0B;IACtD,OAAO,qBAAqB,CAAC,kBAAkB,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AACjF,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAA0B;IAC/D,OAAO,oBAAoB,CAC1B,kCAAkC,EAClC,YAAY,CAAC,kBAAkB,EAC/B,MAAM,EACN,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,YAA0B;IACrE,OAAO,oBAAoB,CAC1B,yCAAyC,EACzC,YAAY,CAAC,wBAAwB,EACrC,MAAM,EACN,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,YAA0B;IACxE,OAAO,qBAAqB,CAC3B,mCAAmC,EACnC,YAAY,CAAC,2BAA2B,EACxC,KAAK,CACL,CAAC;AACH,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,YAA0B;IACtE,OAAO,oBAAoB,CAC1B,kCAAkC,EAClC,YAAY,CAAC,yBAAyB,EACtC,MAAM,EACN,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,YAA0B;IACvE,OAAO,oBAAoB,CAC1B,kCAAkC,EAClC,YAAY,CAAC,0BAA0B,EACvC,CAAC,EACD,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,YAA0B;IAI3D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;IACnD,IAAI,GAAG,KAAK,aAAa,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,mBAAmB;QAAE,OAAO,GAAG,CAAC;IAC1F,OAAO,YAAY,CAAC,cAAc,IAAI,aAAa,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,YAA0B;IACrE,OAAO,oBAAoB,CAC1B,yCAAyC,EACzC,YAAY,CAAC,wBAAwB,EACrC,EAAE,EACF,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,YAA0B;IACnE,OAAO,qBAAqB,CAC3B,uCAAuC,EACvC,YAAY,CAAC,sBAAsB,EACnC,IAAI,CACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,YAA0B;IACnE,OAAO,oBAAoB,CAC1B,uCAAuC,EACvC,YAAY,CAAC,sBAAsB,EACnC,IAAI,EACJ,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,YAA0B;IAClE,OAAO,oBAAoB,CAC1B,sCAAsC,EACtC,YAAY,CAAC,qBAAqB,EAClC,OAAO,EACP,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,YAA0B;IAChE,OAAO,oBAAoB,CAC1B,mCAAmC,EACnC,YAAY,CAAC,mBAAmB,EAChC,MAAM,EACN,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,YAA0B;IACzD,OAAO,oBAAoB,CAC1B,2BAA2B,EAC3B,YAAY,CAAC,YAAY,EACzB,OAAO,EACP,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,YAA0B;IAC/D,OAAO,oBAAoB,CAC1B,kCAAkC,EAClC,YAAY,CAAC,kBAAkB,EAC/B,IAAI,EACJ,EAAE,GAAG,EAAE,CAAC,EAAE,CACV,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare function truncatePath(path: string, maxLength?: number): string;
|
|
2
|
+
export declare function formatToastMessage(message: string): string;
|
|
3
|
+
export declare function formatStatusMessage(message: string): string;
|
|
4
|
+
export declare function formatRateLimitStatusMessage(options: {
|
|
5
|
+
accountCount: number;
|
|
6
|
+
waitMs: number;
|
|
7
|
+
storagePath: string;
|
|
8
|
+
}): string;
|
|
9
|
+
//# sourceMappingURL=formatting.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatting.d.ts","sourceRoot":"","sources":["../../lib/formatting.ts"],"names":[],"mappings":"AAiBA,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAwB,GAAG,MAAM,CAStF;AAmBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAO1D;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAO3D;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE;IACrD,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAQT"}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { formatWaitTime } from "./accounts.js";
|
|
2
|
+
const MAX_TOAST_MESSAGE_LENGTH = 160;
|
|
3
|
+
const MAX_STATUS_MESSAGE_LENGTH = 120;
|
|
4
|
+
const MAX_TOKEN_LENGTH = 48;
|
|
5
|
+
const MAX_PATH_LENGTH = 48;
|
|
6
|
+
function truncateMiddle(value, maxLength) {
|
|
7
|
+
if (maxLength <= 0)
|
|
8
|
+
return "";
|
|
9
|
+
if (value.length <= maxLength)
|
|
10
|
+
return value;
|
|
11
|
+
if (maxLength === 1)
|
|
12
|
+
return "…";
|
|
13
|
+
const head = Math.max(1, Math.floor(maxLength * 0.4));
|
|
14
|
+
const tail = Math.max(0, maxLength - head - 1);
|
|
15
|
+
if (tail === 0)
|
|
16
|
+
return `${value.slice(0, head)}…`;
|
|
17
|
+
return `${value.slice(0, head)}…${value.slice(-tail)}`;
|
|
18
|
+
}
|
|
19
|
+
export function truncatePath(path, maxLength = MAX_PATH_LENGTH) {
|
|
20
|
+
if (path.length <= maxLength)
|
|
21
|
+
return path;
|
|
22
|
+
const parts = path.split(/[\\/]/);
|
|
23
|
+
const last = parts[parts.length - 1] ?? path;
|
|
24
|
+
if (last.length + 2 >= maxLength) {
|
|
25
|
+
return truncateMiddle(last, maxLength);
|
|
26
|
+
}
|
|
27
|
+
const headLen = Math.max(1, maxLength - last.length - 1);
|
|
28
|
+
return `${path.slice(0, headLen)}…${last}`;
|
|
29
|
+
}
|
|
30
|
+
function normalizeWhitespace(message) {
|
|
31
|
+
return message.replace(/\s+/g, " ").trim();
|
|
32
|
+
}
|
|
33
|
+
function truncateToken(token, maxTokenLength, maxPathLength) {
|
|
34
|
+
if (token.length <= maxTokenLength)
|
|
35
|
+
return token;
|
|
36
|
+
if (token.includes("/") || token.includes("\\")) {
|
|
37
|
+
return truncatePath(token, maxPathLength);
|
|
38
|
+
}
|
|
39
|
+
return truncateMiddle(token, maxTokenLength);
|
|
40
|
+
}
|
|
41
|
+
function clampMessage(message, maxLength) {
|
|
42
|
+
if (message.length <= maxLength)
|
|
43
|
+
return message;
|
|
44
|
+
return truncateMiddle(message, maxLength);
|
|
45
|
+
}
|
|
46
|
+
export function formatToastMessage(message) {
|
|
47
|
+
const normalized = normalizeWhitespace(message);
|
|
48
|
+
const tokens = normalized.split(" ");
|
|
49
|
+
const formatted = tokens
|
|
50
|
+
.map((token) => truncateToken(token, MAX_TOKEN_LENGTH, MAX_PATH_LENGTH))
|
|
51
|
+
.join(" ");
|
|
52
|
+
return clampMessage(formatted, MAX_TOAST_MESSAGE_LENGTH);
|
|
53
|
+
}
|
|
54
|
+
export function formatStatusMessage(message) {
|
|
55
|
+
const normalized = normalizeWhitespace(message);
|
|
56
|
+
const tokens = normalized.split(" ");
|
|
57
|
+
const formatted = tokens
|
|
58
|
+
.map((token) => truncateToken(token, MAX_TOKEN_LENGTH, MAX_PATH_LENGTH))
|
|
59
|
+
.join(" ");
|
|
60
|
+
return clampMessage(formatted, MAX_STATUS_MESSAGE_LENGTH);
|
|
61
|
+
}
|
|
62
|
+
export function formatRateLimitStatusMessage(options) {
|
|
63
|
+
if (options.accountCount === 0) {
|
|
64
|
+
return formatStatusMessage("No OpenAI accounts configured. Run `opencode auth login`.");
|
|
65
|
+
}
|
|
66
|
+
const waitLabel = options.waitMs > 0 ? formatWaitTime(options.waitMs) : "a bit";
|
|
67
|
+
const storagePath = truncatePath(options.storagePath, MAX_PATH_LENGTH);
|
|
68
|
+
const message = `All ${options.accountCount} account(s) are temporarily unavailable. Try again in ${waitLabel} or add another account with \`opencode auth login\`. (Storage: ${storagePath})`;
|
|
69
|
+
return formatStatusMessage(message);
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=formatting.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"formatting.js","sourceRoot":"","sources":["../../lib/formatting.ts"],"names":[],"mappings":"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"}
|
|
@@ -548,7 +548,7 @@
|
|
|
548
548
|
<div class="terminal-button red"></div>
|
|
549
549
|
<div class="terminal-button yellow"></div>
|
|
550
550
|
<div class="terminal-button green"></div>
|
|
551
|
-
<div class="terminal-title">opencode-openai-codex-multi-auth@4.5.
|
|
551
|
+
<div class="terminal-title">opencode-openai-codex-multi-auth@4.5.9 — OAuth Authentication</div>
|
|
552
552
|
</div>
|
|
553
553
|
|
|
554
554
|
<div class="status-box">
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import type { SchedulingMode } from "./types.js";
|
|
2
|
+
export type RateLimitReason = "capacity" | "quota" | "rate-limit" | "unknown";
|
|
3
|
+
export interface RateLimitBackoff {
|
|
4
|
+
delayMs: number;
|
|
5
|
+
attempt: number;
|
|
6
|
+
isDuplicate: boolean;
|
|
7
|
+
}
|
|
8
|
+
export interface RateLimitDecisionInput {
|
|
9
|
+
schedulingMode: SchedulingMode;
|
|
10
|
+
accountCount: number;
|
|
11
|
+
maxCacheFirstWaitMs: number;
|
|
12
|
+
switchOnFirstRateLimit: boolean;
|
|
13
|
+
shortRetryThresholdMs: number;
|
|
14
|
+
backoff: RateLimitBackoff;
|
|
15
|
+
}
|
|
16
|
+
export interface RateLimitDecision {
|
|
17
|
+
action: "wait" | "switch";
|
|
18
|
+
delayMs: number;
|
|
19
|
+
}
|
|
20
|
+
export interface RateLimitTrackerOptions {
|
|
21
|
+
dedupWindowMs: number;
|
|
22
|
+
resetMs: number;
|
|
23
|
+
defaultRetryMs: number;
|
|
24
|
+
maxBackoffMs: number;
|
|
25
|
+
jitterMaxMs: number;
|
|
26
|
+
}
|
|
27
|
+
export declare function parseRateLimitReason(status: number, bodyText: string | null | undefined): RateLimitReason;
|
|
28
|
+
export declare function calculateBackoffMs(reason: RateLimitReason, attempt: number, retryAfterMs: number | null, options: Pick<RateLimitTrackerOptions, "defaultRetryMs" | "maxBackoffMs" | "jitterMaxMs">): number;
|
|
29
|
+
export declare function decideRateLimitAction(options: RateLimitDecisionInput): RateLimitDecision;
|
|
30
|
+
export declare class RateLimitTracker {
|
|
31
|
+
private readonly state;
|
|
32
|
+
private readonly options;
|
|
33
|
+
constructor(options: RateLimitTrackerOptions);
|
|
34
|
+
getBackoff(key: string, reason: RateLimitReason, retryAfterMs: number | null): RateLimitBackoff;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=rate-limit.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../lib/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,OAAO,GAAG,YAAY,GAAG,SAAS,CAAC;AAE9E,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,sBAAsB;IACtC,cAAc,EAAE,cAAc,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,OAAO,CAAC;IAChC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,EAAE,gBAAgB,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IACjC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,uBAAuB;IACvC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACpB;AAQD,wBAAgB,oBAAoB,CACnC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACjC,eAAe,CAajB;AAED,wBAAgB,kBAAkB,CACjC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GAAG,IAAI,EAC3B,OAAO,EAAE,IAAI,CAAC,uBAAuB,EAAE,gBAAgB,GAAG,cAAc,GAAG,aAAa,CAAC,GACvF,MAAM,CASR;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,iBAAiB,CA2BxF;AAED,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqC;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;gBAEtC,OAAO,EAAE,uBAAuB;IAI5C,UAAU,CACT,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,MAAM,GAAG,IAAI,GACzB,gBAAgB;CAiBnB"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
export function parseRateLimitReason(status, bodyText) {
|
|
2
|
+
if (status === 503 || status === 529)
|
|
3
|
+
return "capacity";
|
|
4
|
+
const haystack = (bodyText ?? "").toLowerCase();
|
|
5
|
+
if (/capacity|overloaded|server\s+busy|service\s+unavailable/.test(haystack)) {
|
|
6
|
+
return "capacity";
|
|
7
|
+
}
|
|
8
|
+
if (/quota|usage\s+limit|billing|insufficient/.test(haystack)) {
|
|
9
|
+
return "quota";
|
|
10
|
+
}
|
|
11
|
+
if (/rate\s+limit|too\s+many\s+requests/.test(haystack)) {
|
|
12
|
+
return "rate-limit";
|
|
13
|
+
}
|
|
14
|
+
return "unknown";
|
|
15
|
+
}
|
|
16
|
+
export function calculateBackoffMs(reason, attempt, retryAfterMs, options) {
|
|
17
|
+
const base = retryAfterMs && retryAfterMs > 0 ? retryAfterMs : options.defaultRetryMs;
|
|
18
|
+
const pow = Math.max(0, Math.floor(attempt) - 1);
|
|
19
|
+
let delay = base * Math.pow(2, pow);
|
|
20
|
+
if (options.maxBackoffMs > 0)
|
|
21
|
+
delay = Math.min(delay, options.maxBackoffMs);
|
|
22
|
+
if (options.jitterMaxMs > 0) {
|
|
23
|
+
delay += Math.floor(Math.random() * options.jitterMaxMs);
|
|
24
|
+
}
|
|
25
|
+
return Math.max(0, Math.floor(delay));
|
|
26
|
+
}
|
|
27
|
+
export function decideRateLimitAction(options) {
|
|
28
|
+
const delayMs = Math.max(0, Math.floor(options.backoff.delayMs));
|
|
29
|
+
const attempt = Math.max(1, Math.floor(options.backoff.attempt));
|
|
30
|
+
const accountCount = Math.max(0, Math.floor(options.accountCount));
|
|
31
|
+
if (accountCount <= 1) {
|
|
32
|
+
return { action: "wait", delayMs };
|
|
33
|
+
}
|
|
34
|
+
if (options.switchOnFirstRateLimit && attempt <= 1) {
|
|
35
|
+
return { action: "switch", delayMs };
|
|
36
|
+
}
|
|
37
|
+
switch (options.schedulingMode) {
|
|
38
|
+
case "performance_first":
|
|
39
|
+
return { action: "switch", delayMs };
|
|
40
|
+
case "cache_first": {
|
|
41
|
+
const maxWait = Math.max(0, Math.floor(options.maxCacheFirstWaitMs));
|
|
42
|
+
if (delayMs <= maxWait)
|
|
43
|
+
return { action: "wait", delayMs };
|
|
44
|
+
return { action: "switch", delayMs };
|
|
45
|
+
}
|
|
46
|
+
case "balance":
|
|
47
|
+
default: {
|
|
48
|
+
const shortThreshold = Math.max(0, Math.floor(options.shortRetryThresholdMs));
|
|
49
|
+
if (delayMs <= shortThreshold)
|
|
50
|
+
return { action: "wait", delayMs };
|
|
51
|
+
return { action: "switch", delayMs };
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
export class RateLimitTracker {
|
|
56
|
+
state = new Map();
|
|
57
|
+
options;
|
|
58
|
+
constructor(options) {
|
|
59
|
+
this.options = options;
|
|
60
|
+
}
|
|
61
|
+
getBackoff(key, reason, retryAfterMs) {
|
|
62
|
+
const now = Date.now();
|
|
63
|
+
const current = this.state.get(key);
|
|
64
|
+
if (current && now - current.lastAt < this.options.dedupWindowMs) {
|
|
65
|
+
return {
|
|
66
|
+
delayMs: current.lastDelayMs,
|
|
67
|
+
attempt: current.consecutive,
|
|
68
|
+
isDuplicate: true,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
const reset = !current || now - current.lastAt > this.options.resetMs;
|
|
72
|
+
const attempt = reset ? 1 : current.consecutive + 1;
|
|
73
|
+
const delayMs = calculateBackoffMs(reason, attempt, retryAfterMs, this.options);
|
|
74
|
+
this.state.set(key, { lastAt: now, consecutive: attempt, lastDelayMs: delayMs });
|
|
75
|
+
return { delayMs, attempt, isDuplicate: false };
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=rate-limit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../lib/rate-limit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { TokenResult } from "./types.js";
|
|
2
|
+
export type RefreshQueueResult = TokenResult | {
|
|
3
|
+
type: "skipped";
|
|
4
|
+
};
|
|
5
|
+
export type RefreshQueueTask = {
|
|
6
|
+
key: string;
|
|
7
|
+
expires: number;
|
|
8
|
+
refresh: () => Promise<TokenResult>;
|
|
9
|
+
};
|
|
10
|
+
type RefreshQueueOptions = {
|
|
11
|
+
bufferMs?: number;
|
|
12
|
+
intervalMs?: number;
|
|
13
|
+
now?: () => number;
|
|
14
|
+
};
|
|
15
|
+
export declare class ProactiveRefreshQueue {
|
|
16
|
+
private queue;
|
|
17
|
+
private pendingKeys;
|
|
18
|
+
private running;
|
|
19
|
+
private bufferMs;
|
|
20
|
+
private intervalMs;
|
|
21
|
+
private now;
|
|
22
|
+
constructor(options?: RefreshQueueOptions);
|
|
23
|
+
enqueue(task: RefreshQueueTask): Promise<RefreshQueueResult>;
|
|
24
|
+
private process;
|
|
25
|
+
}
|
|
26
|
+
export type RefreshSchedulerOptions = {
|
|
27
|
+
intervalMs: number;
|
|
28
|
+
queue: ProactiveRefreshQueue;
|
|
29
|
+
getTasks: () => RefreshQueueTask[];
|
|
30
|
+
};
|
|
31
|
+
export type RefreshScheduler = {
|
|
32
|
+
start: () => void;
|
|
33
|
+
stop: () => void;
|
|
34
|
+
};
|
|
35
|
+
export declare function createRefreshScheduler(options: RefreshSchedulerOptions): RefreshScheduler;
|
|
36
|
+
export {};
|
|
37
|
+
//# sourceMappingURL=refresh-queue.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-queue.d.ts","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAEnE,MAAM,MAAM,gBAAgB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;CACpC,CAAC;AAEF,KAAK,mBAAmB,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,qBAAqB;IACjC,OAAO,CAAC,KAAK,CAGL;IACR,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,GAAG,CAAe;gBAEd,OAAO,GAAE,mBAAwB;IAM7C,OAAO,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAmB9C,OAAO;CAuBrB;AAED,MAAM,MAAM,uBAAuB,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,qBAAqB,CAAC;IAC7B,QAAQ,EAAE,MAAM,gBAAgB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC9B,KAAK,EAAE,MAAM,IAAI,CAAC;IAClB,IAAI,EAAE,MAAM,IAAI,CAAC;CACjB,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,uBAAuB,GAAG,gBAAgB,CAwBzF"}
|