dsh-ollama-usage 0.1.2 → 0.1.3

package/lib/index.js

@@ -370,22 +370,22 @@ async function handleBridgeRequest(req, res) {
  * ------------------------------------------------------------------ */
 
 export default {
-  inject: ['timer'],
+  // webServer 必须经 inject 声明:宿主 webServer 服务只能经 cordis inject 拿到,
+  // 启动时序上 ctx.get('webServer') 可能拿到 undefined(提供方 fiber 尚未激活),
+  // 导致 RPC 路由注册被跳过(参照 dsh-yolo-mode bridge-entry 头注与
+  // dsh-client-connection 的 inject: ['webServer'])。声明后 Cordis 会等
+  // webServer 可用再调用 apply,路由注册不再依赖启动顺序。
+  inject: ['timer', 'webServer'],
   apply(ctx) {
-    // 1) RPC 路由优先注册:即使后续步骤失败,路由也已生效
-    const webServer = ctx.get('webServer')
-    if (webServer === undefined) {
-      console.error('[ollama-usage] webServer 服务不可用,跳过 RPC 路由注册')
-    } else {
-      try {
-        ctx.effect(
-          () => webServer.register({ kind: 'prefix', path: RPC_CHANNEL, handler: handleBridgeRequest }),
-          'ollama-usage: rpc bridge',
-        )
-        console.log('[ollama-usage] RPC 路由已注册: ' + RPC_CHANNEL)
-      } catch (e) {
-        console.error('[ollama-usage] 路由注册失败: ' + String((e && e.message) || e))
-      }
+    // 1) RPC 路由注册:webServer 已由 inject 保证可用
+    try {
+      ctx.effect(
+        () => ctx.webServer.register({ kind: 'prefix', path: RPC_CHANNEL, handler: handleBridgeRequest }),
+        'ollama-usage: rpc bridge',
+      )
+      console.log('[ollama-usage] RPC 路由已注册: ' + RPC_CHANNEL)
+    } catch (e) {
+      console.error('[ollama-usage] 路由注册失败: ' + String((e && e.message) || e))
     }
     // 2) 自动刷新:失败不影响插件启动
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ollama-usage",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "DeepSeek Harness 插件:可视化 Ollama Cloud 账号用量余量(每 5 小时会话用量 + 周用量),支持侧边栏双横条、设置页面板、API Key 与用量快照持久化、自动刷新与登录引导。Ollama Pro usage & remaining-quota visualization for DeepSeek Harness: 5-hour session + weekly quota bars in the sidebar footer, a full settings panel, persisted API key and usage snapshots, auto-refresh and login guidance.",
   "type": "module",
   "main": "lib/index.js",
@@ -19,26 +19,15 @@
     },
     "client": {
       "platform": "web",
-      "inject": [
-        "slots",
-        "connection",
-        "timer"
-      ]
+      "inject": ["slots", "connection", "timer"]
     }
   },
   "dshhub": {
     "schemaVersion": 1,
     "displayName": "dsh-ollama-usage",
     "summary": "Ollama Cloud 用量余量可视化:会话(5h)/周用量双横条 + 设置页完整面板,Key 与快照持久化,自动刷新,登录引导。",
-    "categories": [
-      "用量",
-      "Web UI",
-      "观测"
-    ],
-    "surfaces": [
-      "host",
-      "web"
-    ],
+    "categories": ["用量", "Web UI", "观测"],
+    "surfaces": ["host", "web"],
     "capabilities": {
       "provides": []
     },
@@ -47,9 +36,7 @@
       "node": ">=20"
     },
     "permissions": {
-      "network": [
-        "https://ollama.com"
-      ]
+      "network": ["https://ollama.com"]
     }
   },
   "files": [