opencode-openai-codex-multi-auth 4.5.4 → 4.5.6
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 +187 -29
- package/dist/index.js.map +1 -1
- package/dist/lib/account-matching.d.ts +1 -0
- package/dist/lib/account-matching.d.ts.map +1 -1
- package/dist/lib/account-matching.js +5 -6
- package/dist/lib/account-matching.js.map +1 -1
- package/dist/lib/accounts.d.ts +15 -1
- package/dist/lib/accounts.d.ts.map +1 -1
- package/dist/lib/accounts.js +193 -30
- package/dist/lib/accounts.js.map +1 -1
- package/dist/lib/auth/auth.d.ts.map +1 -1
- package/dist/lib/auth/auth.js +3 -1
- package/dist/lib/auth/auth.js.map +1 -1
- package/dist/lib/cli.d.ts +3 -1
- package/dist/lib/cli.d.ts.map +1 -1
- package/dist/lib/cli.js +37 -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/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 +2 -0
- package/dist/lib/storage.d.ts.map +1 -1
- package/dist/lib/storage.js +202 -29
- 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 +4 -2
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":"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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.6 — 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"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
export class ProactiveRefreshQueue {
|
|
2
|
+
queue = [];
|
|
3
|
+
pendingKeys = new Set();
|
|
4
|
+
running = false;
|
|
5
|
+
bufferMs;
|
|
6
|
+
intervalMs;
|
|
7
|
+
now;
|
|
8
|
+
constructor(options = {}) {
|
|
9
|
+
this.bufferMs = Math.max(0, Math.floor(options.bufferMs ?? 60_000));
|
|
10
|
+
this.intervalMs = Math.max(0, Math.floor(options.intervalMs ?? 250));
|
|
11
|
+
this.now = options.now ?? (() => Date.now());
|
|
12
|
+
}
|
|
13
|
+
enqueue(task) {
|
|
14
|
+
const now = this.now();
|
|
15
|
+
if (!Number.isFinite(task.expires) || task.expires <= now) {
|
|
16
|
+
return Promise.resolve({ type: "skipped" });
|
|
17
|
+
}
|
|
18
|
+
if (task.expires - now > this.bufferMs) {
|
|
19
|
+
return Promise.resolve({ type: "skipped" });
|
|
20
|
+
}
|
|
21
|
+
if (this.pendingKeys.has(task.key)) {
|
|
22
|
+
return Promise.resolve({ type: "skipped" });
|
|
23
|
+
}
|
|
24
|
+
return new Promise((resolve) => {
|
|
25
|
+
this.pendingKeys.add(task.key);
|
|
26
|
+
this.queue.push({ task, resolve });
|
|
27
|
+
this.process();
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
async process() {
|
|
31
|
+
if (this.running)
|
|
32
|
+
return;
|
|
33
|
+
this.running = true;
|
|
34
|
+
while (this.queue.length > 0) {
|
|
35
|
+
const item = this.queue.shift();
|
|
36
|
+
if (!item)
|
|
37
|
+
continue;
|
|
38
|
+
const now = this.now();
|
|
39
|
+
let result = { type: "skipped" };
|
|
40
|
+
if (item.task.expires > now && item.task.expires - now <= this.bufferMs) {
|
|
41
|
+
try {
|
|
42
|
+
result = await item.task.refresh();
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
result = { type: "failed" };
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
item.resolve(result);
|
|
49
|
+
this.pendingKeys.delete(item.task.key);
|
|
50
|
+
if (this.intervalMs > 0 && this.queue.length > 0) {
|
|
51
|
+
await new Promise((resolve) => setTimeout(resolve, this.intervalMs));
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
this.running = false;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
export function createRefreshScheduler(options) {
|
|
58
|
+
let timer = null;
|
|
59
|
+
const tick = () => {
|
|
60
|
+
const tasks = options.getTasks();
|
|
61
|
+
for (const task of tasks) {
|
|
62
|
+
void options.queue.enqueue(task);
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
return {
|
|
66
|
+
start() {
|
|
67
|
+
if (timer)
|
|
68
|
+
return;
|
|
69
|
+
tick();
|
|
70
|
+
if (options.intervalMs <= 0)
|
|
71
|
+
return;
|
|
72
|
+
timer = setInterval(tick, options.intervalMs);
|
|
73
|
+
timer.unref?.();
|
|
74
|
+
},
|
|
75
|
+
stop() {
|
|
76
|
+
if (!timer)
|
|
77
|
+
return;
|
|
78
|
+
clearInterval(timer);
|
|
79
|
+
timer = null;
|
|
80
|
+
},
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=refresh-queue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refresh-queue.js","sourceRoot":"","sources":["../../lib/refresh-queue.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/rotation.d.ts
CHANGED
|
@@ -59,7 +59,7 @@ export interface AccountWithMetrics {
|
|
|
59
59
|
isRateLimited: boolean;
|
|
60
60
|
isCoolingDown: boolean;
|
|
61
61
|
}
|
|
62
|
-
export declare function selectHybridAccount(accounts: AccountWithMetrics[], tokenTracker: TokenBucketTracker, minHealthScore?: number): number | null;
|
|
62
|
+
export declare function selectHybridAccount(accounts: AccountWithMetrics[], tokenTracker: TokenBucketTracker, currentAccountIndex?: number | null, minHealthScore?: number): number | null;
|
|
63
63
|
export declare function getTokenTracker(): TokenBucketTracker;
|
|
64
64
|
export declare function getHealthTracker(): HealthScoreTracker;
|
|
65
65
|
//# sourceMappingURL=rotation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rotation.d.ts","sourceRoot":"","sources":["../../lib/rotation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,iBAAiB;IACjC,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,aAAa,EAAE,MAAM,CAAC;IACtB,kDAAkD;IAClD,gBAAgB,EAAE,MAAM,CAAC;IACzB,qEAAqE;IACrE,cAAc,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,0DAA0D;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,2BAA2B,EAAE,iBAQzC,CAAC;AAQF,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;gBAE/B,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAInD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAWtC,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAIvC,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAUzC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAW3C,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CAUzC;AAMD,MAAM,WAAW,iBAAiB;IACjC,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,yBAAyB,EAAE,MAAM,CAAC;IAClC,oDAAoD;IACpD,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,2BAA2B,EAAE,iBAIzC,CAAC;AAOF,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuC;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;gBAE/B,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAInD,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAUvC,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,SAAI,GAAG,OAAO;IAIlD,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,SAAI,GAAG,OAAO;IAUhD,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,IAAI;IAQ9C,YAAY,IAAI,MAAM;CAGtB;AAMD,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACvB;
|
|
1
|
+
{"version":3,"file":"rotation.d.ts","sourceRoot":"","sources":["../../lib/rotation.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,iBAAiB;IACjC,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,sDAAsD;IACtD,aAAa,EAAE,MAAM,CAAC;IACtB,kDAAkD;IAClD,gBAAgB,EAAE,MAAM,CAAC;IACzB,qEAAqE;IACrE,cAAc,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,0DAA0D;IAC1D,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,2BAA2B,EAAE,iBAQzC,CAAC;AAQF,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAC9D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;gBAE/B,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAInD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAWtC,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO;IAIvC,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAUzC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAW3C,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;CAUzC;AAMD,MAAM,WAAW,iBAAiB;IACjC,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,iDAAiD;IACjD,yBAAyB,EAAE,MAAM,CAAC;IAClC,oDAAoD;IACpD,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,2BAA2B,EAAE,iBAIzC,CAAC;AAOF,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuC;IAC/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;gBAE/B,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAInD,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAUvC,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,SAAI,GAAG,OAAO;IAIlD,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,SAAI,GAAG,OAAO;IAUhD,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,IAAI;IAQ9C,YAAY,IAAI,MAAM;CAGtB;AAMD,MAAM,WAAW,kBAAkB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;CACvB;AAKD,wBAAgB,mBAAmB,CAClC,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,YAAY,EAAE,kBAAkB,EAChC,mBAAmB,GAAE,MAAM,GAAG,IAAW,EACzC,cAAc,SAAK,GACjB,MAAM,GAAG,IAAI,CA8Bf;AAmBD,wBAAgB,eAAe,IAAI,kBAAkB,CAGpD;AAID,wBAAgB,gBAAgB,IAAI,kBAAkB,CAGrD"}
|
package/dist/lib/rotation.js
CHANGED
|
@@ -107,7 +107,9 @@ export class TokenBucketTracker {
|
|
|
107
107
|
return this.config.maxTokens;
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
|
-
|
|
110
|
+
const STICKINESS_BONUS = 150;
|
|
111
|
+
const SWITCH_THRESHOLD = 100;
|
|
112
|
+
export function selectHybridAccount(accounts, tokenTracker, currentAccountIndex = null, minHealthScore = 50) {
|
|
111
113
|
const candidates = accounts
|
|
112
114
|
.filter((acc) => !acc.isRateLimited &&
|
|
113
115
|
!acc.isCoolingDown &&
|
|
@@ -118,9 +120,19 @@ export function selectHybridAccount(accounts, tokenTracker, minHealthScore = 50)
|
|
|
118
120
|
return null;
|
|
119
121
|
const maxTokens = tokenTracker.getMaxTokens();
|
|
120
122
|
const scored = candidates
|
|
121
|
-
.map((acc) =>
|
|
123
|
+
.map((acc) => {
|
|
124
|
+
const base = calculateHybridScore(acc, maxTokens);
|
|
125
|
+
const isCurrent = currentAccountIndex !== null && acc.index === currentAccountIndex;
|
|
126
|
+
const score = base + (isCurrent ? STICKINESS_BONUS : 0);
|
|
127
|
+
return { index: acc.index, score, base, isCurrent };
|
|
128
|
+
})
|
|
122
129
|
.sort((a, b) => b.score - a.score);
|
|
123
|
-
|
|
130
|
+
const best = scored[0];
|
|
131
|
+
const current = scored.find((item) => item.isCurrent);
|
|
132
|
+
if (current && best && !best.isCurrent && best.base - current.base < SWITCH_THRESHOLD) {
|
|
133
|
+
return current.index;
|
|
134
|
+
}
|
|
135
|
+
return best?.index ?? null;
|
|
124
136
|
}
|
|
125
137
|
function calculateHybridScore(account, maxTokens) {
|
|
126
138
|
const healthComponent = account.healthScore * 2;
|
package/dist/lib/rotation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rotation.js","sourceRoot":"","sources":["../../lib/rotation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rotation.js","sourceRoot":"","sources":["../../lib/rotation.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/storage.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { AccountStorageV3 } from "./types.js";
|
|
2
2
|
export declare function getStoragePath(): string;
|
|
3
|
+
export declare function backupAccountsFile(): Promise<string | null>;
|
|
3
4
|
export declare function loadAccounts(): Promise<AccountStorageV3 | null>;
|
|
5
|
+
export declare function toggleAccountEnabled(storage: AccountStorageV3, index: number): AccountStorageV3 | null;
|
|
4
6
|
export declare function saveAccounts(storage: AccountStorageV3): Promise<void>;
|
|
5
7
|
//# sourceMappingURL=storage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../lib/storage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAsDnD,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CASjE;AAocD,wBAAsB,YAAY,IAAI,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAerE;AAED,wBAAgB,oBAAoB,CACnC,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,MAAM,GACX,gBAAgB,GAAG,IAAI,CAWzB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C3E"}
|