@eddyskywalker/dsh-chatgpt-subscription 0.2.9 → 0.2.11

package/lib/client.js

@@ -1886,6 +1886,8 @@ window.__ModuleLoader__.load({
 			const [loading, setLoading] = (0, react.useState)(true);
 			const [busy, setBusy] = (0, react.useState)(null);
 			const [error, setError] = (0, react.useState)(null);
+			const [validationUrl, setValidationUrl] = (0, react.useState)(null);
+			const [loginProgress, setLoginProgress] = (0, react.useState)(null);
 			const [contextDrafts, setContextDrafts] = (0, react.useState)({});
 			const [savingModel, setSavingModel] = (0, react.useState)(null);
 			const t = zh;
@@ -1894,10 +1896,14 @@ window.__ModuleLoader__.load({
 				loadModelDirectory?.();
 			}, [onModelChange, loadModelDirectory]);
 			const loadStatus = (0, react.useCallback)(async (quiet = false) => {
-				if (!quiet) setError(null);
+				if (!quiet) {
+					setError(null);
+					setValidationUrl(null);
+				}
 				try {
 					const data = await fetchApi$1("/status");
 					setStatus(data);
+					if (data.authenticated && (!data.quota || data.quota.groups.length === 0)) fetchApi$1("/quota", { method: "POST" }).then((updated) => setStatus(updated)).catch(() => void 0);
 					const drafts = {};
 					for (const m of data.models) {
 						const val = data.contextWindowOverrides[m.id] || m.defaultContextWindow;
@@ -1926,29 +1932,37 @@ window.__ModuleLoader__.load({
 				try {
 					setBusy("login");
 					setError(null);
+					setValidationUrl(null);
+					setLoginProgress(null);
 					const flow = await fetchApi$1("/login", { method: "POST" });
 					if (flow.authUrl) window.open(flow.authUrl, "_blank");
 					const pollTimer = setInterval(async () => {
 						try {
 							const pollStatus = await fetchApi$1("/login/status");
+							if (pollStatus.progress) setLoginProgress(pollStatus.progress);
 							if (pollStatus.status === "complete") {
 								clearInterval(pollTimer);
 								setBusy(null);
+								setLoginProgress(null);
 								await loadStatus();
 								notifyChange();
 							} else if (pollStatus.status === "error") {
 								clearInterval(pollTimer);
 								setBusy(null);
-								setError(t.loginFailed);
+								setLoginProgress(null);
+								setError(pollStatus.error || t.loginFailed);
+								if (pollStatus.validationUrl) setValidationUrl(pollStatus.validationUrl);
 							}
 						} catch {}
 					}, 1500);
 					setTimeout(() => {
 						clearInterval(pollTimer);
 						setBusy(null);
+						setLoginProgress(null);
 					}, 300 * 1e3);
 				} catch (err) {
 					setBusy(null);
+					setLoginProgress(null);
 					setError(err instanceof Error ? err.message : String(err));
 				}
 			};
@@ -2127,13 +2141,13 @@ window.__ModuleLoader__.load({
 									className: "dsha-btn dsha-btn-primary",
 									disabled: busy !== null,
 									onClick: handleLogin,
-									children: busy === "login" ? t.signingIn : t.signIn
+									children: busy === "login" ? loginProgress || t.signingIn : t.signIn
 								}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										className: "dsha-btn dsha-btn-primary",
 										disabled: busy !== null,
 										onClick: handleLogin,
-										children: t.signInAgain
+										children: busy === "login" ? loginProgress || t.signingIn : t.signInAgain
 									}),
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										className: "dsha-btn",
@@ -2319,7 +2333,7 @@ window.__ModuleLoader__.load({
 								children: t.signedOut
 							}) : groups.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 								className: "dsha-empty",
-								children: "暂无配额数据，点击右上角刷新用量。"
+								children: busy === "quota" ? t.refreshingQuota : "正在获取配额用量数据..."
 							}) : groups.map((group, gIdx) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								className: "dsha-quota-card",
 								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2354,9 +2368,24 @@ window.__ModuleLoader__.load({
 							})
 						]
 					}),
-					error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					error && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: "dsha-error",
-						children: error
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: error }), validationUrl && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							style: { marginTop: "8px" },
+							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
+								href: validationUrl,
+								target: "_blank",
+								rel: "noreferrer",
+								className: "dsha-btn dsha-btn-primary",
+								style: {
+									display: "inline-block",
+									textDecoration: "none",
+									padding: "4px 10px",
+									fontSize: "12px"
+								},
+								children: "前往 Google 完成账号验证"
+							})
+						})]
 					})
 				]
 			});
@@ -2494,7 +2523,12 @@ window.__ModuleLoader__.load({
 				setLoading(true);
 				try {
 					const data = refresh ? await fetchApi("/quota", { method: "POST" }) : await fetchApi("/status");
-					if (mountedRef.current) setStatus(data);
+					if (mountedRef.current) {
+						setStatus(data);
+						if (data.authenticated && (!data.quota || data.quota.groups.length === 0) && !refresh) fetchApi("/quota", { method: "POST" }).then((updated) => {
+							if (mountedRef.current) setStatus(updated);
+						}).catch(() => void 0);
+					}
 				} catch {} finally {
 					if (mountedRef.current) setLoading(false);
 				}