@goodandready/dsh-key-rotation 0.7.1 → 0.7.4

package/README.md

@@ -24,6 +24,16 @@
   - **Exhaustion warning** — when every key is cooling, a red warning appears in the card and `lastExhaustionAt`/`exhaustionCount` are exposed via `GET /dsh-key-rotation/status`.
   - **Failure log** — last 20 failures per provider (`at`, `ref`, `reason`, `cooldownMs`) via `/status` and a collapsible *Recent failures* list.
   - **Non-stream safety net** — an `agent/request-error` hook retries sync calls (embeddings, batch) with the next key when the error is switchable.
+  - **Search/filter providers** — a search box above the list filters providers by id.
+  - **Bulk edit cooldown** — checkboxes per provider + a cooldown input + *Apply to selected*.
+  - **Undo delete** — after removing a key or provider, an *Undo* bar appears for 5 seconds.
+  - **Per-key last used** — `lastUsedAt` shown as "ago" next to each key.
+  - **Total requests badge** — sum of usage across a provider's keys, shown in its header.
+  - **Export single provider** — ⬇ button exports just that provider's entry.
+  - **Import from .env** — pick a `.env` file; `KEY=val` names are added to the first pool.
+  - **Copy key name** — click a *Key N* label to copy its ref name.
+  - **Sort by usage** — ⇅ sorts a provider's keys by usage (desc).
+  - **Probe history** — health-probe events appear greyed in *Recent failures*.
 
 ## Install
 

package/lib/client-helpers.js

@@ -0,0 +1,21 @@
+export function formatAgo(t, at) {
+  if (!at) return '';
+  const sec = Math.max(0, Math.round((Date.now() - at) / 1000));
+  if (sec < 60) return t('justNow');
+  if (sec < 3600) return t('minutesAgo').replace('{n}', String(Math.round(sec / 60)));
+  return t('hoursAgo').replace('{n}', String(Math.round(sec / 3600)));
+}
+
+export function nextKeyRef(providerId, existingKeys, allRefs) {
+  const fromExisting = (existingKeys || []).find((k) => typeof k === 'string' && k.length > 0);
+  const base = fromExisting
+    ? fromExisting.replace(/_\d+$/, '')
+    : String(providerId || 'provider').toUpperCase().replace(/[^A-Z0-9]+/g, '_').replace(/^_+|_+$/g, '') + '_API_KEY';
+  const taken = new Set(allRefs);
+  if (!taken.has(base)) return base;
+  for (let n = 2; n < 1000; n++) {
+    const candidate = base + '_' + n;
+    if (!taken.has(candidate)) return candidate;
+  }
+  return base + '_' + Date.now();
+}

package/lib/client.js

@@ -61,6 +61,11 @@ 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',
+      exportOne: '⬇',
+      usedAgo: '{ago} ago',
+      importPools: 'Import',
+      importEnv: 'Import .env',
       resetCooldown: 'Reset cooldown',
       testKey: 'Test',
       testOk: 'OK',
