@goodandready/dsh-key-rotation 0.7.26 → 0.7.28

package/lib/quota.js

@@ -1,39 +1,39 @@
-// lib/quota.js — quota-remaining persistence per ref.
-// ponytail: pure helpers, snapshot() returns shallow copies.
-
-export class QuotaStore {
-  constructor() {
-    this._data = new Map(); // ref -> { remaining, limit, reset, at }
-  }
-
-  set(ref, info) {
-    if (!ref) return;
-    if (!info || typeof info !== 'object') return;
-    const next = {
-      remaining: Number.isFinite(info.remaining) ? info.remaining : null,
-      limit: Number.isFinite(info.limit) ? info.limit : null,
-      reset: Number.isFinite(info.reset) ? info.reset : null,
-      at: Number.isFinite(info.at) ? info.at : Date.now(),
-    };
-    this._data.set(ref, next);
-  }
-
-  get(ref) {
-    return this._data.get(ref);
-  }
-
-  snapshot() {
-    const out = {};
-    for (const [k, v] of this._data) out[k] = v;
-    return out;
-  }
-
-  clear(ref) {
-    if (ref) this._data.delete(ref);
-    else this._data.clear();
-  }
-
-  get size() {
-    return this._data.size;
-  }
-}
+// lib/quota.js — quota-remaining persistence per ref.
+// ponytail: pure helpers, snapshot() returns shallow copies.
+
+export class QuotaStore {
+  constructor() {
+    this._data = new Map(); // ref -> { remaining, limit, reset, at }
+  }
+
+  set(ref, info) {
+    if (!ref) return;
+    if (!info || typeof info !== 'object') return;
+    const next = {
+      remaining: Number.isFinite(info.remaining) ? info.remaining : null,
+      limit: Number.isFinite(info.limit) ? info.limit : null,
+      reset: Number.isFinite(info.reset) ? info.reset : null,
+      at: Number.isFinite(info.at) ? info.at : Date.now(),
+    };
+    this._data.set(ref, next);
+  }
+
+  get(ref) {
+    return this._data.get(ref);
+  }
+
+  snapshot() {
+    const out = {};
+    for (const [k, v] of this._data) out[k] = v;
+    return out;
+  }
+
+  clear(ref) {
+    if (ref) this._data.delete(ref);
+    else this._data.clear();
+  }
+
+  get size() {
+    return this._data.size;
+  }
+}

package/lib/region.js

@@ -1,50 +1,50 @@
-// lib/region.js — region tag + failover helper.
-// ponytail: simple — providers declare an optional 'region' (string).
-// When the primary provider hits exhaustion AND a same-region fallback is
-// configured, the plugin picks that as next fallback.
-
-export const REGION_NONE = '';
-export const REGION_GLOBAL = 'global';
-
-export class RegionMap {
-  constructor() {
-    this._byProvider = new Map(); // provider id -> region
-  }
-
-  set(provider, region = REGION_GLOBAL) {
-    if (!provider) return;
-    if (!region) region = REGION_GLOBAL;
-    this._byProvider.set(provider, region);
-  }
-
-  get(provider) {
-    return this._byProvider.get(provider) || REGION_GLOBAL;
-  }
-
-  // Pick a fallback for `provider`. Returns another provider in the same
-  // region if available; otherwise null. Returns null for unknown providers
-  // (we don't know their region -> conservative).
-  pickFallback(provider) {
-    if (!this._byProvider.has(provider)) return null;
-    const region = this.get(provider);
-    for (const [p, r] of this._byProvider) {
-      if (p === provider) continue;
-      if (r === region) return p;
-    }
-    return null;
-  }
-
-  snapshot() {
-    const out = {};
-    for (const [k, v] of this._byProvider) out[k] = v;
-    return out;
-  }
-
-  clear() {
-    this._byProvider.clear();
-  }
-
-  get size() {
-    return this._byProvider.size;
-  }
-}
+// lib/region.js — region tag + failover helper.
+// ponytail: simple — providers declare an optional 'region' (string).
+// When the primary provider hits exhaustion AND a same-region fallback is
+// configured, the plugin picks that as next fallback.
+
+export const REGION_NONE = '';
+export const REGION_GLOBAL = 'global';
+
+export class RegionMap {
+  constructor() {
+    this._byProvider = new Map(); // provider id -> region
+  }
+
+  set(provider, region = REGION_GLOBAL) {
+    if (!provider) return;
+    if (!region) region = REGION_GLOBAL;
+    this._byProvider.set(provider, region);
+  }
+
+  get(provider) {
+    return this._byProvider.get(provider) || REGION_GLOBAL;
+  }
+
+  // Pick a fallback for `provider`. Returns another provider in the same
+  // region if available; otherwise null. Returns null for unknown providers
+  // (we don't know their region -> conservative).
+  pickFallback(provider) {
+    if (!this._byProvider.has(provider)) return null;
+    const region = this.get(provider);
+    for (const [p, r] of this._byProvider) {
+      if (p === provider) continue;
+      if (r === region) return p;
+    }
+    return null;
+  }
+
+  snapshot() {
+    const out = {};
+    for (const [k, v] of this._byProvider) out[k] = v;
+    return out;
+  }
+
+  clear() {
+    this._byProvider.clear();
+  }
+
+  get size() {
+    return this._byProvider.size;
+  }
+}

