dsh-subusage 0.10.8 → 0.10.10

package/README.md

@@ -6,7 +6,7 @@
 
 > **English.** dsh-subusage shows subscription quota and balance for the AI providers you already use, as a pill next to the model selector in DeepSeek Harness. Provider switches and credentials live in one settings page, and other plugins or agents can read the same snapshot through a read-only quota API.
 
-[![npm version](https://img.shields.io/badge/npm-0.10.8-blue)](https://www.npmjs.com/package/dsh-subusage)
+[![npm version](https://img.shields.io/badge/npm-0.10.10-blue)](https://www.npmjs.com/package/dsh-subusage)
 [![license](https://img.shields.io/badge/license-MIT-green)](#license--security--许可与安全)
 [![DSH](https://img.shields.io/badge/DSH-%3E%3D0.2.0--rc.1%20%3C0.3.0--0-informational)](#compatibility--兼容性)
 

package/lib/client.js

@@ -389,13 +389,16 @@ window.__ModuleLoader__.load({
 			}
 			return worst;
 		}
+		function remainingPercent(percent) {
+			return Math.round(Math.max(0, 100 - (Number(percent) || 0)) * 10) / 10;
+		}
 		/** 药丸文案：永远答「还能用多少」（余），限额/连坐直说。多窗带窗口短名。 */
 		function pillText(w, multi, t) {
 			// 短标签走 locale（中文「周 / 月 / 日」，英文 1w / 1m / 1d），不让人猜 W 是哪个窗口。
 			const short = multi ? `${t(KIND_SHORT[w.kind] ?? "srolling")} ` : "";
 			if (w.status === "rate-limited" && !w.cascade) return `${short}${t("pillLimited")}`;
 			if (w.status === "rate-limited") return `${short}${t("pillBlocked")}`;
-			return `${short}${t("pillRemaining").replace("{p}", String(Math.round(Math.max(0, 100 - w.percent) * 10) / 10))}`;
+			return `${short}${t("pillRemaining").replace("{p}", String(remainingPercent(w.percent)))}`;
 		}
 		/** extras 标签：plan / account / balance 三类，未知类型回退为余额。 */
 		function extraLabel(x, t) {
@@ -684,8 +687,9 @@ window.__ModuleLoader__.load({
 				if (disposed) return snapshot;
 				const value = { ...incoming };
 				if (request && request.version < metadataSequence) { delete value.settings; delete value.configured; delete value.updatedAt; }
+				// 过期请求的 settings 已在上一行丢掉，所以这里若还带着 settings，就是「当前代」看到的 Host 配置。
+				// 另一窗口改过配置时采用它（开关跟着变），但不再 epoch++ / invalidate 全员——那会让非活跃条目永久 loading。
 				if (value.settings) metadataSequence = request ? request.version : ++sequence;
-				if (!localChange && snapshot.settings && value.settings && snapshot.settings.revision !== value.settings.revision) { epoch++; invalidate(PROVIDER_ORDER); }
 				const entries = new Map(snapshot.entries.map((e) => [e.providerId, e]));
 				for (const e of value.entries || []) if (!request || providerSequence.get(e.providerId) === request.version) entries.set(e.providerId, e);
 				snapshot = { ...snapshot, ...value, entries: [...entries.values()] };
@@ -694,17 +698,22 @@ window.__ModuleLoader__.load({
 			const refresh = (ids, force = false) => {
 				if (disposed) return Promise.reject(new Error("Client 已卸载"));
 				const unique = [...new Set(ids)].filter((id) => PROVIDER_ORDER.includes(id) && providerEnabled(snapshot.settings, id) && providerRoutable(snapshot, id));
-				const missing = unique.filter((id) => !inflight.has(id));
-				if (missing.length) {
-					const startedEpoch = epoch, request = markRequest(missing);
-					const task = Promise.resolve().then(() => call("refresh", { providerIds: missing, force: !!force, commandCodeAccount: ccAccount })).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => {
+				const start = (id) => {
+					if (inflight.has(id)) return inflight.get(id);
+					const startedEpoch = epoch, request = markRequest([id]);
+					const task = Promise.resolve().then(() => call("refresh", { providerIds: [id], force: !!force, commandCodeAccount: ccAccount })).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => {
 						// 传输失败不能擅自 retainPrevious：只有 Host 明确标 stale 才保留。
-						if (startedEpoch === epoch) merge({ entries: missing.map((providerId) => ({ providerId, state: "error", error: error instanceof Error ? error.message : String(error), freshness: "unknown", coverage: "partial", windows: [], extras: [] })) }, request);
+						if (startedEpoch === epoch) merge({ entries: [{ providerId: id, state: "error", error: error instanceof Error ? error.message : String(error), freshness: "unknown", coverage: "partial", windows: [], extras: [] }] }, request);
 						throw error;
-					}).finally(() => { for (const id of missing) if (inflight.get(id) === task) inflight.delete(id); });
-					for (const id of missing) inflight.set(id, task);
-				}
-				return Promise.all([...new Set(unique.map((id) => inflight.get(id)))]).then(() => snapshot);
+					}).finally(() => { if (inflight.get(id) === task) inflight.delete(id); });
+					inflight.set(id, task);
+					return task;
+				};
+				const tasks = unique.map(start);
+				// 调用方点名多家（刷新全部）即使过滤后只剩一家，也不把失败抬成整页错误。
+				const tolerant = ids.length > 1;
+				if (unique.length <= 1 && !tolerant) return (tasks[0] ?? Promise.resolve(snapshot)).then(() => snapshot);
+				return Promise.all(tasks.map((task) => task.catch(() => null))).then(() => snapshot);
 			};
 			const visible = () => { if (typeof document === "undefined" || document.visibilityState !== "hidden") void refresh([...active.keys()]).catch(() => {}); };
 			const tick = () => {
@@ -745,7 +754,7 @@ window.__ModuleLoader__.load({
 				// invalidate 只重写快照不通知：补一次 emit 让药丸立即进入加载态，
 				// 避免强制刷新返回前「标注已是新账户、数字还是旧账户」的瞬态错标。
 				emit();
-				return refresh(["commandcode"], true);
+				return refresh(["commandcode"], true).catch(() => snapshot);
 			};
 			return {
 				subscribe, getSnapshot: () => snapshot, refresh, activate,
@@ -755,10 +764,16 @@ window.__ModuleLoader__.load({
 				cancelMimoLogin: async (request) => { if (loginJobId && request.jobId !== loginJobId) return null; const generation = ++loginGeneration, startedEpoch = epoch; return acceptLogin(await call("cancelMimoLogin", request), generation, startedEpoch, request.jobId); },
 				readAll: () => { if (!initial) { const startedEpoch = epoch, request = markRequest(PROVIDER_ORDER); initial = Promise.resolve().then(() => call("read", { providerIds: PROVIDER_ORDER, force: false, commandCodeAccount: ccAccount })).then((value) => startedEpoch === epoch ? merge(value, request) : snapshot).catch((error) => { initial = null; throw error; }); } return initial.then(() => snapshot); },
 				save: async (patch) => {
-					const value = await call("save", patch); epoch++;
-					if (patch.visibility) { const entries = snapshot.entries; markRequest(PROVIDER_ORDER); return merge({ ...value, entries }, null, true); }
+					const value = await call("save", patch);
+					// 可见性开关只改 settings：不动 epoch、不重置在途请求序号——否则「刷新全部进行中拨开关」
+					// 会把所有在途用量结果整批丢弃（startedEpoch !== epoch 直接放弃 merge）。merge 内部会推进
+					// metadataSequence，让在途响应里的过期 settings 自动丢弃，本地新 revision 不被盖回。
+					if (patch.visibility) return merge({ ...value, entries: snapshot.entries }, null, true);
+					// 凭据变更改变用量语义：推进 epoch 丢弃在途。火山 AK/SK 是组内容共用的，必须整组失效。
+					epoch++;
 					const cookie = patch.cookieUpdate;
-					invalidate([patch.providerId], !cookie || cookie.action === "keep"); return merge(value, null, true);
+					const affected = PROVIDER_META[patch.providerId]?.volc && patch.volc ? ARK_IDS : [patch.providerId];
+					invalidate(affected, !cookie || cookie.action === "keep"); return merge(value, null, true);
 				},
 				reader: (id) => {
 					if (!readers.has(id)) {
@@ -905,14 +920,23 @@ window.__ModuleLoader__.load({
 			);
 		}
 
+		function RemainingBar({ value, color, label }) {
+			const pct = Math.max(0, Math.min(100, Number(value) || 0));
+			return h("div", {
+				role: "progressbar",
+				"aria-valuemin": 0, "aria-valuemax": 100, "aria-valuenow": pct, "aria-label": label,
+				style: { width: "100%", height: 10, marginTop: 8, borderRadius: 6, background: "rgba(148,163,184,.22)", overflow: "hidden" }
+			}, h("div", { style: { width: `${pct}%`, height: "100%", borderRadius: 6, background: color, boxShadow: pct ? "inset 0 1px 0 rgba(255,255,255,.2)" : "none" } }));
+		}
 		/**
-		 * 单窗口行（药丸弹层与设置页共用）：徽标 + 已用% 主数字 + 进度条 + 明细行。
+		 * 单窗口行（药丸弹层与设置页共用）：徽标 + 余量% 主数字 + 进度条（满格=100% 剩余，随已用扣减）+ 明细行。
 		 * 明细分两行：用量/适用范围一行，重置时间一行。挤在一行时「重置于 …（还有 …）」
 		 * 会在窄弹层里被从中间折断，读起来像属性和数值分了家。
 		 */
 		function UsageWindowRow({ w, t, getLocale, uncertain = false }) {
 			const tier = uncertain && w.status !== "rate-limited" ? { icon: "?", badge: "badgeUnknown", color: "#b7791f", rank: 2 } : usageTier(w);
 			const blocked = w.status === "rate-limited";
+			const left = blocked ? 0 : remainingPercent(w.percent);
 			const usageLine = [
 				w.detail && typeof w.detail.used === "number" && typeof w.detail.limit === "number" && w.detail.limit > 0
 					? t("detailUsed").replace("{used}", fmtTokens(w.detail.used)).replace("{limit}", fmtTokens(w.detail.limit)).replace("{unit}", w.detail.unit || "")
@@ -943,12 +967,9 @@ window.__ModuleLoader__.load({
 					}, `${tier.icon} ${t(tier.badge)}`),
 					h("span", { style: { flex: 1 } }),
 					h("strong", { style: { fontSize: 13, color: numColor(w), whiteSpace: "nowrap" } },
-						blocked ? t(tier.num) : t("numUsed").replace("{p}", String(w.percent)))
+						blocked ? t(tier.num) : t("pillRemaining").replace("{p}", String(remainingPercent(w.percent))))
 				),
-				h("progress", {
-					max: 100, value: Math.min(100, w.percent),
-					style: { width: "100%", height: 6, marginTop: 6, accentColor: tier.color }
-				}),
+				RemainingBar({ value: left, color: tier.color, label: blocked ? t(tier.num) : t("pillRemaining").replace("{p}", String(remainingPercent(w.percent))) }),
 				usageLine || resetParts
 					? h("div", { style: { fontSize: 11, opacity: 0.7, marginTop: 4 } },
 						usageLine ? h("div", { style: { overflowWrap: "anywhere" } }, usageLine) : null,
@@ -987,7 +1008,7 @@ window.__ModuleLoader__.load({
 			// unavailable/loading 保持现状；store 内部对相同账户去重，不产生多余请求。
 			react.useEffect(() => {
 				if (providerId !== "commandcode" || !ccState || !setCommandCodeAccount) return;
-				if (ccState.status === "ready") void setCommandCodeAccount(ccState.activeId);
+				if (ccState.status === "ready") void setCommandCodeAccount(ccState.activeId).catch(() => {});
 			}, [providerId, setCommandCodeAccount, ccState && ccState.status, ccState && ccState.activeId]);
 			react.useEffect(() => {
 				let alive = true;
@@ -1197,6 +1218,7 @@ window.__ModuleLoader__.load({
 			const [draft, setDraft] = react.useState(() => draftFor(result.settings, tab));
 			const [dirty, setDirty] = react.useState(false);
 			const [busy, setBusy] = react.useState(false);
+			const [refreshing, setRefreshing] = react.useState(false);
 			const [notice, setNotice] = react.useState(null);
 			const [loadError, setLoadError] = react.useState(null);
 			const [login, setLogin] = react.useState({ jobId: null, state: "idle" });
@@ -1281,10 +1303,10 @@ window.__ModuleLoader__.load({
 				try { window.localStorage.setItem("dsh-subusage:last-provider", id); } catch {}
 			};
 			const refresh = async (all) => {
-				setBusy(true);
+				setRefreshing(true);
 				try { if (!result.settings) await usageStore.readAll(); else await usageStore.refresh(all ? PROVIDER_ORDER : usageId ? [usageId] : [], true); if (aliveRef.current) setLoadError(null); }
 				catch (error) { if (aliveRef.current) setLoadError(String(error.message || error)); }
-				finally { if (aliveRef.current) setBusy(false); }
+				finally { if (aliveRef.current) setRefreshing(false); }
 			};
 			const saveVisibility = async (visibility) => {
 				if (busy || !result.settings || !result.settings.revision) return;
@@ -1319,7 +1341,7 @@ window.__ModuleLoader__.load({
 					if (!providerEnabled(saved.settings, tab)) return;
 					// 保存已成功落盘；独立验证失败不改写成“保存失败”。
 					try {
-						const verified = await usageStore.refresh([tab], true);
+						const verified = await usageStore.refresh(PROVIDER_META[tab]?.volc ? ARK_IDS : [tab], true);
 						const current = verified.entries.find((e) => e.providerId === tab);
 						if (aliveRef.current) setLoadError(current && current.state === "ok" ? null : text("已保存；验证获取失败：", "Saved; validation fetch failed: ") + (current && current.error || statusText(current, t)));
 					} catch (error) { if (aliveRef.current) setLoadError(text("已保存；验证获取失败：", "Saved; validation fetch failed: ") + String(error.message || error)); }
@@ -1473,8 +1495,8 @@ window.__ModuleLoader__.load({
 						"aria-label": text(`${success}/${visibleIds.length} 家数据获取成功；${troubledIds.length ? `点击跳到 ${PROVIDER_META[troubledIds[0]].short}` : "没有待处理项"}`, `${success}/${visibleIds.length} providers fetched; ${troubledIds.length ? `click to jump to ${PROVIDER_META[troubledIds[0]].short}` : "nothing needs attention"}`),
 						style: { ...btnStyle, padding: "2px 8px", fontSize: 12, opacity: .85, cursor: troubledIds.length ? "pointer" : "default", color: troubledIds.length ? "#b7791f" : "inherit" }
 					}, text(`${success}/${visibleIds.length} 家数据获取成功`, `${success}/${visibleIds.length} providers fetched`)),
-					h("button", { type: "button", disabled: busy || !usageId, style: primary, onClick: () => refresh(false) }, text("刷新当前", "Refresh current")),
-					h("button", { type: "button", disabled: busy, style: btnStyle, onClick: () => refresh(true) }, text("刷新全部", "Refresh all"))
+					h("button", { type: "button", disabled: busy || refreshing || !usageId, style: { ...primary, cursor: busy || refreshing || !usageId ? "default" : "pointer" }, onClick: () => refresh(false) }, refreshing ? t("refreshing") : text("刷新当前", "Refresh current")),
+					h("button", { type: "button", disabled: busy || refreshing, style: { ...btnStyle, cursor: busy || refreshing ? "default" : "pointer" }, onClick: () => refresh(true) }, refreshing ? t("refreshing") : text("刷新全部", "Refresh all"))
 				),
 				loadError ? h("p", { role: "alert", style: { color: "#dc2626", overflowWrap: "anywhere" } }, loadError) : null,
 				!visibleIds.length ? h("p", { role: "status" }, text("没有可显示的提供商，请展开下方「提供商管理」开启、配置 API，或关闭默认隐藏。", "No visible providers. Expand Provider management below to enable a provider, configure API credentials, or turn off auto-hide.")) : null,

package/lib/index.js

@@ -387,6 +387,17 @@ function parseQuery(value) {
 function failure(code, message, retryable = false, retryAfterMs) {
  return new RemoteError(code, message, { retryable, retainPrevious: retryable, ...(retryAfterMs !== undefined ? { retryAfterMs } : {}) });
 }
+// 与 fetchJson 的 AbortSignal.timeout 同语义的 promise 超时门；ms 非正数视为不限时。
+// race 结束即清 timer：未触发的 setTimeout 否则会把测试进程挂到超时才退出；先 settle 的
+// 原始 promise 之后才 reject 时，handler 已由 race 注册，不会变成 unhandledRejection。
+function withTimeout(promise, ms, makeError) {
+ if (!Number.isFinite(ms) || ms <= 0) return promise;
+ let timer;
+ const work = Promise.resolve(promise);
+ work.catch(() => {});
+ const gate = new Promise((_, reject) => { timer = setTimeout(() => reject(makeError()), ms); });
+ return Promise.race([work, gate]).finally(() => { clearTimeout(timer); });
+}
 // 火山方舟把拒绝原因放在 ResponseMetadata.Error 业务信封里：401 是签名/凭据（服务端不知道你是谁），
 // 403 是授权（身份已确认但不能做：IAM 权限不足、套餐未开通、欠费），两者对用户的行动项不同。
 function volcFailure(action, error) {
@@ -400,7 +411,7 @@ function volcFailure(action, error) {
 }
 async function fetchJson(fetcher, url, headers, lifetimeSignal, init = {}) {
  let response;
- try { response = await fetcher(url, { method: init.method ?? "GET", ...(init.body !== undefined ? { body: init.body } : {}), headers: { accept: "application/json", "user-agent": "dsh-subusage/0.10.8", ...headers }, signal: lifetimeSignal ? AbortSignal.any([AbortSignal.timeout(10000), lifetimeSignal]) : AbortSignal.timeout(10000), redirect: "manual" }); }
+ try { response = await fetcher(url, { method: init.method ?? "GET", ...(init.body !== undefined ? { body: init.body } : {}), headers: { accept: "application/json", "user-agent": "dsh-subusage/0.10.10", ...headers }, signal: lifetimeSignal ? AbortSignal.any([AbortSignal.timeout(10000), lifetimeSignal]) : AbortSignal.timeout(10000), redirect: "manual" }); }
  catch { throw failure("subusage/network", "网络请求失败或超时", true); }
  if (response.status >= 300 && response.status < 400 || response.status === 401 || response.status === 403) throw failure("subusage/auth", "登录或凭据已失效");
  if (!response.ok) {
@@ -876,6 +887,9 @@ export class SubUsageService extends TypertRemoteService {
   this.io = options.io ?? { readFileSync, mkdirSync, writeFileSync, renameSync, chmodSync };
   this.path = options.configPath ?? CONFIG_PATH; this.fetcher = options.fetch ?? globalThis.fetch;
   this.now = options.now ?? Date.now;
+  // identity 解析（凭据服务/登录文件读取）与 HTTP 同量级的超时，默认 10s（对齐 fetchJson 的
+  // AbortSignal.timeout）；经 options 注入以便测试用极短值，不必真等 10 秒。
+  this.identityTimeoutMs = options.identityTimeoutMs ?? 10000;
   this.credentials = options.resolveCredentials ?? (async id => await ctx.get("credentials")?.resolve(credentialRef(PROVIDERS[id].envName)));
   this.environment = options.resolveEnvironment ?? (id => launchEnvironmentOf(ctx).get(PROVIDERS[id].envName));
   // 火山方舟的 AK/SK 不是路由的推理 Key，按固定变量名各自解析，两端都命中才算配对。
@@ -1125,8 +1139,17 @@ export class SubUsageService extends TypertRemoteService {
  async provider(id, settings, force, account = "") {
   const startedGeneration = this.generations.get(id) ?? 0;
   let identity;
-  try { identity = await this.identity(id, settings, account); }
-  catch { this.cache.delete(id); return { ...this.base(id, "none", settings, account), state: "error", errorCode: "subusage/credentials", error: "无法解析凭据" }; }
+  // identity 解析依赖凭据服务/登录文件读取，可能像 HTTP 一样永久挂起：套上与 fetchJson 同量级
+  // 的超时。超时不等于凭据失效——不清 Cookie、不用 subusage/credentials（client 的
+  // /auth|credential/ 判定会把它导去重新登录/凭据编辑入口），而是独立 errorCode 的可读条目。
+  // 只让这一家及时返回，不拖死整批 Promise.all；挂起的原始 promise 由 race 持有，之后
+  // settle 也被静默丢弃（含其 reject，handler 已注册，不会变成 unhandledRejection）。
+  try { identity = await withTimeout(this.identity(id, settings, account), this.identityTimeoutMs, () => failure("subusage/identity-timeout", `凭据解析超时（${Math.round(this.identityTimeoutMs / 1000)} 秒无响应）：凭据服务或登录文件读取未返回，请稍后重试`)); }
+  catch (e) {
+   const timedOut = e?.code === "subusage/identity-timeout";
+   this.cache.delete(id);
+   return { ...this.base(id, "none", settings, account), state: "error", errorCode: timedOut ? "subusage/identity-timeout" : "subusage/credentials", error: timedOut ? e.message : "无法解析凭据" };
+  }
   if (this.disposed) throw failure("subusage/disposed", "服务已卸载");
   if (startedGeneration !== (this.generations.get(id) ?? 0)) return this.provider(id, this.load(), force, account);
   if (!providerEnabled(settings, id)) {
@@ -1184,7 +1207,7 @@ export class SubUsageService extends TypertRemoteService {
   const wanted = matched.length || !unknown.length ? matched : [...IDS];
   const settings = this.load();
   const force = request?.force === true;
-  const entries = await Promise.all(wanted.map(id => this.provider(id, settings, force).catch(() => ({ providerId: id, label: PROVIDERS[id].label, state: "error", errorCode: "subusage/internal", error: "读取用量失败" }))));
+  const entries = await withTimeout(Promise.all(wanted.map(id => this.provider(id, settings, force).catch(() => ({ providerId: id, label: PROVIDERS[id].label, state: "error", errorCode: "subusage/internal", error: "读取用量失败" })))), 30000, () => failure("subusage/timeout", "额度查询超过 30 秒仍未完成，请稍后重试或缩小 providers"));
   // 认不出的名字要回一条**可读**条目而不是静默丢掉：调用方（尤其是模型）无从知道本插件用的是
   // 路由 id，丢掉之后它只看到空列表，会当成「本机没配任何额度」——真正的原因只是名字没对上。
   // 放在最前面，免得淹没在几十条数据后面。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-subusage",
-  "version": "0.10.8",
+  "version": "0.10.10",
   "displayName": "订阅用量显示",
   "description": "显示 DeepSeek 官方余额、火山方舟（arkcli 官方 CLI 路由：Agent / Coding Plan 个人版与企业版席位，设置页合并为一组）、Z.ai（中国与国际）、Kimi、MiMo、OpenCode Go、Command Code、SuperGrok、Codex（ChatGPT 订阅，默认关闭）、MiniMax（中国）、Synthetic、NanoGPT、SiliconFlow、OpenRouter、Novita、Hyperbolic、DeepInfra、Chutes、Ollama Cloud、Vercel AI Gateway、ZenMux、LiteLLM 的订阅余量与余额；共享刷新与凭据管理，默认关闭 17 家。",
   "keywords": [