dsh-plugin-subscription-oauth 0.4.0 → 0.6.0

package/lib/client/index.js

@@ -10,7 +10,7 @@
  */
 import { SubscriptionsSection } from './SubscriptionsSection.js';
 import { UsageChip } from './UsageChip.js';
-import { createSubscriptionsCall } from './subscriptions-rpc.js';
+import { createSubscriptionsCall, createAccountBalanceCall, createCcSwitchBalanceCall } from './subscriptions-rpc.js';
 import { en, zh } from './locales.js';
 export { createSubscriptionsCall, SubscriptionsRpcError } from './subscriptions-rpc.js';
 /**
@@ -71,6 +71,8 @@ export function apply(ctx) {
             call,
             t: t,
             isOwnProvider: (provider) => OWN_PROVIDER_IDS.has(provider),
+            accountBalance: createAccountBalanceCall(connection.rpc),
+            ccSwitchBalance: createCcSwitchBalanceCall(connection.rpc),
         }),
     }, UsageChip));
 }

package/lib/client/subscriptions-rpc.d.ts

@@ -8,7 +8,7 @@
  * @module dsh-plugin-subscription-oauth/client/subscriptions-rpc
  */
 import type { ConnectionHandle } from '@deepseek-ai/dsh-api-remotes/client';
-import type { RpcEndpoint, RpcMap } from '../protocol.js';
+import type { CcSwitchBalanceResult, RpcEndpoint, RpcMap } from '../protocol.js';
 /** A failed call: either the transport rejected or the endpoint answered `ok: false`. */
 export declare class SubscriptionsRpcError extends Error {
     readonly code: string;
@@ -16,9 +16,62 @@ export declare class SubscriptionsRpcError extends Error {
 }
 /** Call one endpoint, unwrapping the transport result. */
 export type SubscriptionsCall = <K extends RpcEndpoint>(endpoint: K, payload: RpcMap[K]['payload']) => Promise<RpcMap[K]['value']>;
+/** A caller for one non-subscription provider's cc-switch balance. */
+export interface CcSwitchBalanceCall {
+    (provider: string): Promise<CcSwitchBalanceResult>;
+}
 /**
  * Bind a caller to one connection's RPC transport.
  * @param rpc - the browser connection's RPC caller.
  * @returns a typed caller for this plugin's endpoints.
  */
 export declare function createSubscriptionsCall(rpc: ConnectionHandle['rpc']): SubscriptionsCall;
+/**
+ * The DeepSeek account's balance, as the plugin's node half reports it.
+ *
+ * The node half reads the host's `deepseekAccount` service (which owns the OAuth grant
+ * and the platform endpoint) and serves the wallets here. It answers `undefined` when
+ * the account is signed out or the read failed, so a chip simply does not render.
+ */
+export interface AccountBalance {
+    /** Normal (topped-up) wallets, one per currency. */
+    wallets: readonly {
+        currency: string;
+        balance: string;
+    }[];
+    /** Bonus / promotional wallets, one per currency. */
+    bonusWallets: readonly {
+        currency: string;
+        balance: string;
+    }[];
+}
+/** A narrow caller for the DeepSeek account's balance. */
+export interface AccountBalanceCall {
+    (): Promise<AccountBalance | undefined>;
+}
+/**
+ * Read the DeepSeek account's balance through the plugin's own RPC.
+ *
+ * The browser cannot call the host's account service directly — it sits behind the
+ * host's Remote controller, not a `/api` fetch route — so the node half reads it and
+ * serves it on the plugin's channel, the same one the rest of the chip's data travels.
+ *
+ * @param rpc - the browser connection's RPC caller.
+ * @returns the balance, or undefined when there is nothing to show.
+ */
+export declare function createAccountBalanceCall(rpc: ConnectionHandle['rpc']): AccountBalanceCall;
+/**
+ * Read a manually added provider's balance through the plugin's cc-switch endpoint.
+ *
+ * The caller names the credential reference the provider's profile uses (its
+ * Read a non-subscription provider's balance through the plugin's cc-switch endpoint.
+ *
+ * The caller names the provider; the server maps it to the credential reference the
+ * provider's profile names (`apiKeyEnv`) and resolves that to the API key. The result
+ * is `undefined` when there is no key or the provider did not answer — never a wrong
+ * figure.
+ *
+ * @param rpc - the browser connection's RPC caller.
+ * @returns a narrow caller taking the provider id.
+ */
+export declare function createCcSwitchBalanceCall(rpc: ConnectionHandle['rpc']): CcSwitchBalanceCall;

package/lib/client/subscriptions-rpc.js

@@ -42,3 +42,61 @@ export function createSubscriptionsCall(rpc) {
         return result.value;
     };
 }