@@ -105,6 +110,11 @@ window.__ModuleLoader__.load({
       keyWriteFailed: 'не удалось сохранить ключ: {msg}',
       keyHint: 'Значение хранится в учётных данных DSH и обратно в браузер не отдаётся — показываются только последние 5 символов. Имена переменных создаются автоматически; наведите на ключ, чтобы увидеть используемое имя.',
       brokenKey: 'сломан (3× AUTH)',
+      exportPools: 'Экспорт',
+      exportOne: '⬇',
+      usedAgo: '{ago} назад',
+      importPools: 'Импорт',
+      importEnv: 'Импорт .env',
       resetCooldown: 'Сбросить кулдаун',
       testKey: 'Тест',
       testOk: 'OK',
@@ -142,6 +152,7 @@ window.__ModuleLoader__.load({
       return byProvider;
     }
 
+    // formatAgo moved to lib/client-helpers.js for testability — keep local alias for bundle self-containment
     function formatAgo(t, at) {
       if (!at) return '';
       const sec = Math.max(0, Math.round((Date.now() - at) / 1000));
@@ -202,6 +213,7 @@ window.__ModuleLoader__.load({
      * не ломались, и проверяется на занятость по ВСЕМ провайдерам — иначе два
      * провайдера незаметно делили бы одну учётную запись.
      */
+    // nextKeyRef also in lib/client-helpers.js
     function nextKeyRef(providerId, existingKeys, allRefs) {
       const fromExisting = (existingKeys || []).find((k) => typeof k === 'string' && k.length > 0);
       const base = fromExisting
@@ -319,7 +331,19 @@ 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 [search, setSearch] = React.useState('');
+      const [selected, setSelected] = React.useState(new Set());
+      const [undo, setUndo] = React.useState(null); // {type, provider, index, entry}
+      const undoTimer = React.useRef(null);
+      const stashUndo = (u) => { setUndo(u); if (undoTimer.current) clearTimeout(undoTimer.current); undoTimer.current = setTimeout(() => setUndo(null), 5000); };
+      const doUndo = () => { if (!undo) return; const u = undo; setUndo(null); setField((cur) => {
+        const providers = [...(cur.providers ?? [])];
+        if (u.type === 'provider') providers.splice(Math.min(u.index, providers.length), 0, u.entry);
+        else if (providers[u.index]) { const keys=[...providers[u.index].keys]; keys.splice(Math.min(u.kIndex, keys.length), 0, u.key); providers[u.index] = { ...providers[u.index], keys }; }
+        return { ...cur, providers };
+      }); };
+      const [bulkCooldown, setBulkCooldown] = React.useState('');
+      const providerList = Array.isArray(val.providers) ? val.providers.filter((p) => Array.isArray(p.keys) && p.keys.length > 0).filter((p) => !search || p.provider.toLowerCase().includes(search.toLowerCase())) : [];
 
       const setProvider = (index, id) => setField((cur) => {
         const next = [...(Array.isArray(cur.providers) ? cur.providers : [])];
@@ -334,15 +358,17 @@ window.__ModuleLoader__.load({
         providers[pIndex] = entry;
         return { ...cur, providers };
       });
-      const removeKey = (pIndex, kIndex) => setField((cur) => {
+      const removeKey = (pIndex, kIndex) => { setField((cur) => {
         const next = [...(Array.isArray(cur.providers) ? cur.providers : [])];
+        stashUndo({ type: 'key', index: pIndex, kIndex, key: next[pIndex]?.keys?.[kIndex] });
         next[pIndex] = { ...next[pIndex], keys: (next[pIndex].keys ?? []).filter((_, i) => i !== kIndex) };
         return { ...cur, providers: next };
+      }); };
+      const removeProvider = (pIndex) => setField((cur) => {
+        const arr = Array.isArray(cur.providers) ? cur.providers : [];
+        stashUndo({ type: 'provider', index: pIndex, entry: arr[pIndex] });
+        return { ...cur, providers: arr.filter((_, i) => i !== pIndex) };
       });
-      const removeProvider = (pIndex) => setField((cur) => ({
-        ...cur,
-        providers: (Array.isArray(cur.providers) ? cur.providers : []).filter((_, i) => i !== pIndex),
-      }));
       // Порядок ключей = порядок попыток, поэтому его надо менять кнопками,
       // а не перепечатыванием имён.
       const moveKey = (pIndex, kIndex, delta) => setField((cur) => {
@@ -430,6 +456,7 @@ window.__ModuleLoader__.load({
         return { color: 'var(--dsw-alias-label-tertiary)', text: t('keyReady') };
       };
 
+      const searchInput = h('input', { className: 'krot-in', placeholder: 'Search providers…', value: search, onChange: (e) => setSearch(e.target.value), style: { marginBottom: '8px' } });
       const providerRows = providerList.map((entry, pIndex) => {
         const options = [];
         if (entry.provider && !providerById.has(entry.provider)) {
@@ -450,8 +477,12 @@ window.__ModuleLoader__.load({
           // соседние ключи выглядели одинаково.
           const nameRow = [
             h('span', { className: 'krot-num', key: 'n' }, String(kIndex + 1)),
-            h('span', { key: 'i', className: 'krot-name', title: key },
-              t('keyLabel').replace('{n}', String(kIndex + 1))),
+            h('span', { key: 'i', className: 'krot-name', title: key + ' (click to copy)', style: { cursor: 'copy' }, onClick: () => {
+              if (navigator.clipboard) navigator.clipboard.writeText(key).then(() => setSecretDraft((cur) => ({ ...cur, ['copied:' + key]: true }))).catch(() => {});
+              setTimeout(() => setSecretDraft((cur) => ({ ...cur, ['copied:' + key]: false })), 1500);
+            } },
+              t('keyLabel').replace('{n}', String(kIndex + 1)),
+              h('span', null, secretDraft['copied:' + key] ? ' ✓' : '')),
           ];
 
           const meta = [
@@ -473,6 +504,8 @@ 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 && info.lastUsedAt) meta.push(h('span', { key: 'lu', className: 'krot-tail', title: 'last used' }, formatAgo((k)=>t(k), info.lastUsedAt)));
+          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')));
@@ -502,7 +535,27 @@ window.__ModuleLoader__.load({
 
         return h('div', { key: pIndex, className: 'krot-prov' },
           h('div', { className: 'krot-prov-head' },
+            h('input', { type: 'checkbox', checked: selected.has(entry.provider), onChange: (e) => { const ns = new Set(selected); if (e.target.checked) ns.add(entry.provider); else ns.delete(entry.provider); setSelected(ns); } }),
+            btn(t('exportOne'), () => {
+              const data = JSON.stringify([entry], 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 = entry.provider + '.json'; a.click(); URL.revokeObjectURL(url);
+            }, { title: 'Export this provider' }),
+            btn('⇅', () => {
+              const ps = status[entry.provider];
+              if (!ps || !Array.isArray(ps.keys)) return;
+              const usageOf = (ref) => { const hit = ps.keys.find((k) => k.ref === ref); return hit && typeof hit.usage === 'number' ? hit.usage : 0; };
+              setField((cur) => {
+                const next = [...(cur.providers ?? [])];
+                if (!next[pIndex]) return cur;
+                const sorted = [...(next[pIndex].keys ?? [])].sort((a, b) => usageOf(b) - usageOf(a));
+                next[pIndex] = { ...next[pIndex], keys: sorted };
+                return { ...cur, providers: next };
+              });
+            }, { title: 'Sort by usage' }),
             h('select', { className: 'krot-in', value: entry.provider, onChange: (e) => setProvider(pIndex, e.target.value) }, options),
+            (() => { const ps = status[entry.provider]; const tot = ps && typeof ps.totalUsage === 'number' ? ps.totalUsage : null; return tot !== null ? h('span', { className: 'krot-tail', title: 'total requests', style: { flex: 'none' } }, String(tot)) : null; })(),
             btn('✕', () => removeProvider(pIndex), { title: t('removeProvider') }),
           ),
           h('div', { className: 'krot-keys' }, keyRows),
@@ -510,7 +563,8 @@ window.__ModuleLoader__.load({
             btn(t('addKey'), () => addKey(pIndex), { title: t('addKeyTitle') }),
             switchesLine,
             exhaustionWarning,
-            (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),
+            (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, style: ev.type === 'probe' ? { opacity: .5 } : null }, new Date(ev.at).toLocaleTimeString() + ' ' + (ev.type === 'probe' ? '[probe] ' : '') + 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') }),
           ),
         );
@@ -532,12 +586,38 @@ window.__ModuleLoader__.load({
           code,
         )))),
         field(t('providersTitle'), h('div', { className: 'krot-keys' },
+          searchInput,
+          h('div', { className: 'krot-foot' }, h('input', { className: 'krot-in', placeholder: 'Bulk cooldown ms', value: bulkCooldown, onChange: (e) => setBulkCooldown(e.target.value), style: { maxWidth: '140px' } }), btn('Apply to selected', () => {
+            const v = Number(bulkCooldown); if (!v) return;
+            setField((cur) => {
+              const next = [...(cur.providers ?? [])];
+              for (let i=0;i<next.length;i++) if (selected.has(next[i].provider)) next[i] = { ...next[i], cooldownMs: v };
+              return { ...cur, providers: next };
+            });
+          }, { disabled: selected.size === 0 || !bulkCooldown })),
           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,
+        undo ? h('div', { className: 'krot-foot' }, h('span', { className: 'krot-hint' }, undo.type === 'provider' ? 'Удалён провайдер' : 'Удалён ключ'), btn('Undo', doUndo, {})) : null,
         h('div', { className: 'krot-foot' },
           btn(t('save'), save, { primary: true }),
           btn(t('discard'), load, {}),

package/lib/index.js

@@ -53,8 +53,8 @@ const PIAI_NS = 'llm-pi-ai';
 /** Marker on internally re-dispatched requests so the interceptor does not loop. */
 const MARKER = '__dshKeyRotation';
 const MAX_EVENTS = 50;
-function pushEvent(pool, ref, reason, cooldownMs) {
-  const ev = { at: Date.now(), ref, reason: String(reason ?? 'UNKNOWN'), cooldownMs };
+function pushEvent(pool, ref, reason, cooldownMs, type) {
+  const ev = { at: Date.now(), ref, reason: String(reason ?? 'UNKNOWN'), cooldownMs, type: type ?? 'fail' };
   pool.state.events.push(ev);
   if (pool.state.events.length > MAX_EVENTS) pool.state.events.shift();
 }
@@ -250,7 +250,19 @@ export function apply(ctx, config = {}) {
   // Periodic sweep of expired cooldowns — keeps health probe cheap and avoids waiting for next user request
   ctx.effect(() => {
     const id = setInterval(() => {
-      const n = sweepExpired(poolState, Date.now());
+      const now = Date.now();
+      // probe events for keys whose cooldown just expired
+      for (const st of poolState.values()) {
+        for (const [ref, until] of [...(st.failedUntil?.entries() ?? [])]) {
+          if (until <= now && !st.probedAt?.has(ref)) {
+            st.events.push({ at: until, ref, reason: 'probe', cooldownMs: 0, type: 'probe' });
+            if (st.events.length > 50) st.events.shift();
+            if (!st.probedAt) st.probedAt = new Map();
+            st.probedAt.set(ref, until);
+          }
+        }
+      }
+      const n = sweepExpired(poolState, now);
       if (n > 0) console.warn(`[dsh-key-rotation] sweep: cleared ${n} expired cooldown(s)`);
     }, 30000);
     return () => clearInterval(id);
@@ -321,6 +333,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 +459,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 +472,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 +573,8 @@ 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,
+            lastUsedAt: pool.state.lastUsedAt?.get(ref) ?? null,
             broken: pool.state.brokenUntil?.has(ref) ?? false,
           });
         }
@@ -562,7 +586,8 @@ 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),
+          totalUsage: [...(pool.state.usageCounts?.values() ?? [])].reduce((a, b) => a + b, 0),
+          events: (pool.state.events ?? []).slice(-50),
         });
       }
       json(res, 200, { providers });
@@ -732,7 +757,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.4",
   "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",