@goodandready/dsh-key-rotation 0.7.1 → 0.7.2

package/lib/client.js

@@ -61,6 +61,8 @@ window.__ModuleLoader__.load({
       keyWriteFailed: 'could not store the key: {msg}',
       keyHint: 'The value is stored in DSH credentials and never sent back to the browser — only its last 5 characters are shown. Names are generated for you; hover a key to see the one it uses.',
       brokenKey: 'broken (3× AUTH)',
+      exportPools: 'Export',
+      importPools: 'Import',
       resetCooldown: 'Reset cooldown',
       testKey: 'Test',
       testOk: 'OK',
@@ -105,6 +107,8 @@ window.__ModuleLoader__.load({
       keyWriteFailed: 'не удалось сохранить ключ: {msg}',
       keyHint: 'Значение хранится в учётных данных DSH и обратно в браузер не отдаётся — показываются только последние 5 символов. Имена переменных создаются автоматически; наведите на ключ, чтобы увидеть используемое имя.',
       brokenKey: 'сломан (3× AUTH)',
+      exportPools: 'Экспорт',
+      importPools: 'Импорт',
       resetCooldown: 'Сбросить кулдаун',
       testKey: 'Тест',
       testOk: 'OK',
@@ -319,7 +323,7 @@ window.__ModuleLoader__.load({
       const providerById = new Map(providers.map((p) => [p.id, p.name]));
 
       const setField = (fn) => setDraft(fn(val));
-      const providerList = Array.isArray(val.providers) ? val.providers : [];
+      const providerList = Array.isArray(val.providers) ? val.providers.filter((p) => Array.isArray(p.keys) && p.keys.length > 0) : [];
 
       const setProvider = (index, id) => setField((cur) => {
         const next = [...(Array.isArray(cur.providers) ? cur.providers : [])];
@@ -473,6 +477,7 @@ window.__ModuleLoader__.load({
             if (typed) meta.push(btn('✓', () => saveSecret(key, rowKey), { title: t('keySave'), key: 'w' }));
           }
           if (info && typeof info.usage === 'number' && info.usage > 0) meta.push(h('span', { key: 'u', className: 'krot-tail', title: 'requests through this key' }, String(info.usage)));
+          if (info && typeof info.cost === 'number' && info.cost > 0) meta.push(h('span', { key: 'c', className: 'krot-tail', title: 'cost' }, '$' + info.cost.toFixed(2)));
           const tr = testResult[key];
           if (tr) meta.push(h('span', { key: 'tr', className: 'krot-tail', title: tr.message || (tr.ok ? t('testOk') : t('testFail')) }, tr.ok ? '✓' : '✕'));
           meta.push(h('button', { key: 't', className: 'krot-btn', onClick: () => doTest(key), disabled: testing === key, title: t('testKey') }, testing === key ? '…' : t('testKey')));
@@ -510,6 +515,7 @@ window.__ModuleLoader__.load({
             btn(t('addKey'), () => addKey(pIndex), { title: t('addKeyTitle') }),
             switchesLine,
             exhaustionWarning,
+            (providerStatus && Array.isArray(providerStatus.events) && providerStatus.events.length > 0 ? h('div', { style: { display: 'flex', gap: '2px', alignItems: 'end', height: '24px', marginTop: '4px' } }, (() => { const now = Date.now(); const buckets = Array(24).fill(0); for (const ev of providerStatus.events) { const h = Math.floor((now - ev.at) / 3600000); if (h >= 0 && h < 24) buckets[23 - h]++; } const max = Math.max(1, ...buckets); return buckets.map((c, i) => h('div', { key: i, title: c + ' switches', style: { flex: 1, background: c ? 'var(--dsw-alias-state-warning-primary)' : 'var(--dsw-alias-border-l2)', height: (c / max * 24) + 'px', minHeight: '2px', borderRadius: '2px' } })); })()) : null),
             (providerStatus && Array.isArray(providerStatus.events) && providerStatus.events.length > 0 ? h('details', { style: { fontSize: '11px', marginTop: '6px' } }, h('summary', null, 'Recent failures ('+providerStatus.events.length+')'), h('ul', { style: { margin: '4px 0 0', paddingLeft: '16px' } }, providerStatus.events.slice().reverse().map((ev, i) => h('li', { key: i }, new Date(ev.at).toLocaleTimeString() + ' ' + ev.ref + ' ' + ev.reason + ' cd=' + ev.cooldownMs)) )) : null),
             btn(t('resetCooldown'), () => doReset(entry.provider), { disabled: !(providerStatus && providerStatus.switches > 0) || resetting === entry.provider, title: t('resetCooldown') }),
           ),
@@ -535,6 +541,22 @@ window.__ModuleLoader__.load({
           providerRows,
           h('div', { className: 'krot-foot' }, btn(t('addProvider'), addProvider, {}), noProviders),
         )),
+        h('div', { className: 'krot-foot' }, btn(t('exportPools'), () => {
+          const data = JSON.stringify(val.providers ?? [], null, 2);
+          const blob = new Blob([data], { type: 'application/json' });
+          const url = URL.createObjectURL(blob);
+          const a = document.createElement('a'); a.href = url; a.download = 'pools.json'; a.click(); URL.revokeObjectURL(url);
+        }, {}), h('label', { className: 'krot-btn', style: { cursor: 'pointer' } }, t('importPools'), h('input', { type: 'file', accept: '.json', style: { display: 'none' }, onChange: (e) => {
+          const f = e.target.files[0]; if (!f) return;
+          const reader = new FileReader();
+          reader.onload = () => { try { const imp = JSON.parse(String(reader.result)); if (!Array.isArray(imp)) throw new Error('expected array'); setField((cur) => {
+            const curProviders = Array.isArray(cur.providers) ? [...cur.providers] : [];
+            const map = new Map(curProviders.map((p) => [p.provider, p]));
+            for (const p of imp) { if (p && typeof p.provider === 'string') map.set(p.provider, p); }
+            return { ...cur, providers: [...map.values()] };
+          }); } catch (err) { setSecretError(String(err.message || err)); } };
+          reader.readAsText(f);
+        } }))),
         h('p', { className: 'krot-hint' }, t('keyHint')),
         secretError ? h('p', { className: 'krot-err' }, secretError) : null,
         state.error ? h('p', { className: 'krot-err' }, state.error) : null,

package/lib/index.js

@@ -321,6 +321,10 @@ export function apply(ctx, config = {}) {
       }
     }
 
+    // auto-cleanup: remove poolState for providers that are now empty or removed
+    for (const key of [...poolState.keys()]) {
+      if (![...poolByRef.values()].some((p) => p.base === key)) poolState.delete(key);
+    }
     return { switchCodes, cooldownMs, maxCooldownMs, notifyWebhook, notifyThreshold, poolByRef, providerToPool, cloneIds };
   }
 
@@ -443,8 +447,9 @@ export function apply(ctx, config = {}) {
               const failure = chunk.reason?.failure;
               const code = failure?.code;
               const message = failure?.message ?? '';
+              const effectiveSwitchCodes = pool.switchCodes ?? switchCodes;
               const switchable = !yielded && kind === 'error' &&
-                (switchCodes.has(code) || SWITCHABLE_MESSAGE_PATTERN.test(message));
+                (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); } }
                 pool.state.switches = (pool.state.switches ?? 0) + 1;
@@ -455,6 +460,11 @@ export function apply(ctx, config = {}) {
                 switching = true;
                 break;
               }
+              // 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);
+              }
               yield chunk;
               return;
             }
@@ -551,6 +561,7 @@ export function apply(ctx, config = {}) {
             active: pool.state.lastUsed === ref,
             cooldownMsLeft: until !== undefined && until > now ? until - now : 0,
             usage: pool.state.usageCounts?.get(ref) ?? 0,
+            cost: pool.state.costPerKey?.get(ref) ?? 0,
             broken: pool.state.brokenUntil?.has(ref) ?? false,
           });
         }
@@ -562,7 +573,7 @@ export function apply(ctx, config = {}) {
           lastSwitchAt: pool.state.lastSwitchAt ?? null,
           lastExhaustionAt: pool.state.lastExhaustionAt ?? null,
           exhaustionCount: pool.state.exhaustionCount ?? 0,
-          events: (pool.state.events ?? []).slice(-20),
+          events: (pool.state.events ?? []).slice(-50),
         });
       }
       json(res, 200, { providers });
@@ -732,7 +743,8 @@ export function apply(ctx, config = {}) {
     if (!pool) return next();
     const code = String(payload?.failure?.code ?? payload?.code ?? '');
     const message = String(payload?.failure?.message ?? payload?.message ?? '');
-    const switchable = switchCodes.has(code) || SWITCHABLE_MESSAGE_PATTERN.test(message);
+    const effectiveSwitchCodes = pool.switchCodes ?? switchCodes;
+    const switchable = effectiveSwitchCodes.has(code) || SWITCHABLE_MESSAGE_PATTERN.test(message);
     if (!switchable) return next();
     const ref = pool.state.lastUsed;
     if (ref) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-key-rotation",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "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",