+/**
+ * Read the DeepSeek account's balance through the plugin's own RPC.
+ *
+ * The browser cannot call the host's account service directly — it sits behind the
+ * host's Remote controller, not a `/api` fetch route — so the node half reads it and
+ * serves it on the plugin's channel, the same one the rest of the chip's data travels.
+ *
+ * @param rpc - the browser connection's RPC caller.
+ * @returns the balance, or undefined when there is nothing to show.
+ */
+export function createAccountBalanceCall(rpc) {
+    return async function call() {
+        let result;
+        try {
+            result = await rpc.call(CHANNEL, `${RPC_PREFIX}deepseek-balance`, {
+                version: '1',
+                locale: Intl.DateTimeFormat().resolvedOptions().locale ?? 'en-US',
+                // East-positive whole seconds, as the host's account service expects (the same
+                // value DSH's own account card sends).
+                timezoneOffsetSeconds: -new Date().getTimezoneOffset() * 60,
+            });
+        }
+        catch (error) {
+            throw new SubscriptionsRpcError(messageOf(error), 'RPC_TRANSPORT');
+        }
+        if (!result.ok)
+            throw new SubscriptionsRpcError(result.error.message, result.error.code);
+        return result.value;
+    };
+}
+/**
+ * Read a manually added provider's balance through the plugin's cc-switch endpoint.
+ *
+ * The caller names the credential reference the provider's profile uses (its
+ * Read a non-subscription provider's balance through the plugin's cc-switch endpoint.
+ *
+ * The caller names the provider; the server maps it to the credential reference the
+ * provider's profile names (`apiKeyEnv`) and resolves that to the API key. The result
+ * is `undefined` when there is no key or the provider did not answer — never a wrong
+ * figure.
+ *
+ * @param rpc - the browser connection's RPC caller.
+ * @returns a narrow caller taking the provider id.
+ */
+export function createCcSwitchBalanceCall(rpc) {
+    return async function call(provider) {
+        let result;
+        try {
+            result = await rpc.call(CHANNEL, `${RPC_PREFIX}ccswitch-balance`, { provider });
+        }
+        catch (error) {
+            throw new SubscriptionsRpcError(messageOf(error), 'RPC_TRANSPORT');
+        }
+        if (!result.ok)
+            throw new SubscriptionsRpcError(result.error.message, result.error.code);
+        return result.value;
+    };
+}

package/lib/client.js

@@ -661,6 +661,58 @@ function createSubscriptionsCall(rpc) {
 		return result.value;
 	};
 }
+/**
+* Read the DeepSeek account's balance through the plugin's own RPC.
+*
+* The browser cannot call the host's account service directly — it sits behind the
+* host's Remote controller, not a `/api` fetch route — so the node half reads it and
+* serves it on the plugin's channel, the same one the rest of the chip's data travels.
+*
+* @param rpc - the browser connection's RPC caller.
+* @returns the balance, or undefined when there is nothing to show.
+*/
+function createAccountBalanceCall(rpc) {
+	return async function call() {
+		let result;
+		try {
+			result = await rpc.call(CHANNEL, `${RPC_PREFIX}deepseek-balance`, {
+				version: "1",
+				locale: Intl.DateTimeFormat().resolvedOptions().locale ?? "en-US",
+				timezoneOffsetSeconds: -(/* @__PURE__ */ new Date()).getTimezoneOffset() * 60
+			});
+		} catch (error) {
+			throw new SubscriptionsRpcError(messageOf$1(error), "RPC_TRANSPORT");
+		}
+		if (!result.ok) throw new SubscriptionsRpcError(result.error.message, result.error.code);
+		return result.value;
+	};
+}
+/**
+* Read a manually added provider's balance through the plugin's cc-switch endpoint.
+*
+* The caller names the credential reference the provider's profile uses (its
+* Read a non-subscription provider's balance through the plugin's cc-switch endpoint.
+*
+* The caller names the provider; the server maps it to the credential reference the
+* provider's profile names (`apiKeyEnv`) and resolves that to the API key. The result
+* is `undefined` when there is no key or the provider did not answer — never a wrong
+* figure.
+*
+* @param rpc - the browser connection's RPC caller.
+* @returns a narrow caller taking the provider id.
+*/
+function createCcSwitchBalanceCall(rpc) {
+	return async function call(provider) {
+		let result;
+		try {
+			result = await rpc.call(CHANNEL, `${RPC_PREFIX}ccswitch-balance`, { provider });
+		} catch (error) {
+			throw new SubscriptionsRpcError(messageOf$1(error), "RPC_TRANSPORT");
+		}
+		if (!result.ok) throw new SubscriptionsRpcError(result.error.message, result.error.code);
+		return result.value;
+	};
+}
 
 //#endregion
 //#region src/client/SubscriptionsSection.tsx
