dsh-modelscope-pool 0.10.1 → 0.10.3

package/README.md

@@ -121,7 +121,7 @@
 ### 方式一：从 npm 安装（推荐）
 
 ```bash
-dsh plugin --profile web add dsh-modelscope-pool@0.10.0
+dsh plugin --profile web add dsh-modelscope-pool@0.10.3
 ```
 
 一条命令搞定。装好后重启 App（或让插件重新加载），网关会在 `127.0.0.1:8899` 起来。
@@ -334,7 +334,7 @@ dsh-go 里更进一步：这个插件会把自己注册成一个叫 **魔搭 Key
 看看是不是被「手动禁用」了（`manual` 标记）。手动禁用不会被自动恢复流程放开，需要点「恢复」。
 
 **点「刷新额度」提示「魔搭 Key 池没有响应」？**
-App 要求点按在 3 秒内返回，而刷新额度要联网逐个查所有 Key 的额度，早就超过 3 秒了。0.10.1 起这几个慢操作（刷新额度 / 测试全部 / 重新拉取模型 / 添加 Key）改成先回一个「正在刷新额度」的等待态，结果异步回来，最多 60 秒。如果你还在 0.10.0 或更早，升级即可。
+App 要求点按在 3 秒内返回，而刷新额度要联网逐个查所有 Key 的额度，早就超过 3 秒了。0.10.3 起这几个慢操作（刷新额度 / 测试全部 / 重新拉取模型 / 添加 Key）不再在点按里等：点一下立刻在**面板顶部**显示「正在刷新额度」，**3 秒后自动收起**（操作不会中断），跑完再把结果挂上去 3 秒。如果你还在 0.10.0 或更早，升级即可。
 
 **端口被占用？**
 改 `config.json` 的 `port`，同时把客户端和供应商配置里的地址一起改掉。

package/lib/index.js

@@ -144,6 +144,48 @@ export function apply(ctx) {
   })
   let refreshPanel = () => {}
   let refreshStrip = () => {}
+
+  // 慢操作的顶部提示：写进 data.hint，3 秒后自动收起（后台任务不中断）。
+  // 必须放在这一层：buildData 在外面读它，放进 inject 回调里会变成未定义变量。
+  let notice = ''
+  let noticeUntil = 0
+  const noticeNow = () => (noticeUntil > Date.now() ? notice : '')
+  let noticeTimer = null
+  const kicks = new Set()
+  const setNotice = (text, ms = 3000) => {
+    notice = String(text ?? '')
+    noticeUntil = notice ? Date.now() + ms : 0
+    try {
+      refreshPanel()
+    } catch {}
+    try {
+      refreshStrip()
+    } catch {}
+    // 立刻推一次：点下就能看到，不用等下一次心跳。
+    for (const kick of kicks) {
+      try {
+        kick()
+      } catch {}
+    }
+    // 到点主动推一次，让提示正好在 3 秒收起，而不是等下一次 1.5 秒心跳。
+    if (noticeTimer) clearTimeout(noticeTimer)
+    noticeTimer = null
+    if (noticeUntil > 0) {
+      noticeTimer = setTimeout(() => {
+        noticeTimer = null
+        if (noticeUntil > Date.now()) return
+        try {
+          refreshPanel()
+        } catch {}
+        for (const kick of kicks) {
+          try {
+            kick()
+          } catch {}
+        }
+      }, ms + 60)
+      if (typeof noticeTimer.unref === 'function') noticeTimer.unref()
+    }
+  }
   // Key 级无感路由：模型不变，只换 Key。
   const router = createRouter({ logger })
 
@@ -300,14 +342,16 @@ const modelRowOf = (entry, current, t) => {
     const routing = router.snapshot()
     const routed =
       routing.blockedPairs > 0 ? ` ${t('routed', { n: routing.blockedPairs })}` : ''
+    const busy = noticeNow()
     const hint =
-      s.total === 0
+      busy ||
+      (s.total === 0
         ? t('hintNoKeys')
         : s.cooling > 0
           ? `${t('hintCooling')}${routed}`
           : model
             ? `${t('hintModel', { model })}${routed}`
-            : `${t('hintIdle')}${routed}`
+            : `${t('hintIdle')}${routed}`)
 
     // 扇形图：Key 池的状态分布（可用 / 额度不足 / 令牌无效 / 其他冷却）
     const order = [
@@ -515,6 +559,7 @@ const modelRowOf = (entry, current, t) => {
       title: t('poolTitle'),
       accent: 'teal',
       children: [
+        { type: 'callout', tone: 'info', text: { $: 'data.hint' } },
         {
           type: 'row',
           children: [
@@ -531,7 +576,6 @@ const modelRowOf = (entry, current, t) => {
           caption: { $: 'data.magic.brief' },
           tone: 'good',
         },
-        { type: 'callout', tone: 'info', text: { $: 'data.hint' } },
         { type: 'text', text: { $: 'data.keyTitle' }, style: { size: 'title', weight: 'bold' } },
         { type: 'list', items: { $: 'data.keys' } },
         {
@@ -716,37 +760,52 @@ const modelRowOf = (entry, current, t) => {
         ready
           .then(() => {
             tick()
+            kicks.add(tick)
             const timer = setInterval(tick, 1500)
             if (typeof timer.unref === 'function') timer.unref()
-            stop = () => clearInterval(timer)
+            stop = () => {
+              kicks.delete(tick)
+              clearInterval(timer)
+            }
           })
           .catch(() => {})
         let stop = () => {}
         return () => {
           stopped = true
+          kicks.delete(tick)
           stop()
         }
     }
 
-    // 点按必须在 3 秒内返回，否则 App 会提示「没有响应」。
-    // 刷新额度 / 测试全部 / 拉模型 / 校验 Key 都要联网，所以先回 pending，结果走延后效果。
-    const defer = (label, work) => ({
-      pending: { label, timeoutMs: 60_000 },
-      result: async () => {
-        const value = await work()
-        refreshPanel()
-        refreshStrip()
-        return value
-      },
-    })
+    // 点按必须 3 秒内返回，否则 App 会提示「没有响应」。
+    // 联网的慢操作因此不在点按里等：先把一句话挂到面板顶部（data.hint），
+    // 3 秒后自动收起，真正的活儿在后台继续跑，跑完再挂一句结果，同样 3 秒收起。
+    const running = new Set()
+    const runInBackground = (key, label, work) => {
+      if (running.has(key)) return { toast: label }
+      running.add(key)
+      setNotice(label)
+      void (async () => {
+        let message = ''
+        try {
+          message = String((await work()) ?? '')
+        } catch (error) {
+          message = String(error?.message ?? error ?? '')
+        } finally {
+          running.delete(key)
+        }
+        setNotice(message)
+      })()
+      return { refresh: true }
+    }
 
     const panelActions = {
         refresh(scope, event) {
           const t = makeT(event?.locale)
-          return defer(t('pendingRefresh'), async () => {
+          return runInBackground('refresh', t('pendingRefresh'), async () => {
             await refreshQuota(true)
             await refreshCatalog(true)
-            return { toast: t('toastQuotaUpdated') }
+            return t('toastQuotaUpdated')
           })
         },
         async 'pick-model'(scope, event) {
@@ -759,37 +818,35 @@ const modelRowOf = (entry, current, t) => {
         },
         'test-all'(scope, event) {
           const t = makeT(event?.locale)
-          const keys = pool ? [...pool.keys] : []
-          if (keys.length === 0) return { toast: t('toastNoKeys') }
-          // 注意不能用 /v1/models 验 Key：那个接口是公开的，什么令牌都返回 200。
-          // 真正会校验令牌的是额度接口，而且查额度不扣魔粒。
-          return defer(t('pendingTest'), async () => {
-          const rows = await quota.refresh(
-            keys.map((k) => ({ id: k.id, key: k.key, region: k.region })),
-            { force: true },
-          )
-          for (const [i, row] of rows.entries()) {
-            const k = keys[i]
-            if (row.state?.region) await pool.setRegion(k.id, row.state.region)
-            if (!row.state?.ok) {
-              pool.markFailure(k.id, '令牌无效', String(row.state?.error ?? '').slice(0, 80))
-              continue
-            }
-            if (row.state.available < QUOTA_FLOOR) {
-              pool.markFailure(k.id, '额度不足', `剩余 ${row.state.available} 魔粒`, nextQuotaResetAt())
-              continue
+          return runInBackground('test', t('pendingTest'), async () => {
+            const keys = pool ? [...pool.keys] : []
+            if (keys.length === 0) return t('toastNoKeys')
+            // 注意不能用 /v1/models 验 Key：那个接口是公开的，什么令牌都返回 200。
+            // 真正会校验令牌的是额度接口，而且查额度不扣魔粒。
+            const rows = await quota.refresh(
+              keys.map((k) => ({ id: k.id, key: k.key, region: k.region })),
+              { force: true },
+            )
+            for (const [i, row] of rows.entries()) {
+              const k = keys[i]
+              if (row.state?.region) await pool.setRegion(k.id, row.state.region)
+              if (!row.state?.ok) {
+                pool.markFailure(k.id, '令牌无效', String(row.state?.error ?? '').slice(0, 80))
+                continue
+              }
+              if (row.state.available < QUOTA_FLOOR) {
+                pool.markFailure(k.id, '额度不足', `剩余 ${row.state.available} 魔粒`, nextQuotaResetAt())
+                continue
+              }
+              pool.restore(k.id)
             }
-            pool.restore(k.id)
-          }
-          refreshPanel()
-          refreshStrip()
-          const ok = rows.filter((r) => r.state?.ok && r.state.available >= QUOTA_FLOOR).length
-          const invalid = rows.filter((r) => !r.state?.ok).length
-          const short = rows.length - ok - invalid
-          const parts = [t('partOk', { ok, total: keys.length })]
-          if (short > 0) parts.push(t('partShort', { n: short }))
-          if (invalid > 0) parts.push(t('partInvalid', { n: invalid }))
-          return { toast: t('toastTestDone', { parts: parts.join(' · ') }) }
+            const ok = rows.filter((r) => r.state?.ok && r.state.available >= QUOTA_FLOOR).length
+            const invalid = rows.filter((r) => !r.state?.ok).length
+            const short = rows.length - ok - invalid
+            const parts = [t('partOk', { ok, total: keys.length })]
+            if (short > 0) parts.push(t('partShort', { n: short }))
+            if (invalid > 0) parts.push(t('partInvalid', { n: invalid }))
+            return t('toastTestDone', { parts: parts.join(' · ') })
           })
         },
         'restore-all': async (scope, event) => {
@@ -870,13 +927,13 @@ const modelRowOf = (entry, current, t) => {
           })
           return { toast: t('toastDeleted', { id }), refresh: true }
         },
-        'add-form': (scope, event) => {
+        'add-form'(scope, event) {
           const t = makeT(event?.locale)
           const value = event?.value
           const raw = typeof value === 'string' ? value : value?.newKey ?? value?.value ?? ''
-          return defer(t('pendingAdd'), async () => {
+          return runInBackground('add', t('pendingAdd'), async () => {
             const result = await addKey(raw, event?.locale)
-            return { toast: result?.toast ?? t('toastNoNew') }
+            return result?.toast ?? t('toastNoNew')
           })
         },
         'key-back'() {
@@ -884,13 +941,12 @@ const modelRowOf = (entry, current, t) => {
         },
         'refresh-models'(scope, event) {
           const t = makeT(event?.locale)
-          return defer(t('pendingModels'), async () => {
+          return runInBackground('models', t('pendingModels'), async () => {
             await refreshCatalog(true)
-            return { toast: t('toastModelsReloaded') }
+            return t('toastModelsReloaded')
           })
         },
     }
-
     dshGo.panel('pool', { view: viewPool, data: panelData(buildPoolData), actions: panelActions })
     dshGo.panel('key', { view: viewKey, data: panelData(buildKeyData), actions: panelActions })
     dshGo.panel('models', { view: viewModels, data: panelData(buildModelsData), actions: panelActions })
@@ -932,11 +988,14 @@ const modelRowOf = (entry, current, t) => {
       },
     })
 
-    dshGo.on('addkey', async (scope, event) => {
+    dshGo.on('addkey', (scope, event) => {
+      const t = makeT(event?.locale)
       const text = String(scope.clipboard ?? '').trim()
-      if (!text) return { toast: makeT(event?.locale)('toastNoClipboard') }
-      const result = await addKey(text, event?.locale)
-      return { ...result, refresh: 'pool' }
+      if (!text) return { toast: t('toastNoClipboard') }
+      return runInBackground('add', t('pendingAdd'), async () => {
+        const result = await addKey(text, event?.locale)
+        return result?.toast ?? t('toastNoNew')
+      })
     })
 
     dshGo.on('open-pool', () => ({ open: 'panel:pool' }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-modelscope-pool",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "魔搭多 Key 聚合网关：无感路由（模型不变，Key 遇限流/额度不足/无权限/不存在自动换下一个）；自动识别国际版/国内版令牌；单个 Key 可禁用/停用/恢复/删除/查看；全部密钥分页浏览；模型实际拉取国际版+国内版合并成简化名、按站点分组；额度低于 2 停用到次日 00:01、多 Key 轮换、限流临时失败冷却 5 分钟，并注册为 DSH 模型供应商",
   "license": "MIT",
   "author": "Yizutt",