dsh-plugin-subscription-oauth 0.5.0 → 0.6.1

package/lib/client/subscriptions-rpc.js

@@ -10,9 +10,6 @@
 import { RPC_PREFIX } from '../protocol.js';
 /** The shared channel the node half's routes are mounted on. */
 const CHANNEL = '/api';
-/** The host's own DeepSeek account controller, from which the chip reads a balance. */
-const ACCOUNT_CHANNEL = '/api';
-const ACCOUNT_NAMESPACE = 'account';
 /** A failed call: either the transport rejected or the endpoint answered `ok: false`. */
 export class SubscriptionsRpcError extends Error {
     code;
@@ -46,23 +43,25 @@ export function createSubscriptionsCall(rpc) {
     };
 }
 /**
- * Read the DeepSeek account's balance through the host's own account controller.
+ * Read the DeepSeek account's balance through the plugin's own RPC.
  *
- * The host owns the DeepSeek OAuth grant and the platform endpoint, so this asks it
- * rather than re-deriving either. It returns `null` when the account is signed out or
- * the read fails, so a chip can simply not render in that case.
+ * 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 null when there is nothing to show.
+ * @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(ACCOUNT_CHANNEL, 'account/getBalance', {
+            result = await rpc.call(CHANNEL, `${RPC_PREFIX}deepseek-balance`, {
                 version: '1',
                 locale: Intl.DateTimeFormat().resolvedOptions().locale ?? 'en-US',
-                timezoneOffsetSeconds: -new Date().getTimezoneOffset(),
+                // 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) {
@@ -77,18 +76,21 @@ export function createAccountBalanceCall(rpc) {
  * 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
- * `apiKeyEnv`), and the host's credential service resolves it to the API key. The result
+ * 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 credential reference.
+ * @returns a narrow caller taking the provider id.
  */
 export function createCcSwitchBalanceCall(rpc) {
-    return async function call(credentialRef) {
+    return async function call(provider) {
         let result;
         try {
-            result = await rpc.call(CHANNEL, `${RPC_PREFIX}ccswitch-balance`, { credentialRef });
+            result = await rpc.call(CHANNEL, `${RPC_PREFIX}ccswitch-balance`, { provider });
         }
         catch (error) {
             throw new SubscriptionsRpcError(messageOf(error), 'RPC_TRANSPORT');

package/lib/client.js

@@ -632,8 +632,6 @@ const RPC_PREFIX = "subscription-oauth.";
 //#region src/client/subscriptions-rpc.ts
 /** The shared channel the node half's routes are mounted on. */
 const CHANNEL = "/api";
-/** The host's own DeepSeek account controller, from which the chip reads a balance. */
-const ACCOUNT_CHANNEL = "/api";
 /** A failed call: either the transport rejected or the endpoint answered `ok: false`. */
 var SubscriptionsRpcError = class extends Error {
 	constructor(message, code) {
@@ -664,23 +662,23 @@ function createSubscriptionsCall(rpc) {
 	};
 }
 /**
-* Read the DeepSeek account's balance through the host's own account controller.
+* Read the DeepSeek account's balance through the plugin's own RPC.
 *
-* The host owns the DeepSeek OAuth grant and the platform endpoint, so this asks it
-* rather than re-deriving either. It returns `null` when the account is signed out or
-* the read fails, so a chip can simply not render in that case.
+* 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 null when there is nothing to show.
+* @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(ACCOUNT_CHANNEL, "account/getBalance", {
+			result = await rpc.call(CHANNEL, `${RPC_PREFIX}deepseek-balance`, {
 				version: "1",
 				locale: Intl.DateTimeFormat().resolvedOptions().locale ?? "en-US",
-				timezoneOffsetSeconds: -(/* @__PURE__ */ new Date()).getTimezoneOffset()
+				timezoneOffsetSeconds: -(/* @__PURE__ */ new Date()).getTimezoneOffset() * 60
 			});
 		} catch (error) {
 			throw new SubscriptionsRpcError(messageOf$1(error), "RPC_TRANSPORT");
@@ -693,18 +691,21 @@ function createAccountBalanceCall(rpc) {
 * 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
-* `apiKeyEnv`), and the host's credential service resolves it to the API key. The result
+* 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 credential reference.
+* @returns a narrow caller taking the provider id.
 */
 function createCcSwitchBalanceCall(rpc) {
-	return async function call(credentialRef) {
+	return async function call(provider) {
 		let result;
 		try {
-			result = await rpc.call(CHANNEL, `${RPC_PREFIX}ccswitch-balance`, { credentialRef });
+			result = await rpc.call(CHANNEL, `${RPC_PREFIX}ccswitch-balance`, { provider });
 		} catch (error) {
 			throw new SubscriptionsRpcError(messageOf$1(error), "RPC_TRANSPORT");
 		}
@@ -2272,21 +2273,23 @@ function providerOf(projection) {
 	return (projection?.next ?? projection?.lastUsed)?.provider;
 }
 /**
-* Reduce the host's account-balance payload to the wallets the chip shows.
+* 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.
+* 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 host's ready balance, or undefined when there is none.
+* @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 || !("value" in value) || value.value === void 0) return void 0;
-	const wallets = [...value.value.map((wallet) => ({
+	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 ?? []).map((wallet) => ({
+	})), ...(value.bonusWallets ?? []).filter((wallet) => Number.parseFloat(wallet.balance) > 0).map((wallet) => ({
 		currency: wallet.currency,
 		balance: wallet.balance,
 		bonus: true
@@ -2397,7 +2400,7 @@ 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, accountBalance, ccSwitchBalance, ccSwitchCredentialRef, 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);
@@ -2406,15 +2409,16 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, cc
 	const lastOwn = (0, react.useRef)(void 0);
 	const selected = useProjection("modelSelection", (value) => providerOf(value));
 	const isDeepSeek = selected === "deepseek-account";
-	const ccRef = selected === void 0 || isOwnProvider(selected) || isDeepSeek ? void 0 : ccSwitchCredentialRef(selected);
+	const isBalanceProvider = selected !== void 0 && !isOwnProvider(selected) && !isDeepSeek;
 	(0, react.useEffect)(() => {
-		if (ccRef === void 0) {
+		if (!isBalanceProvider || selected === void 0) {
 			setCcBalance(void 0);
 			return;
 		}
 		let live = true;
+		const target = selected;
 		const refresh = () => {
-			ccSwitchBalance(ccRef).then((value) => {
+			ccSwitchBalance(target).then((value) => {
 				if (live) setCcBalance(value === void 0 ? void 0 : {
 					currency: value.currency,
 					total: value.total
@@ -2427,7 +2431,11 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, cc
 			live = false;
 			clearInterval(timer);
 		};
-	}, [ccRef, ccSwitchBalance]);
+	}, [
+		isBalanceProvider,
+		selected,
+		ccSwitchBalance
+	]);
 	const load = (0, react.useCallback)(async (target) => {
 		try {
 			const result = await call("usage", { provider: target });
@@ -2490,7 +2498,7 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, cc
 			document.removeEventListener("click", close);
 		};
 	}, [open]);
-	if (ccRef !== void 0) {
+	if (isBalanceProvider) {
 		if (ccBalance === void 0) return null;
 		const short$1 = shortLabel(selected ?? "", selected ?? "");
 		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
@@ -2680,17 +2688,6 @@ const SECTION_ORDER = 92;
 */
 const CHIP_ORDER = 10;
 /**
-* The credential reference a manually added provider's balance query uses, by provider
-* id.
-*
-* A manually added provider is not one this plugin serves, so the only way to read its
-* balance is cc-switch's query, which needs the provider's API key. The provider's
-* profile names that key by reference (`apiKeyEnv`), and the host's credential service
-* resolves the name; this map is the one place a provider id is tied to that name. A
-* provider with no entry gets no balance.
-*/
-const CC_SWITCH_CREDENTIAL_REFS = { huanling: "HUANLING_API_KEY" };
-/**
 * Required services: `slots` carries the registration seat, `connection` the
 * RPC caller, and `locale` the copy dictionaries.
 */
@@ -2734,8 +2731,7 @@ function apply(ctx) {
 			t,
 			isOwnProvider: (provider) => OWN_PROVIDER_IDS.has(provider),
 			accountBalance: createAccountBalanceCall(connection.rpc),
-			ccSwitchBalance: createCcSwitchBalanceCall(connection.rpc),
-			ccSwitchCredentialRef: (provider) => CC_SWITCH_CREDENTIAL_REFS[provider]
+			ccSwitchBalance: createCcSwitchBalanceCall(connection.rpc)
 		})
 	}, UsageChip));
 }