@goodandready/dsh-key-rotation 0.7.6 → 0.7.9

package/lib/client.js

@@ -1,5 +1,5 @@
 // dsh-key-rotation — Settings section ("Key Rotation" / "Ротация ключей").
-// Renders in the harness Settings sidebar via the settings.section slot and
+// Renders in Settings → Plugins → Plugin settings via the settings.plugin.item slot and
 // edits the plugin's `dsh-key-rotation` settings namespace through the
 // loopback-fenced config bridge at /dsh-key-rotation/config.
 //
@@ -27,6 +27,8 @@ window.__ModuleLoader__.load({
     // -------------------------------------------------------------- i18n
     const en = {
       title: 'Key Rotation',
+      subtitle: 'Per-provider API key rotation: pools of keys, automatic failover on quota/rate-limit errors, cooldown and recovery.',
+      cardDesc: 'Per-provider API key rotation: pools of keys, automatic failover on quota/rate-limit errors, cooldown and recovery.',
       loading: 'Loading…',
       notRegistered: 'not registered',
       removeKey: 'Remove key',
@@ -67,6 +69,8 @@ window.__ModuleLoader__.load({
       importPools: 'Import',
       importEnv: 'Import .env',
       resetCooldown: 'Reset cooldown',
+      testAll: 'Test all keys',
+      testing: 'Testing…',
       testKey: 'Test',
       testOk: 'OK',
       testFail: 'FAIL',
@@ -76,6 +80,8 @@ window.__ModuleLoader__.load({
     };
     const ru = {
       title: 'Ротация ключей',
+      subtitle: 'Ротация API-ключей по провайдерам: пулы ключей, автоматическое переключение при исчерпании квоты или лимита, кулдаун и восстановление.',
+      cardDesc: 'Ротация API-ключей по провайдерам: пулы ключей, автоматическое переключение при исчерпании квоты или лимита, кулдаун и восстановление.',
       loading: 'Загрузка…',
       notRegistered: 'не зарегистрирован',
       removeKey: 'Удалить ключ',
@@ -116,6 +122,8 @@ window.__ModuleLoader__.load({
       importPools: 'Импорт',
       importEnv: 'Импорт .env',
       resetCooldown: 'Сбросить кулдаун',
+      testAll: 'Тест всех ключей',
+      testing: 'Тестирование…',
       testKey: 'Тест',
       testOk: 'OK',
       testFail: 'FAIL',
@@ -194,6 +202,13 @@ window.__ModuleLoader__.load({
       '.krot-btn:not(:disabled):hover{color:var(--dsw-alias-label-primary);border-color:var(--dsw-alias-border-l3,var(--dsw-alias-border-l2))}',
       '.krot-foot{display:flex;gap:8px;align-items:center}',
       '.krot-save{background:var(--dsw-alias-button-info-fill);border-color:var(--dsw-alias-button-info-fill);color:var(--dsw-alias-label-primary-foreground);padding:5px 14px;font-size:13px}',
+      '.krot-card{border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:8px;overflow:hidden}',
+      '.krot-card-header{display:flex;align-items:center;justify-content:space-between;gap:8px;width:100%;padding:10px 12px;background:transparent;border:none;cursor:pointer;color:var(--dsw-alias-label-primary);font:inherit;text-align:left}',
+      '.krot-card-head-text{display:flex;flex-direction:column;gap:2px;min-width:0}',
+      '.krot-card-name{font-weight:600;font-size:13px}',
+      '.krot-card-description{font-size:11px;color:var(--dsw-alias-label-tertiary)}',
+      '.krot-card-chevron{flex:none;opacity:.6}',
+      '.krot-card-body{padding:0 12px 12px;border-top:1px solid var(--dsw-alias-border-l2)}',
     ].join('');
     const CARD_CSS_ID = 'dsh-key-rotation/section.module.css';
     if (typeof document !== 'undefined' && !document.querySelector('style[data-plugin-css="' + CARD_CSS_ID + '"]')) {
@@ -258,6 +273,7 @@ window.__ModuleLoader__.load({
       const undoTimer = React.useRef(null);
       const [testing, setTesting] = React.useState('');
       const [testResult, setTestResult] = React.useState({});
+      const [testAllProvider, setTestAllProvider] = React.useState('');
       const [secretDraft, setSecretDraft] = React.useState({});
       const [secretError, setSecretError] = React.useState('');
       const stashUndo = (u) => { setUndo(u); if (undoTimer.current) clearTimeout(undoTimer.current); undoTimer.current = setTimeout(() => setUndo(null), 5000); };
@@ -275,6 +291,22 @@ window.__ModuleLoader__.load({
           .catch((e) => setTestResult((m) => ({ ...m, [ref]: { ok: false, message: String(e?.message ?? e) } })))
           .finally(() => setTesting(''));
       };
+      const doTestAll = (providerId) => {
+        if (!val || !Array.isArray(val.providers)) return;
+        const entry = val.providers.find((p) => p.provider === providerId);
+        if (!entry || !Array.isArray(entry.keys)) return;
+        const refs = entry.keys.filter((k) => k && typeof k === 'string' && k.length > 0);
+        setTestAllProvider(providerId);
+        Promise.all(refs.map((ref) =>
+          fetch('/dsh-key-rotation/test', { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ ref }) })
+            .then((r) => r.json())
+            .then((data) => ({ ref, data }))
+            .catch((e) => ({ ref, data: { ok: false, message: String(e?.message ?? e) } }))
+        )).then((results) => {
+          setTestResult((m) => { const nm = { ...m }; for (const { ref, data } of results) nm[ref] = data; return nm; });
+          setTestAllProvider('');
+        });
+      };
 
       const load = React.useCallback(() => {
         setState((s) => ({ ...s, status: 'loading', error: '' }));
@@ -569,6 +601,7 @@ window.__ModuleLoader__.load({
             (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') }),
+            btn(testAllProvider === entry.provider ? t('testing') : t('testAll'), () => doTestAll(entry.provider), { disabled: testAllProvider === entry.provider, title: t('testAll') }),
           ),
         );
       });
@@ -634,12 +667,38 @@ window.__ModuleLoader__.load({
       function useLocale() {
         return useActiveLocale(ctx);
       }
-      ctx.slots.inject('settings.section', () => ctx.slots.register({
-        name: 'settings.section',
-        id: 'dsh-key-rotation',
-        order: 20,
-        label: () => 'Key Rotation',
-      }, (props) => React.createElement(KeyRotationSection, { ...props, locale: useLocale() })));
+      // Collapsible card in Settings -> Plugins -> Plugin settings
+      // (settings.plugin.item), matching Model Sync / Spendmeter / Vision Bridge.
+      // key MUST equal the settings namespace (NS), else the tab silently skips it.
+      function KeyRotationCard(props) {
+        const locale = useLocale();
+        const t = makeT(locale === 'ru' ? ru : en, en);
+        const [open, setOpen] = React.useState(false);
+        return h('div', { className: 'krot-card' + (open ? ' krot-card-open' : '') },
+          h('button', { type: 'button', className: 'krot-card-header', 'aria-expanded': open, onClick: () => setOpen((v) => !v) },
+            h('span', { className: 'krot-card-head-text' },
+              h('span', { className: 'krot-card-name' }, t('title')),
+              h('span', { className: 'krot-card-description' }, t('subtitle'))),
+            h('span', { className: 'krot-card-chevron', 'aria-hidden': 'true' }, open ? '▴' : '▾')),
+          open ? h('div', { className: 'krot-card-body' }, h(KeyRotationSection, { ...props, locale })) : null);
+      }
+      const tryPluginItem = () => {
+        try {
+          ctx.slots.inject('settings.plugin.item', () =>
+            ctx.slots.register(
+              { name: 'settings.plugin.item', key: NS, locale: NS, inject: () => ({ ctx }) },
+              KeyRotationCard,
+            ));
+          return true;
+        } catch { return false; }
+      };
+      if (!tryPluginItem()) {
+        // Fallback for builds without the Plugins tab slot: keep the sidebar section.
+        ctx.slots.inject('settings.section', () => ctx.slots.register(
+          { name: 'settings.section', id: 'dsh-key-rotation', order: 20, label: () => 'Key Rotation' },
+          (props) => h(KeyRotationSection, { ...props, locale: useLocale() }),
+        ));
+      }
     }
 
     module.exports = { apply, inject: ['slots', 'locale'] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-key-rotation",
-  "version": "0.7.6",
+  "version": "0.7.9",
   "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",
@@ -54,5 +54,8 @@
   },
   "scripts": {
     "test": "node --test test/*.test.js"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }