@goodandready/dsh-key-rotation 0.7.13 → 0.7.15

package/lib/client.js

@@ -570,7 +570,20 @@ 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.usage === 'number' && info.usage > 0) {
+            let tip = 'requests through this key';
+            if (info.byModel && Object.keys(info.byModel).length > 0) {
+              tip = Object.entries(info.byModel).map(([m, c]) => m + ': ' + c).join('\n');
+            }
+            meta.push(h('span', { key: 'u', className: 'krot-tail', title: tip }, String(info.usage)));
+            if (info.usageDays && Object.keys(info.usageDays).length > 0) {
+              const days = Object.entries(info.usageDays);
+              const max = Math.max(1, ...days.map(([, c]) => c));
+              meta.push(h('span', { key: 'g', className: 'krot-graph', title: days.map(([d, c]) => d + ': ' + c).join('\n'), style: { display: 'inline-flex', gap: '1px', alignItems: 'flex-end', height: '12px' } },
+                days.slice(-14).map(([d, c]) => h('span', { key: d, style: { width: '3px', height: Math.max(2, (c / max) * 12) + 'px', background: 'var(--dsw-alias-state-success-primary)', borderRadius: '1px' } }))
+              ));
+            }
+          }
           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];

package/lib/index.js

@@ -33,7 +33,7 @@
 //    providers:  array       [{ provider, keys: [envName, ...] }]
 // ─────────────────────────────────────────────────────────────────────────────
 import Schema from '@deepseek-ai/schemastery';
-import { keyTail, isLoopbackAddress, isTrustedBridgeRequest, SWITCHABLE_MESSAGE_PATTERN, DEFAULT_SWITCH_CODES, isValidRef, pickNext, applyCooldown, recordFailure, recordSuccess, computeBackoff, envValue, sweepExpired, parseRetryAfter, computeHealthScore } from './pool.js';
+import { keyTail, isLoopbackAddress, isTrustedBridgeRequest, SWITCHABLE_MESSAGE_PATTERN, DEFAULT_SWITCH_CODES, isValidRef, pickNext, applyCooldown, recordFailure, recordSuccess, computeBackoff, envValue, sweepExpired, parseRetryAfter, computeHealthScore, extractRateLimit, isRateLimited } from './pool.js';
 
 export const name = 'dsh-key-rotation';
 export const inject = ['llm', 'webServer', 'settings', 'credentials'];
