mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-07-31 04:12:10 +03:00
* fix(cli-tools): guard modelId type before calling indexOf E2E shakedown v3.8.0: cli-tools quebrava com TypeError quando dynamicModels continha entradas sem .id (objeto retornado diretamente em vez de string). * fix(offline): avoid SSR/CSR hydration mismatch on navigator.onLine Replace useState+lazy-initializer with useSyncExternalStore so the server snapshot (() => false) and client snapshot (() => navigator.onLine) are declared separately. React hydrates with the server value and switches to the real online status client-side without a mismatch. * chore(i18n): add missing en.json keys for translator, cli-tools, memory, onboarding Adds 58 missing keys identified by the new dashboard audit script: - cliTools: 18 custom CLI builder keys (CustomCliCard) - translator: 24 keys covering stream transformer, live monitor, test bench - memory: 12 health/pagination/dialog keys - onboarding.tier: 8 keys for the tier tour walkthrough Also adds scripts/i18n/audit-dashboard-pages.mjs which scans all dashboard pages, reports t() calls referencing missing en.json keys, and flags candidate hardcoded JSX/attribute strings. * chore(i18n): replace hardcoded UI text with t() calls across dashboard (round 1) Subagents refactored 8 high-impact dashboard pages, replacing 81 of the 407 hardcoded English/PT strings flagged by the audit with proper useTranslations() lookups. Added 73 corresponding keys to en.json across the home, apiManager, providers, settings, and usage namespaces. Pages affected: - BudgetTab (27 → 0) - HomePageClient (2 → 0) - RoutingTab (25 → 7) - ResilienceTab (38 → 18) - SystemStorageTab (42 → 21) - providers/[id] (17 → 15) - ApiManagerPageClient (14 → 13) - OneproxyTab (13 → 10) Also adds two helper scripts: - scripts/i18n/extract-keys-from-diff.mjs — extracts new keys from git diff - scripts/i18n/merge-keys.mjs — merges a pending-keys JSON into en.json Remaining hardcoded strings will be addressed in follow-up rounds. * chore(i18n): replace hardcoded UI text with t() calls across dashboard (round 2) Continues round 1 (commit8d34f4c65). Round-2 subagents refactored additional dashboard pages, replacing 77 more hardcoded strings with useTranslations() lookups. Added 79 corresponding keys to en.json across the a2aDashboard, agents, analytics, apiManager, cliTools, common, and settings namespaces. Pages affected: - a2a/page (new useTranslations + 6 keys) - agent-skills/page (new useTranslations + 9 keys) - AutoRoutingAnalyticsTab (new useTranslations + 6 keys) - AppearanceTab (8 → 6 remaining) - OneproxyTab (10 → 0) - ResilienceTab (18 → 0 missing key) - RoutingTab (7 → 0 missing key) - VisionBridgeSettingsTab (new useTranslations + 6 keys) - CopilotToolCard (7 → 0 missing key) - ApiManagerPageClient (13 → 0 missing key) - gamification/admin (new useTranslations + 7 keys) Hardcoded total: 326 → 249. Real missing keys: 0 (the 6 still flagged are false positives in exampleTemplates.tsx where t is passed as a parameter — keys exist at translator.templatePayloads.*). * chore(i18n): replace hardcoded UI text with t() calls across dashboard (round 3) Round-3 subagents and manual edits refactored 9 more dashboard pages (plus 2 small extras), replacing ~80 hardcoded strings with useTranslations() lookups. Added 79 corresponding keys to en.json across analytics, cloudAgents, combos, common, health, settings, and usage namespaces. Pages affected: - analytics/ComboHealthTab (new useTranslations + 15 keys) - analytics/CompressionAnalyticsTab (new useTranslations + 11 keys) - settings/SystemStorageTab (21 → 0 missing key) - tokens/page (new useTranslations + 13 keys) - usage/BudgetTab (9 missing fixed) - health/page (manual: 6 keys) - cloud-agents/page (manual: 3 keys) - combos/page (manual: 1 key) Hardcoded total: 249 → 164. Real missing keys: 0 (6 remaining are exampleTemplates.tsx false positives). Also adds scripts/i18n/build-pending-from-missing.mjs which reads _audit.json and locates English values from HEAD to rebuild _pending-keys.json after race-condition resets between subagent edits. * chore(i18n): localize remaining dashboard settings labels Replace hardcoded labels in compression and resilience settings with translation lookups to continue the dashboard i18n cleanup. Add the v3.8.0 dashboard shakedown runbook to document the manual smoke-test process and known dev environment pitfalls. * chore(i18n): replace hardcoded UI text with t() calls across dashboard (round 4) Round-4 subagent + manual key-resolution refactored remaining strings in 3 high-traffic settings/API tabs, plus extracted English values for keys that were already added as t() calls but lost during the previous en.json race-condition resets. Pages affected: - api-manager/ApiManagerPageClient (7 → 0 missing key) - settings/CompressionSettingsTab (8 → 0 missing key) - settings/MemorySkillsTab (8 → 0 missing key) - settings/ResilienceTab (4 more keys recovered) Hardcoded total: 164 → 140. Real missing keys: 0 (6 remaining are the exampleTemplates.tsx false positives — t passed as parameter). * chore(i18n): replace hardcoded UI text with t() calls across dashboard (round 5) Round-5 agent began processing the remaining smaller dashboard files. Added 5 more keys to en.json for providers/[id]/page.tsx OAuth flow labels and the cross-OS auto-detection hint. Pages affected: - providers/[id]/page.tsx (5 keys) Hardcoded total: 140 → 136. Real missing keys: 0. * chore(i18n): resolve last 2 missing providers/[id] keys Adds providerDetailMyClaudeAccountPlaceholder and providerDetailPathAutoDetected — the final user-visible labels in the providers/[id] page that the round-5 subagent rewrote to t() calls without yet adding to en.json. Real missing keys: 0 (6 remaining are exampleTemplates.tsx false positives — t is passed as a parameter so the audit cannot resolve the namespace; keys do exist at translator.templatePayloads.*). * chore(i18n): replace hardcoded UI text with t() calls across dashboard (round 6 — 10 parallel agents) Round-6 dispatched 10 parallel subagents covering all 57 remaining dashboard files. Each agent worked on a disjoint file set to avoid en.json race conditions. Added ~60 new i18n keys across 9 namespaces covering small UI labels, table headers, search placeholders, and empty-state messages. Major changes: - analytics: SearchAnalyticsTab, ProviderUtilizationTab, DiversityScoreCard, CompressionAnalyticsTab (new useTranslations + keys) - batch: BatchDetailModal, BatchListTab, FileDetailModal, FilesListTab (new useTranslations + keys) - settings: CliproxyapiSettingsTab, PayloadRulesTab, ModelCooldownsCard, AppearanceTab, PricingTab (mostly new useTranslations) - endpoint: TokenSaverCard, ApiEndpointsTab, EndpointPageClient - cache: CachePerformance, IdempotencyLayer, ReasoningCacheTab, MediaPageClient, page - combos: IntelligentComboPanel, page - playground: ChatPlayground, SearchPlayground - providers: ProviderCard - onboarding: TierFlowDiagram - changelog: ChangelogViewer - home: ProviderTopology, TierCoverageWidget, BootstrapBanner, BadgeToast - usage: BudgetTab, BudgetTelemetryCards, QuotaTable - quotaShare: QuotaSharePageClient - profile: page - leaderboard: page - skills: page Hardcoded total: 131 → 60. Real missing keys: 0 plus 1 false-positive for combos.modePack (lookup via prop-passed t). * chore(i18n): finalize round-6 keys for batch/cache/endpoint/usage Adds the remaining keys produced by parallel agents A4, A6, A8, A9: - common: batch-related labels (BatchDetailModal, BatchListTab, FileDetailModal, FilesListTab, page) + profile/leaderboard - cache: hit rate, latency, retry, avg chars - endpoint: token saver, API endpoints, copy URL, cloud/local labels - usage: noSpend, activeSessions, quotaAlerts, budget timing - skills: install/marketplace/filter - proxyRegistry/quotaShare/mcpDashboard: misc labels Hardcoded total: 60 → 48. Real missing keys: 0 (modePack remaining is a false positive — combos.modePack exists but the audit can't resolve it since IntelligentComboPanel receives t as a prop). * fix(playground): dedupe filteredModels to avoid duplicate React key warning The /v1/models endpoint can return the same model id twice (e.g., when a model is listed by both an alias and its canonical provider), which made the <Select> emit two <option> elements with the same key — triggering "Encountered two children with the same key, codex/gpt-5.5". Replace the chained filter + map with a single pass that skips ids already added. * fix(playground): guard against non-string model ids before .split/.startsWith The /v1/models endpoint can include synthetic entries (combos, locals, in-progress imports) with a null/undefined id. The playground used to call m.id.split("/") in the provider-discovery loop, which threw on the first non-string entry; the surrounding .catch(() => {}) silently swallowed the error, so the provider/model/account dropdowns ended up empty even though /v1/models returned thousands of valid entries. - Skip entries without a string id before split/startsWith. - Log the rejection in the .catch handler so future regressions are visible in DevTools instead of silently emptying the UI. * fix(playground): guard ChatPlayground filteredModels for non-string ids Same root cause as commit49fe356b9: ChatPlayground filtered models with m.id.startsWith(...) which crashed on null/undefined ids returned by /v1/models (synthetic combo entries). Apply the same defensive guard and dedupe used in the parent page. * fix(claude): drop orphan tool_result after fixToolAdjacency strip (discussion #2410) Discussion #2410 reports Claude returning 400 for sequences like: assistant: tool_use(id=X) user: <plain text> ← breaks adjacency user: tool_result(id=X) The previous round added `fixToolAdjacency` (commit44d9abac9) which correctly strips the orphan tool_use from the assistant message. But that left the now-unmatched tool_result intact, so the upstream rejected the request with: messages.N.content.M: unexpected `tool_use_id` found in `tool_result` blocks: X. Each tool_result block must have a corresponding tool_use block in the previous message. Fix: after running `fixToolAdjacency`, re-run `fixToolPairs` to drop the orphaned tool_result blocks. All three call sites updated: - contextManager.purifyHistory (both inside the binary-search loop and the final pass) - BaseExecutor message-prep (Claude path) - claudeCodeCompatible request signer Also tightens an unrelated dynamic-key access in readNestedString (claudeCodeCompatible) to satisfy the prototype- pollution scanner triggered by the post-tool semgrep hook. * fix(mitm): point runtime manager re-export to js entrypoint Use the emitted `.js` path for the runtime manager re-export so dynamic runtime loading resolves correctly outside the Turbopack alias handling. * docs: add AgentRouter setup guide (#2422) Integrated into release/v3.8.0 — AgentRouter setup guide docs. * feat: add new feature on combos - falloverBeforeRetry (#2417) Integrated into release/v3.8.0 — falloverBeforeRetry for per-model quota skipping in combos. * feat(batch): implement 10 feature requests harvested (#2414) Integrated into release/v3.8.0 — batch of 10 feature requests: llama.cpp local provider, upstream error exposure, Termux detection, providers rotate CLI, t3.chat web skeleton, Zed Docker integration, Kiro multi-account OAuth isolation, auto-combo cost blending, auto-combo context filter, combo provider-level exhaustion tracking (#1731). Conflicts with #2417 (falloverBeforeRetry) resolved. * fix(gamification): resolve SQL bug, auth gap, pagination, and anomaly scoring (#2421) Integrated into release/v3.8.0 — 6 critical gamification bug fixes: SQL SELECT in checkActionCountBadges, federation auth enforcement, leaderboard pagination offset, real z-score computation, addXp level calculation, and barrel index.ts * docs(changelog): add post-release entries for #2414 #2417 #2421 #2422 - feat(batch): T3-Chat-Web executor, exhaustedProviders set (#1731), Zed Docker - feat(combos): falloverBeforeRetry + setTry loop (#2417 — @hartmark) - fix(gamification): SQL SELECT bug, federation auth, pagination, z-score (#2421 — @oyi77) - docs: AgentRouter setup guide (#2422 — @leninejunior) * fix(security): resolve CodeQL random/password-hash alerts and sync docs & tests * feat/fix: integrate PRs #2423, #2425, #2427, #2428 with test & security fixes * docs(changelog): credit contributors for PRs #2423, #2425, #2427, #2428 * fix(mitm): drop .js extension on manager.runtime re-export for webpack build (#2425) Merged into release/v3.8.0 * fix: persist STORAGE_ENCRYPTION_KEY across upgrades (closes #1622) (#2428) Merged into release/v3.8.0 * fix: auto-reset apiKeyHealth on successful connection test (#2427) Merged into release/v3.8.0 * fix: support Antigravity image generation, Add Gemini 3.5 Flash (#2423) Merged into release/v3.8.0 --------- Co-authored-by: diegosouzapw <diego.souza.pw@gmail.com> Co-authored-by: Lenine Júnior <lenine@engrene.com.br> Co-authored-by: Markus Hartung <mail@hartmark.se> Co-authored-by: Paijo <14921983+oyi77@users.noreply.github.com> Co-authored-by: Anton <39598727+NomenAK@users.noreply.github.com> Co-authored-by: Chewji <126886556+Chewji9875@users.noreply.github.com> Co-authored-by: clousky2020 <33016567+clousky2020@users.noreply.github.com> Co-authored-by: backryun <bakryun0718@proton.me>
342 lines
11 KiB
TypeScript
342 lines
11 KiB
TypeScript
/**
|
|
* apiKeyRotator.ts — T07: API Key Round-Robin with Health Tracking
|
|
*
|
|
* Rotates between a primary API key and extra API keys stored in
|
|
* providerSpecificData.extraApiKeys[]. Uses round-robin by default.
|
|
*
|
|
* Extra keys are stored as plain strings in providerSpecificData.extraApiKeys.
|
|
* Example: { extraApiKeys: ["sk-abc...", "sk-def...", "sk-ghi..."] }
|
|
*
|
|
* The in-memory rotation index resets on process restart, which is intentional —
|
|
* it ensures even distribution across restarts without persistence overhead.
|
|
*
|
|
* Health tracking: monitors per-key authentication failures. Keys that fail
|
|
* 3+ consecutive times are marked as "invalid" and skipped during rotation.
|
|
* Health status is persisted in providerSpecificData.apiKeyHealth.
|
|
*/
|
|
|
|
// In-memory round-robin index per connection
|
|
const _keyIndexes = new Map<string, number>();
|
|
|
|
// Tracks which connections have extra API keys (for A3 guard in chatCore.ts)
|
|
// Used to prevent disabling an entire connection when only one key fails.
|
|
const _connectionExtraKeys = new Map<string, boolean>();
|
|
|
|
/**
|
|
* Record whether a connection has extra API keys.
|
|
* Called by chatCore.ts when a 401 is detected, to inform the A3 guard.
|
|
*/
|
|
export function trackConnectionExtraKeys(connectionId: string, extraKeys: string[]): void {
|
|
const validExtras = extraKeys.filter((k) => typeof k === "string" && k.trim().length > 0);
|
|
_connectionExtraKeys.set(connectionId, validExtras.length > 0);
|
|
}
|
|
|
|
/**
|
|
* Check if a connection has extra API keys (for the A3 guard).
|
|
* Uses the in-memory cache (populated during request execution) and falls back
|
|
* to direct extraKeys data when provided, ensuring reliability across restarts.
|
|
*/
|
|
export function connectionHasExtraKeys(connectionId: string, extraKeys?: string[]): boolean {
|
|
// Direct data check is always authoritative
|
|
if (extraKeys && extraKeys.length > 0) return true;
|
|
// Fall back to in-memory cache (populated as side-effect during execution)
|
|
return _connectionExtraKeys.get(connectionId) ?? false;
|
|
}
|
|
|
|
// In-memory health status (synced to DB on state changes)
|
|
// Key format: "primary" | "extra_0" | "extra_1" | ...
|
|
interface KeyHealth {
|
|
status: "active" | "warning" | "invalid";
|
|
failures: number; // consecutive failures
|
|
lastFailure: string | null; // ISO timestamp
|
|
lastSuccess: string | null; // ISO timestamp
|
|
totalRequests: number;
|
|
totalFailures: number;
|
|
}
|
|
|
|
const _keyHealth = new Map<string, KeyHealth>();
|
|
|
|
const FAILURE_THRESHOLD = 2; // Mark as invalid after 2 consecutive failures
|
|
|
|
/**
|
|
* Get or create health status for a specific key within a connection scope.
|
|
*/
|
|
function getOrCreateHealth(connectionId: string, keyId: string): KeyHealth {
|
|
const scopedKey = `${connectionId}:${keyId}`;
|
|
if (!_keyHealth.has(scopedKey)) {
|
|
_keyHealth.set(scopedKey, {
|
|
status: "active",
|
|
failures: 0,
|
|
lastFailure: null,
|
|
lastSuccess: null,
|
|
totalRequests: 0,
|
|
totalFailures: 0,
|
|
});
|
|
}
|
|
return _keyHealth.get(scopedKey)!;
|
|
}
|
|
|
|
/**
|
|
* Get the next valid API key in round-robin rotation.
|
|
* Skips keys marked as "invalid" in health status.
|
|
*
|
|
* @param connectionId - Unique connection identifier (for index isolation)
|
|
* @param primaryKey - The main api_key from the connection
|
|
* @param extraKeys - Additional API keys from providerSpecificData.extraApiKeys
|
|
* @param health - Optional health status from providerSpecificData.apiKeyHealth
|
|
* @returns The selected API key, or null if no valid keys available
|
|
*/
|
|
export function getValidApiKey(
|
|
connectionId: string,
|
|
primaryKey: string,
|
|
extraKeys: string[] = [],
|
|
health?: Record<string, KeyHealth>
|
|
): { key: string; keyId: string } | null {
|
|
const validExtras = extraKeys.filter((k) => typeof k === "string" && k.trim().length > 0);
|
|
|
|
// Build list of all keys with their IDs
|
|
const allKeys: Array<{ key: string; keyId: string }> = [];
|
|
|
|
// Add primary key if valid
|
|
if (primaryKey) {
|
|
const primaryHealth = health?.["primary"] || getOrCreateHealth(connectionId, "primary");
|
|
if (primaryHealth.status !== "invalid") {
|
|
allKeys.push({ key: primaryKey, keyId: "primary" });
|
|
} else {
|
|
console.warn(
|
|
`[KeyRotator] Skipping invalid primary key for connection ${connectionId.slice(0, 8)}`
|
|
);
|
|
}
|
|
}
|
|
|
|
// Add extra keys if valid
|
|
for (let i = 0; i < validExtras.length; i++) {
|
|
const keyId = `extra_${i}`;
|
|
const keyHealth = health?.[keyId] || getOrCreateHealth(connectionId, keyId);
|
|
if (keyHealth.status !== "invalid") {
|
|
allKeys.push({ key: validExtras[i], keyId });
|
|
}
|
|
}
|
|
|
|
if (allKeys.length === 0) return null;
|
|
if (allKeys.length === 1) {
|
|
return { key: allKeys[0].key, keyId: allKeys[0].keyId };
|
|
}
|
|
|
|
// Round-robin among valid keys only
|
|
const current = _keyIndexes.get(connectionId) ?? 0;
|
|
const idx = current % allKeys.length;
|
|
_keyIndexes.set(connectionId, current + 1);
|
|
|
|
return { key: allKeys[idx].key, keyId: allKeys[idx].keyId };
|
|
}
|
|
|
|
/**
|
|
* Get the next API key in round-robin rotation (legacy, without health check).
|
|
* @deprecated Use getValidApiKey() instead
|
|
*/
|
|
export function getRotatingApiKey(
|
|
connectionId: string,
|
|
primaryKey: string,
|
|
extraKeys: string[] = []
|
|
): string {
|
|
const validExtras = extraKeys.filter((k) => typeof k === "string" && k.trim().length > 0);
|
|
|
|
if (validExtras.length === 0) return primaryKey;
|
|
|
|
const allKeys = [primaryKey, ...validExtras].filter(Boolean);
|
|
if (allKeys.length <= 1) return primaryKey;
|
|
|
|
const current = _keyIndexes.get(connectionId) ?? 0;
|
|
const idx = current % allKeys.length;
|
|
_keyIndexes.set(connectionId, current + 1);
|
|
|
|
return allKeys[idx];
|
|
}
|
|
|
|
/**
|
|
* Record a failed authentication attempt for a key.
|
|
* Increments failure count and marks as "invalid" if threshold exceeded.
|
|
*
|
|
* @param connectionId - Connection scope for health state isolation
|
|
* @param keyId - Key identifier ("primary" | "extra_0" | ...)
|
|
* @returns Updated health status
|
|
*/
|
|
export function recordKeyFailure(connectionId: string, keyId: string): KeyHealth {
|
|
const health = getOrCreateHealth(connectionId, keyId);
|
|
health.failures++;
|
|
health.totalRequests++;
|
|
health.totalFailures++;
|
|
health.lastFailure = new Date().toISOString();
|
|
|
|
if (health.failures >= FAILURE_THRESHOLD) {
|
|
health.status = "invalid";
|
|
} else if (health.failures > 0) {
|
|
health.status = "warning";
|
|
}
|
|
|
|
return { ...health };
|
|
}
|
|
|
|
/**
|
|
* Record a successful authentication attempt for a key.
|
|
* Resets failure count and marks as "active".
|
|
*
|
|
* @param connectionId - Connection scope for health state isolation
|
|
* @param keyId - Key identifier ("primary" | "extra_0" | ...)
|
|
* @returns Updated health status
|
|
*/
|
|
export function recordKeySuccess(connectionId: string, keyId: string): KeyHealth {
|
|
const health = getOrCreateHealth(connectionId, keyId);
|
|
health.failures = 0;
|
|
health.totalRequests++;
|
|
health.lastSuccess = new Date().toISOString();
|
|
health.status = "active";
|
|
|
|
return { ...health };
|
|
}
|
|
|
|
/**
|
|
* Get count of invalid keys (for notification).
|
|
*/
|
|
export function getInvalidKeyCount(health?: Record<string, KeyHealth>): number {
|
|
if (!health) return 0;
|
|
return Object.values(health).filter((h) => h.status === "invalid").length;
|
|
}
|
|
|
|
/**
|
|
* Get health statistics for display.
|
|
*/
|
|
export function getKeyHealthStats(
|
|
connectionId: string,
|
|
primaryKey: string,
|
|
extraKeys: string[] = [],
|
|
health?: Record<string, KeyHealth>
|
|
): {
|
|
total: number;
|
|
active: number;
|
|
warning: number;
|
|
invalid: number;
|
|
} {
|
|
const total = (primaryKey ? 1 : 0) + extraKeys.filter((k) => k.trim().length > 0).length;
|
|
const keys = ["primary", ...extraKeys.map((_, i) => `extra_${i}`)];
|
|
|
|
let active = 0;
|
|
let warning = 0;
|
|
let invalid = 0;
|
|
|
|
for (const keyId of keys) {
|
|
const h = health?.[keyId] || getOrCreateHealth(connectionId, keyId);
|
|
if (h.status === "active") active++;
|
|
else if (h.status === "warning") warning++;
|
|
else if (h.status === "invalid") invalid++;
|
|
}
|
|
|
|
return { total, active, warning, invalid };
|
|
}
|
|
|
|
/**
|
|
* Reset a key's health status to active.
|
|
* Called manually from Dashboard to recover from false positives.
|
|
*/
|
|
export function resetKeyStatus(connectionId: string, keyId: string): KeyHealth {
|
|
const health = getOrCreateHealth(connectionId, keyId);
|
|
health.failures = 0;
|
|
health.status = "active";
|
|
health.lastFailure = null;
|
|
return { ...health };
|
|
}
|
|
|
|
/**
|
|
* Get full health status for all keys.
|
|
*/
|
|
export function getAllKeyHealth(): Record<string, KeyHealth> {
|
|
const result: Record<string, KeyHealth> = {};
|
|
for (const [keyId, health] of _keyHealth.entries()) {
|
|
result[keyId] = { ...health };
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Sync health status from DB (on connection load).
|
|
*/
|
|
export function syncHealthFromDB(connectionId: string, health?: Record<string, KeyHealth>): void {
|
|
if (!health) return;
|
|
|
|
for (const [keyId, keyHealth] of Object.entries(health)) {
|
|
_keyHealth.set(`${connectionId}:${keyId}`, keyHealth);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Reset the rotation index for a connection.
|
|
* Call this when a key fails (401/403) to skip the bad key next time.
|
|
*
|
|
* @param connectionId - Connection to reset
|
|
* @deprecated Use recordKeyFailure() instead
|
|
*/
|
|
export function resetRotationIndex(connectionId: string): void {
|
|
_keyIndexes.delete(connectionId);
|
|
}
|
|
|
|
/**
|
|
* Get the total number of API keys available for a connection.
|
|
* Used for logging/observability.
|
|
*/
|
|
export function getApiKeyCount(primaryKey: string, extraKeys: string[] = []): number {
|
|
const validExtras = extraKeys.filter((k) => typeof k === "string" && k.trim().length > 0);
|
|
return (primaryKey ? 1 : 0) + validExtras.length;
|
|
}
|
|
|
|
/**
|
|
* Resolve the API key and its health status for an ongoing request.
|
|
*
|
|
* Unlike getValidApiKey() (which does round-robin for every call), this
|
|
* method re-uses the previously selected keyId when available — ensuring
|
|
* that a multi-turn request stream keeps using the same key. If no key
|
|
* was selected yet or the stored key is no longer valid, it falls back
|
|
* to fresh round-robin via getValidApiKey().
|
|
*
|
|
* @returns The resolved key+keyId, or null if no valid keys remain.
|
|
*/
|
|
export function resolveKeyForRequest(
|
|
connectionId: string,
|
|
primaryKey: string,
|
|
extraKeys: string[],
|
|
selectedKeyId: string | null
|
|
): { key: string; keyId: string } | null {
|
|
if (selectedKeyId) {
|
|
const health = getOrCreateHealth(connectionId, selectedKeyId);
|
|
if (health.status !== "invalid") {
|
|
if (selectedKeyId === "primary" && primaryKey) {
|
|
return { key: primaryKey, keyId: "primary" };
|
|
}
|
|
const match = /^extra_(\d+)$/.exec(selectedKeyId);
|
|
if (match) {
|
|
const idx = Number.parseInt(match[1], 10);
|
|
if (idx >= 0 && idx < extraKeys.length && extraKeys[idx].trim().length > 0) {
|
|
return { key: extraKeys[idx], keyId: selectedKeyId };
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return getValidApiKey(connectionId, primaryKey, extraKeys);
|
|
}
|
|
|
|
export function removeConnectionHealth(connectionId: string): void {
|
|
for (const key of _keyHealth.keys()) {
|
|
if (key.startsWith(`${connectionId}:`)) {
|
|
_keyHealth.delete(key);
|
|
}
|
|
}
|
|
}
|
|
|
|
export function removeConnectionIndex(connectionId: string): void {
|
|
_keyIndexes.delete(connectionId);
|
|
_connectionExtraKeys.delete(connectionId);
|
|
}
|
|
|
|
export type { KeyHealth };
|