@iasiv5/dsh-quota-watch 0.1.21 → 0.1.23

package/lib/client.js

@@ -199,6 +199,7 @@ var COPY = {
     loading: "\u8BFB\u53D6\u4E2D",
     failed: "\u67E5\u8BE2\u5931\u8D25",
     stale: "\u6570\u636E\u53EF\u80FD\u5DF2\u8FC7\u671F",
+    authRejected: "\u51ED\u8BC1\u5DF2\u88AB\u670D\u52A1\u5546\u62D2\u7EDD\uFF0C\u8BF7\u91CD\u65B0\u6388\u6743",
     requestFailed: "\u5237\u65B0\u5931\u8D25\uFF0C\u663E\u793A\u4E0A\u6B21\u6210\u529F\u6570\u636E",
     available: "\u53EF\u7528\u989D\u5EA6",
     used: "\u672C\u671F\u5DF2\u7528",
@@ -236,6 +237,7 @@ var COPY = {
     loading: "Loading",
     failed: "Query failed",
     stale: "Data may be stale",
+    authRejected: "Credential rejected by provider \u2014 re-authorize",
     requestFailed: "Refresh failed; showing last successful data",
     available: "Available credits",
     used: "Used this cycle",
@@ -433,7 +435,7 @@ function kvRow(doc, label, value) {
 }
 function glmRowModel(provider) {
   if (provider?.status === "missing") return null;
-  if (provider?.status === "error") return { kind: "error", label: "GLM", error: provider.error };
+  if (provider?.status === "error") return { kind: "error", label: "GLM", error: provider.error, errorKind: provider.errorKind };
   const windows = provider?.plan?.windows;
   if (!Array.isArray(windows) || windows.length === 0) return null;
   const five = windows.find((window) => window?.key === "5h");
@@ -444,12 +446,13 @@ function glmRowModel(provider) {
     percent: five?.percent,
     stale: provider.status === "stale",
     error: provider.error,
+    errorKind: provider.errorKind,
     extra: tokens
   };
 }
 function copilotRowModel(provider) {
   if (provider?.status === "missing") return null;
-  if (provider?.status === "error") return { kind: "error", label: "Copilot", error: provider.error };
+  if (provider?.status === "error") return { kind: "error", label: "Copilot", error: provider.error, errorKind: provider.errorKind };
   const quota = provider?.quota;
   if (quota?.balanceAvailable !== true) return null;
   const used = remainingToUsed(quota.percentRemaining);
@@ -460,6 +463,7 @@ function copilotRowModel(provider) {
     percent: used,
     stale: provider.status === "stale",
     error: provider.error,
+    errorKind: provider.errorKind,
     extra: typeof quota.creditsUsed === "number" && quota.creditsUsed >= 0 ? quota.creditsUsed : void 0
   };
 }
@@ -740,7 +744,7 @@ function mountQuotaCard({
     if (model.stale) {
       const mark = text(doc, "span", "dqw-stale-mark", "\u26A0");
       mark.dataset.dshQuotaWatchStale = "";
-      mark.title = model.error ?? copy.stale;
+      mark.title = model.errorKind === "auth" && model.error ? `${copy.authRejected}: ${model.error}` : model.error ?? copy.stale;
       row.append(mark);
     }
     row.append(text(doc, "span", "dqw-pct", typeof model.percent === "number" ? formatPercent(model.percent, locale) : "\u2014"));
@@ -824,7 +828,8 @@ function mountQuotaCard({
     detail.replaceChildren();
     detail.append(panelHeader({ title: copy.providerNames[key], showBack: fromPanelNav }));
     if (provider?.status === "stale") {
-      detail.append(text(doc, "p", "dqw-error", `${copy.stale}${provider.error ? `: ${provider.error}` : ""}`));
+      const bannerPrefix = provider.errorKind === "auth" ? copy.authRejected : copy.stale;
+      detail.append(text(doc, "p", "dqw-error", `${bannerPrefix}${provider.error ? `: ${provider.error}` : ""}`));
     }
     if (key === "glm") {
       const usage = provider?.usage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iasiv5/dsh-quota-watch",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "description": "DSH Web sidebar monitor for GLM Coding Plan quotas and GitHub Copilot credits",
   "type": "module",
   "main": "./src/host.mjs",

package/src/client.mjs

@@ -34,6 +34,7 @@ const COPY = {
     loading: '读取中',
     failed: '查询失败',
     stale: '数据可能已过期',
+    authRejected: '凭证已被服务商拒绝，请重新授权',
     requestFailed: '刷新失败，显示上次成功数据',
     available: '可用额度',
     used: '本期已用',
@@ -71,6 +72,7 @@ const COPY = {
     loading: 'Loading',
     failed: 'Query failed',
     stale: 'Data may be stale',
+    authRejected: 'Credential rejected by provider — re-authorize',
     requestFailed: 'Refresh failed; showing last successful data',
     available: 'Available credits',
     used: 'Used this cycle',
@@ -322,7 +324,7 @@ function kvRow(doc, label, value) {
 /** GLM summary row view model: fixed 5h-window percent plus today's compact tokens. */
 function glmRowModel(provider) {
   if (provider?.status === 'missing') return null
-  if (provider?.status === 'error') return { kind: 'error', label: 'GLM', error: provider.error }
+  if (provider?.status === 'error') return { kind: 'error', label: 'GLM', error: provider.error, errorKind: provider.errorKind }
   const windows = provider?.plan?.windows
   if (!Array.isArray(windows) || windows.length === 0) return null
   const five = windows.find((window) => window?.key === '5h')
@@ -335,6 +337,7 @@ function glmRowModel(provider) {
     percent: five?.percent,
     stale: provider.status === 'stale',
     error: provider.error,
+    errorKind: provider.errorKind,
     extra: tokens,
   }
 }
@@ -342,7 +345,7 @@ function glmRowModel(provider) {
 /** Copilot summary row view model: used% inverted from the reported remaining percent. */
 function copilotRowModel(provider) {
   if (provider?.status === 'missing') return null
-  if (provider?.status === 'error') return { kind: 'error', label: 'Copilot', error: provider.error }
+  if (provider?.status === 'error') return { kind: 'error', label: 'Copilot', error: provider.error, errorKind: provider.errorKind }
   const quota = provider?.quota
   if (quota?.balanceAvailable !== true) return null
   const used = remainingToUsed(quota.percentRemaining)
@@ -353,6 +356,7 @@ function copilotRowModel(provider) {
     percent: used,
     stale: provider.status === 'stale',
     error: provider.error,
+    errorKind: provider.errorKind,
     extra: typeof quota.creditsUsed === 'number' && quota.creditsUsed >= 0 ? quota.creditsUsed : undefined,
   }
 }
@@ -695,7 +699,9 @@ export function mountQuotaCard({
     if (model.stale) {
       const mark = text(doc, 'span', 'dqw-stale-mark', '⚠')
       mark.dataset.dshQuotaWatchStale = ''
-      mark.title = model.error ?? copy.stale
+      mark.title = model.errorKind === 'auth' && model.error
+        ? `${copy.authRejected}: ${model.error}`
+        : (model.error ?? copy.stale)
       row.append(mark)
     }
     row.append(text(doc, 'span', 'dqw-pct', typeof model.percent === 'number' ? formatPercent(model.percent, locale) : '—'))
@@ -793,7 +799,8 @@ export function mountQuotaCard({
     detail.replaceChildren()
     detail.append(panelHeader({ title: copy.providerNames[key], showBack: fromPanelNav }))
     if (provider?.status === 'stale') {
-      detail.append(text(doc, 'p', 'dqw-error', `${copy.stale}${provider.error ? `: ${provider.error}` : ''}`))
+      const bannerPrefix = provider.errorKind === 'auth' ? copy.authRejected : copy.stale
+      detail.append(text(doc, 'p', 'dqw-error', `${bannerPrefix}${provider.error ? `: ${provider.error}` : ''}`))
     }
     if (key === 'glm') {
       const usage = provider?.usage

package/src/host.mjs

@@ -77,11 +77,17 @@ function initialProvider(key, displayName) {
   return { key, displayName, status: 'loading', credential: 'unknown' }
 }
 
-function safeProbeError(error) {
-  if (error?.name === 'TimeoutError' || error?.name === 'AbortError') return '请求超时'
-  if (Number.isInteger(error?.status)) return `HTTP ${error.status}`
-  if (error?.code === 'UNRECOGNIZED_RESPONSE') return '服务商响应格式无法识别'
-  return '探测失败'
+/** Classify a probe failure into a user-facing message and a stable kind for the client. */
+export function classifyProbeError(error) {
+  if (error?.name === 'TimeoutError' || error?.name === 'AbortError') return { message: '请求超时', kind: 'network' }
+  if (Number.isInteger(error?.status)) {
+    if (error.status === 401 || error.status === 403) return { message: `HTTP ${error.status}`, kind: 'auth' }
+    return { message: `HTTP ${error.status}`, kind: 'server' }
+  }
+  if (error?.code === 'UNRECOGNIZED_RESPONSE') return { message: '服务商响应格式无法识别', kind: 'parse' }
+  const causeCode = String(error?.cause?.code ?? '')
+  if (/^[A-Z0-9_]{3,60}$/.test(causeCode)) return { message: `探测失败 (${causeCode})`, kind: 'network' }
+  return { message: '探测失败', kind: 'network' }
 }
 
 function responseJson(res, status, body) {
@@ -117,6 +123,7 @@ export function createQuotaService(ctx, options = {}) {
   let pollPromise
   let timer
   let disposed = false
+  let coldAttempts = 0
 
   function view() {
     return {
@@ -131,6 +138,7 @@ export function createQuotaService(ctx, options = {}) {
           ...(provider.updatedAt !== undefined ? { updatedAt: provider.updatedAt } : {}),
           ...(provider.checkedAt !== undefined ? { checkedAt: provider.checkedAt } : {}),
           ...(provider.error !== undefined ? { error: provider.error } : {}),
+          ...(provider.errorKind !== undefined ? { errorKind: provider.errorKind } : {}),
           ...(provider.plan !== undefined ? { plan: provider.plan } : {}),
           ...(provider.quota !== undefined ? { quota: provider.quota } : {}),
           ...(provider.usage !== undefined ? { usage: provider.usage } : {}),
@@ -139,7 +147,20 @@ export function createQuotaService(ctx, options = {}) {
     }
   }
 
+  /** Log one real state transition; degradations warn, recoveries and missing-credentials inform.
+   * Dual-channel: ctx.logger (cordis, ring-buffer only — the host registers no journal
+   * exporter) mirrored to console so service stdout lands in journald. */
+  function logTransition(key, from, to, detail) {
+    if (from === to) return
+    const line = `quota-watch: ${key} ${from}→${to}${detail ? ` (${detail})` : ''}`
+    const level = to === 'error' || to === 'stale' ? 'warn' : 'info'
+    if (level === 'warn') ctx.logger?.warn?.(line)
+    else ctx.logger?.info?.(line)
+    ;(options.logMirror ?? console)[level]?.(line)
+  }
+
   function markMissing(key, displayName) {
+    const from = providers.get(key)?.status
     providers.set(key, {
       key,
       displayName,
@@ -147,9 +168,11 @@ export function createQuotaService(ctx, options = {}) {
       credential: 'none',
       checkedAt: now(),
     })
+    logTransition(key, from, 'missing')
   }
 
   function markSuccess(key, displayName, payload) {
+    const from = providers.get(key)?.status
     const at = now()
     providers.set(key, {
       key,
@@ -160,6 +183,7 @@ export function createQuotaService(ctx, options = {}) {
       checkedAt: at,
       ...payload,
     })
+    logTransition(key, from, 'ready')
   }
 
   function markGlmPlanSuccess(plan) {
@@ -175,6 +199,7 @@ export function createQuotaService(ctx, options = {}) {
       plan,
       ...(previous?.usage !== undefined ? { usage: previous.usage } : {}),
     })
+    logTransition('glm', previous?.status, 'ready')
   }
 
   function markGlmUsageSuccess(usage) {
@@ -189,6 +214,7 @@ export function createQuotaService(ctx, options = {}) {
       checkedAt: at,
       usage: { status: 'ready', updatedAt: at, ...usage },
     })
+    logTransition('glm-usage', previous.usage?.status ?? 'loading', 'ready')
   }
 
   function markGlmUsageFailure(error) {
@@ -197,27 +223,35 @@ export function createQuotaService(ctx, options = {}) {
     const lastGood = previous.usage?.status === 'ready' || previous.usage?.status === 'stale'
       ? previous.usage
       : undefined
+    const { message, kind } = classifyProbeError(error)
+    const status = lastGood !== undefined ? 'stale' : 'error'
     providers.set('glm', {
       ...previous,
       checkedAt: now(),
       usage: {
         ...(lastGood !== undefined ? lastGood : {}),
-        status: lastGood !== undefined ? 'stale' : 'error',
-        error: safeProbeError(error),
+        status,
+        error: message,
+        errorKind: kind,
       },
     })
+    logTransition('glm-usage', previous.usage?.status ?? 'loading', status, message)
   }
 
   function markFailure(key, displayName, error) {
     const previous = providers.get(key)
     const checkedAt = now()
     const hasLastGood = previous?.status === 'ready' || previous?.status === 'stale'
+    const { message, kind } = classifyProbeError(error)
+    const status = hasLastGood ? 'stale' : 'error'
     providers.set(key, {
       ...(hasLastGood ? previous : { key, displayName, credential: 'configured' }),
-      status: hasLastGood ? 'stale' : 'error',
+      status,
       checkedAt,
-      error: safeProbeError(error),
+      error: message,
+      errorKind: kind,
     })
+    logTransition(key, previous?.status, status, message)
   }
 
   async function fetchBody(spec) {
@@ -311,18 +345,23 @@ export function createQuotaService(ctx, options = {}) {
     timer = setTimeout(async () => {
       timer = undefined
       await refresh()
-      // Cold-start retry: until at least one provider has reached ready/stale,
-      // a failed or still-loading round re-arms shortly instead of waiting a
-      // full interval — a desktop cold start with a slow network would
-      // otherwise stare at no capsule for up to a minute. (updatedAt alone
-      // cannot signal "cold": refresh() stamps it even when every probe
-      // failed.) All-'missing' (no credentials configured) and warm states
-      // keep the normal cadence, so nobody without credentials gets
-      // high-frequency probing.
+      // Cold-start retry with capped exponential backoff: until at least one
+      // provider has reached ready/stale, a failed or still-loading round re-arms
+      // at coldRetryMs, doubling per consecutive retryable round and capping at
+      // the normal cadence — a desktop cold start with a slow network still gets
+      // fast early retries, but a persistently broken state (e.g. a rejected
+      // credential) can no longer hammer the upstream every few seconds forever.
+      // Any non-retryable round (success, or all-missing) resets the counter, so
+      // a later cold phase restarts from the short interval. (updatedAt alone
+      // cannot signal "cold": refresh() stamps it even when every probe failed.)
       const states = [...providers.values()].map((provider) => provider.status)
       const retryable = states.some((status) => status === 'loading' || status === 'error')
         && states.every((status) => status !== 'ready' && status !== 'stale')
-      schedule(retryable ? (options.coldRetryMs ?? 5_000) : pollIntervalSec * 1000)
+      if (retryable) coldAttempts += 1
+      else coldAttempts = 0
+      schedule(retryable
+        ? Math.min((options.coldRetryMs ?? 5_000) * 2 ** (coldAttempts - 1), pollIntervalSec * 1000)
+        : pollIntervalSec * 1000)
     }, delayMs)
     timer.unref?.()
   }