package/lib/sandbox.js

@@ -1,117 +1,117 @@
-// sandbox.js — probe sandbox-test runner + last-test cache.
-// Ponytail-mode (full): simplest correct path.
-// YAGNI: chat completions is a hook (not-implemented).
-// In-memory only; restart dsh-web = clear cache.
-
-export const PROBE_MODELS_TIMEOUT_MS = 5000;
-export const PROBE_RETRY_DELAY_MS = 1000;
-export const LAST_TEST_MAX = 200;
-
-export class LastTestCache {
-  constructor(max = LAST_TEST_MAX) {
-    this._max = max;
-    this._data = new Map();
-  }
-
-  set(ref, result) {
-    if (!ref || !result) return;
-    if (this._data.has(ref)) this._data.delete(ref);
-    this._data.set(ref, result);
-    while (this._data.size > this._max) {
-      const first = this._data.keys().next().value;
-      if (first === undefined) break;
-      this._data.delete(first);
-    }
-  }
-
-  get(ref) {
-    return this._data.get(ref);
-  }
-
-  snapshot() {
-    const out = {};
-    for (const [k, v] of this._data) out[k] = v;
-    return out;
-  }
-
-  clear() {
-    this._data.clear();
-  }
-
-  get size() {
-    return this._data.size;
-  }
-}
-
-function classifyStatus(status) {
-  if (status === 401 || status === 403) return 'auth';
-  if (status === 404) return 'not-found';
-  if (status === 429) return 'rate-limit';
-  if (status >= 500 && status < 600) return 'server';
-  return `http-${status}`;
-}
-
-export class SandboxRunner {
-  constructor({ fetchImpl, resolveBaseUrl, log = () => {} } = {}) {
-    if (typeof fetchImpl !== 'function') throw new Error('sandbox: fetchImpl required');
-    if (typeof resolveBaseUrl !== 'function') throw new Error('sandbox: resolveBaseUrl required');
-    this._fetch = fetchImpl;
-    this._resolveBaseUrl = resolveBaseUrl;
-    this._log = log;
-  }
-
-  async probeModels(ref, key) {
-    if (!ref || typeof key !== 'string' || key.length === 0) {
-      return { ok: false, code: 'no-credential', latencyMs: 0 };
-    }
-    const baseUrl = await this._resolveBaseUrl(ref);
-    if (!baseUrl) {
-      return { ok: false, code: 'no-baseurl', latencyMs: 0 };
-    }
-    const url = `${baseUrl.replace(/\/+$/, '')}/models`;
-    const started = Date.now();
-    const ctrl = new AbortController();
-    const timer = setTimeout(() => ctrl.abort(), PROBE_MODELS_TIMEOUT_MS);
-    const doFetch = () => this._fetch(url, {
-      method: 'GET',
-      headers: { authorization: `Bearer ${key}`, accept: 'application/json' },
-      signal: ctrl.signal,
-    });
-    try {
-      let res;
-      try {
-        res = await doFetch();
-      } catch (e) {
-        if (e && e.name === 'AbortError') return { ok: false, code: 'timeout', latencyMs: Date.now() - started };
-        return { ok: false, code: 'network', latencyMs: Date.now() - started };
-      }
-      // ponytail: 1 retry on 5xx — naive; classifier refines if needed
-      if (res.status >= 500 && res.status < 600) {
-        await new Promise((r) => setTimeout(r, PROBE_RETRY_DELAY_MS));
-        if (ctrl.signal.aborted) return { ok: false, code: 'timeout', latencyMs: Date.now() - started };
-        try {
-          res = await doFetch();
-        } catch (e) {
-          if (e && e.name === 'AbortError') return { ok: false, code: 'timeout', latencyMs: Date.now() - started };
-          return { ok: false, code: 'network', latencyMs: Date.now() - started };
-        }
-      }
-      const status = res.status;
-      if (status >= 200 && status < 300) {
-        let modelsCount = 0;
-        try {
-          const body = await res.json();
-          modelsCount = Array.isArray(body && body.data) ? body.data.length : 0;
-        } catch (_) { /* not json */ }
-        return { ok: true, code: 'ok', latencyMs: Date.now() - started, modelsCount };
-      }
-      return { ok: false, code: classifyStatus(status), latencyMs: Date.now() - started };
-    } finally {
-      clearTimeout(timer);
-    }
-  }
-
-  async probeChat(_ref, _key) {
-    return { ok: false, code: 'not-implemented', latencyMs: 0 };
-  }
-}
+// sandbox.js — probe sandbox-test runner + last-test cache.
+// Ponytail-mode (full): simplest correct path.
+// YAGNI: chat completions is a hook (not-implemented).
+// In-memory only; restart dsh-web = clear cache.
+
+export const PROBE_MODELS_TIMEOUT_MS = 5000;
+export const PROBE_RETRY_DELAY_MS = 1000;
+export const LAST_TEST_MAX = 200;
+
+export class LastTestCache {
+  constructor(max = LAST_TEST_MAX) {
+    this._max = max;
+    this._data = new Map();
+  }
+
+  set(ref, result) {
+    if (!ref || !result) return;
+    if (this._data.has(ref)) this._data.delete(ref);
+    this._data.set(ref, result);
+    while (this._data.size > this._max) {
+      const first = this._data.keys().next().value;
+      if (first === undefined) break;
+      this._data.delete(first);
+    }
+  }
+
+  get(ref) {
+    return this._data.get(ref);
+  }
+
+  snapshot() {
+    const out = {};
+    for (const [k, v] of this._data) out[k] = v;
+    return out;
+  }
+
+  clear() {
+    this._data.clear();
+  }
+
+  get size() {
+    return this._data.size;
+  }
+}
+
+function classifyStatus(status) {
+  if (status === 401 || status === 403) return 'auth';
+  if (status === 404) return 'not-found';
+  if (status === 429) return 'rate-limit';
+  if (status >= 500 && status < 600) return 'server';
+  return `http-${status}`;
+}
+
+export class SandboxRunner {
+  constructor({ fetchImpl, resolveBaseUrl, log = () => {} } = {}) {
+    if (typeof fetchImpl !== 'function') throw new Error('sandbox: fetchImpl required');
+    if (typeof resolveBaseUrl !== 'function') throw new Error('sandbox: resolveBaseUrl required');
+    this._fetch = fetchImpl;
+    this._resolveBaseUrl = resolveBaseUrl;
+    this._log = log;
+  }
+
+  async probeModels(ref, key) {
+    if (!ref || typeof key !== 'string' || key.length === 0) {
+      return { ok: false, code: 'no-credential', latencyMs: 0 };
+    }
+    const baseUrl = await this._resolveBaseUrl(ref);
+    if (!baseUrl) {
+      return { ok: false, code: 'no-baseurl', latencyMs: 0 };
+    }
+    const url = `${baseUrl.replace(/\/+$/, '')}/models`;
+    const started = Date.now();
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), PROBE_MODELS_TIMEOUT_MS);
+    const doFetch = () => this._fetch(url, {
+      method: 'GET',
+      headers: { authorization: `Bearer ${key}`, accept: 'application/json' },
+      signal: ctrl.signal,
+    });
+    try {
+      let res;
+      try {
+        res = await doFetch();
+      } catch (e) {
+        if (e && e.name === 'AbortError') return { ok: false, code: 'timeout', latencyMs: Date.now() - started };
+        return { ok: false, code: 'network', latencyMs: Date.now() - started };
+      }
+      // ponytail: 1 retry on 5xx — naive; classifier refines if needed
+      if (res.status >= 500 && res.status < 600) {
+        await new Promise((r) => setTimeout(r, PROBE_RETRY_DELAY_MS));
+        if (ctrl.signal.aborted) return { ok: false, code: 'timeout', latencyMs: Date.now() - started };
+        try {
+          res = await doFetch();
+        } catch (e) {
+          if (e && e.name === 'AbortError') return { ok: false, code: 'timeout', latencyMs: Date.now() - started };
+          return { ok: false, code: 'network', latencyMs: Date.now() - started };
+        }
+      }
+      const status = res.status;
+      if (status >= 200 && status < 300) {
+        let modelsCount = 0;
+        try {
+          const body = await res.json();
+          modelsCount = Array.isArray(body && body.data) ? body.data.length : 0;
+        } catch (_) { /* not json */ }
+        return { ok: true, code: 'ok', latencyMs: Date.now() - started, modelsCount };
+      }
+      return { ok: false, code: classifyStatus(status), latencyMs: Date.now() - started };
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+
+  async probeChat(_ref, _key) {
+    return { ok: false, code: 'not-implemented', latencyMs: 0 };
+  }
+}