@@ -2221,6 +2273,45 @@ function providerOf(projection) {
 	return (projection?.next ?? projection?.lastUsed)?.provider;
 }
 /**
+* Reduce the node half's balance payload to the wallets the chip shows.
+*
+* Bonus wallets are shown after the topped-up ones, so a reader sees their own credit
+* first and any promotional credit as a secondary figure. A bonus wallet that holds
+* nothing is dropped rather than shown as `+¥0`: the platform reports one for every
+* currency whether or not there is a bonus, and an empty one is noise, not information.
+*
+* @param value - the node half's balance, or undefined when there is none.
+* @returns the wallets, topped-up first then bonus, or undefined when nothing is usable.
+*/
+function balanceOf(value) {
+	if (value === null || value === void 0) return void 0;
+	const wallets = [...(value.wallets ?? []).map((wallet) => ({
+		currency: wallet.currency,
+		balance: wallet.balance,
+		bonus: false
+	})), ...(value.bonusWallets ?? []).filter((wallet) => Number.parseFloat(wallet.balance) > 0).map((wallet) => ({
+		currency: wallet.currency,
+		balance: wallet.balance,
+		bonus: true
+	}))];
+	return wallets.length === 0 ? void 0 : wallets;
+}
+/**
+* Format one wallet for the chip's compact line.
+*
+* A balance is money, not a percentage, so it renders as `¥6.89` rather than a meter;
+* the currency prefix keeps two currencies from being mistaken for one sum.
+*
+* @param wallet - the wallet to show.
+* @returns the short form, e.g. `¥6.89` or `+¥2` for a bonus wallet.
+*/
+function formatBalance(wallet) {
+	const amount = Number.parseFloat(wallet.balance);
+	const trimmed = Number.isFinite(amount) ? String(Math.round(amount * 100) / 100) : wallet.balance;
+	const symbol = wallet.currency === "CNY" ? "¥" : wallet.currency === "USD" ? "$" : `${wallet.currency} `;
+	return `${wallet.bonus ? "+" : ""}${symbol}${trimmed}`;
+}
+/**
 * The short form of a route's name.
 *
 * @param provider - the route id.
@@ -2309,12 +2400,42 @@ function formatReset(at, now) {
 * @param props - injected RPC caller, copy, and the session's provider reader.
 * @returns the chip, or null when there is nothing true to say.
 */
