@rayadesu/dsh-client-ui-billing 0.2.2 → 0.2.3

package/lib/client.js

@@ -4277,6 +4277,20 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			return `¥${amount.toFixed(4).replace(/\.?0+$/, "")}`;
 		}
 		/**
+		* Run one fetch line: the fetch is deferred to a microtask so the effect's
+		* render commits before any state update lands; a settled value is stored
+		* while `current` stays true, and a rejection keeps the previous value (a
+		* no-op unless `onReject` supplies fallback handling) so a failed refetch
+		* never blanks the UI.
+		*/
+		function fetchLine(current, fetch, store, onReject) {
+			return Promise.resolve().then(fetch).then((value) => {
+				if (current()) store(value);
+			}, (reason) => {
+				if (current()) onReject?.(reason);
+			});
+		}
+		/**
 		* Render the billing badge in the session-header utilities row. The trigger
 		* shows the remaining balance and this conversation's billed spend and opens
 		* a label box with the amount, this session's spend with its cache-hit /
@@ -4305,24 +4319,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const pricedRunningRef = (0, react.useRef)(running);
 			(0, react.useEffect)(() => {
 				let current = true;
+				const isCurrent = () => current;
 				setRefreshing(balance !== null);
 				Promise.resolve().then(() => {
-					const balanceRequest = Promise.resolve().then(getBalance).then((value) => {
-						if (!current) return;
+					const balanceRequest = fetchLine(isCurrent, getBalance, (value) => {
 						setBalance(value);
 						setError(null);
 					}, (reason) => {
-						if (!current) return;
 						if (balance === null) setError(reason instanceof Error ? reason.message : String(reason));
 					});
-					const sessionSpendRequest = Promise.resolve().then(() => getSessionSpend(sessionId)).then((value) => {
-						if (!current) return;
-						setSpend(value);
-					}, () => {});
-					const todaySpendRequest = Promise.resolve().then(() => getTodaySpend(request > 0)).then((value) => {
-						if (!current) return;
-						setTodaySpend(value);
-					}, () => {});
+					const sessionSpendRequest = fetchLine(isCurrent, () => getSessionSpend(sessionId), setSpend);
+					const todaySpendRequest = fetchLine(isCurrent, () => getTodaySpend(request > 0), setTodaySpend);
 					Promise.allSettled([
 						balanceRequest,
 						sessionSpendRequest,
@@ -4346,17 +4353,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				pricedRunningRef.current = running;
 				if (running) return;
 				let current = true;
+				const isCurrent = () => current;
 				const timer = setTimeout(() => {
-					Promise.resolve().then(() => {
-						Promise.resolve().then(() => getSessionSpend(sessionId)).then((value) => {
-							if (!current) return;
-							setSpend(value);
-						}, () => {});
-						Promise.resolve().then(() => getTodaySpend()).then((value) => {
-							if (!current) return;
-							setTodaySpend(value);
-						}, () => {});
-					});
+					fetchLine(isCurrent, () => getSessionSpend(sessionId), setSpend);
+					fetchLine(isCurrent, () => getTodaySpend(), setTodaySpend);
 				}, 2e3);
 				return () => {
 					clearTimeout(timer);
@@ -4542,6 +4542,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			"locale",
 			"remote"
 		];
+		/** Unwrap one Remote result into its value, reporting the endpoint on failure. */
+		function unwrap(endpoint, result) {
+			if (!result.ok) throw new Error(`${endpoint} failed: ${result.error.code}: ${result.error.message}`);
+			return result.value;
+		}
 		/**
 		* Client plugin body: mount the `billing` Remote, register the dictionaries,
 		* and contribute the header utility badge.
@@ -4555,29 +4560,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				zh,
 				en
 			}), "ui-billing: dictionaries");
-			const injected = () => ({
-				getBalance: async () => {
-					const result = await billing.getBalance();
-					if (!result.ok) throw new Error(`billing.getBalance failed: ${result.error.code}: ${result.error.message}`);
-					return result.value;
-				},
-				getSessionSpend: async (sessionId) => {
-					const result = await billing.getSessionSpend(sessionId);
-					if (!result.ok) throw new Error(`billing.getSessionSpend failed: ${result.error.code}: ${result.error.message}`);
-					return result.value;
-				},
-				getTodaySpend: async (force) => {
-					const result = await billing.getTodaySpend(force);
-					if (!result.ok) throw new Error(`billing.getTodaySpend failed: ${result.error.code}: ${result.error.message}`);
-					return result.value;
-				}
-			});
+			const injected = {
+				getBalance: async () => unwrap("billing.getBalance", await billing.getBalance()),
+				getSessionSpend: async (sessionId) => unwrap("billing.getSessionSpend", await billing.getSessionSpend(sessionId)),
+				getTodaySpend: async (force) => unwrap("billing.getTodaySpend", await billing.getTodaySpend(force))
+			};
 			ctx.slots.inject("conversation.session.header.utilities", () => ctx.slots.register({
 				name: "conversation.session.header.utilities",
 				id: "billing-balance",
 				order: 30,
 				locale: NS,
-				inject: injected
+				inject: () => injected
 			}, BalanceBadge));
 		}
 		//#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rayadesu/dsh-client-ui-billing",
   "description": "Session-header DeepSeek account-balance and conversation-spend badge over the billing Remote",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -47,7 +47,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@rayadesu/dsh-llm-billing": "^0.2.2",
+    "@rayadesu/dsh-llm-billing": "^0.2.3",
     "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-typert-protocol": "^0.1.1-rc.2",
@@ -58,7 +58,7 @@
     "@deepseek-ai/dsh-session": "^0.1.1-rc.2"
   },
   "devDependencies": {
-    "@rayadesu/dsh-llm-billing": "^0.2.2",
+    "@rayadesu/dsh-llm-billing": "^0.2.3",
     "@deepseek-ai/dsh-client-locale": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-client-test-runtime": "^0.1.1-rc.2",