dsh-cost-meter 1.5.21 → 1.5.22

package/README.en.md

@@ -6,7 +6,7 @@
 
 Per-conversation cost · daily totals · OpenCode Go subscription quota display · budget with usage percentage · official account balance · custom provider balance · balance progress bar · history · peak/off-peak pricing hours display (peak hours UTC 01:00–04:00, 06:00–10:00) · pre-switch popup & system-notification alerts for peak/off-peak changes (position / lead time / alert type configurable) · one-click price sync from the official docs · Codex-style token usage heat grid · multi-vendor model pricing (built-in 90+ model price catalog with auto-matching) · mainstream Coding Plan quota queries & display (Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow / SCNet)
 
-[![version](https://img.shields.io/badge/version-1.5.21-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.22-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 [![npm](https://img.shields.io/npm/v/dsh-cost-meter?label=npm)](https://www.npmjs.com/package/dsh-cost-meter)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -45,6 +45,7 @@ English | [中文](README.md)
 | UI language | Settings → Display settings | Simplified Chinese / English / Follow browser (auto); switches instantly and auto-saves |
 | AI price sync | [prompt](docs/AI-PRICE-SYNC-PROMPT.en.md) | DeepSeek official sync; other providers use the verified official price catalog and manual configuration |
 | Model & Plan adaptation guide | [adaptation doc](docs/model-and-plan-adaptation.en.md) | Adaptation matrix for per-model billing and the 7 Coding Plan vendors, the auto-matching mechanism and price sources ([中文](docs/model-and-plan-adaptation.md)) |
+| Peak/off-peak alert guide | [alert doc](docs/peak-alert.en.md) | Fully illustrated guide to the pre-switch popup and system notification: effect screenshots (EN/中文), settings reference and usage tips ([中文](docs/peak-alert.md)) |
 | Multi-provider billing | Settings / ledger | OpenAI, Anthropic, Google Gemini, Mistral and other providers with input/output, cache and reasoning-token pricing isolated by provider + model |
 | Model-name auto-matching | Settings / ledger | Unknown model ids are matched against the price table: case/spaces/hyphens/dots and bracket annotations (e.g. (go)) are ignored — a normalized-equal or containing name hits (e.g. `gpt5.6 luna(go)`); router providers (opencode/zen etc.) search across all vendors; can be restricted to exact match, and unmatched models can be pinned to a specific entry in Settings |
 | Extended price catalog | Settings → Extended price catalog | Built-in reference catalog grouped by vendor and model family (expandable; vendors collapsed by default); mount entries into billing with one click — mounted third-party models live inside the catalog and stay editable; a per-model “Show directly in Cost settings” toggle chooses which models (DeepSeek included) appear directly in the price table |
@@ -193,22 +194,22 @@ Real captures from an actual DSH sidebar of the period strip and collapsed verti
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell one-click script** (copy the whole line, paste, press Enter; pnpm is provisioned automatically, git is auto-detected — no clone needed; the install chain is **pinned to the release tag `v1.5.21`** — review the script before running):
+**PowerShell one-click script** (copy the whole line, paste, press Enter; pnpm is provisioned automatically, git is auto-detected — no clone needed; the install chain is **pinned to the release tag `v1.5.22`** — review the script before running):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.21/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.22/install.ps1 | iex
 ```
 
 **Or a plain command line** (the machine must already have pnpm and git; also pinned to the tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.21
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.22
 ```
 
 Without git, use the GitHub tag archive:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.21.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.22.tar.gz
 ```
 
 After installing, **restart** `dsh web` (plugin rows, the Typert manifest and the client bundle are all scanned at startup):

package/README.md

@@ -6,7 +6,7 @@
 
 本会话费用 · 当日费用 · OpenCode Go 订阅额度显示 · 预算与已用百分比 · 官方账户余额 · 自定义 Provider 余额查询(可配任意 HTTP 端点) · 余额三段进度条 · 历史记录 · 峰谷计价时段显示(UTC 01:00–04:00、06:00–10:00 为峰时段) · 峰/谷切换前弹窗与系统通知提醒(位置/提前量/提醒类型可配) · 官方价格一键同步 · 类 Codex Token 用量热图 · 多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配) · 主流 Coding Plan 额度查询与显示(Anthropic / Z.ai / MiniMax / Kimi / OpenRouter / SiliconFlow / SCNet 七家)
 
-[![version](https://img.shields.io/badge/version-1.5.21-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
+[![version](https://img.shields.io/badge/version-1.5.22-4176E6)](https://github.com/Han-1413141/dsh-cost-meter)
 [![npm](https://img.shields.io/npm/v/dsh-cost-meter?label=npm)](https://www.npmjs.com/package/dsh-cost-meter)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![dsh](https://img.shields.io/badge/DeepSeek%20Harness-dsh--plugin-4176E6)](https://github.com/deepseek-ai/deepseek-harness)
@@ -46,6 +46,7 @@
 | 界面语言 | 设置页 → 显示设置 | 简体中文 / English / 跟随浏览器(自动);切换即时生效并自动保存 |
 | AI 价格同步 | [提示词](docs/AI-PRICE-SYNC-PROMPT.md) | DeepSeek 官方同步;其他 provider 使用已核对的官方价格目录与手动配置 |
 | 模型与 Plan 适配说明 | [适配文档](docs/model-and-plan-adaptation.md) | 各厂商模型计费与 7 家 Coding Plan 的适配矩阵、自动匹配机制与价格来源([English](docs/model-and-plan-adaptation.en.md)) |
+| 峰/谷切换提醒图解 | [提醒文档](docs/peak-alert.md) | 峰谷切换前弹窗与系统通知的完整图解:效果截图(中/英)、设置项说明与使用建议([English](docs/peak-alert.en.md)) |
 | 多 provider 计费 | 设置页 / 账本 | 支持 OpenAI、Anthropic、Google Gemini、Mistral 等 provider 的 input/output、缓存与 reasoning token 价格,按 provider+model 隔离计费 |
 | 模型名自动匹配 | 设置页 / 账本 | 未知模型 id 自动匹配价格表:忽略大小写/空格/横杠/点号与括号附注,归一化等价或请求名包含表内模型名即命中(如 `gpt5.6 luna(go)`);路由 provider(opencode/zen 等)下跨厂商全库查找;可关闭为仅精确;未命中模型可手动指定计费条目 |
 | 拓展价格表 | 设置页 → 拓展价格表 | 内置各厂商、按模型家族分类的参考价格目录(点开展开,厂商默认折叠);一键挂载参与计费,挂载的第三方模型默认收入表内可编辑;逐模型「在费用设置直接显示」开关自选哪些模型(含 DeepSeek)在「价格表」区直接显示 |
@@ -195,22 +196,22 @@
 dsh plugin --profile web add dsh-cost-meter
 ```
 
-**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.21`**,建议先下载审阅再运行):
+**PowerShell 一键脚本**(复制整行粘贴回车;自动补齐 pnpm、自动探测 git,无需克隆仓库;安装链**固定到发布 tag `v1.5.22`**,建议先下载审阅再运行):
 
 ```powershell
-irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.21/install.ps1 | iex
+irm https://raw.githubusercontent.com/Han-1413141/dsh-cost-meter/v1.5.22/install.ps1 | iex
 ```
 
 **或直接命令行**(机器上需已有 pnpm 与 git;同样固定到 tag):
 
 ```sh
-dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.21
+dsh plugin --profile web add github:Han-1413141/dsh-cost-meter#v1.5.22
 ```
 
 没有 git 时可用 GitHub tag 打包直链:
 
 ```sh
-dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.21.tar.gz
+dsh plugin --profile web add https://github.com/Han-1413141/dsh-cost-meter/archive/refs/tags/v1.5.22.tar.gz
 ```
 
 安装后**重启** `dsh web`(插件行、Typert 清单与客户端 bundle 均在启动时扫描):

package/lib/coding-plans.js

@@ -21,6 +21,8 @@
  *  - 百炼 Coding Plan / OpenAI Codex / Gemini Code Assist / GitHub Copilot 个人版暂无 API-Key 化公开用量端点(仅控制台/组织级 API),不接入。
  */
 
+import { fetchWithRetry } from './net.js'
+
 export const CODING_PLAN_PROVIDERS = {
   anthropic: {
     label: 'Anthropic (Claude Pro/Max)',
@@ -526,13 +528,13 @@ export async function queryCodingPlan(provider, key, locale, t) {
   for (const url of urls) {
     let response
     try {
-      response = await fetch(url, {
+      // 瞬时网络错误先在单端点上重试(issue #28 同一封装),仍失败再换端点变体。
+      response = await fetchWithRetry(url, {
         headers: {
           authorization: `Bearer ${key.trim()}`,
           'user-agent': 'dsh-cost-meter/1.4 (DeepSeek Harness plugin)',
         },
-        signal: AbortSignal.timeout(15000),
-      })
+      }, { timeoutMs: 15000 })
     } catch (error) {
       lastError = error
       continue // 网络错误:尝试下一个端点变体

package/lib/custom-balance.js

@@ -3,6 +3,7 @@
  * 与 coding-plans.js 固定端点 adapter 互补:共用 index.js 侧的 refresh/cache 模式。
  */
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
+import { fetchWithRetry } from './net.js'
 
 export const CUSTOM_BALANCE_ADAPTER_ID = 'custom'
 
@@ -102,14 +103,15 @@ export async function queryCustomBalance(ctx, config) {
   }
   const method = typeof request.method === 'string' ? request.method.toUpperCase() : 'GET'
   const headers = await resolveHeaders(request.headers ?? {}, ctx)
-  const init = { method, headers, signal: AbortSignal.timeout(15000) }
+  const init = { method, headers }
   if (method !== 'GET' && method !== 'HEAD' && request.body !== undefined) {
     init.body = typeof request.body === 'string' ? request.body : JSON.stringify(request.body)
     if (!headers['content-type'] && !headers['Content-Type']) {
       init.headers = { ...headers, 'content-type': 'application/json' }
     }
   }
-  const response = await fetch(request.url, init)
+  // 瞬时网络错误自动重试(issue #28 同一封装;body 为字符串可安全重放)。
+  const response = await fetchWithRetry(request.url, init, { timeoutMs: 15000 })
   if (!response.ok) {
     throw new Error(`custom balance HTTP ${String(response.status)}`)
   }

package/lib/index.js

@@ -22,6 +22,7 @@ import { Ledger, applyConfigPatch, localDayKey, pickBalanceInfo, reconcileBalanc
 import { backfillLegacyLedger, importLegacyHistory } from './backfill.js'
 import { OFFICIAL_PRICING_URL, normalizePrice, parsePricingHtml, costOf, priceEntryFor, providerPriceEntryFor, buildPriceCatalog } from './pricing.js'
 import { CODING_PLAN_PROVIDERS, CODING_PLAN_PROVIDER_IDS, queryCodingPlan, scnetTokenPlanWindows, emptyCustomBalance, queryCustomBalance } from './coding-plans.js'
+import { fetchWithRetry } from './net.js'
 import { stateSchema } from './typert.host.js'
 
 export const name = 'cost-meter'
@@ -349,14 +350,15 @@ async function queryGoQuota(ctx, config, locale) {
     error.soft = true // 未登录/未配置 Key 属预期场景,面板以中性提示展示
     throw error
   }
-  const response = await fetch(GO_QUOTA_URL, {
+  // Cloudflare 前置会间歇性重置连接(ECONNRESET → fetch failed):瞬时网络错误
+  // 自动重试,401/403 等业务状态仍走下方原语义(issue #28)。
+  const response = await fetchWithRetry(GO_QUOTA_URL, {
     headers: {
       authorization: `Bearer ${key}`,
       // 浏览器 UA:避免被 opencode.ai 前置 Cloudflare 以 error 1010 拦截。
       'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36',
     },
-    signal: AbortSignal.timeout(15000),
-  })
+  }, { timeoutMs: 15000 })
   if (!response.ok) {
     if (response.status === 401 || response.status === 403) {
       const error = new Error(tmsg(locale, 'goQuotaNoSub', { code: String(response.status) }))
@@ -469,10 +471,10 @@ async function queryBalance(ctx, locale) {
   if (endpoint === null) {
     throw new Error(tmsg(locale, 'balanceEndpointNotOfficial', { url: String(baseURL ?? '') }))
   }
-  const response = await fetch(endpoint, {
+  // 瞬时网络错误自动重试(issue #28 同一封装);非 2xx 状态仍按业务错误处理。
+  const response = await fetchWithRetry(endpoint, {
     headers: { authorization: `Bearer ${apiKey}` },
-    signal: AbortSignal.timeout(15000),
-  })
+  }, { timeoutMs: 15000 })
   if (!response.ok) throw new Error(tmsg(locale, 'balanceHttp', { code: String(response.status) }))
   const data = await response.json()
   // 多币种账号返回 CNY/USD 两条且顺序不稳定(#24/#25):按余额与币种挑选,不固定取首条。
@@ -548,12 +550,11 @@ function buildState(ledger, balance = emptyBalance(), goQuota = emptyGoQuota(),
   return state
 }
 
-/** 带超时抓取官方定价页。 */
+/** 带超时抓取官方定价页(瞬时网络错误自动重试,issue #28 同一封装)。 */
 async function fetchPricingHtml(locale) {
-  const response = await fetch(OFFICIAL_PRICING_URL, {
-    signal: AbortSignal.timeout(20000),
+  const response = await fetchWithRetry(OFFICIAL_PRICING_URL, {
     headers: { 'user-agent': 'dsh-cost-meter/0.4 (DeepSeek Harness plugin)' },
-  })
+  }, { timeoutMs: 20000 })
   if (!response.ok) throw new Error(`HTTP ${String(response.status)}`)
   const text = await response.text()
   if (text.length < 500) throw new Error(tmsg(locale, 'pageTooShort'))

package/lib/net.js

@@ -0,0 +1,57 @@
+/**
+ * 对外 HTTP 请求的统一重试封装(issue #28)。
+ * opencode.ai 等端点部署在 Cloudflare 之后会间歇性重置连接(ECONNRESET),
+ * Node fetch 统一抛为 `fetch failed`;对这类瞬时网络错误做少量重试即可消除
+ * 面板偶发报错,而 401/403 等业务错误重试无意义,仍由调用方原样处理。
+ */
+
+/** 视为瞬时的网络错误码(Node DNS/socket 层 + undici 内部码)。 */
+const TRANSIENT_CODES = new Set([
+  'ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'ENOTFOUND', 'EHOSTUNREACH',
+  'ENETUNREACH', 'EPIPE', 'EAI_AGAIN',
+  'UND_ERR_SOCKET', 'UND_ERR_CONNECT_TIMEOUT', 'UND_ERR_HEADERS_TIMEOUT',
+  'UND_ERR_BODY_TIMEOUT', 'UND_ERR_READ_ERROR', 'UND_ERR_ABORTED',
+])
+
+/**
+ * 判定 fetch 抛出的错误是否为瞬时网络错误(值得重试)。
+ * @param {unknown} error - fetch reject 的错误。
+ */
+export function isTransientFetchError(error) {
+  if (typeof error !== 'object' || error === null) return false
+  // AbortSignal.timeout 触发的超时:DOMException TimeoutError(老版本 undici 为
+  // AbortError)。本插件对外请求只用超时信号、无手动取消,二者均可安全重试。
+  if (error.name === 'TimeoutError' || error.name === 'AbortError') return true
+  const code = error.cause?.code ?? error.code
+  // 有具体 code 时以白名单为准:证书过期(EPERM/CERT_*)等持久性错误不重试。
+  if (typeof code === 'string') return TRANSIENT_CODES.has(code)
+  // 无具体 code 的纯 'fetch failed'(TypeError)按瞬时处理。
+  return error instanceof TypeError && String(error.message ?? '').includes('fetch failed')
+}
+
+/** @param {number} ms */
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+/**
+ * 带重试的 fetch:仅对瞬时网络错误自动重试(默认共 4 次尝试,退避 300/600/1200ms,
+ * 上限 1500ms),其余错误与 HTTP 状态码原样交回调用方(业务语义各自判断)。
+ * 每次尝试用 timeoutMs 新建超时信号——重试若复用已中止的 AbortSignal.timeout
+ * 会立即再抛 AbortError,重试形同虚设。
+ * @param {string} url - 请求地址。
+ * @param {RequestInit} [init] - fetch init(headers/method/body 等)。
+ * @param {{ attempts?: number, backoffMs?: number, timeoutMs?: number }} [options]
+ *   - attempts:总尝试次数(含首次),默认 4。
+ *   - backoffMs:退避基数,默认 300(实际等待 backoffMs * 2^(尝试序-2))。
+ *   - timeoutMs:单次尝试超时;>0 时覆盖 init.signal,默认 0(沿用调用方信号)。
+ */
+export async function fetchWithRetry(url, init = {}, { attempts = 4, backoffMs = 300, timeoutMs = 0 } = {}) {
+  for (let attempt = 1; ; attempt++) {
+    if (attempt > 1) await sleep(Math.min(1500, backoffMs * 2 ** (attempt - 2)))
+    const perAttempt = timeoutMs > 0 ? { ...init, signal: AbortSignal.timeout(timeoutMs) } : init
+    try {
+      return await fetch(url, perAttempt)
+    } catch (error) {
+      if (!isTransientFetchError(error) || attempt >= attempts) throw error
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cost-meter",
-  "version": "1.5.21",
+  "version": "1.5.22",
   "description": "DeepSeek Harness 会话费用统计插件:本会话成本、当日费用、历史记录与官方价格同步,支持多厂商多模型价格计费(内置 90+ 模型价格目录与自动匹配)、主流 Coding Plan 订阅额度查询与显示(7 家,含 SCNet Token Plan 本地 Credits 计量)、自定义 Provider 余额查询(可配任意 HTTP 端点)与余额进度条、峰谷计价时段显示与切换前弹窗/系统通知提醒(位置/提前量/类型可配),界面中英双语。Session cost tracking plugin for DeepSeek Harness: per-conversation cost, daily totals, history and official price sync, with multi-vendor model pricing (built-in 90+ model catalog with auto-matching), Coding Plan quota queries & display for 7 vendors (incl. local credits metering for the SCNet Token Plan), custom provider balance lookup (configurable HTTP endpoint) and balance progress bar, plus peak/off-peak pricing display with pre-switch popup & system-notification alerts (position / lead time / type configurable), in a bilingual (Chinese/English) UI.",
   "type": "module",
   "main": "lib/index.js",