@goodandready/dsh-key-rotation 0.7.23 → 0.7.25

package/lib/index.js

@@ -477,6 +477,7 @@ export function apply(ctx, config = {}) {
     const backupKeep = cfg.backupKeep ?? 7;
     const rotationScheduleDays = cfg.rotationScheduleDays ?? 0;
     const rateLimitThreshold = cfg.rateLimitThreshold ?? 0.1;
+    const incidentThreshold = cfg.incidentThreshold ?? 5;
 
     // ref -> pool (every key env of every configured provider)
     const poolByRef = new Map();
@@ -491,9 +492,24 @@ export function apply(ctx, config = {}) {
       let st = poolState.get(base);
       if (!st) {
         st = {
-          failedUntil: new Map(), failCounts: new Map(), pointer: 0, lastUsed: undefined,
-          switches: 0, lastReason: undefined, lastSwitchAt: undefined,
-          lastExhaustionAt: undefined, exhaustionCount: 0, events: [], usageCounts: new Map(), byModel: new Map(), usageDays: new Map(),
+          failedUntil: new Map(),
+          failCounts: new Map(),
+          authFailCounts: new Map(),
+          brokenUntil: new Map(),
+          costPerKey: new Map(),
+          lastUsedAt: new Map(),
+          usageCounts: new Map(),
+          byModel: new Map(),
+          usageDays: new Map(),
+          quotaWindows: new Map(),
+          pointer: 0,
+          lastUsed: undefined,
+          switches: 0,
+          lastReason: undefined,
+          lastSwitchAt: undefined,
+          lastExhaustionAt: undefined,
+          exhaustionCount: 0,
+          events: [],
         };
         poolState.set(base, st);
       }
@@ -704,7 +720,28 @@ export function apply(ctx, config = {}) {
               const switchable = !yielded && kind === 'error' &&
                 (effectiveSwitchCodes.has(code) || SWITCHABLE_MESSAGE_PATTERN.test(message));
               if (switchable) {
-                if (pool.state.lastUsed) { const _retry = parseRetryAfter(message); const _base = pool.cooldownMs ?? cooldownMs; const _max = pool.maxCooldownMs ?? maxCooldownMs; const _effBase = _retry !== undefined ? Math.max(_base, Math.min(_retry, _max ?? _base * 8)) : _base; const _b = recordFailure(pool, pool.state.lastUsed, Date.now(), _effBase, _max); pushEvent(pool, pool.state.lastUsed, code ?? 'UNKNOWN', _b); const _code2 = String(code ?? ''); if (_code2 === 'AUTH' || /auth/i.test(message)) { const _c2 = (pool.state.authFailCounts.get(pool.state.lastUsed) ?? 0) + 1; pool.state.authFailCounts.set(pool.state.lastUsed, _c2); if (_c2 >= 3) { pool.state.brokenUntil.set(pool.state.lastUsed, Date.now() + 86400000*30); pool.state.failedUntil.set(pool.state.lastUsed, Date.now() + 86400000*30); } } else { pool.state.authFailCounts.delete(pool.state.lastUsed); } }
+                if (pool.state.lastUsed) {
+                  const _retry = parseRetryAfter(message);
+                  const _base = pool.cooldownMs ?? cooldownMs;
+                  const _max = pool.maxCooldownMs ?? maxCooldownMs;
+                  const _effBase = _retry !== undefined ? Math.max(_base, Math.min(_retry, _max ?? _base * 8)) : _base;
+                  const _b = recordFailure(pool, pool.state.lastUsed, Date.now(), _effBase, _max);
+                  pushEvent(pool, pool.state.lastUsed, code ?? 'UNKNOWN', _b);
+                  // authFailCounts/brokenUntil: lazy-init if state was created by an older plugin version
+                  if (!pool.state.authFailCounts) pool.state.authFailCounts = new Map();
+                  if (!pool.state.brokenUntil) pool.state.brokenUntil = new Map();
+                  const _code2 = String(code ?? '');
+                  if (_code2 === 'AUTH' || /auth/i.test(message)) {
+                    const _c2 = (pool.state.authFailCounts.get(pool.state.lastUsed) ?? 0) + 1;
+                    pool.state.authFailCounts.set(pool.state.lastUsed, _c2);
+                    if (_c2 >= 3) {
+                      pool.state.brokenUntil.set(pool.state.lastUsed, Date.now() + 86400000*30);
+                      pool.state.failedUntil.set(pool.state.lastUsed, Date.now() + 86400000*30);
+                    }
+                  } else {
+                    pool.state.authFailCounts.delete(pool.state.lastUsed);
+                  }
+                }
                 pool.state.switches = (pool.state.switches ?? 0) + 1;
                 pool.state.lastReason = String(code ?? 'UNKNOWN');
                 pool.state.lastSwitchAt = Date.now();
@@ -716,7 +753,10 @@ export function apply(ctx, config = {}) {
               // cost tracking if provider returns usage.cost
               if (chunk.usage?.cost != null && pool.state.lastUsed) {
                 const c = Number(chunk.usage.cost);
-                if (!isNaN(c)) pool.state.costPerKey.set(pool.state.lastUsed, (pool.state.costPerKey.get(pool.state.lastUsed) ?? 0) + c);
+                if (!isNaN(c)) {
+                  if (!pool.state.costPerKey) pool.state.costPerKey = new Map();
+                  pool.state.costPerKey.set(pool.state.lastUsed, (pool.state.costPerKey.get(pool.state.lastUsed) ?? 0) + c);
+                }
               }
               // Usage by day (#119)
               if (pool.state.lastUsed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-key-rotation",
-  "version": "0.7.23",
+  "version": "0.7.25",
   "description": "Per-provider API key rotation for DeepSeek Harness: a key pool per provider, auto-created clone routes, and switching to the next key on quota/rate-limit errors. Includes a Settings section (Key Rotation) to edit the key pools, cooldown and switch codes.",
   "keywords": [
     "deepseek-harness",