dsh-token-use 0.3.1 → 0.3.2

package/client/client.js

@@ -164,6 +164,8 @@ window.__ModuleLoader__.load({ id: "dsh-token-use", factory: (require) => {
     versionChecked: "检查于 {time}",
     versionRefresh: "重新检查",
     versionRefreshing: "检查中…",
+    versionFailed: "本次检查未成功：{names}（显示的是上次结果）",
+    versionFailedTitle: "失败原因：{reason}",
     healthCheck: "健康检查",
     healthRunning: "检查中…",
     healthOk: "接口正常",
@@ -324,6 +326,8 @@ window.__ModuleLoader__.load({ id: "dsh-token-use", factory: (require) => {
     versionChecked: "Checked {time}",
     versionRefresh: "Check again",
     versionRefreshing: "Checking…",
+    versionFailed: "This check failed for {names} — showing the last successful result",
+    versionFailedTitle: "Reason: {reason}",
     healthCheck: "Health check",
     healthRunning: "Checking…",
     healthOk: "Endpoint healthy",
@@ -1217,10 +1221,11 @@ window.__ModuleLoader__.load({ id: "dsh-token-use", factory: (require) => {
       h("td", { className: "dshtu_verCell" }, entry.installed === null ? "—" : entry.installed),
       h("td", { className: "dshtu_verCell" }, entry.latest === null ? "—" : entry.latest),
       // The status stays a real table cell so its column lines up with the
-      // header; the inline-flex badge lives inside it.
+      // header; the inline-flex badge lives inside it. A failed lookup never
+      // mixes into this label — it is reported under the table instead.
       h("td", null, h("span", { className: "dshtu_state", "data-tone": tone },
         glyph === null ? null : h(glyph, {}),
-        entry.error === null ? label : label + "（" + entry.error + "）")));
+        label)));
   }
 
   /** Uptime as `2d 3h` / `45m`, whichever reads better at this scale. */
@@ -1242,6 +1247,11 @@ window.__ModuleLoader__.load({ id: "dsh-token-use", factory: (require) => {
       return h("div", { className: "dshtu_card dshtu_meta" }, props.error === null ? t("loading") : t("error") + ": " + props.error);
     }
     var runtime = config.platform || {};
+    // Packages whose last registry lookup failed: their row keeps the previous
+    // answer, and the reason is reported once, under the table.
+    var failed = (config.packages || []).filter(function (entry) { return entry.error !== null && entry.error !== undefined; });
+    // Cap what reaches the tooltip: a cached error string can be arbitrary.
+    var reasonOf = function (entry) { return String(entry.error).replace(/\s+/g, " ").slice(0, 140); };
     var health = props.health;
     var rows = [];
     if (health && health.state === "ok") {
@@ -1279,7 +1289,17 @@ window.__ModuleLoader__.load({ id: "dsh-token-use", factory: (require) => {
             disabled: props.refreshing === true,
             icon: iconRefresh === null ? null : h(iconRefresh, {}),
             onClick: props.onRefresh
-          }, props.refreshing === true ? t("versionRefreshing") : t("versionRefresh")))),
+          }, props.refreshing === true ? t("versionRefreshing") : t("versionRefresh"))),
+        failed.length === 0 ? null : h("div", {
+          className: "dshtu_state",
+          "data-tone": "warn",
+          style: { marginTop: "8px" },
+          // The reason rides the title, not the label: a lookup failure must not
+          // be mistaken for a package's version verdict.
+          title: t("versionFailedTitle").replace("{reason}", failed.map(function (entry) { return entry.label + ": " + reasonOf(entry); }).join(" / "))
+        },
+        iconWarn === null ? null : h(iconWarn, {}),
+        h("span", null, t("versionFailed").replace("{names}", failed.map(function (entry) { return entry.label; }).join("、"))))),
       h("div", { className: "dshtu_card" },
         h("div", { className: "dshtu_head" }, iconGauge === null ? null : h(iconGauge, {}), h("h3", null, t("configRuntime"))),
         h("dl", { className: "dshtu_kv" }, [

package/lib/versions.js

@@ -224,17 +224,39 @@ export class VersionStore {
   /**
    * The registry's install metadata (versions + dist-tags) — the abbreviated
    * packument, which is a fraction of the full document's size.
+   *
+   * `accept-encoding: identity` is deliberate: a proxy in front of a local
+   * machine can hand back a compressed body that never gets decoded (seen in the
+   * wild as brotli bytes), and these documents are small enough that asking for
+   * them uncompressed costs nothing. The body is read as text and validated
+   * before parsing, so a bad response produces a short diagnostic instead of a
+   * JSON error quoting raw binary.
+   *
+   * @param name - package name.
+   * @param variant - `abbreviated` (default) or `full` for the retry.
    */
-  async fetchPackument(name) {
+  async fetchPackument(name, variant = 'abbreviated') {
     const url = `${this.registry}/${name.replace('/', '%2f')}`
     const response = await fetch(url, {
-      headers: { accept: 'application/vnd.npm.install-v1+json', 'user-agent': USER_AGENT },
+      headers: {
+        accept: variant === 'full' ? 'application/json' : 'application/vnd.npm.install-v1+json',
+        'accept-encoding': 'identity',
+        'user-agent': USER_AGENT,
+      },
       signal: AbortSignal.timeout(this.timeoutMs),
     })
     if (!response.ok) throw new Error(`http ${response.status}`)
-    const body = await response.json()
+    const type = response.headers.get('content-type') ?? ''
+    const text = await response.text()
+    if (!type.includes('json')) throw new Error(`content-type ${type.length > 0 ? type : '(none)'}, ${text.length} bytes`)
+    let body
+    try {
+      body = JSON.parse(text)
+    } catch {
+      throw new Error(`${text.length} bytes that are not JSON`)
+    }
     const versions = Object.keys(body?.versions ?? {})
-    if (versions.length === 0) throw new Error('no versions in registry response')
+    if (versions.length === 0) throw new Error('no versions in the response')
     return { versions, tags: body['dist-tags'] ?? {} }
   }
 
@@ -254,18 +276,9 @@ export class VersionStore {
       const packages = { ...this.cache.packages }
       const errors = {}
       await Promise.all(names.map(async (name) => {
-        try {
-          const { versions, tags } = await this.fetchPackument(name)
-          const next = typeof tags.next === 'string' ? tags.next : undefined
-          packages[name] = {
-            versions: versions.slice(-40),
-            tags,
-            next: next ?? null,
-            latest: highestInChannel(versions, channelOf(next ?? '')) ?? highestInChannel(versions, 'stable') ?? versions[versions.length - 1],
-          }
-        } catch (error) {
-          errors[name] = String(error?.message ?? error)
-        }
+        const record = await this.lookup(name)
+        if (typeof record === 'string') errors[name] = record
+        else packages[name] = record
       }))
       this.cache = { checkedAt: Date.now(), packages, errors }
       this.persist()
@@ -277,6 +290,30 @@ export class VersionStore {
     }
   }
 
+  /**
+   * One package's registry record, or a short reason string when the lookup
+   * failed. A second attempt with the full document rides out the transient
+   * failures a proxy can introduce.
+   */
+  async lookup(name) {
+    let first
+    for (const variant of ['abbreviated', 'full']) {
+      try {
+        const { versions, tags } = await this.fetchPackument(name, variant)
+        const next = typeof tags.next === 'string' ? tags.next : undefined
+        return {
+          versions: versions.slice(-40),
+          tags,
+          next: next ?? null,
+          latest: highestInChannel(versions, channelOf(next ?? '')) ?? highestInChannel(versions, 'stable') ?? versions[versions.length - 1],
+        }
+      } catch (error) {
+        if (first === undefined) first = cleanMessage(error?.message ?? error)
+      }
+    }
+    return first
+  }
+
   persist() {
     try {
       mkdirSync(dirname(this.file), { recursive: true })
@@ -333,6 +370,16 @@ export class VersionStore {
   }
 }
 
+/**
+ * Keep a diagnostic to one printable short line. Error text can quote a
+ * response body, and a panel has no business rendering raw bytes.
+ */
+function cleanMessage(message) {
+  const text = String(message).replace(/[^\t\n\r\x20-\x7e]/g, '').replace(/\s+/g, ' ').trim()
+  if (text.length === 0) return 'unknown error'
+  return text.length > 140 ? `${text.slice(0, 137)}...` : text
+}
+
 /** Single-quote a shell word so paths with spaces survive. */
 function shellQuote(value) {
   return `'${String(value).replaceAll("'", `'\\''`)}'`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-token-use",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Real-time token usage and estimated spend for DeepSeek Harness, in a four-tab settings panel: an overview with cost/totals cards, a trend chart with a daily-average line and a 12-month usage heatmap; by-model and by-project tables with day/month/year/date-range queries; and versions, runtime facts, a harness self-check and a one-click restart. Prices come from DeepSeek's official page, refreshed daily, peak/off-peak aware. · 实时 Token 用量与估算金额面板，四个 tab：概览（金额/总量卡片、带日均线的趋势图、近 12 个月使用热力图）、模型统计与项目统计（按天/月/年/时间段/全部查询）、配置信息（版本对比、运行环境、Harness 自检、一键重启）。定价取 DeepSeek 官网、每日自动更新，区分高峰/空闲。",
   "keywords": [
     "dsh",