@omdp/dsh-key-fallback 1.0.0 → 1.0.2

package/cordis.patch.yml

@@ -1,5 +1,5 @@
 - insert:
     - id: key-fallback
-      name: dsh-key-fallback
+      name: '@omdp/dsh-key-fallback'
       inject: [llm, settings, webServer]
       config: {}

package/lib/client.js

@@ -1,65 +1,140 @@
-'use strict'
 // @omdp/dsh-key-fallback — Client half
 // Settings → 插件 里的只读状态卡：显示每个 provider 的 key 数 / 游标 / 冷却。
-function apply(ctx) {
-  const slots = ctx.get('slots')
-  if (slots === undefined) return
+//
+// Hand-written in the lazy-CJS bundle protocol (window.__ModuleLoader__.load
+// with a factory receiving `require`) — the same zero-dependency stance as the
+// host half. The registered id MUST be the package name (@omdp/dsh-key-fallback):
+// dsh-client-modules rejects any bundle whose __ModuleLoader__.load id does not
+// match the package it was loaded for.
+window.__ModuleLoader__.load({
+  id: '@omdp/dsh-key-fallback',
+  factory: function (require) {
+    var module = { exports: {} }
+    var exports = module.exports
+    Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
+    var React = require('react')
 
-  async function fetchJson(url, opts) {
-    const r = await fetch(url, opts)
-    return r.json()
-  }
+    function fetchJson(url, signal) {
+      return fetch(url, signal ? { signal: signal } : undefined).then(function (r) { return r.json() })
+    }
 
-  function KeyFallbackCard() {
-    const [state, setState] = React.useState({ loading: true, data: null })
-    const refresh = React.useCallback(function () {
-      fetchJson('/dsh-key-fallback/pools')
-        .then(function (data) { setState({ loading: false, data: (data && data.pools) || {} }) })
-        .catch(function () { setState({ loading: false, data: null }) })
-    }, [])
-    React.useEffect(function () {
-      refresh()
-      const t = setInterval(refresh, 2000)
-      return function () { clearInterval(t) }
-    }, [refresh])
+    // 卡片可见性驱动的"仅在用户观看时轮询"：
+    // 不看（页面隐藏 / 卡片滚出视口 / 组件卸载）→ 停止轮询，零网络；
+    // 重新可见 → 立即刷新并恢复每 2s 轮询，数据最多晚 2s，正常及时。
+    function KeyFallbackCard() {
+      var s = React.useState({ loading: true, data: null })
+      var state = s[0]
+      var setState = s[1]
+      var rootRef = React.useRef(null)
+      var ioRef = React.useRef(null)
 
-    if (state.loading) {
-      return React.createElement('div', { style: { fontSize: '12px', opacity: 0.6 } }, '加载中…')
-    }
-    const data = state.data || {}
-    const providers = Object.keys(data)
-    if (providers.length === 0) {
-      return React.createElement('p', { style: { fontSize: '12px', opacity: 0.6, margin: 0 } },
-        '未在 settings.yaml 配置 keyFallback.providers')
+      // 回调 ref：卡片根元素变化（loading ↔ 列表）时先解除旧元素再观察新元素，
+      // 避免旧元素因被移除触发 isIntersecting:false 而错误停止轮询。
+      var attachRoot = React.useCallback(function (el) {
+        var prev = rootRef.current
+        var io = ioRef.current
+        if (io && prev && prev !== el) io.unobserve(prev)
+        rootRef.current = el
+        if (io && el) io.observe(el)
+      }, [])
+
+      var refresh = React.useCallback(function () {
+        fetchJson('/dsh-key-fallback/pools')
+          .then(function (data) { setState({ loading: false, data: (data && data.pools) || {} }) })
+          .catch(function () { setState({ loading: false, data: null }) })
+      }, [])
+
+      React.useEffect(function () {
+        var alive = true
+        var timer = null
+        var pageVisible = !document.hidden
+        var cardVisible = true
+
+        function stop() {
+          if (timer !== null) { clearInterval(timer); timer = null }
+        }
+        function start() {
+          if (!alive || timer !== null || !pageVisible || !cardVisible) return
+          refresh()
+          timer = setInterval(refresh, 2000)
+        }
+        function sync() {
+          if (!alive) return
+          if (pageVisible && cardVisible) start()
+          else stop()
+        }
+        function onVisibility() {
+          pageVisible = !document.hidden
+          sync()
+        }
+
+        document.addEventListener('visibilitychange', onVisibility)
+
+        if (typeof IntersectionObserver === 'function') {
+          var io = new IntersectionObserver(function (entries) {
+            if (!alive) return
+            for (var i = 0; i < entries.length; i++) {
+              cardVisible = entries[i].isIntersecting
+            }
+            sync()
+          }, { threshold: 0.01 })
+          ioRef.current = io
+          var el = rootRef.current
+          if (el) io.observe(el)
+        }
+
+        refresh()
+        start()
+
+        return function () {
+          alive = false
+          stop()
+          document.removeEventListener('visibilitychange', onVisibility)
+          if (ioRef.current) { ioRef.current.disconnect(); ioRef.current = null }
+          ioRef.current = null
+        }
+      }, [refresh])
+
+      if (state.loading) {
+        return React.createElement('div', { ref: attachRoot, style: { fontSize: '12px', opacity: 0.6 } }, '加载中…')
+      }
+      var data = state.data || {}
+      var providers = Object.keys(data)
+      if (providers.length === 0) {
+        return React.createElement('p', { ref: attachRoot, style: { fontSize: '12px', opacity: 0.6, margin: 0 } },
+          '未在 settings.yaml 配置 keyFallback.providers')
+      }
+      return React.createElement('div', { ref: attachRoot, style: { fontSize: '12px', display: 'flex', flexDirection: 'column', gap: '8px' } },
+        providers.map(function (p) {
+          var pd = data[p]
+          return React.createElement('div', { key: p, style: { padding: '6px 0', borderTop: '1px solid var(--dsw-alias-border-l2, #eee)' } },
+            React.createElement('div', { style: { fontWeight: 600 } }, p + '  (' + pd.env + ')'),
+            React.createElement('div', { style: { opacity: 0.8 } }, 'key 数: ' + pd.keyCount + '，当前游标: ' + pd.currentIndex),
+            pd.cooling.length > 0
+              ? React.createElement('div', { style: { color: '#c62828' } }, '冷却中: ' + pd.cooling.join(', '))
+              : null,
+            pd.healthy.length > 0
+              ? React.createElement('div', { style: { color: '#2e7d32' } }, '健康: ' + pd.healthy.join(', '))
+              : null,
+          )
+        }),
+      )
     }
-    return React.createElement('div', { style: { fontSize: '12px', display: 'flex', flexDirection: 'column', gap: '8px' } },
-      providers.map(function (p) {
-        const pd = data[p]
-        return React.createElement('div', { key: p, style: { padding: '6px 0', borderTop: '1px solid var(--dsw-alias-border-l2, #eee)' } },
-          React.createElement('div', { style: { fontWeight: 600 } }, p + '  (' + pd.env + ')'),
-          React.createElement('div', { style: { opacity: 0.8 } }, 'key 数: ' + pd.keyCount + '，当前游标: ' + pd.currentIndex),
-          pd.cooling.length > 0
-            ? React.createElement('div', { style: { color: '#c62828' } }, '冷却中: ' + pd.cooling.join(', '))
-            : null,
-          pd.healthy.length > 0
-            ? React.createElement('div', { style: { color: '#2e7d32' } }, '健康: ' + pd.healthy.join(', '))
-            : null,
-        )
-      }),
-    )
-  }
 
-  ctx.slots.inject('settings.plugin.item', function* () {
-    yield ctx.slots.register({
-      name: 'settings.plugin.item',
-      key: 'key-fallback',
-      id: 'key-fallback',
-      order: 50,
-      label: () => 'API Key 回退',
-      inject: () => ({}),
-    }, KeyFallbackCard)
-  })
-}
+    function apply(ctx) {
+      var slots = ctx.get('slots')
+      if (slots === undefined) return
+      // settings.plugin.item 是 root-scope 的 keyed slot，按 settings 命名空间
+      // 分发：host 端 settings.register('key-fallback', …) 让该 key 进入
+      // served 集合后，本卡片才会被渲染（参考 auto-continue 的注册姿势）。
+      slots.inject('settings.plugin.item', () => slots.register({
+        name: 'settings.plugin.item',
+        key: 'key-fallback',
+      }, KeyFallbackCard))
+    }
 
-exports.apply = apply
-exports.inject = ['slots']
+    exports.apply = apply
+    exports.inject = ['slots']
+    return module.exports
+  },
+})

package/lib/index.js

@@ -8,6 +8,11 @@ const { load: loadYaml } = (() => {
   try { return require('js-yaml') }
   catch { return { load: (s) => { try { return JSON.parse(s) } catch { return {} } } } }
 })()
+// schemastery 用于注册 settings 命名空间占位（served 集合来源）。
+// bundle 环境解析失败时降级为 null，此时仅卡片显示受影响、轮换逻辑照常。
+const zs = (() => {
+  try { return require('@deepseek-ai/schemastery') } catch { return null }
+})()
 
 const name = 'key-fallback'
 const inject = ['llm', 'settings', 'webServer']
@@ -41,12 +46,26 @@ function readConfig() {
 }
 
 function apply(ctx) {
-  // 占位命名空间：让只读状态卡出现在 Settings → 插件（keyed slot 要求 key ∈ served）
-  ctx.inject(['settings'], (sctx) => {
+  // 注册 settings 命名空间（含真实字段 schema）：让客户端 Settings → 插件
+  // 的 keyed slot（settings.plugin.item, key='key-fallback'）被 serve 并渲染状态卡。
+  // 状态卡只读；轮换逻辑仍直接读 settings.yaml（v1.0.0 原设计）。
+  // 注意：1.0.0 版写的是 `if (typeof zs !== 'undefined')` 死代码（zs 从未导入），
+  // 注册实际从未发生；这里用真实 require 修复。
+  if (zs) {
     try {
-      if (typeof zs !== 'undefined') sctx.settings.register('key-fallback', zs.object({}), { base: {} })
-    } catch (e) { /* 命名空间注册失败不影响核心轮换逻辑 */ }
-  })
+      ctx.inject(['settings'], (sctx) => {
+        sctx.settings.register('key-fallback', zs.object({
+          providers: zs.dict(zs.object({
+            env: zs.string(),
+            keys: zs.array(zs.string()),
+            cooldownMs: zs.natural(),
+          })),
+        }), { base: {} })
+      })
+    } catch (e) {
+      // 命名空间注册失败不影响核心轮换逻辑
+    }
+  }
 
   const pools = new Map()
   const attempts = new Map() // `${turn}:${step}` -> 已尝试次数（防止死循环）

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omdp/dsh-key-fallback",
   "description": "Minimal API key fallback for DeepSeek Harness: on a retryable request error, silently retry the same call with the next key in the pool.",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "commonjs",
   "main": "lib/index.js",
   "exports": {