dsh-agy 0.2.2 → 0.2.4

package/lib/web/plugin.mjs

@@ -1,7 +1,8 @@
-import { m as resolveAntigravityVersionBounded, n as generateFingerprint, r as recordFingerprintVersion } from "../session-KoIh3xdB.mjs";
-import { t as createAgyRuntime } from "../plugin-common-CQoDUeqE.mjs";
-import { t as exchangeAntigravity } from "../exchange-DBRzR2M-.mjs";
-import { n as upsertImportedAccount, r as authorizeAntigravity, t as importManySources } from "../import-C4CRBTbi.mjs";
+import { d as isAgyDisabled, f as generateFingerprint, g as resolveAntigravityVersionBounded, n as maskProxyUrl, p as recordFingerprintVersion } from "../accounts-DbTTxX_z.mjs";
+import { a as proxyUrlForLogs, r as normalizeProxyUrl, t as isProxyReachable } from "../proxy-DQPIwUov.mjs";
+import { t as createAgyRuntime } from "../plugin-common-D7lc-W6b.mjs";
+import { t as exchangeAntigravity } from "../exchange-BvrLu2E4.mjs";
+import { n as upsertImportedAccount, r as authorizeAntigravity, t as importManySources } from "../import-DSvpbB0T.mjs";
 //#region src/web/i18n.ts
 const I18N_DICT = {
 	en: {
@@ -895,6 +896,15 @@ function renderDashboardHtml() {
             '<button class="btn btn-secondary btn-sm" id="btn-action-fp">' + esc(t('fingerprint')) + '</button>' +
             '<button class="btn btn-danger btn-sm" id="btn-action-delete">' + esc(t('deleteAccount')) + '</button>' +
           '</div>' +
+          '</div>' +
+
+        '<div style="margin-top:14px;padding:10px 12px;border:1px solid var(--border-l1);border-radius:8px;background:var(--bg-surface-elevated);display:flex;flex-wrap:wrap;gap:8px;align-items:center;">' +
+          '<span style="font-size:13px;font-weight:500;white-space:nowrap;">Proxy:</span>' +
+          '<input id="proxy-input-' + selectedIndex + '" placeholder="socks5://user:pass@host:1080" style="flex:1;min-width:220px;font-family:var(--ds-font-family-code);font-size:12.5px;padding:6px 10px;background:var(--bg-input);border:1px solid var(--border-l2);border-radius:6px;color:var(--text-primary);outline:none;">' +
+          '<button class="btn btn-primary btn-sm" id="btn-proxy-save">Save</button>' +
+          '<button class="btn btn-secondary btn-sm" id="btn-proxy-clear">Clear</button>' +
+          '<button class="btn btn-secondary btn-sm" id="btn-proxy-test">Test</button>' +
+          '<span id="proxy-status" style="font-size:12px;color:var(--text-secondary);">' + ((a.proxy || a.proxyMasked) ? 'Current: ' + esc(a.proxy || a.proxyMasked) : 'No proxy (using env)') + '</span>' +
         '</div>' +
 
         '<div style="margin-top:16px;">' +
@@ -1026,6 +1036,58 @@ function renderDashboardHtml() {
         btnTestAll.disabled = false;
       };
 
+      // Proxy actions
+      const btnProxySave = $('btn-proxy-save');
+      if (btnProxySave) btnProxySave.onclick = async () => {
+        const input = $('proxy-input-' + index);
+        const proxy = input ? input.value.trim() : '';
+        btnProxySave.disabled = true;
+        try {
+          const r = await api('/proxy', { method: 'POST', body: JSON.stringify({ index, proxy }) });
+          const masked = r.proxy || r.proxyMasked || '';
+          const statusEl = $('proxy-status');
+          if (statusEl) statusEl.textContent = masked ? 'Current: ' + masked : 'No proxy (using env)';
+          toast(masked ? 'Proxy saved: ' + masked : 'Proxy cleared (using env)', 'success');
+          render();
+        } catch (e) { toast(String(e), 'error'); }
+        finally { btnProxySave.disabled = false; }
+      };
+      const btnProxyClear = $('btn-proxy-clear');
+      if (btnProxyClear) btnProxyClear.onclick = async () => {
+        btnProxyClear.disabled = true;
+        try {
+          await api('/proxy', { method: 'POST', body: JSON.stringify({ index, proxy: '' }) });
+          const statusEl = $('proxy-status');
+          if (statusEl) statusEl.textContent = 'No proxy (using env)';
+          const input = $('proxy-input-' + index);
+          if (input) input.value = '';
+          toast('Proxy cleared (using env)', 'success');
+          render();
+        } catch (e) { toast(String(e), 'error'); }
+        finally { btnProxyClear.disabled = false; }
+      };
+      const btnProxyTest = $('btn-proxy-test');
+      if (btnProxyTest) btnProxyTest.onclick = async () => {
+        const input = $('proxy-input-' + index);
+        const val = input ? input.value.trim() : '';
+        const body = val ? { index, proxy: val } : { index };
+        btnProxyTest.disabled = true;
+        btnProxyTest.textContent = '...';
+        try {
+          const r = await api('/proxy/test', { method: 'POST', body: JSON.stringify(body) });
+          const masked = r.masked ? esc(r.masked) : '';
+          const statusEl = $('proxy-status');
+          if (r.ok) {
+            toast('Proxy reachable: ' + (r.masked || ''), 'success');
+            if (statusEl) statusEl.textContent = 'Reachable: ' + (r.masked || '');
+          } else {
+            toast('Proxy unreachable: ' + (r.masked || '') + (r.error ? ' - ' + r.error : ''), 'error');
+            if (statusEl) statusEl.textContent = 'Unreachable: ' + (r.masked || '') + (r.error ? ' (' + r.error + ')' : '');
+          }
+        } catch (e) { toast(String(e), 'error'); }
+        finally { btnProxyTest.disabled = false; btnProxyTest.textContent = 'Test'; }
+      };
+
       // Single model tests
       document.querySelectorAll('[data-test-model]').forEach((btn) => {
         btn.onclick = async () => {
@@ -1310,7 +1372,9 @@ function createAgyWebRoutes(options) {
 					createdAt: account.fingerprint.createdAt
 				} : null,
 				fingerprintHistory: (account.fingerprintHistory ?? []).length,
-				quota: null
+				quota: null,
+				proxy: account.proxy ? maskProxyUrl(account.proxy) : null,
+				proxyMasked: account.proxy ? maskProxyUrl(account.proxy) : null
 			};
 			list.push(entry);
 		}
@@ -1318,7 +1382,7 @@ function createAgyWebRoutes(options) {
 			const session = await sessions.getSession().catch(() => void 0);
 			if (!session || session.index !== entry.index) continue;
 			try {
-				const { fetchAvailableModels } = await import("../models-1rf_Wfo2.mjs").then((n) => n.n);
+				const { fetchAvailableModels } = await import("../models-DRWVi33p.mjs").then((n) => n.r);
 				const discovered = await fetchAvailableModels(session.auth.access, session.account.projectId);
 				const models = Object.entries(discovered.models ?? {});
 				if (models.length > 0) {
@@ -1388,7 +1452,8 @@ function createAgyWebRoutes(options) {
 			expiresAt: new Date(result.expires).toISOString(),
 			authMethod: "oauth",
 			email: result.email ?? null,
-			projectId: result.projectId || null
+			projectId: result.projectId || null,
+			clientId: result.clientId || null
 		}, { overwriteExisting: true });
 		res.writeHead(200, { "content-type": "text/html; charset=utf-8" });
 		res.end(renderCallbackHtml({
@@ -1437,6 +1502,15 @@ function createAgyWebRoutes(options) {
 			sendJson(res, 400, { error: error instanceof Error ? error.message : String(error) });
 		}
 	};
+	const handleHealth = async (req, res) => {
+		try {
+			const body = await readJson(req);
+			const indices = Array.isArray(body.indices) ? body.indices.map((value) => Number(value)) : void 0;
+			sendJson(res, 200, { results: await sessions.checkAccounts(indices) });
+		} catch (error) {
+			sendJson(res, 400, { error: error instanceof Error ? error.message : String(error) });
+		}
+	};
 	const handleDelete = async (req, res) => {
 		try {
 			const body = await readJson(req);
@@ -1474,7 +1548,7 @@ function createAgyWebRoutes(options) {
 			return;
 		}
 		try {
-			const { listAgyModels } = await import("../models-1rf_Wfo2.mjs").then((n) => n.n);
+			const { listAgyModels } = await import("../models-DRWVi33p.mjs").then((n) => n.r);
 			const models = await listAgyModels(session.auth.access, session.account.projectId);
 			sendJson(res, 200, {
 				account: session.account.email ?? null,
@@ -1542,6 +1616,107 @@ function createAgyWebRoutes(options) {
 			sendJson(res, 400, { error: error instanceof Error ? error.message : String(error) });
 		}
 	};
+	const handleProxy = async (req, res) => {
+		try {
+			const body = await readJson(req);
+			const rawIdx = Number(body.index);
+			if (!Number.isInteger(rawIdx) || !Number.isFinite(rawIdx) || rawIdx < 0) {
+				sendJson(res, 400, { error: "invalid index" });
+				return;
+			}
+			const index = rawIdx;
+			const raw = typeof body.proxy === "string" ? body.proxy : "";
+			if (!raw.trim()) {
+				await store.mutate((storage) => {
+					const account = storage.accounts[index];
+					if (!account) throw new Error("account not found");
+					delete account.proxy;
+				});
+				sendJson(res, 200, {
+					ok: true,
+					proxy: null,
+					proxyMasked: null,
+					rawLogs: null
+				});
+				return;
+			}
+			let normalized;
+			try {
+				normalized = normalizeProxyUrl(raw);
+			} catch (e) {
+				sendJson(res, 400, { error: e instanceof Error ? e.message : String(e) });
+				return;
+			}
+			await store.mutate((storage) => {
+				const account = storage.accounts[index];
+				if (!account) throw new Error("account not found");
+				account.proxy = normalized;
+			});
+			sendJson(res, 200, {
+				ok: true,
+				proxy: maskProxyUrl(normalized),
+				proxyMasked: maskProxyUrl(normalized),
+				rawLogs: proxyUrlForLogs(normalized)
+			});
+		} catch (error) {
+			sendJson(res, 400, { error: error instanceof Error ? error.message : String(error) });
+		}
+	};
+	const handleProxyTest = async (req, res) => {
+		try {
+			const body = await readJson(req);
+			const rawIdx2 = body.index !== void 0 ? Number(body.index) : NaN;
+			const hasExplicitProxy = typeof body.proxy === "string" && body.proxy.trim() !== "";
+			if (!hasExplicitProxy) {
+				if (!Number.isInteger(rawIdx2) || !Number.isFinite(rawIdx2) || rawIdx2 < 0) {
+					sendJson(res, 400, { error: "invalid index" });
+					return;
+				}
+			} else if (body.index !== void 0) {
+				if (!Number.isInteger(rawIdx2) || !Number.isFinite(rawIdx2) || rawIdx2 < 0) {
+					sendJson(res, 400, { error: "invalid index" });
+					return;
+				}
+			}
+			const index = hasExplicitProxy && body.index === void 0 ? -1 : rawIdx2;
+			let target;
+			if (hasExplicitProxy) try {
+				target = normalizeProxyUrl(body.proxy);
+			} catch (e) {
+				sendJson(res, 400, { error: e instanceof Error ? e.message : String(e) });
+				return;
+			}
+			else {
+				const account = (await store.load()).accounts[index];
+				if (!account) {
+					sendJson(res, 400, { error: "account not found" });
+					return;
+				}
+				if (!account.proxy) {
+					sendJson(res, 400, { error: "no proxy configured for this account" });
+					return;
+				}
+				target = account.proxy;
+			}
+			const masked = maskProxyUrl(target) ?? proxyUrlForLogs(target);
+			let ok = false;
+			let errMsg;
+			try {
+				ok = await isProxyReachable(target, 2e3);
+				if (!ok) errMsg = "proxy unreachable: " + masked;
+			} catch (e) {
+				ok = false;
+				errMsg = e instanceof Error ? e.message : String(e);
+			}
+			sendJson(res, 200, {
+				ok,
+				masked,
+				...errMsg ? { error: errMsg } : {}
+			});
+		} catch (error) {
+			sendJson(res, 400, { error: error instanceof Error ? error.message : String(error) });
+		}
+	};
 	return [
 		{
 			kind: "exact",
@@ -1590,6 +1765,11 @@ function createAgyWebRoutes(options) {
 			path: "/agy/api/verify",
 			handler: handleVerify
 		},
+		{
+			kind: "exact",
+			path: "/agy/api/health",
+			handler: handleHealth
+		},
 		{
 			kind: "exact",
 			path: "/agy/api/delete",
@@ -1619,6 +1799,16 @@ function createAgyWebRoutes(options) {
 			kind: "exact",
 			path: "/agy/api/fingerprint",
 			handler: handleFingerprint
+		},
+		{
+			kind: "exact",
+			path: "/agy/api/proxy",
+			handler: handleProxy
+		},
+		{
+			kind: "exact",
+			path: "/agy/api/proxy/test",
+			handler: handleProxyTest
 		}
 	];
 }
@@ -1627,6 +1817,10 @@ function createAgyWebRoutes(options) {
 const name = "dsh-agy-web";
 const inject = ["llm", "webServer"];
 function apply(ctx) {
+	if (isAgyDisabled()) {
+		ctx.logger.warn("[dsh-agy] disabled by DSH_AGY_DISABLE=1 — skipping /agy registration");
+		return;
+	}
 	ctx.effect(async () => {
 		const webServer = ctx.get("webServer");
 		if (!webServer) return () => {};