dsh-ollama-usage 0.1.4 → 0.1.6-beta.0

package/lib/client.js

@@ -253,6 +253,8 @@ window.__ModuleLoader__.load({
             if (disposed) return
             if (res && res.ok && res.value && res.value.usage) {
               setData(res.value.usage); setHistory(res.value.history || null); setUpdatedAt(res.value.updatedAt || null); setError(''); setPhase('usage')
+              // snapshot 数据读自磁盘文件(插件无内存缓存),必然已持久化;服务端字段优先,缺省按不变式置 true
+              setPersisted(typeof res.value.persisted === 'boolean' ? res.value.persisted : true)
             }
           }).catch(() => {})
           refresh()

package/lib/index.js

@@ -161,20 +161,20 @@ async function checkWithToken(token) {
   try {
     res = await fetchUsage(token)
   } catch (e) {
-    return { ok: false, error: { code: 'network', message: String((e && e.message) || e) } }
+    return fail('network', String((e && e.message) || e))
   }
   if (res.status === 401 || res.status === 403) {
     // 凭证失效:清掉持久化的 token,保留历史
     const rec = readFile()
     if (rec && rec.token) writeFile({ token: null, updatedAt: rec.updatedAt, usage: rec.usage, history: rec.history || [] })
-    return { ok: false, error: { code: 'unauthorized', message: '凭证无效或已过期(' + res.status + '),请重新登录或更换 API Key' } }
+    return fail('unauthorized', '凭证无效或已过期(' + res.status + '),请重新登录或更换 API Key')
   }
   if (res.status >= 400) {
-    return { ok: false, error: { code: 'http-error', message: res.body || ('HTTP ' + res.status) } }
+    return fail('http-error', res.body || ('HTTP ' + res.status))
   }
   const parsed = parseUsage(res.body, res.status)
   if (!parsed.ok) {
-    return { ok: false, error: { code: 'internal', message: parsed.message } }
+    return fail('internal', parsed.message)
   }
   // 持久化:token + 快照 + 历史(保留最近 24 条)
   const now = new Date().toISOString()
@@ -204,6 +204,17 @@ async function autoRefresh() {
  * RPC 端点分派
  * ------------------------------------------------------------------ */
 
+/**
+ * Canonical Connection RPC failure result (mirrors alpha.4's
+ * ConnectionRpcFailure: code + message + details object). The alpha.4
+ * browser caller (dsh-client-connection parseConnectionResponse) REJECTS
+ * failures without a `details` object (`TypeError: connection: invalid
+ * server-response failure`), so every error result must carry one.
+ */
+function fail(code, message) {
+  return { ok: false, error: { code, message, details: {} } }
+}
+
 async function dispatch(endpoint, payload) {
   if (endpoint === 'check') {
     const manual = payload && typeof payload.token === 'string' ? payload.token.trim() : ''
@@ -214,14 +225,15 @@ async function dispatch(endpoint, payload) {
       token = (rec && rec.token) || null
     }
     if (!token) token = readLocalToken()
-    if (!token) return { ok: false, error: { code: 'no-token', message: '未检测到本地登录凭证,也未提供 API Key' } }
+    if (!token) return fail('no-token', '未检测到本地登录凭证,也未提供 API Key')
     return checkWithToken(token)
   }
   if (endpoint === 'snapshot') {
     const rec = readFile()
-    if (!rec || !rec.usage) return { ok: false, error: { code: 'no-data', message: '暂无持久化的用量数据' } }
+    if (!rec || !rec.usage) return fail('no-data', '暂无持久化的用量数据')
     const usage = withResetTimes(rec.usage, new Date().toISOString())
-    return { ok: true, value: { tokenPersisted: !!rec.token, updatedAt: rec.updatedAt, history: (rec.history || []).slice(-5), usage } }
+    // snapshot 数据读自磁盘文件(插件无内存缓存),必然已持久化;与 check 端点一致地报告 persisted
+    return { ok: true, value: { tokenPersisted: !!rec.token, persisted: true, updatedAt: rec.updatedAt, history: (rec.history || []).slice(-5), usage } }
   }
   if (endpoint === 'forget') {
     const rec = readFile()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ollama-usage",
-  "version": "0.1.4",
+  "version": "0.1.6-beta.0",
   "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,15 +19,26 @@
     },
     "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": []
     },
@@ -36,7 +47,9 @@
       "node": ">=20"
     },
     "permissions": {
-      "network": ["https://ollama.com"]
+      "network": [
+        "https://ollama.com"
+      ]
     }
   },
   "files": [
@@ -46,7 +59,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@deepseek-ai/dsh-home-paths": "^0.1.0-rc.6"
+    "@deepseek-ai/dsh-home-paths": "^0.1.2-alpha.4"
   },
   "repository": {
     "type": "git",
@@ -70,6 +83,6 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "DSH_HOME=.tmp-dsh-home HOME=.tmp-home node test/bridge-smoke.mjs"
+    "test": "DSH_HOME=.tmp-dsh-home HOME=.tmp-home node test/bridge-smoke.mjs && DSH_HOME=.tmp-env-dsh-home HOME=.tmp-env-home node test/rpc-envelope-alpha4.mjs"
   }
 }