@linxin666/dsh-usage 0.4.1 → 0.4.3

package/README.i18n.yaml

@@ -2,5 +2,5 @@
 # side as of the last confirmed-consistent state. Both languages carry equal authority;
 # after editing either side, bring the other along and re-record with:
 #   node scripts/verify-docs.mjs --write <dir>
-README.md: 075200f9f72702730eee6fefb3c8f0c78e920c13
-README.zh.md: a01d4af56fada30de8f044d4fde544378a7c9c2a
+README.md: 2397df7cc658e2f6f5f447312723de5bee7cb490
+README.zh.md: 34535e95511e0d66198e801d37ef5ba6b5d1a288

package/README.md

@@ -24,7 +24,7 @@ It covers the official DeepSeek routes only — relay traffic billed elsewhere (
 
 ## Install
 
-Requires DSH 0.1.7-rc.1 or later: the plugin is developed against the 0.1.7-rc.1 DSH cohort (its settings page is the Host-generated page of the plugin's own Config schema) and its `@deepseek-ai/*` runtime imports are provided by the host itself.
+Requires DSH 0.1.7-rc.2 or later: the plugin is developed against the 0.1.7-rc.2 DSH cohort (its settings page is the Host-generated page of the plugin's own Config schema) and its `@deepseek-ai/*` runtime imports are provided by the host itself.
 
 In your profile (e.g. `~/.dsh/profiles/web`):
 

package/README.zh.md

@@ -24,7 +24,7 @@ dsh Web GUI 的使用统计插件：多 provider 余额与编程套餐用量检
 
 ## 安装
 
-要求 DSH 0.1.7-rc.1 或更高：插件基于 0.1.7-rc.1 DSH cohort 开发（其设置页即宿主根据插件自身 Config schema 生成的页面），`@deepseek-ai/*` 运行时导入由宿主本体提供。
+要求 DSH 0.1.7-rc.2 或更高：插件基于 0.1.7-rc.2 DSH cohort 开发（其设置页即宿主根据插件自身 Config schema 生成的页面），`@deepseek-ai/*` 运行时导入由宿主本体提供。
 
 在 profile（如 `~/.dsh/profiles/web`）中：
 

package/lib/client.js

@@ -303,16 +303,11 @@ window.__ModuleLoader__.load({
 		function bearer(apiKey) {
 			return { authorization: `Bearer ${apiKey}` };
 		}
-		/**
-		* The official pay-as-you-go balance. `deepseek` is the configurable-catalog
-		* route key; `deepseek-official` is the live provider route the llm-deepseek
-		* adapter registers (sessions and agent-default-model carry it), so both ids
-		* must resolve here or the current provider would never be probed.
-		*/
 		const DEEPSEEK = {
 			ids: ["deepseek", "deepseek-official"],
 			displayName: "DeepSeek",
 			balance: {
+				origin: "https://api.deepseek.com",
 				build: ({ apiKey }) => ({
 					url: "https://api.deepseek.com/user/balance",
 					headers: bearer(apiKey)
@@ -1019,6 +1014,10 @@ window.__ModuleLoader__.load({
 				className: usage_module_css_default.muted,
 				children: t("usage.balance.noCredential")
 			});
+			if (provider.balanceSupported === false) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+				className: usage_module_css_default.muted,
+				children: t("usage.balance.unsupported")
+			});
 			if (!provider.supported) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 				className: usage_module_css_default.muted,
 				children: t("usage.balance.unsupported")
@@ -1224,7 +1223,7 @@ window.__ModuleLoader__.load({
 								}),
 								(() => {
 									const configured = snapshot.providers.filter(isConfigured);
-									const rows = configured.filter((provider) => provider.balanceSupported === true || provider.balanceSupported === void 0 && provider.supported);
+									const rows = configured.filter((provider) => provider.balanceSupported === true || provider.balanceSupported === false || provider.balanceSupported === void 0 && provider.supported);
 									if (rows.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 										className: usage_module_css_default.muted,
 										children: configured.length === 0 ? t("usage.balance.noneConfigured") : t("usage.balance.unsupported")
@@ -2119,6 +2118,96 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
+		//#region src/client/settings-entry-form.ts
+		/** The snapshot a form reports before the Host has answered with this entry. */
+		function pendingSnapshot() {
+			return {
+				status: "loading",
+				value: void 0,
+				base: void 0,
+				user: void 0,
+				revision: void 0,
+				writable: false,
+				mode: "host"
+			};
+		}
+		/**
+		* Create a settings form bound to the profile entry id this Host serves, and
+		* rebound whenever the shared describe mirror names a different one of this
+		* package's rows.
+		* @param options - the shared forms service and this package's candidate row ids.
+		* @returns a form delegating to the currently resolved entry's own form.
+		*/
+		function createServedEntryForm(options) {
+			const { forms, entryIds } = options;
+			const fallbackId = entryIds[0];
+			const namespaceId = entryIds[entryIds.length - 1];
+			const listeners = /* @__PURE__ */ new Set();
+			let boundId;
+			let bound;
+			let offBound;
+			let snapshot = pendingSnapshot();
+			/** Republish: the delegated snapshot when one is bound, the pending one otherwise. */
+			const publish = () => {
+				if (bound !== void 0) snapshot = bound.getSnapshot();
+				for (const listener of [...listeners]) listener();
+			};
+			/**
+			* The entry id the mirror currently justifies. An unanswered or empty mirror
+			* is not evidence of absence, so it keeps the first candidate; a mirror that
+			* answers without any of this package's rows leaves the namespace itself.
+			* @returns the entry id to bind.
+			*/
+			const resolve = () => {
+				let served;
+				try {
+					served = forms.describe().getSnapshot().view?.namespaces.map((row) => row.ns);
+				} catch {
+					served = void 0;
+				}
+				if (served === void 0 || served.length === 0) return fallbackId;
+				return entryIds.find((id) => served.includes(id)) ?? namespaceId;
+			};
+			/** Bind (or rebind) the resolved entry's form; a no-op while it is unchanged. */
+			const bind = () => {
+				const target = resolve();
+				if (target === boundId) return;
+				offBound?.();
+				offBound = void 0;
+				let form;
+				try {
+					form = forms.get(target);
+				} catch {
+					boundId = void 0;
+					return;
+				}
+				boundId = target;
+				bound = form;
+				offBound = form.subscribe(() => {
+					publish();
+				});
+				publish();
+			};
+			try {
+				forms.describe().subscribe(() => {
+					bind();
+				});
+			} catch {}
+			bind();
+			return {
+				getSnapshot: () => snapshot,
+				subscribe: (listener) => {
+					listeners.add(listener);
+					return () => {
+						listeners.delete(listener);
+					};
+				},
+				set: (field, value) => bound?.set(field, value) ?? Promise.resolve(false),
+				unset: (field) => bound?.unset(field) ?? Promise.resolve(false),
+				mutate: (ops, expectedRevision) => bound?.mutate(ops, expectedRevision) ?? Promise.resolve(false)
+			};
+		}
+		//#endregion
 		//#region src/client/index.ts
 		/** Hard ceiling for one usage API call; a stalled host must not pile up requests. */
 		const USAGE_FETCH_TIMEOUT_MS = 2e4;
@@ -2131,11 +2220,20 @@ window.__ModuleLoader__.load({
 			return await response.json();
 		}
 		const usageApi = {
-			overview: () => usageFetch("/api/dsh-usage/overview", "GET"),
-			refresh: () => usageFetch("/api/dsh-usage/refresh", "POST")
+			overview: () => usageFetch("api/dsh-usage/overview", "GET"),
+			refresh: () => usageFetch("api/dsh-usage/refresh", "POST")
 		};
-		/** Settings namespace the section edits (dsh-web-settings maps it onto this row's profile entry id). */
+		/**
+		* Settings namespace the section edits: the family identity of this plugin's
+		* own settings form, and the row id a standalone bundle install carries.
+		*/
 		const USAGE_SETTINGS_NS = "dsh-usage";
+		/** Profile entry ids this package's patch rows carry, most likely first. */
+		const USAGE_ENTRY_IDS = [
+			"web-ui-usage",
+			"usage",
+			USAGE_SETTINGS_NS
+		];
 		/** First-level nav position: directly below the Workshop section (order 150). */
 		const SECTION_ORDER = 151;
 		/** Required services. */
@@ -2164,7 +2262,10 @@ window.__ModuleLoader__.load({
 				}
 			}, "dsh-usage: dictionaries");
 			const binder = ctx.get("webUiSettings");
-			const settingsForm = binder !== void 0 ? binder.bind({ namespace: USAGE_SETTINGS_NS }) : ctx.configForms.get(USAGE_SETTINGS_NS);
+			const settingsForm = binder !== void 0 ? binder.bind({ namespace: USAGE_SETTINGS_NS }) : createServedEntryForm({
+				forms: ctx.configForms,
+				entryIds: USAGE_ENTRY_IDS
+			});
 			const store = createUsageStore().create();
 			let pollSeq = 0;
 			const poll = () => {