-function UsageChip({ call, t, isOwnProvider, useProjection }) {
+function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, useProjection }) {
 	const [reading, setReading] = (0, react.useState)(void 0);
+	const [balance, setBalance] = (0, react.useState)(void 0);
+	const [ccBalance, setCcBalance] = (0, react.useState)(void 0);
 	const [now, setNow] = (0, react.useState)(() => Date.now());
 	const [open, setOpen] = (0, react.useState)(false);
 	const lastOwn = (0, react.useRef)(void 0);
 	const selected = useProjection("modelSelection", (value) => providerOf(value));
+	const isDeepSeek = selected === "deepseek-account";
+	const isBalanceProvider = selected !== void 0 && !isOwnProvider(selected) && !isDeepSeek;
+	(0, react.useEffect)(() => {
+		if (!isBalanceProvider || selected === void 0) {
+			setCcBalance(void 0);
+			return;
+		}
+		let live = true;
+		const target = selected;
+		const refresh = () => {
+			ccSwitchBalance(target).then((value) => {
+				if (live) setCcBalance(value === void 0 ? void 0 : {
+					currency: value.currency,
+					total: value.total
+				});
+			}).catch(() => {});
+		};
+		refresh();
+		const timer = setInterval(refresh, REFRESH_INTERVAL_MS);
+		return () => {
+			live = false;
+			clearInterval(timer);
+		};
+	}, [
+		isBalanceProvider,
+		selected,
+		ccSwitchBalance
+	]);
 	const load = (0, react.useCallback)(async (target) => {
 		try {
 			const result = await call("usage", { provider: target });
@@ -2323,6 +2444,24 @@ function UsageChip({ call, t, isOwnProvider, useProjection }) {
 			return;
 		}
 	}, [call]);
+	(0, react.useEffect)(() => {
+		if (!isDeepSeek) {
+			setBalance(void 0);
+			return;
+		}
+		let live = true;
+		const refresh = () => {
+			accountBalance().then((value) => {
+				if (live) setBalance(balanceOf(value));
+			}).catch(() => {});
+		};
+		refresh();
+		const timer = setInterval(refresh, REFRESH_INTERVAL_MS);
+		return () => {
+			live = false;
+			clearInterval(timer);
+		};
+	}, [isDeepSeek, accountBalance]);
 	(0, react.useEffect)(() => {
 		const target = selected !== void 0 && isOwnProvider(selected) ? selected : lastOwn.current;
 		if (target === void 0) {
@@ -2359,6 +2498,100 @@ function UsageChip({ call, t, isOwnProvider, useProjection }) {
 			document.removeEventListener("click", close);
 		};
 	}, [open]);
+	if (isBalanceProvider) {
+		if (ccBalance === void 0) return null;
+		const short$1 = shortLabel(selected ?? "", selected ?? "");
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			className: "dsh-subscription-usage-chip",
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: usageChipCss }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+					type: "button",
+					className: "dsh-subscription-usage-chip-trigger",
+					"aria-expanded": open,
+					title: t("usageChipTitle", { provider: selected ?? "" }),
+					onClick: (event) => {
+						event.stopPropagation();
+						setOpen((was) => !was);
+					},
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-label",
+						children: short$1
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-cell",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "dsh-subscription-usage-chip-value",
+							children: `${ccBalance.currency === "CNY" ? "¥" : ccBalance.currency === "USD" ? "$" : `${ccBalance.currency} `}${ccBalance.total}`
+						})
+					})]
+				}),
+				open && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					className: "dsh-subscription-usage-chip-panel",
+					role: "status",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-full",
+						children: t("usageChipFull", { provider: selected ?? "" })
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-meter",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+							className: "dsh-subscription-usage-chip-meterHead",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: ccBalance.currency }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-subscription-usage-chip-detail",
+								children: ccBalance.total
+							})]
+						})
+					})]
+				})
+			]
+		});
+	}
+	if (isDeepSeek) {
+		if (balance === void 0) return null;
+		const short$1 = shortLabel("deepseek-account", "DeepSeek Account");
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+			className: "dsh-subscription-usage-chip",
+			children: [
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: usageChipCss }),
+				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+					type: "button",
+					className: "dsh-subscription-usage-chip-trigger",
+					"aria-expanded": open,
+					title: t("usageChipTitle", { provider: "DeepSeek Account" }),
+					onClick: (event) => {
+						event.stopPropagation();
+						setOpen((was) => !was);
+					},
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-label",
+						children: short$1
+					}), balance.map((wallet) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-cell",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: "dsh-subscription-usage-chip-value",
+							children: formatBalance(wallet)
+						})
+					}, `${wallet.currency}${wallet.bonus ? ":bonus" : ""}`))]
+				}),
+				open && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					className: "dsh-subscription-usage-chip-panel",
+					role: "status",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-full",
+						children: t("usageChipFull", { provider: "DeepSeek Account" })
+					}), balance.map((wallet) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-meter",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+							className: "dsh-subscription-usage-chip-meterHead",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: `${wallet.bonus ? "Bonus · " : ""}${wallet.currency}` }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-subscription-usage-chip-detail",
+								children: formatBalance(wallet)
+							})]
+						})
+					}, `${wallet.currency}${wallet.bonus ? ":bonus" : ""}`))]
+				})
+			]
+		});
+	}
 	if (reading === void 0) return null;
 	if (reading.window.usedPercent === void 0) return null;
 	formatReset(reading.window.resetsAt, now);
@@ -2496,7 +2729,9 @@ function apply(ctx) {
 		inject: () => ({
 			call,
 			t,
-			isOwnProvider: (provider) => OWN_PROVIDER_IDS.has(provider)
+			isOwnProvider: (provider) => OWN_PROVIDER_IDS.has(provider),
+			accountBalance: createAccountBalanceCall(connection.rpc),
+			ccSwitchBalance: createCcSwitchBalanceCall(connection.rpc)
 		})
 	}, UsageChip));
 }