dsh-plugin-subscription-oauth 0.7.0 → 0.8.1

package/lib/client.js

@@ -557,6 +557,18 @@ const usageChipCss = `
   color: var(--dsw-alias-label-primary, #e8e8e8);
   font-variant-numeric: tabular-nums;
 }
+.dsh-subscription-usage-chip-account {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  /* A hairline between accounts, so two sign-ins read as two groups not one run. */
+  padding-top: 6px;
+  border-top: 1px solid var(--dsw-alias-border-secondary, #ffffff14);
+}
+.dsh-subscription-usage-chip-account:first-of-type {
+  padding-top: 0;
+  border-top: 0;
+}
 .dsh-subscription-usage-chip-panel {
   position: absolute;
   bottom: calc(100% + 6px);
@@ -564,9 +576,9 @@ const usageChipCss = `
   z-index: 20;
   display: flex;
   flex-direction: column;
-  gap: 8px;
-  min-width: 168px;
-  padding: 10px 12px;
+  gap: 10px;
+  min-width: 180px;
+  padding: 12px 14px;
   border: 1px solid var(--dsw-alias-border-secondary, #ffffff1f);
   border-radius: var(--dsw-radius-md, 10px);
   background: var(--dsw-alias-bg-layer-2, #26262a);
@@ -581,7 +593,7 @@ const usageChipCss = `
 .dsh-subscription-usage-chip-meter {
   display: flex;
   flex-direction: column;
-  gap: 4px;
+  gap: 5px;
 }
 .dsh-subscription-usage-chip-meterHead {
   display: flex;
@@ -2300,14 +2312,16 @@ function balanceOf(value) {
 * 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.
+* the currency prefix keeps two currencies from being mistaken for one sum. The amount
+* is rounded to two decimal places (a balance reads to the cent, and a figure like
+* `1.1` for `1.10` would mislead) and always carries both places.
 *
 * @param wallet - the wallet to show.
-* @returns the short form, e.g. `¥6.89` or `+¥2` for a bonus wallet.
+* @returns the short form, e.g. `¥6.89` or `+$2.00` 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 trimmed = Number.isFinite(amount) ? amount.toFixed(2) : wallet.balance;
 	const symbol = wallet.currency === "CNY" ? "¥" : wallet.currency === "USD" ? "$" : `${wallet.currency} `;
 	return `${wallet.bonus ? "+" : ""}${symbol}${trimmed}`;
 }
@@ -2336,43 +2350,78 @@ function shortWindow(label) {
 	return label.length <= 4 ? label : label.slice(0, 4);
 }
 /**
-* Pick the window a single line should show.
+* Reduce a route's per-account usage to one reading per account.
 *
-* A plan can meter several windows at once (a rolling five-hour one and a weekly one).
-* The most constrained is the one that will stop work soonest, so it earns the space;
-* ties fall to the earlier window, which is the order the providers state them in.
+* A provider can hold several accounts (two Antigravity sign-ins, say), and the chip
+* shows each one's allowance on its own line, the way the settings cards do — a merged
+* figure would hide that one account is exhausted while the other is free.
 *
-* @param windows - the route's metered windows.
-* @returns the window to show, or undefined when none states a figure.
+* @param usage - every account the route answered for.
+* @returns one reading per account that states a figure, in the route's order.
 */
-function pickWindow(windows) {
-	let best;
-	for (const window$1 of windows) {
-		if (window$1.usedPercent === void 0) continue;
-		if (best?.usedPercent === void 0 || window$1.usedPercent > best.usedPercent) best = window$1;
+/**
+* Reduce a route's per-account usage to one reading per account.
+*
+* A provider can hold several accounts (two Antigravity sign-ins, say). Every account's
+* windows are kept as the route stated them — a percentage-metered quota and a credit
+* balance (`credits`) alike — so the per-account panel shows the real figures, and the
+* compact line's merge decides which to integrate.
+*
+* @param usage - every account the route answered for.
+* @returns one reading per account that states any window, in the route's order.
+*/
+function accountReadingsOf(usage) {
+	const out = [];
+	for (const entry of usage) {
+		if (entry.windows.length === 0) continue;
+		out.push({
+			account: entry.account,
+			windows: entry.windows,
+			...entry.plan === void 0 ? {} : { plan: entry.plan }
+		});
 	}
-	return best;
+	return out;
 }
 /**
-* Reduce one route's usage to what the chip renders.
+* Merge every account's percentage-metered windows into one figure per label.
+*
+* The chip's compact line integrates the whole pool: two accounts at 50 percent read as
+* one window at 50 percent (the same allowance spent twice as wide), not two lines. A
+* credit balance (`credits`) is money, not a share of a shared allowance, so it is not
+* merged — it stays on the per-account panel, where it reads correctly. Only windows
+* that state a `usedPercent` (a share of an allowance) merge.
 *
-* @param provider - the route the figures came from.
-* @param label - the route's display name.
-* @param usage - the accounts the route answered for.
-* @returns the reading, or undefined when the route stated no figure.
+* @param readings - one per account, from {@link accountReadingsOf}.
+* @returns one merged window per percentage-metered label, most-spent first.
 */
-function readingOf(provider, label, usage) {
-	for (const entry of usage) {
-		const window$1 = pickWindow(entry.windows);
-		if (window$1 === void 0) continue;
-		return {
-			provider,
+function mergeAccountWindows(readings) {
+	const byLabel = /* @__PURE__ */ new Map();
+	for (const reading of readings) for (const window$1 of reading.windows) {
+		if (window$1.usedPercent === void 0) continue;
+		const list = byLabel.get(window$1.label) ?? [];
+		list.push(window$1);
+		byLabel.set(window$1.label, list);
+	}
+	const merged = [];
+	for (const [label, list] of byLabel) {
+		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 resets = list.map((window$1) => window$1.resetsAt).filter((at) => typeof at === "number");
+		merged.push({
 			label,
-			windows: entry.windows.filter((candidate) => candidate.usedPercent !== void 0),
-			window: window$1,
-			...entry.plan === void 0 ? {} : { plan: entry.plan }
-		};
+			usedPercent: Math.max(0, Math.min(100, usedPercent)),
+			...resets.length === 0 ? {} : { resetsAt: Math.min(...resets) }
+		});
 	}
+	const order = (label) => {
+		const short = shortWindow(label);
+		if (short === "5h" || short === "s") return 0;
+		if (short === "1d" || short === "mo") return 1;
+		if (short === "7d") return 2;
+		return 3;
+	};
+	return merged.sort((left, right) => order(left.label) - order(right.label));
 }
 /**
 * Format a window's reset the way the settings cards do.
@@ -2402,6 +2451,7 @@ function formatReset(at, now) {
 */
 function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, useProjection }) {
 	const [reading, setReading] = (0, react.useState)(void 0);
+	const [accountReadings, setAccountReadings] = (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());
@@ -2438,8 +2488,7 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 	]);
 	const load = (0, react.useCallback)(async (target) => {
 		try {
-			const result = await call("usage", { provider: target });
-			return readingOf(target, result.status.providers.find((entry) => entry.provider === target)?.displayName ?? target, result.usage);
+			return accountReadingsOf((await call("usage", { provider: target })).usage);
 		} catch {
 			return;
 		}
@@ -2465,7 +2514,7 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 	(0, react.useEffect)(() => {
 		const target = selected !== void 0 && isOwnProvider(selected) ? selected : lastOwn.current;
 		if (target === void 0) {
-			setReading(void 0);
+			setAccountReadings(void 0);
 			return;
 		}
 		let live = true;
@@ -2474,7 +2523,7 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 			load(target).then((next) => {
 				if (!live || next === void 0) return;
 				lastOwn.current = target;
-				setReading(next);
+				setAccountReadings(next);
 			});
 		};
 		refresh();
@@ -2592,10 +2641,9 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 			]
 		});
 	}
-	if (reading === void 0) return null;
-	if (reading.window.usedPercent === void 0) return null;
-	formatReset(reading.window.resetsAt, now);
-	const short = shortLabel(reading.provider, reading.label);
+	if (accountReadings === void 0 || accountReadings.length === 0) return null;
+	const short = shortLabel(selected ?? "", selected ?? "");
+	const merged = mergeAccountWindows(accountReadings);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 		className: "dsh-subscription-usage-chip",
 		children: [
@@ -2604,7 +2652,7 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 				type: "button",
 				className: "dsh-subscription-usage-chip-trigger",
 				"aria-expanded": open,
-				title: t("usageChipTitle", { provider: reading.label }),
+				title: t("usageChipTitle", { provider: selected ?? "" }),
 				onClick: (event) => {
 					event.stopPropagation();
 					setOpen((was) => !was);
@@ -2612,7 +2660,7 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: "dsh-subscription-usage-chip-label",
 					children: short
-				}), reading.windows.map((window$1) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				}), merged.map((window$1) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 					className: "dsh-subscription-usage-chip-cell",
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						className: "dsh-subscription-usage-chip-window",
@@ -2626,22 +2674,26 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 			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: reading.label })
-					}),
-					reading.windows.map((window$1) => {
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "dsh-subscription-usage-chip-full",
+					children: t("usageChipFull", { provider: selected ?? "" })
+				}), accountReadings.map((account) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+					className: "dsh-subscription-usage-chip-account",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-subscription-usage-chip-meterHead",
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: account.plan ?? account.account })
+					}), account.windows.map((window$1) => {
 						const windowReset = formatReset(window$1.resetsAt, now);
+						const amount = window$1.usedPercent === void 0 && window$1.used !== void 0 && window$1.limit !== void 0 ? `${String(window$1.used)}/${String(window$1.limit)}` : `${String(Math.round(window$1.usedPercent ?? 0))}%`;
 						return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("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: window$1.label }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 									className: "dsh-subscription-usage-chip-detail",
-									children: `${String(Math.round(window$1.usedPercent ?? 0))}%${windowReset === void 0 ? "" : ` · ${windowReset}`}`
+									children: `${amount}${windowReset === void 0 ? "" : ` · ${windowReset}`}`
 								})]
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							}), window$1.usedPercent !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: "dsh-subscription-usage-chip-track",
 								"aria-hidden": "true",
 								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -2650,12 +2702,8 @@ function UsageChip({ call, t, isOwnProvider, accountBalance, ccSwitchBalance, us
 								})
 							})]
 						}, window$1.label);
-					}),
-					reading.plan === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "dsh-subscription-usage-chip-detail",
-						children: reading.plan
-					})
-				]
+					})]
+				}, account.account))]
 			})
 		]
 	});