@@ -87,6 +87,7 @@ export const Config = Schema.object({
   backupIntervalMs: Schema.number().default(86400000),
   backupKeep: Schema.number().default(7),
   rotationScheduleDays: Schema.number().default(0),
+  rateLimitThreshold: Schema.number().default(0.1),
   providers: Schema.array(Schema.object({
     provider: Schema.string().required(),
     keys: Schema.array(Schema.string()).default([]),
@@ -255,7 +256,38 @@ export function apply(ctx, config = {}) {
   let getConfig = () => config;
   registerConfigBridge(ctx, () => buildRuntime().cloneIds);
 
-  // ── key-pool state, persisted across config reloads ──
+  // Dashboard widget (#117): fixed bottom-right panel that polls /health.
+  const DASH_HTML = '<div id="krot-dash" style="position:fixed;top:16px;right:16px;z-index:9999;font:12px/1.4 system-ui;background:var(--dsw-alias-bg-layer-3,#1c1c1e);color:var(--dsw-alias-label-primary,#eee);border:1px solid var(--dsw-alias-border-l2,#333);border-radius:10px;padding:8px 12px;box-shadow:0 2px 8px rgba(0,0,0,.3);max-width:280px;display:none;cursor:grab;user-select:none;touch-action:none"></div>' +
+'<script>' +
+'(function(){' +
+'var el=document.getElementById("krot-dash");if(!el)return;var shown=false;' +
+'var saved=null;try{saved=JSON.parse(localStorage.getItem("krot-dash-pos")||"null");}catch(e){}' +
+'if(saved){el.style.left=saved.left+"px";el.style.top=saved.top+"px";el.style.right="auto";}' +
+'function poll(){' +
+'fetch("/dsh-key-rotation/health",{headers:{accept:"application/json"}})' +
+'.then(function(r){return r.ok?r.json():null;})' +
+'.then(function(d){if(!d)return;' +
+'if(!shown){el.style.display="block";shown=true;}' +
+'var lines=[];' +
+'for(var name in d.pools){var p=d.pools[name];' +
+'var color=p.exhausted?"#e5484d":(p.healthy<p.total?"#f5a623":"#30a46c");' +
+'lines.push(\'<div style="display:flex;align-items:center;gap:6px;margin:2px 0"><span style="width:8px;height:8px;border-radius:50%;background:\'+color+\';flex:none"></span><span style="flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">\'+name+\'</span><span style="opacity:.6">\'+p.healthy+\'/\'+p.total+\'</span></div>\');' +
+'}' +
+'el.innerHTML=lines.join("")||\'<div style="opacity:.6">no pools</div>\';' +
+'})' +
+'.catch(function(){});' +
+'}' +
+'poll();' +
+'setInterval(poll,4000);' +
+'// drag to move' +
+'var dragging=false,ox=0,oy=0;' +
+'el.addEventListener("mousedown",function(e){dragging=true;ox=e.clientX-el.offsetLeft;oy=e.clientY-el.offsetTop;el.style.cursor="grabbing";e.preventDefault();});' +
+'document.addEventListener("mousemove",function(e){if(!dragging)return;var x=e.clientX-ox,y=e.clientY-oy;x=Math.max(0,Math.min(x,window.innerWidth-el.offsetWidth));y=Math.max(0,Math.min(y,window.innerHeight-el.offsetHeight));el.style.left=x+"px";el.style.top=y+"px";el.style.right="auto";});' +
+'document.addEventListener("mouseup",function(){if(!dragging)return;dragging=false;el.style.cursor="grab";try{localStorage.setItem("krot-dash-pos",JSON.stringify({left:el.offsetLeft,top:el.offsetTop}));}catch(e){}});' +
+'})();' +
+'</script>';
+ctx.effect(() => ctx.webServer.tapIndex((html) => html + DASH_HTML), 'dsh-key-rotation: dashboard');
+    // ── key-pool state, persisted across config reloads ──
   // base provider -> { failedUntil: Map<ref, epochMs>, pointer: number, lastUsed: ref }
   const poolState = new Map();
   // Periodic backup of pools config
@@ -378,6 +410,7 @@ export function apply(ctx, config = {}) {
     const backupIntervalMs = cfg.backupIntervalMs ?? 86400000;
     const backupKeep = cfg.backupKeep ?? 7;
     const rotationScheduleDays = cfg.rotationScheduleDays ?? 0;
+    const rateLimitThreshold = cfg.rateLimitThreshold ?? 0.1;
 
     // ref -> pool (every key env of every configured provider)
     const poolByRef = new Map();
@@ -394,7 +427,7 @@ export function apply(ctx, config = {}) {
         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(),
+          lastExhaustionAt: undefined, exhaustionCount: 0, events: [], usageCounts: new Map(), byModel: new Map(), usageDays: new Map(),
         };
         poolState.set(base, st);
       }
@@ -462,7 +495,7 @@ export function apply(ctx, config = {}) {
     for (const key of [...poolState.keys()]) {
       if (![...poolByRef.values()].some((p) => p.base === key)) poolState.delete(key);
     }
-    return { switchCodes, cooldownMs, maxCooldownMs, notifyWebhook, notifyThreshold, backupDir, backupIntervalMs, backupKeep, rotationScheduleDays, poolByRef, providerToPool, modelPoolByProvider, cloneIds };
+    return { switchCodes, cooldownMs, maxCooldownMs, notifyWebhook, notifyThreshold, backupDir, backupIntervalMs, backupKeep, rotationScheduleDays, rateLimitThreshold, poolByRef, providerToPool, modelPoolByProvider, cloneIds };
   }
 
   // ── patch credentials.resolve: pool refs resolve to the next healthy key ──
@@ -603,6 +636,34 @@ export function apply(ctx, config = {}) {
                 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);
               }
+              // Usage by day (#119)
+              if (pool.state.lastUsed) {
+                if (!pool.state.usageDays) pool.state.usageDays = new Map();
+                const day = new Date().toISOString().slice(0, 10);
+                const dayMap = pool.state.usageDays.get(pool.state.lastUsed) || new Map();
+                dayMap.set(day, (dayMap.get(day) ?? 0) + 1);
+                pool.state.usageDays.set(pool.state.lastUsed, dayMap);
+              }
+              // Per-model request detail (#121)
+              if (pool.state.lastUsed && options.model) {
+                if (!pool.state.byModel) pool.state.byModel = new Map();
+                let byRef = pool.state.byModel.get(pool.state.lastUsed);
+                if (!byRef) { byRef = new Map(); pool.state.byModel.set(pool.state.lastUsed, byRef); }
+                byRef.set(options.model, (byRef.get(options.model) ?? 0) + 1);
+              }
+              // Proactive rate-limit (#115): if response headers say this key is near
+              // its quota, cool it down so the NEXT request starts on a different key.
+              // We do NOT re-run this (already successful) request — that would double-send.
+              const rate = extractRateLimit(chunk?.metadata?.headers ?? chunk?.headers);
+              if (rate && pool.state.lastUsed) {
+                const { rateLimitThreshold } = buildRuntime();
+                if (isRateLimited(rate, rateLimitThreshold ?? 0.1)) {
+                  const cool = rate.reset && rate.reset > Date.now() ? (rate.reset - Date.now()) : pool.cooldownMs;
+                  recordFailure(pool, pool.state.lastUsed, Date.now(), cool, pool.maxCooldownMs);
+                  pushEvent(pool, pool.state.lastUsed, 'RATE_LIMIT', cool);
+                  console.warn(`[dsh-key-rotation] ${options.provider}: key ${pool.state.lastUsed} near quota (remaining ${String(rate.remaining)}/${String(rate.limit)}) — next request will rotate`);
+                }
+              }
               yield chunk;
               return;
             }
@@ -699,6 +760,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,
+            byModel: pool.state.byModel?.get(ref) ? Object.fromEntries(pool.state.byModel.get(ref)) : {},
+            usageDays: pool.state.usageDays?.get(ref) ? Object.fromEntries(pool.state.usageDays.get(ref)) : {},
             cost: pool.state.costPerKey?.get(ref) ?? 0,
             lastUsedAt: pool.state.lastUsedAt?.get(ref) ?? null,
             expiresAt: pool.expiresAt?.[ref] ?? null,

package/lib/pool.js

@@ -200,3 +200,28 @@ export function computeHealthScore(state) {
   const broken = state.brokenUntil ? state.brokenUntil.size : 0;
   return Math.max(0, Math.min(100, 100 - (switches * 5) - (exhaustions * 10) - (broken * 15)));
 }
+
+/** Extract rate-limit info from an object that may carry response headers.
+ *  Looks for X-RateLimit-Remaining / X-RateLimit-Limit / X-RateLimit-Reset
+ *  (case-insensitive) in headers. Returns { remaining, limit, reset } or null. */
+export function extractRateLimit(headers) {
+  if (!headers || typeof headers !== 'object') return null;
+  const get = (name) => {
+    const v = headers[name] ?? headers[name.toLowerCase()] ?? headers[name.toUpperCase()];
+    if (v === undefined || v === null) return undefined;
+    return Number(String(v));
+  };
+  const remaining = get('X-RateLimit-Remaining');
+  const limit = get('X-RateLimit-Limit');
+  const reset = get('X-RateLimit-Reset');
+  if (remaining === undefined && limit === undefined) return null;
+  return { remaining, limit, reset };
+}
+
+/** True if remaining is below the given threshold fraction of limit (e.g. 0.1). */
+export function isRateLimited(rate, threshold = 0.1) {
+  if (!rate) return false;
+  if (rate.remaining === undefined) return false;
+  if (rate.limit && rate.limit > 0) return rate.remaining < rate.limit * threshold;
+  return rate.remaining <= 0;
+}

package/package.json

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