package/lib/shadow.js

@@ -1,81 +1,81 @@
-// lib/shadow.js — shadow A/B traffic sampling.
-// ponytail: per-provider counter, simple percent gating.
-
-export const SHADOW_DEFAULT_PERCENT = 0;  // 0 = disabled
-export const SHADOW_BUCKET = 100;        // percent base
-
-export class ShadowRouter {
-  constructor({ primary, secondary, percent = SHADOW_DEFAULT_PERCENT } = {}) {
-    this._primary = primary || '';
-    this._secondary = secondary || '';
-    this._percent = Number.isFinite(percent) && percent > 0 ? Math.min(SHADOW_BUCKET, Math.floor(percent)) : 0;
-    this._sent = 0;
-    this._shadowed = 0;
-    this._latencySumPrimary = 0;
-    this._latencySumSecondary = 0;
-    this._latencyCountPrimary = 0;
-    this._latencyCountSecondary = 0;
-  }
-
-  isEnabled() {
-    return this._percent > 0 && Boolean(this._primary) && Boolean(this._secondary) && this._primary !== this._secondary;
-  }
-
-  pick(requestHash = Math.random()) {
-    if (!this.isEnabled()) return { primary: this._primary, secondary: null, sampled: false };
-    // Convert requestHash to [0, SHADOW_BUCKET)
-    let h;
-    if (typeof requestHash === 'number') {
-      h = Math.floor(requestHash * SHADOW_BUCKET);
-    } else {
-      // Stable hash: fnv1a-lite on string
-      let str = String(requestHash);
-      let x = 2166136261;
-      for (let i = 0; i < str.length; i++) {
-        x ^= str.charCodeAt(i);
-        x = (x * 16777619) >>> 0;
-      }
-      h = x % SHADOW_BUCKET;
-    }
-    const sampled = h < this._percent;
-    this._sent += 1;
-    if (sampled) this._shadowed += 1;
-    return { primary: this._primary, secondary: sampled ? this._secondary : null, sampled };
-  }
-
-  recordLatency(target, ms) {
-    if (!Number.isFinite(ms) || ms < 0) return;
-    if (target === this._primary) {
-      this._latencySumPrimary += ms;
-      this._latencyCountPrimary += 1;
-    } else if (target === this._secondary) {
-      this._latencySumSecondary += ms;
-      this._latencyCountSecondary += 1;
-    }
-  }
-
-  snapshot() {
-    const avg = (sum, count) => (count > 0 ? sum / count : null);
-    return {
-      primary: this._primary,
-      secondary: this._secondary,
-      percent: this._percent,
-      enabled: this.isEnabled(),
-      sent: this._sent,
-      shadowed: this._shadowed,
-      avgLatencyMs: {
-        primary: avg(this._latencySumPrimary, this._latencyCountPrimary),
-        secondary: avg(this._latencySumSecondary, this._latencyCountSecondary),
-      },
-    };
-  }
-
-  reset() {
-    this._sent = 0;
-    this._shadowed = 0;
-    this._latencySumPrimary = 0;
-    this._latencySumSecondary = 0;
-    this._latencyCountPrimary = 0;
-    this._latencyCountSecondary = 0;
-  }
-}
+// lib/shadow.js — shadow A/B traffic sampling.
+// ponytail: per-provider counter, simple percent gating.
+
+export const SHADOW_DEFAULT_PERCENT = 0;  // 0 = disabled
+export const SHADOW_BUCKET = 100;        // percent base
+
+export class ShadowRouter {
+  constructor({ primary, secondary, percent = SHADOW_DEFAULT_PERCENT } = {}) {
+    this._primary = primary || '';
+    this._secondary = secondary || '';
+    this._percent = Number.isFinite(percent) && percent > 0 ? Math.min(SHADOW_BUCKET, Math.floor(percent)) : 0;
+    this._sent = 0;
+    this._shadowed = 0;
+    this._latencySumPrimary = 0;
+    this._latencySumSecondary = 0;
+    this._latencyCountPrimary = 0;
+    this._latencyCountSecondary = 0;
+  }
+
+  isEnabled() {
+    return this._percent > 0 && Boolean(this._primary) && Boolean(this._secondary) && this._primary !== this._secondary;
+  }
+
+  pick(requestHash = Math.random()) {
+    if (!this.isEnabled()) return { primary: this._primary, secondary: null, sampled: false };
+    // Convert requestHash to [0, SHADOW_BUCKET)
+    let h;
+    if (typeof requestHash === 'number') {
+      h = Math.floor(requestHash * SHADOW_BUCKET);
+    } else {
+      // Stable hash: fnv1a-lite on string
+      let str = String(requestHash);
+      let x = 2166136261;
+      for (let i = 0; i < str.length; i++) {
+        x ^= str.charCodeAt(i);
+        x = (x * 16777619) >>> 0;
+      }
+      h = x % SHADOW_BUCKET;
+    }
+    const sampled = h < this._percent;
+    this._sent += 1;
+    if (sampled) this._shadowed += 1;
+    return { primary: this._primary, secondary: sampled ? this._secondary : null, sampled };
+  }
+
+  recordLatency(target, ms) {
+    if (!Number.isFinite(ms) || ms < 0) return;
+    if (target === this._primary) {
+      this._latencySumPrimary += ms;
+      this._latencyCountPrimary += 1;
+    } else if (target === this._secondary) {
+      this._latencySumSecondary += ms;
+      this._latencyCountSecondary += 1;
+    }
+  }
+
+  snapshot() {
+    const avg = (sum, count) => (count > 0 ? sum / count : null);
+    return {
+      primary: this._primary,
+      secondary: this._secondary,
+      percent: this._percent,
+      enabled: this.isEnabled(),
+      sent: this._sent,
+      shadowed: this._shadowed,
+      avgLatencyMs: {
+        primary: avg(this._latencySumPrimary, this._latencyCountPrimary),
+        secondary: avg(this._latencySumSecondary, this._latencyCountSecondary),
+      },
+    };
+  }
+
+  reset() {
+    this._sent = 0;
+    this._shadowed = 0;
+    this._latencySumPrimary = 0;
+    this._latencySumSecondary = 0;
+    this._latencyCountPrimary = 0;
+    this._latencyCountSecondary = 0;
+  }
+}

package/lib/usage-report.js

@@ -0,0 +1,49 @@
+// 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');
+}