dsh-plugin-subscription-oauth 0.12.0 → 0.12.3

package/lib/auth/rpc.js

@@ -155,6 +155,8 @@ async function runEndpoint(registry, endpoint, payload, balance) {
         }
         case 'usage':
             return registry.usage(requiredProvider(payload, endpoint), booleanField(payload, 'force'));
+        case 'auto-state':
+            return registry.autoState();
         case 'setAutoOn': {
             const enabled = booleanField(payload, 'enabled');
             if (enabled === undefined)

package/lib/client/SubscriptionsSection.js

@@ -244,6 +244,8 @@ const styles = {
     },
     /** The metered windows under one account row: no border, just the meters. */
     usageInline: { display: 'flex', flexDirection: 'column', gap: 6, marginTop: 4 },
+    /** The auto provider's on/off row: a label and its switch. */
+    autoSwitchRow: { display: 'flex', alignItems: 'center', gap: 8, justifyContent: 'space-between' },
     modelRow: {
         display: 'flex', alignItems: 'flex-start', gap: 8,
         cursor: 'pointer', fontSize: 13, lineHeight: '20px',
@@ -517,7 +519,7 @@ function ProviderCard(props) {
     return (_jsxs("div", { style: cardOpen ? { ...styles.card, ...styles.cardOpen } : styles.card, children: [_jsxs("div", { style: styles.cardHeader, role: "button", tabIndex: 0, "aria-expanded": cardOpen, onClick: toggleCardOpen, onKeyDown: (event) => { if (event.key === 'Enter' || event.key === ' ') {
                     event.preventDefault();
                     toggleCardOpen();
-                } }, children: [_jsx("span", { style: { ...styles.dot, ...dotStyle(status) }, "aria-hidden": "true" }), _jsx("span", { style: styles.name, children: status.displayName }), status.loggedIn && _jsx("span", { style: styles.badgeDefault, children: t('badgeLive') }), _jsx("span", { style: styles.cardSummary, children: summaryLine }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, "aria-expanded": cardOpen, "aria-controls": `dsh-subscription-card-${status.provider}`, onClick: (event) => { event.stopPropagation(); toggleCardOpen(); }, children: cardOpen ? t('collapse') : t('edit') })] }), _jsxs("div", { id: `dsh-subscription-card-${status.provider}`, style: cardOpen ? styles.cardBody : { ...styles.cardBody, display: 'none' }, children: [connectable && !status.loggedIn && !busy && _jsx("p", { style: styles.statusLine, children: t('statusSignIn') }), status.lastError !== undefined && (_jsx("p", { className: "dsh-subscription-error", children: t('lastError', { message: status.lastError }) })), message?.tone === 'error' && _jsx("p", { className: "dsh-subscription-error", children: message.text }), message?.tone === 'success' && _jsx("p", { className: "dsh-subscription-success", children: message.text }), accounts.map((account) => {
+                } }, children: [_jsx("span", { style: { ...styles.dot, ...dotStyle(status) }, "aria-hidden": "true" }), _jsx("span", { style: styles.name, children: status.displayName }), status.loggedIn && _jsx("span", { style: styles.badgeDefault, children: t('badgeLive') }), _jsx("span", { style: styles.cardSummary, children: summaryLine }), _jsx("button", { type: "button", className: "dsh-subscription-quiet", style: styles.pushRight, "aria-expanded": cardOpen, "aria-controls": `dsh-subscription-card-${status.provider}`, onClick: (event) => { event.stopPropagation(); toggleCardOpen(); }, children: cardOpen ? t('collapse') : t('edit') })] }), _jsxs("div", { id: `dsh-subscription-card-${status.provider}`, style: cardOpen ? styles.cardBody : { ...styles.cardBody, display: 'none' }, children: [connectable && !status.loggedIn && !busy && _jsx("p", { style: styles.statusLine, children: t('statusSignIn') }), status.lastError !== undefined && (_jsx("p", { className: "dsh-subscription-error", children: t('lastError', { message: status.lastError }) })), message?.tone === 'error' && _jsx("p", { className: "dsh-subscription-error", children: message.text }), message?.tone === 'success' && _jsx("p", { className: "dsh-subscription-success", children: message.text }), status.provider === 'auto' && props.onSetAutoOn !== undefined && (_jsxs("label", { style: styles.autoSwitchRow, children: [_jsx("span", { style: styles.modelName, children: t('autoSwitchLabel') }), _jsx("input", { type: "checkbox", className: "dsh-subscription-switch", checked: props.autoOn ?? true, disabled: busyAction, onChange: (event) => { props.onSetAutoOn?.(event.target.checked); } })] })), accounts.map((account) => {
                         const usageEntry = (status.usage ?? []).find((entry) => entry.account === account.account);
                         return (_jsxs("div", { style: styles.accountRow, children: [_jsxs("div", { style: styles.accountHeader, children: [_jsx("button", { type: "button", style: styles.starButton, title: account.isDefault ? t('defaultBadge') : t('makeDefault'), "aria-label": account.isDefault ? t('defaultBadge') : t('makeDefault'), disabled: busyAction || account.isDefault, onClick: () => { props.onSetDefault(account.account); }, children: account.isDefault ? '★' : '☆' }), _jsx("span", { style: styles.accountName, children: account.label }), account.isDefault && _jsx("span", { style: styles.badgeDefault, children: t('defaultBadge') }), account.needsLogin === true && (_jsx("span", { style: styles.badgeWarn, title: t('accountNeedsLoginHint'), children: t('accountNeedsLogin') })), usageEntry?.plan !== undefined && (_jsx("span", { style: styles.badge, children: t('usagePlan', { plan: usageEntry.plan }) })), _jsx("span", { style: styles.statusLine, children: account.expired
                                                 ? t('accountExpired')
@@ -563,8 +565,20 @@ export function SubscriptionsSection(props) {
     const [error, setError] = useState(undefined);
     const [messages, setMessages] = useState({});
     const [busyAction, setBusyAction] = useState(false);
+    const [autoOn, setAutoOn] = useState(true);
     const mounted = useRef(true);
     const timer = useRef(undefined);
+    /** Read whether the `auto` provider is offered, so its card can render the switch. */
+    useEffect(() => {
+        if (call === undefined)
+            return;
+        let live = true;
+        void call('auto-state', undefined)
+            .then((result) => { if (live)
+            setAutoOn(result.enabled); })
+            .catch(() => { });
+        return () => { live = false; };
+    }, [call]);
     /** Fetch the current state; a failure is shown rather than swallowed. */
     const refresh = useCallback(async () => {
         if (call === undefined)
@@ -581,6 +595,27 @@ export function SubscriptionsSection(props) {
                 setError(t('actionFailed', { message: messageOf(caught) }));
         }
     }, [call, t]);
+    /** Flip the `auto` provider on or off. */
+    const setAuto = useCallback(async (enabled) => {
+        if (call === undefined)
+            return;
+        setBusyAction(true);
+        try {
+            const result = await call('setAutoOn', { enabled });
+            if (!mounted.current)
+                return;
+            setAutoOn(result.enabled);
+            await refresh();
+        }
+        catch (caught) {
+            if (mounted.current)
+                setError(t('actionFailed', { message: messageOf(caught) }));
+        }
+        finally {
+            if (mounted.current)
+                setBusyAction(false);
+        }
+    }, [call, refresh, t]);
     const stopPolling = useCallback(() => {
         if (timer.current !== undefined) {
             clearInterval(timer.current);
@@ -824,5 +859,5 @@ export function SubscriptionsSection(props) {
     }, [act, call]);
     if (call === undefined)
         return _jsx("p", { style: styles.intro, children: t('unavailable') });
-    return (_jsxs("div", { className: "dsh-subscriptions-settings", style: styles.section, children: [_jsx("style", { children: subscriptionsCss }), _jsxs("div", { style: styles.sectionHeader, children: [_jsx("h2", { style: styles.heading, children: t('nav') }), _jsx("p", { style: styles.intro, children: t('intro') })] }), error !== undefined && _jsx("p", { className: "dsh-subscription-error", children: error }), status === undefined && _jsx("p", { style: styles.statusLine, children: t('loading') }), orderedProviders.map((provider) => (_jsx(ProviderCard, { status: provider, t: t, busyAction: busyAction, ...messages[provider.provider] === undefined ? {} : { message: messages[provider.provider] }, onLogin: () => { login(provider.provider); }, onCancel: () => { cancel(provider.provider); }, onLogout: (account) => { logout(provider.provider, account); }, onSetDefault: (account) => { setDefault(provider.provider, account); }, onRefreshToken: (account) => { refreshToken(provider.provider, account); }, onRefreshModels: () => { refreshModels(provider.provider); }, onSetModelVisible: (id, visible) => { setModelVisible(provider.provider, id, visible); }, onSetModelOrder: (ids) => { setModelOrder(provider.provider, ids); }, onAddModel: (id) => { addModel(provider.provider, id); }, onRemoveModel: (id) => { removeModel(provider.provider, id); }, onRefreshUsage: () => { refreshUsage(provider.provider); }, onReload: () => { reload(provider.provider); } }, provider.provider)))] }));
+    return (_jsxs("div", { className: "dsh-subscriptions-settings", style: styles.section, children: [_jsx("style", { children: subscriptionsCss }), _jsxs("div", { style: styles.sectionHeader, children: [_jsx("h2", { style: styles.heading, children: t('nav') }), _jsx("p", { style: styles.intro, children: t('intro') })] }), error !== undefined && _jsx("p", { className: "dsh-subscription-error", children: error }), status === undefined && _jsx("p", { style: styles.statusLine, children: t('loading') }), orderedProviders.map((provider) => (_jsx(ProviderCard, { status: provider, t: t, busyAction: busyAction, ...messages[provider.provider] === undefined ? {} : { message: messages[provider.provider] }, onLogin: () => { login(provider.provider); }, onCancel: () => { cancel(provider.provider); }, onLogout: (account) => { logout(provider.provider, account); }, onSetDefault: (account) => { setDefault(provider.provider, account); }, onRefreshToken: (account) => { refreshToken(provider.provider, account); }, onRefreshModels: () => { refreshModels(provider.provider); }, onSetModelVisible: (id, visible) => { setModelVisible(provider.provider, id, visible); }, onSetModelOrder: (ids) => { setModelOrder(provider.provider, ids); }, onAddModel: (id) => { addModel(provider.provider, id); }, onRemoveModel: (id) => { removeModel(provider.provider, id); }, onRefreshUsage: () => { refreshUsage(provider.provider); }, onReload: () => { reload(provider.provider); }, ...provider.provider !== 'auto' ? {} : { autoOn, onSetAutoOn: (enabled) => { void setAuto(enabled); } } }, provider.provider)))] }));
 }

package/lib/client/UsageChip.js

@@ -207,12 +207,18 @@ export function mergeAccountWindows(readings) {
         if (withPercent.length === 0)
             continue;
         const usedPercent = withPercent.reduce((sum, window) => sum + (window.usedPercent ?? 0), 0) / withPercent.length;
+        // A credit window carries the raw figures too; keep them so the compact line can read
+        // money as money (0/1500) rather than as a spent share (0%), which misreads an empty
+        // balance as nothing to meter.
+        const used = list.reduce((sum, window) => sum + (window.used ?? 0), 0);
+        const limit = list.reduce((sum, window) => sum + (window.limit ?? 0), 0);
         // The pool's reset is the soonest account reset: the window refills when the first
         // account's does.
         const resets = list.map((window) => window.resetsAt).filter((at) => typeof at === 'number');
         merged.push({
             label,
             usedPercent: Math.max(0, Math.min(100, usedPercent)),
+            ...limit > 0 ? { used, limit } : {},
             ...resets.length === 0 ? {} : { resetsAt: Math.min(...resets) },
         });
     }

package/lib/client/locales.d.ts

@@ -60,6 +60,7 @@ export declare const en: {
     readonly modelsDrag: "Drag to re-order (or press ↑ / ↓ here)";
     readonly modelsAutoChainOff: "Take out of Auto";
     readonly modelsAutoChainEmpty: "No model is enabled, so Auto has nothing to try.";
+    readonly autoSwitchLabel: "Offer Auto in the model picker";
     readonly modelsPinned: "pinned";
     readonly usageTitle: "Plan and usage";
     readonly usagePlan: "Plan: {plan}";
@@ -157,6 +158,7 @@ export declare const zh: {
     modelsDrag: string;
     modelsAutoChainOff: string;
     modelsAutoChainEmpty: string;
+    autoSwitchLabel: string;
     modelsPinned: string;
     usageTitle: string;
     usagePlan: string;

package/lib/client/locales.js

@@ -60,6 +60,7 @@ export const en = {
     modelsDrag: 'Drag to re-order (or press ↑ / ↓ here)',
     modelsAutoChainOff: 'Take out of Auto',
     modelsAutoChainEmpty: 'No model is enabled, so Auto has nothing to try.',
+    autoSwitchLabel: 'Offer Auto in the model picker',
     modelsPinned: 'pinned',
     usageTitle: 'Plan and usage',
     usagePlan: 'Plan: {plan}',
@@ -155,6 +156,7 @@ export const zh = {
     modelsDrag: '拖动调整顺序（也可在此按 ↑ / ↓）',
     modelsAutoChainOff: '从自动中移除',
     modelsAutoChainEmpty: '没有启用任何模型，自动没有可尝试的模型。',
+    autoSwitchLabel: '在模型选择器中提供 Auto',
     modelsPinned: '固定',
     usageTitle: '套餐与额度',
     usagePlan: '套餐：{plan}',

package/lib/client.js

@@ -91,6 +91,7 @@ const en = {
 	modelsDrag: "Drag to re-order (or press ↑ / ↓ here)",
 	modelsAutoChainOff: "Take out of Auto",
 	modelsAutoChainEmpty: "No model is enabled, so Auto has nothing to try.",
+	autoSwitchLabel: "Offer Auto in the model picker",
 	modelsPinned: "pinned",
 	usageTitle: "Plan and usage",
 	usagePlan: "Plan: {plan}",
@@ -186,6 +187,7 @@ const zh = {
 	modelsDrag: "拖动调整顺序（也可在此按 ↑ / ↓）",
 	modelsAutoChainOff: "从自动中移除",
 	modelsAutoChainEmpty: "没有启用任何模型，自动没有可尝试的模型。",
+	autoSwitchLabel: "在模型选择器中提供 Auto",
 	modelsPinned: "固定",
 	usageTitle: "套餐与额度",
 	usagePlan: "套餐：{plan}",
@@ -1189,6 +1191,12 @@ const styles = {
 		gap: 6,
 		marginTop: 4
 	},
+	autoSwitchRow: {
+		display: "flex",
+		alignItems: "center",
+		gap: 8,
+		justifyContent: "space-between"
+	},
 	modelRow: {
 		display: "flex",
 		alignItems: "flex-start",
@@ -1628,6 +1636,21 @@ function ProviderCard(props) {
 						className: "dsh-subscription-success",
 						children: message.text
 					}),
+					status.provider === "auto" && props.onSetAutoOn !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", {
+						style: styles.autoSwitchRow,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							style: styles.modelName,
+							children: t("autoSwitchLabel")
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
+							type: "checkbox",
+							className: "dsh-subscription-switch",
+							checked: props.autoOn ?? true,
+							disabled: busyAction,
+							onChange: (event) => {
+								props.onSetAutoOn?.(event.target.checked);
+							}
+						})]
+					}),
 					accounts.map((account) => {
 						const usageEntry = (status.usage ?? []).find((entry) => entry.account === account.account);
 						return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2044,8 +2067,20 @@ function SubscriptionsSection(props) {
 	const [error, setError] = (0, react.useState)(void 0);
 	const [messages, setMessages] = (0, react.useState)({});
 	const [busyAction, setBusyAction] = (0, react.useState)(false);
+	const [autoOn, setAutoOn] = (0, react.useState)(true);
 	const mounted = (0, react.useRef)(true);
 	const timer = (0, react.useRef)(void 0);
+	/** Read whether the `auto` provider is offered, so its card can render the switch. */
+	(0, react.useEffect)(() => {
+		if (call === void 0) return;
+		let live = true;
+		call("auto-state", void 0).then((result) => {
+			if (live) setAutoOn(result.enabled);
+		}).catch(() => {});
+		return () => {
+			live = false;
+		};
+	}, [call]);
 	/** Fetch the current state; a failure is shown rather than swallowed. */
 	const refresh = (0, react.useCallback)(async () => {
 		if (call === void 0) return;
@@ -2058,6 +2093,25 @@ function SubscriptionsSection(props) {
 			if (mounted.current) setError(t("actionFailed", { message: messageOf(caught) }));
 		}
 	}, [call, t]);
+	/** Flip the `auto` provider on or off. */
+	const setAuto = (0, react.useCallback)(async (enabled) => {
+		if (call === void 0) return;
+		setBusyAction(true);
+		try {
+			const result = await call("setAutoOn", { enabled });
+			if (!mounted.current) return;
+			setAutoOn(result.enabled);
+			await refresh();
+		} catch (caught) {
+			if (mounted.current) setError(t("actionFailed", { message: messageOf(caught) }));
+		} finally {
+			if (mounted.current) setBusyAction(false);
+		}
+	}, [
+		call,
+		refresh,
+		t
+	]);
 	const stopPolling = (0, react.useCallback)(() => {
 		if (timer.current !== void 0) {
 			clearInterval(timer.current);
@@ -2371,6 +2425,12 @@ function SubscriptionsSection(props) {
 				},
 				onReload: () => {
 					reload(provider.provider);
+				},
+				...provider.provider !== "auto" ? {} : {
+					autoOn,
+					onSetAutoOn: (enabled) => {
+						setAuto(enabled);
+					}
 				}
 			}, provider.provider))
 		]
@@ -2539,10 +2599,16 @@ function mergeAccountWindows(readings) {
 		const withPercent = list.filter((window$1) => window$1.usedPercent !== void 0);
 		if (withPercent.length === 0) continue;
 		const usedPercent = withPercent.reduce((sum, window$1) => sum + (window$1.usedPercent ?? 0), 0) / withPercent.length;
+		const used = list.reduce((sum, window$1) => sum + (window$1.used ?? 0), 0);
+		const limit = list.reduce((sum, window$1) => sum + (window$1.limit ?? 0), 0);
 		const resets = list.map((window$1) => window$1.resetsAt).filter((at) => typeof at === "number");
 		merged.push({
 			label,
 			usedPercent: Math.max(0, Math.min(100, usedPercent)),
+			...limit > 0 ? {
+				used,
+				limit
+			} : {},
 			...resets.length === 0 ? {} : { resetsAt: Math.min(...resets) }
 		});
 	}