@goodandready/dsh-key-rotation 0.7.30 → 0.7.32

package/lib/usage-report.js

@@ -1,49 +1,79 @@
-// lib/usage-report.js - #209 usage report rows from pool state. Pure helpers.
-const DAY_MS = 86400000;
-
-/**
- * Build per-key usage rows for the last `days` ISO days (default 7).
- * Returns [{ ref, requests, cost, active, usageByDay: {day: n} }].
- */
-export function usageRows(pool, days = 7, now = Date.now()) {
-  const out = [];
-  const dayKeys = [];
-  for (let i = 0; i < Math.max(1, days); i++) dayKeys.push(new Date(now - i * DAY_MS).toISOString().slice(0, 10));
-  const refs = pool?.refs ?? [];
-  for (const ref of refs) {
-    const daysMap = pool.state.usageDays?.get(ref) ?? new Map();
-    const costMap = pool.state.costDays?.get(ref) ?? new Map();
-    let requests = 0, cost = 0;
-    const usageByDay = {};
-    for (const d of dayKeys) {
-      const r = daysMap.get(d) ?? 0;
-      const c = costMap.get(d) ?? 0;
-      requests += r;
-      cost += c;
-      usageByDay[d] = r;
-    }
-    out.push({
-      ref,
-      requests,
-      cost: Math.round(cost * 100) / 100,
-      active: pool.state.lastUsed === ref,
-      usageByDay,
-    });
-  }
-  return out;
-}
-
-/** CSV of usage rows: ref,requests,cost,active + per-day columns. */
-export function usageCsv(rows) {
-  const dayCols = [...new Set(rows.flatMap((r) => Object.keys(r.usageByDay)))].sort();
-  const head = ['ref', 'requests', 'cost', 'active', ...dayCols];
-  const esc = (v) => {
-    const s = String(v ?? '');
-    return /[",\n]/.test(s) ? '"' + s.replace(/"/g, '""') + '"' : s;
-  };
-  const lines = [head.join(',')];
-  for (const r of rows) {
-    lines.push([esc(r.ref), r.requests, r.cost, r.active ? 'yes' : 'no', ...dayCols.map((d) => r.usageByDay[d] ?? 0)].join(','));
-  }
-  return lines.join('\n');
-}
+// lib/usage-report.js - #209 usage report rows from pool state + 30-day compaction (#11). Pure helpers.
+const DAY_MS = 86400000;
+export const MAX_USAGE_RETENTION_DAYS = 30;
+
+/**
+ * Build per-key usage rows for the last `days` ISO days (default 7).
+ * Returns [{ ref, requests, cost, active, usageByDay: {day: n} }].
+ */
+export function usageRows(pool, days = 7, now = Date.now()) {
+  const out = [];
+  const dayKeys = [];
+  for (let i = 0; i < Math.max(1, days); i++) dayKeys.push(new Date(now - i * DAY_MS).toISOString().slice(0, 10));
+  const refs = pool?.refs ?? [];
+  for (const ref of refs) {
+    const daysMap = pool.state.usageDays?.get(ref) ?? new Map();
+    const costMap = pool.state.costDays?.get(ref) ?? new Map();
+    let requests = 0, cost = 0;
+    const usageByDay = {};
+    for (const d of dayKeys) {
+      const r = daysMap.get(d) ?? 0;
+      const c = costMap.get(d) ?? 0;
+      requests += r;
+      cost += c;
+      usageByDay[d] = r;
+    }
+    out.push({
+      ref,
+      requests,
+      cost: Math.round(cost * 100) / 100,
+      active: pool.state.lastUsed === ref,
+      usageByDay,
+    });
+  }
+  return out;
+}
+
+/** CSV of usage rows: ref,requests,cost,active + per-day columns. */
+export function usageCsv(rows) {
+  const dayCols = [...new Set(rows.flatMap((r) => Object.keys(r.usageByDay)))].sort();
+  const head = ['ref', 'requests', 'cost', 'active', ...dayCols];
+  const esc = (v) => {
+    const s = String(v ?? '');
+    return /[",\n]/.test(s) ? '"' + s.replace(/"/g, '""') + '"' : s;
+  };
+  const lines = [head.join(',')];
+  for (const r of rows) {
+    lines.push([esc(r.ref), r.requests, r.cost, r.active ? 'yes' : 'no', ...dayCols.map((d) => r.usageByDay[d] ?? 0)].join(','));
+  }
+  return lines.join('\n');
+}
+
+/**
+ * Compact usage days/cost data by purging dates older than maxDays (default 30).
+ * Returns count of purged day keys.
+ */
+export function compactUsage(pool, maxDays = MAX_USAGE_RETENTION_DAYS, now = Date.now()) {
+  if (!pool?.state) return 0;
+  const cutoffIso = new Date(now - maxDays * DAY_MS).toISOString().slice(0, 10);
+  let purged = 0;
+
+  for (const daysMap of pool.state.usageDays?.values() ?? []) {
+    for (const d of [...daysMap.keys()]) {
+      if (d < cutoffIso) {
+        daysMap.delete(d);
+        purged++;
+      }
+    }
+  }
+
+  for (const costMap of pool.state.costDays?.values() ?? []) {
+    for (const d of [...costMap.keys()]) {
+      if (d < cutoffIso) {
+        costMap.delete(d);
+      }
+    }
+  }
+
+  return purged;
+}

package/lib/webhook.js

@@ -1,133 +1,193 @@
-// lib/webhook.js — webhook sender with throttle + interactive actions (#199).
-// ponytail: minimal. lastSentAt only on success — failures don't block future sends.
-export const WEBHOOK_TIMEOUT_MS = 5000;
-export const WEBHOOK_MIN_INTERVAL_MS = 1000;
-export const WEBHOOK_RETRY_DELAY_MS = 2000;
-
-/**
- * Detect platform from webhook URL (#199).
- */
-export function detectPlatform(url) {
-  const u = String(url ?? '');
-  if (u.includes('api.telegram.org')) return 'telegram';
-  if (u.includes('discord.com/api/webhooks')) return 'discord';
-  if (u.includes('hooks.slack.com')) return 'slack';
-  return 'generic';
-}
-
-/**
- * Build a platform-specific interactive body (#199).
- * payload: { title, text, actions: [{ id, label }] }
- */
-export function formatInteractive(url, payload, actionToken) {
-  const platform = detectPlatform(url);
-  const actions = Array.isArray(payload.actions) ? payload.actions : [];
-  const title = String(payload.title ?? 'dsh-key-rotation');
-  const text = String(payload.text ?? '');
-  if (platform === 'telegram') {
-    return {
-      text: `*${title}*\n${text}`,
-      parse_mode: 'Markdown',
-      reply_markup: {
-        inline_keyboard: [actions.map((a) => ({
-          text: a.label,
-          callback_data: JSON.stringify({ id: a.id, token: actionToken }),
-        }))],
-      },
-    };
-  }
-  if (platform === 'discord') {
-    return {
-      content: `**${title}**\n${text}`,
-      components: [{
-        type: 1, // action row
-        components: actions.map((a) => ({
-          type: 2, // button
-          style: 4, // danger
-          label: String(a.label).slice(0, 80),
-          custom_id: JSON.stringify({ id: a.id, token: actionToken }),
-        })),
-      }],
-    };
-  }
-  if (platform === 'slack') {
-    return {
-      text: `*${title}*\n${text}`,
-      blocks: [
-        { type: 'section', text: { type: 'mrkdwn', text: `*${title}*\n${text}` } },
-        {
-          type: 'actions',
-          elements: actions.map((a) => ({
-            type: 'button',
-            text: { type: 'plain_text', text: String(a.label).slice(0, 75) },
-            value: JSON.stringify({ id: a.id, token: actionToken }),
-          })),
-        },
-      ],
-    };
-  }
-  // generic JSON webhook: actions as plain data, receiver decides
-  return { ...payload, actions };
-}
-
-export class WebhookSender {
-  constructor({ fetchImpl, minIntervalMs = WEBHOOK_MIN_INTERVAL_MS, timeoutMs = WEBHOOK_TIMEOUT_MS } = {}) {
-    if (typeof fetchImpl !== 'function') throw new Error('webhook: fetchImpl required');
-    this._fetch = fetchImpl;
-    this._minIntervalMs = minIntervalMs;
-    this._timeoutMs = timeoutMs;
-    this._lastSentAt = new Map();
-  }
-
-  async send(url, payload, now = Date.now()) {
-    if (!url || typeof url !== 'string') return { sent: false };
-    const last = this._lastSentAt.get(url);
-    if (Number.isFinite(last) && now - last < this._minIntervalMs) return { sent: false, throttled: true };
-    // #199: interactive payload -> platform-specific buttons with callback data
-    const body = (payload && typeof payload === 'object' && Array.isArray(payload.actions) && payload.actions.length > 0)
-      ? JSON.stringify(formatInteractive(url, payload, payload.actionToken))
-      : (typeof payload === 'string' ? payload : JSON.stringify(payload));
-    const ctrl = new AbortController();
-    const timer = setTimeout(() => ctrl.abort(), this._timeoutMs);
-    const doFetch = () => this._fetch(url, {
-      method: 'POST',
-      headers: { 'content-type': 'application/json' },
-      body,
-      signal: ctrl.signal,
-    });
-    try {
-      let res;
-      try {
-        res = await doFetch();
-      } catch (e) {
-        if (e && e.name === 'AbortError') return { sent: false, error: 'timeout' };
-        return { sent: false, error: 'network' };
-      }
-      if (res.status >= 500 && res.status < 600) {
-        await new Promise((r) => setTimeout(r, WEBHOOK_RETRY_DELAY_MS));
-        if (ctrl.signal.aborted) return { sent: false, error: 'timeout' };
-        try {
-          res = await doFetch();
-        } catch (_) {
-          return { sent: false, error: 'network' };
-        }
-      }
-      // Only mark on success — failures shouldn't block future sends.
-      if (res.ok) this._lastSentAt.set(url, now);
-      return { sent: res.ok, status: res.status };
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  reset(url) {
-    if (url) this._lastSentAt.delete(url);
-    else this._lastSentAt.clear();
-  }
-
-  snapshot() {
-    const out = {};
-    for (const [k, v] of this._lastSentAt) out[k] = v;
-    return out;
-  }
-}
+// lib/webhook.js — webhook sender with throttle, interactive actions + alert digest debouncer (#199, #10).
+export const WEBHOOK_TIMEOUT_MS = 5000;
+export const WEBHOOK_MIN_INTERVAL_MS = 1000;
+export const WEBHOOK_RETRY_DELAY_MS = 2000;
+
+/**
+ * Detect platform from webhook URL (#199).
+ */
+export function detectPlatform(url) {
+  const u = String(url ?? '');
+  if (u.includes('api.telegram.org')) return 'telegram';
+  if (u.includes('discord.com/api/webhooks')) return 'discord';
+  if (u.includes('hooks.slack.com')) return 'slack';
+  return 'generic';
+}
+
+/**
+ * Build a platform-specific interactive body (#199).
+ * payload: { title, text, actions: [{ id, label }] }
+ */
+export function formatInteractive(url, payload, actionToken) {
+  const platform = detectPlatform(url);
+  const actions = Array.isArray(payload.actions) ? payload.actions : [];
+  const title = String(payload.title ?? 'dsh-key-rotation');
+  const text = String(payload.text ?? '');
+  if (platform === 'telegram') {
+    return {
+      text: `*${title}*\n${text}`,
+      parse_mode: 'Markdown',
+      reply_markup: {
+        inline_keyboard: [actions.map((a) => ({
+          text: a.label,
+          callback_data: JSON.stringify({ id: a.id, token: actionToken }),
+        }))],
+      },
+    };
+  }
+  if (platform === 'discord') {
+    return {
+      content: `**${title}**\n${text}`,
+      components: [{
+        type: 1, // action row
+        components: actions.map((a) => ({
+          type: 2, // button
+          style: 4, // danger
+          label: String(a.label).slice(0, 80),
+          custom_id: JSON.stringify({ id: a.id, token: actionToken }),
+        })),
+      }],
+    };
+  }
+  if (platform === 'slack') {
+    return {
+      text: `*${title}*\n${text}`,
+      blocks: [
+        { type: 'section', text: { type: 'mrkdwn', text: `*${title}*\n${text}` } },
+        {
+          type: 'actions',
+          elements: actions.map((a) => ({
+            type: 'button',
+            text: { type: 'plain_text', text: String(a.label).slice(0, 75) },
+            value: JSON.stringify({ id: a.id, token: actionToken }),
+          })),
+        },
+      ],
+    };
+  }
+  // generic JSON webhook: actions as plain data, receiver decides
+  return { ...payload, actions };
+}
+
+export class WebhookSender {
+  constructor({ fetchImpl, minIntervalMs = WEBHOOK_MIN_INTERVAL_MS, timeoutMs = WEBHOOK_TIMEOUT_MS } = {}) {
+    if (typeof fetchImpl !== 'function') throw new Error('webhook: fetchImpl required');
+    this._fetch = fetchImpl;
+    this._minIntervalMs = minIntervalMs;
+    this._timeoutMs = timeoutMs;
+    this._lastSentAt = new Map();
+  }
+
+  async send(url, payload, now = Date.now()) {
+    if (!url || typeof url !== 'string') return { sent: false };
+    const last = this._lastSentAt.get(url);
+    if (Number.isFinite(last) && now - last < this._minIntervalMs) return { sent: false, throttled: true };
+    // #199: interactive payload -> platform-specific buttons with callback data
+    const body = (payload && typeof payload === 'object' && Array.isArray(payload.actions) && payload.actions.length > 0)
+      ? JSON.stringify(formatInteractive(url, payload, payload.actionToken))
+      : (typeof payload === 'string' ? payload : JSON.stringify(payload));
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), this._timeoutMs);
+    const doFetch = () => this._fetch(url, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body,
+      signal: ctrl.signal,
+    });
+    try {
+      let res;
+      try {
+        res = await doFetch();
+      } catch (e) {
+        if (e && e.name === 'AbortError') return { sent: false, error: 'timeout' };
+        return { sent: false, error: 'network' };
+      }
+      if (res.status >= 500 && res.status < 600) {
+        await new Promise((r) => setTimeout(r, WEBHOOK_RETRY_DELAY_MS));
+        if (ctrl.signal.aborted) return { sent: false, error: 'timeout' };
+        try {
+          res = await doFetch();
+        } catch (_) {
+          return { sent: false, error: 'network' };
+        }
+      }
+      // Only mark on success — failures shouldn't block future sends.
+      if (res.ok) this._lastSentAt.set(url, now);
+      return { sent: res.ok, status: res.status };
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  reset(url) {
+    if (url) this._lastSentAt.delete(url);
+    else this._lastSentAt.clear();
+  }
+
+  snapshot() {
+    const out = {};
+    for (const [k, v] of this._lastSentAt) out[k] = v;
+    return out;
+  }
+}
+
+/**
+ * AlertDebouncer aggregates rapid alert events across providers into a consolidated digest.
+ */
+export class AlertDebouncer {
+  constructor({ sender, debounceMs = 5000, maxBatch = 10 } = {}) {
+    this._sender = sender;
+    this._debounceMs = debounceMs;
+    this._maxBatch = maxBatch;
+    this._pending = new Map(); // url -> { timer, events: [], callbacks: [] }
+  }
+
+  enqueue(url, event, onFlushed = null) {
+    if (!url) return;
+    let entry = this._pending.get(url);
+    if (!entry) {
+      entry = { events: [], timer: null, callbacks: [] };
+      this._pending.set(url, entry);
+    }
+    entry.events.push(event);
+    if (onFlushed) entry.callbacks.push(onFlushed);
+
+    if (entry.events.length >= this._maxBatch) {
+      return this.flush(url);
+    }
+    if (!entry.timer) {
+      entry.timer = setTimeout(() => this.flush(url), this._debounceMs);
+    }
+  }
+
+  async flush(url) {
+    const entry = this._pending.get(url);
+    if (!entry) return;
+    if (entry.timer) clearTimeout(entry.timer);
+    this._pending.delete(url);
+
+    const events = entry.events;
+    if (events.length === 0) return;
+
+    let payload;
+    if (events.length === 1) {
+      payload = events[0];
+    } else {
+      const providers = [...new Set(events.map((e) => e.provider).filter(Boolean))];
+      const keys = [...new Set(events.flatMap((e) => e.keys || [e.key]).filter(Boolean))];
+      payload = {
+        title: `dsh-key-rotation: Alert Digest (${events.length} incidents)`,
+        text: `Multiple key incidents:\n- Providers: ${providers.join(', ')}\n- Affected keys: ${keys.join(', ')}`,
+        digest: true,
+        incidentCount: events.length,
+        events,
+      };
+    }
+
+    const res = await this._sender.send(url, payload);
+    for (const cb of entry.callbacks) {
+      try { cb(res); } catch (_) {}
+    }
+    return res;
+  }
+}

package/package.json

@@ -1,58 +1,58 @@
-{
-  "name": "@goodandready/dsh-key-rotation",
-  "version": "0.7.30",
-  "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",
-    "dsh",
-    "dsh-plugin",
-    "bundle",
-    "api-key",
-    "rotation",
-    "quota",
-    "rate-limit"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/GooDAnDReaDY/dsh-key-rotation.git"
-  },
-  "homepage": "https://github.com/GooDAnDReaDY/dsh-key-rotation",
-  "bugs": {
-    "url": "https://github.com/GooDAnDReaDY/dsh-key-rotation/issues"
-  },
-  "type": "module",
-  "main": "lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json",
-    "./cordis.patch.yml": "./cordis.patch.yml"
-  },
-  "files": [
-    "lib",
-    "cordis.patch.yml",
-    "README.md",
-    "LICENSE"
-  ],
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-ui-slots"
-      ]
-    }
-  },
-  "license": "MIT",
-  "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6"
-  },
-  "scripts": {
-    "test": "node --test test/*.test.js test/*.test.mjs"
-  }
-}
+{
+  "name": "@goodandready/dsh-key-rotation",
+  "version": "0.7.32",
+  "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",
+    "dsh",
+    "dsh-plugin",
+    "bundle",
+    "api-key",
+    "rotation",
+    "quota",
+    "rate-limit"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/GooDAnDReaDY/dsh-key-rotation.git"
+  },
+  "homepage": "https://github.com/GooDAnDReaDY/dsh-key-rotation",
+  "bugs": {
+    "url": "https://github.com/GooDAnDReaDY/dsh-key-rotation/issues"
+  },
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./package.json": "./package.json",
+    "./cordis.patch.yml": "./cordis.patch.yml"
+  },
+  "files": [
+    "lib",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE"
+  ],
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-slots"
+      ]
+    }
+  },
+  "license": "MIT",
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "^4.0.1",
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6"
+  },
+  "scripts": {
+    "test": "node --test test/*.test.js test/*.test.mjs"
+  }
+}