@omdp/dsh-key-fallback 1.0.1 → 1.0.3

package/lib/client.js

@@ -14,35 +14,97 @@ window.__ModuleLoader__.load({
     Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' })
     var React = require('react')
 
-    function fetchJson(url) {
-      return fetch(url).then(function (r) { return r.json() })
+    function fetchJson(url, signal) {
+      return fetch(url, signal ? { signal: signal } : undefined).then(function (r) { return r.json() })
     }
 
+    // 卡片可见性驱动的"仅在用户观看时轮询"：
+    // 不看（页面隐藏 / 卡片滚出视口 / 组件卸载）→ 停止轮询，零网络；
+    // 重新可见 → 立即刷新并恢复每 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)
+
+      // 回调 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()
-        var t = setInterval(refresh, 2000)
-        return function () { clearInterval(t) }
+        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', { style: { fontSize: '12px', opacity: 0.6 } }, '加载中…')
+        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', { style: { fontSize: '12px', opacity: 0.6, margin: 0 } },
+        return React.createElement('p', { ref: attachRoot, style: { fontSize: '12px', opacity: 0.6, margin: 0 } },
           '未在 settings.yaml 配置 keyFallback.providers')
       }
-      return React.createElement('div', { style: { fontSize: '12px', display: 'flex', flexDirection: 'column', gap: '8px' } },
+      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)' } },
@@ -60,14 +122,24 @@ window.__ModuleLoader__.load({
     }
 
     function apply(ctx) {
-      var slots = ctx.get('slots')
-      if (slots === undefined) return
-      // settings.plugin.item 是 root-scope 的 keyed slot（注册只需 key）；本卡是只读状态展示，
-      // 不需要 settingsScope 绑定可编辑配置。与 resume-stream 的 slots.inject 姿势一致。
-      slots.inject('settings.plugin.item', () => slots.register({
-        name: 'settings.plugin.item',
-        key: 'key-fallback',
-      }, KeyFallbackCard))
+      // settings.plugin.item 是 root-scope 的 keyed slot，按 settings 命名空间
+      // 分发：host 端 installSettingsSection 注册 key-fallback 命名空间，使它
+      // 进入 served 集合后，本卡片才会被 ConfigurablePluginsTab 渲染。
+      // 参考 dshmarket：注册通过嵌套 settingsScope inject（保持模块级无
+      // settingsScope 硬依赖——旧宿主没有该服务时不至于拖垮整个插件）。
+      var scopedInject = ctx.inject
+      if (typeof scopedInject === 'function') {
+        scopedInject(['settingsScope'], function (scoped) {
+          var scopedSlots = scoped.slots
+          if (!scopedSlots) return
+          scopedSlots.inject('settings.plugin.item', function () {
+            return scopedSlots.register({
+              name: 'settings.plugin.item',
+              key: 'key-fallback',
+            }, KeyFallbackCard)
+          })
+        })
+      }
     }
 
     exports.apply = apply

package/lib/index.js

@@ -8,11 +8,22 @@ const { load: loadYaml } = (() => {
   try { return require('js-yaml') }
   catch { return { load: (s) => { try { return JSON.parse(s) } catch { return {} } } } }
 })()
+// dsh-settings 官方助手：installSettingsSection 挂在 scoped fiber 上，注册命名空间
+// 后 client 的 settings.plugin.item 键槽才能把它 serve 并渲染状态卡。
+// 参考 dshmarket（同款姿势，实证可显示）。schemastery 用于构造命名空间 schema。
+const dshSettings = (() => {
+  try { return require('@deepseek-ai/dsh-settings') } catch { return null }
+})()
+const zs = (() => {
+  try { return require('@deepseek-ai/schemastery') } catch { return null }
+})()
 
 const name = 'key-fallback'
 const inject = ['llm', 'settings', 'webServer']
 const API_BASE = '/dsh-key-fallback'
 const SETTINGS_FILE = join(homedir(), '.dsh', 'settings.yaml')
+// 与客户端 slots.register key 保持一致的命名空间名。
+const SETTINGS_NS = 'key-fallback'
 
 function mask(key) {
   if (!key) return ''
@@ -41,6 +52,28 @@ function readConfig() {
 }
 
 function apply(ctx) {
+  // 注册 settings 命名空间（官方助手 installSettingsSection，与 dshmarket 同款）：
+  // 让客户端 Settings → 插件的 keyed slot（settings.plugin.item, key='key-fallback'）
+  // 被 serve 并渲染状态卡。状态卡只读；轮换逻辑仍直接读 settings.yaml（原设计）。
+  if (dshSettings && zs) {
+    try {
+      const ns = dshSettings.settingsNamespace(SETTINGS_NS)
+      const schema = zs.object({
+        providers: zs.dict(zs.object({
+          env: zs.string(),
+          keys: zs.array(zs.string()),
+          cooldownMs: zs.natural(),
+        })),
+      })
+      dshSettings.installSettingsSection(ctx, ns, schema, {}, {
+        setSource: () => {},
+        onChange: () => {},
+      })
+    } catch (e) {
+      // 命名空间注册失败不影响核心轮换逻辑
+    }
+  }
+
   const pools = new Map()
   const attempts = new Map() // `${turn}:${step}` -> 已尝试次数（防止死循环）
   const lifetime = new AbortController()

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.1",
+  "version": "1.0.3",
   "type": "commonjs",
   "main": "lib/index.js",
   "exports": {