magpie-gemini-web 0.5.6 → 0.6.0

package/lib/setup.mjs

@@ -1,5 +1,36 @@
 // Sign-in helpers for the one-click setup: turn what the user pasted into a Cookie header and
 // add it to the local backend's account pool through its admin API.
+import path from 'node:path';
+import os from 'node:os';
+import { fileURLToPath } from 'node:url';
+
+// Do not infer support from a version: upstream and local builds can have the same version
+// while silently ignoring proxy_id. Recheck at submission too, in case the service restarted.
+export async function requireLoginBackend(setup, options = {}) {
+  const fetchFn = options.fetchFn || globalThis.fetch;
+  let res, info;
+  try {
+    res = await fetchFn(`${setup.origin}/`, {
+      method: 'GET', redirect: 'error', signal: AbortSignal.timeout(5000)
+    });
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    info = await res.json();
+  } catch (err) {
+    throw new Error(`无法确认本地 Gemini Web 后端的登录能力（${setup.origin}）：${err.message}`);
+  }
+  if (info?.capabilities?.account_proxy_binding === true) return;
+  const dataDir = options.dataDir || process.env.GEMINI_WEB_DATA_DIR || path.join(os.homedir(), '.local', 'share', 'magpie-gemini-web');
+  const platform = options.platform || process.platform;
+  const script = fileURLToPath(new URL('../scripts/backend.mjs', import.meta.url));
+  // PowerShell and POSIX shells both accept single-quoted literal arguments, but escape
+  // apostrophes differently. Never interpolate credentials or proxy URLs into the hint.
+  const quote = value => `'${value.replaceAll("'", platform === 'win32' ? "''" : "'\\''")}'`;
+  const command = `node ${quote(script)} install --data-dir=${quote(path.resolve(dataDir))}`;
+  const stop = platform === 'win32'
+    ? '在任务管理器的「详细信息」中结束本数据目录对应的 gemini-web2api-go.exe'
+    : '在活动监视器或进程管理器中停止本数据目录对应的 gemini-web2api-go';
+  throw new Error(`正在运行的 Gemini Web 后端不支持登录时绑定代理，请先升级。先退出 Magpie，${stop}，再执行：\n${command}\n数据目录：${path.resolve(dataDir)}。如下载需要代理，请先设置 GEMINI_WEB_PROXY 环境变量。升级后重新打开 Magpie 并登录；账号和配置会保留。`);
+}
 
 // The sign-in cookies a gemini.google.com request carries; without these the backend serves
 // the request anonymously (or the account check fails).
@@ -79,6 +110,31 @@ export function parseCookieInput(input) {
 }
 
 const ADMIN_TIMEOUT_MS = 60000;
+const PROXY_PROTOCOLS = new Set(['http:', 'https:', 'socks5:', 'socks5h:']);
+
+// validateProxyURL checks a proxy URL meant for the backend's proxy pool (http, https, socks5,
+// or socks5h). An empty or omitted value returns '', meaning no proxy is set here.
+export function validateProxyURL(proxy) {
+  if (proxy === undefined || proxy === null || proxy === '') return '';
+  if (typeof proxy !== 'string') {
+    throw new Error('Invalid option proxy: must be a string');
+  }
+  const trimmed = proxy.trim();
+  if (!trimmed) return '';
+  if (/[\r\n]/.test(trimmed)) {
+    throw new Error('Invalid proxy URL: must not contain newlines');
+  }
+  let parsed;
+  try {
+    parsed = new URL(trimmed);
+  } catch {
+    throw new Error('代理地址格式无效：请填写完整的 URL，例如 http://127.0.0.1:7890 或 socks5://127.0.0.1:1080');
+  }
+  if (!PROXY_PROTOCOLS.has(parsed.protocol)) {
+    throw new Error('代理地址必须以 http://、https://、socks5:// 或 socks5h:// 开头');
+  }
+  return trimmed;
+}
 
 // adminCall is one request to the backend's admin API. A request that gets no answer within
 // ADMIN_TIMEOUT_MS fails with timeoutMessage when one is given: the backend was reached, but what
@@ -108,10 +164,41 @@ async function adminCall(setup, fetchFn, method, path, body, timeoutMessage) {
   return data;
 }
 
+// ensureProxy makes sure the given proxy URL is present, enabled, and not circuit-broken in the
+// backend's proxy pool before the backend reaches gemini.google.com to check a cookie.
+export async function ensureProxy(setup, proxy, options = {}) {
+  const url = validateProxyURL(proxy);
+  if (!url) return null;
+  const fetchFn = options.fetchFn || globalThis.fetch;
+  const name = options.name || 'Magpie';
+  const listed = await adminCall(setup, fetchFn, 'GET', 'proxies');
+  const items = Array.isArray(listed?.items) ? listed.items : [];
+  const exact = items.find(p => p && p.url === url && Number.isInteger(p.id));
+  if (exact) {
+    if (!exact.enabled) {
+      await adminCall(setup, fetchFn, 'PATCH', `proxies/${exact.id}`, { enabled: true });
+    }
+    if ((exact.fail_count ?? 0) > 0) {
+      await adminCall(setup, fetchFn, 'POST', `proxies/${exact.id}/reset`);
+    }
+    return { id: exact.id, url };
+  }
+  const managed = items.find(p => p && p.name === name && Number.isInteger(p.id));
+  if (managed) {
+    await adminCall(setup, fetchFn, 'PATCH', `proxies/${managed.id}`, { name, url, enabled: true });
+    if ((managed.fail_count ?? 0) > 0) {
+      await adminCall(setup, fetchFn, 'POST', `proxies/${managed.id}/reset`);
+    }
+    return { id: managed.id, url };
+  }
+  const created = await adminCall(setup, fetchFn, 'POST', 'proxies', { name, url, weight: 1 });
+  return { id: created.id, url };
+}
+
 // The check is the backend fetching gemini.google.com with the cookie, directly or through the
 // backend's own proxy pool: neither Magpie's proxy nor HTTP_PROXY reach it.
 function proxyHint(setup) {
-  return `后端不走 Magpie 的代理，也不读系统代理（HTTP_PROXY / HTTPS_PROXY）：需要代理才能访问 Google 的话，请在管理面板 ${setup.origin}/admin 的代理池里添加（登录口令是数据目录 secrets.json 里的 adminToken），然后重试。`;
+  return `后端不走 Magpie 的代理，也不读系统代理（HTTP_PROXY / HTTPS_PROXY）：需要代理才能访问 Google 的话，请在登录时填写代理地址（或设置插件选项 proxy / 环境变量 GEMINI_WEB_PROXY，也可以在管理面板 ${setup.origin}/admin 的代理池里添加，登录口令是数据目录 secrets.json 里的 adminToken），然后重试。`;
 }
 
 // checkFailure is the error for a check that came back not ok. The backend words the cookie's
@@ -128,11 +215,18 @@ function checkFailure(setup, detail) {
 // account that fails the check is removed again, and the error says why.
 export async function importCookie(setup, cookie, options = {}) {
   const fetchFn = options.fetchFn || globalThis.fetch;
+  await requireLoginBackend(setup, options);
+  let proxyId = Number.isInteger(options.proxyId) ? options.proxyId : undefined;
+  if (options.proxy) {
+    const ensured = await ensureProxy(setup, options.proxy, { fetchFn });
+    if (ensured && Number.isInteger(ensured.id)) proxyId = ensured.id;
+  }
   const label = options.label || `Magpie ${new Date().toISOString().slice(0, 10)}`;
   const added = await adminCall(setup, fetchFn, 'POST', 'cookies', {
     label,
     cookie,
-    note: 'Added by Magpie one-click setup'
+    note: 'Added by Magpie one-click setup',
+    ...(proxyId !== undefined ? { proxy_id: proxyId } : {})
   });
   if (!Number.isInteger(added.id)) throw new Error('本地后端没有返回新账号的 id');
 

package/lib/studio-native.mjs

@@ -3,6 +3,8 @@ import path from 'node:path';
 import os from 'node:os';
 import crypto from 'node:crypto';
 import net from 'node:net';
+import http from 'node:http';
+import { Readable } from 'node:stream';
 import { fileURLToPath } from 'node:url';
 import { spawn, execFile, execFileSync } from 'node:child_process';
 import { promisify } from 'node:util';
@@ -16,6 +18,7 @@ export const STUDIO_VERSION = `v${release.version}`;
 export const PINNED_ARCHIVES = release.binaries;
 // The port a new setup tries first: AIStudio2API's own default.
 export const DEFAULT_STUDIO_PORT = 2048;
+const DEFAULT_PREVIEW_PORT = 2050;
 // backend.log is set aside as backend.log.1 when a start finds it past this size.
 const LOG_ROTATE_BYTES = 10 * 1024 * 1024;
 
@@ -34,7 +37,7 @@ export function setupStep(dataDir) {
 }
 
 export function studioDataDir(env = process.env) {
-  return env.AI_STUDIO_DATA_DIR || path.join(os.homedir(), '.local', 'share', 'magpie-ai-studio');
+  return path.resolve(env.AI_STUDIO_DATA_DIR || path.join(os.homedir(), '.local', 'share', 'magpie-ai-studio'));
 }
 
 export function computeFileHash(filePath) {
@@ -59,7 +62,7 @@ export function studioCommand(action, { dataDir } = {}) {
 // has free. A user who already runs AIStudio2API keeps it on its default port, which a new setup
 // would otherwise find taken on every start.
 export async function pickStudioPort(preferred = DEFAULT_STUDIO_PORT) {
-  if (!(await portAnswers(preferred)) && await canListen(preferred)) return preferred;
+  if (preferred > 0 && !(await portAnswers(preferred)) && await canListen(preferred)) return preferred;
   return new Promise((resolve, reject) => {
     const server = net.createServer();
     server.once('error', reject);
@@ -189,11 +192,12 @@ export function validateConfig(config) {
 
 // ENV_KEYS are the settings upstream reads from .env, in the order it writes them (config.configKeys).
 const ENV_KEYS = [
-  'AISTUDIO_AUTH_STATES', 'LISTEN_ADDR', 'PROXY_API_KEY', 'PROXY', 'INIT_TIMEOUT', 'REQUEST_TIMEOUT',
+  'AISTUDIO_AUTH_STATES', 'LISTEN_ADDR', 'PREVIEW_LISTEN_ADDR', 'PROXY_API_KEY', 'PROXY', 'INIT_TIMEOUT', 'REQUEST_TIMEOUT',
   'WARM_WORKER_LIMIT', 'MAX_ACTIVE_WORKERS', 'WARM_STARTUP_CONCURRENCY', 'PER_ACCOUNT_CONCURRENCY',
-  'ROUTING_STRATEGY', 'UPSTREAM_CHANNELS', 'MODEL_MAPPING', 'TEMPORARY_CHAT', 'WAA_BACKEND', 'AUTO_START',
-  'REQUEST_BODY_LOG', 'LOG_FILE', 'LOG_MAX_TOTAL_MB', 'ADMIN_AUTH_ENABLED', 'ADMIN_USERNAME', 'ADMIN_PASSWORD',
-  'BUILD_NATIVE_NONSTREAM', 'MODEL_CHANNELS', 'MEDIA_OUTPUT', 'MEDIA_BASE_URL'
+  'ROUTING_STRATEGY', 'UPSTREAM_CHANNELS', 'MODEL_MAPPING', 'MODEL_CHANNELS', 'TEMPORARY_CHAT', 'WAA_BACKEND',
+  'MEDIA_OUTPUT', 'MEDIA_BASE_URL', 'AUTO_START', 'REQUEST_BODY_LOG', 'LOG_FILE', 'LOG_MAX_TOTAL_MB',
+  'ADMIN_AUTH_ENABLED', 'ADMIN_USERNAME', 'ADMIN_PASSWORD', 'BUILD_NATIVE_NONSTREAM',
+  'NONSTREAM_KEEPALIVE', 'FAKE_STREAM', 'YOUTUBE_LINKS'
 ];
 
 // PROXY_ENV are the proxy variables the service would fall back to with no PROXY of its own.
@@ -211,7 +215,8 @@ const SETTING_DEFAULTS = {
   WARM_STARTUP_CONCURRENCY: '1',
   ROUTING_STRATEGY: 'fill-first',
   REQUEST_TIMEOUT: '30m',
-  INIT_TIMEOUT: '2m'
+  INIT_TIMEOUT: '2m',
+  NONSTREAM_KEEPALIVE: 'false'
 };
 
 // pluginEnv is the settings this plugin depends on to reach, trust and drive the service. The
@@ -305,6 +310,17 @@ function writeStudioEnv(dataDir, values) {
   fs.chmodSync(envPath, 0o600);
 }
 
+function previewPort(addr) {
+  const match = /^.+:(\d+)$/.exec(String(addr ?? '').trim());
+  if (!match) return 0;
+  const port = Number(match[1]);
+  return Number.isInteger(port) && port >= 1 && port <= 65535 ? port : 0;
+}
+
+function defaultPreviewPort(studioPort) {
+  return studioPort === DEFAULT_PREVIEW_PORT ? DEFAULT_PREVIEW_PORT + 1 : DEFAULT_PREVIEW_PORT;
+}
+
 // syncStudioEnv brings .env up to date with config.json, keeping what the admin page saved: this
 // plugin's settings are written over, the others only when missing. A missing PROXY is the one
 // given, else the one an older config.json kept (which nothing reads after that).
@@ -312,10 +328,26 @@ function syncStudioEnv(dataDir, config, seedProxy) {
   const values = readStudioEnv(dataDir);
   Object.assign(values, pluginEnv(dataDir, config));
   for (const [key, value] of Object.entries(SETTING_DEFAULTS)) values[key] ??= value;
+  const preview = previewPort(values.PREVIEW_LISTEN_ADDR);
+  if (!preview || preview === config.port) {
+    values.PREVIEW_LISTEN_ADDR = `127.0.0.1:${defaultPreviewPort(config.port)}`;
+  }
   values.PROXY ??= validateProxy(seedProxy) || config.proxy;
   writeStudioEnv(dataDir, values);
 }
 
+// ensurePreviewPort makes sure PREVIEW_LISTEN_ADDR in .env is on a free port other than
+// studioPort before the service starts: upstream listens on both and exits when either is taken.
+async function ensurePreviewPort(dataDir, studioPort) {
+  const values = readStudioEnv(dataDir);
+  const current = previewPort(values.PREVIEW_LISTEN_ADDR);
+  if (current && current !== studioPort && !(await portAnswers(current)) && await canListen(current)) return;
+  let port = await pickStudioPort(defaultPreviewPort(studioPort));
+  while (port === studioPort) port = await pickStudioPort(0);
+  values.PREVIEW_LISTEN_ADDR = `127.0.0.1:${port}`;
+  writeStudioEnv(dataDir, values);
+}
+
 // saveStudioProxy saves the service's proxy in its .env, as the admin page does. The service
 // takes it the next time its generation service starts.
 export function saveStudioProxy(dataDir, proxy) {
@@ -398,6 +430,20 @@ export function localStudio(options = {}) {
   };
 }
 
+// nodeFetch is fetch over node:http, bounded only by its signal.
+export function nodeFetch(url, init = {}) {
+  return new Promise((resolve, reject) => {
+    const options = { method: init.method, headers: Object.fromEntries(new Headers(init.headers)), signal: init.signal };
+    const req = http.request(url, options, res => {
+      const headers = new Headers();
+      for (let i = 0; i < res.rawHeaders.length; i += 2) headers.append(res.rawHeaders[i], res.rawHeaders[i + 1]);
+      resolve(new Response(res.statusCode === 204 ? null : Readable.toWeb(res), { status: res.statusCode, headers }));
+    });
+    req.on('error', reject);
+    req.end(init.body ?? undefined);
+  });
+}
+
 export async function studioAdmin(local, method, pathname, body = null, options = {}) {
   if (!local || typeof local !== 'object') {
     throw new Error('localStudio configuration required for studioAdmin');
@@ -484,11 +530,13 @@ export async function studioAdmin(local, method, pathname, body = null, options
         payload = String(body);
       }
     }
+    // Bun's fetch drops a connection idle for 300 s; the signal sets the deadline instead.
     return fetchFn(url, {
       method,
       headers,
       body: payload,
       redirect: 'error',
+      timeout: false,
       signal: AbortSignal.timeout(timeoutMs)
     });
   }
@@ -893,7 +941,7 @@ export function verifyProcessIdentity(pid, expectedBinaryPath, platform = proces
         '-NoProfile',
         '-NonInteractive',
         '-Command',
-        `Get-CimInstance Win32_Process -Filter "ProcessId = $env:TARGET_PID" | Select-Object -ExpandProperty ExecutablePath`
+        `[Console]::OutputEncoding = [Text.UTF8Encoding]::new(); Get-CimInstance Win32_Process -Filter "ProcessId = $env:TARGET_PID" | Select-Object -ExpandProperty ExecutablePath`
       ], {
         env: { ...process.env, TARGET_PID: String(pid) },
         encoding: 'utf8',
@@ -1188,7 +1236,7 @@ export async function installStudio(options = {}) {
         fs.writeFileSync(archivePath, buffer, { mode: 0o600 });
       } else {
         // Without a progress meter curl's stderr holds just the reason a download failed.
-        const curlArgs = ['--fail', '--location', '--silent', '--show-error', '--connect-timeout', '15', '--max-time', '300'];
+        const curlArgs = ['--fail', '--location', '--silent', '--show-error', '--connect-timeout', '15', '--speed-limit', '1', '--speed-time', '60'];
         if (proxy) {
           curlArgs.push('--proxy', proxy);
         }
@@ -1513,6 +1561,7 @@ async function launchStudio(options) {
     if (health.state === 'foreign') throw portTaken(local);
     if (health.state !== 'down') throw notResponding(local, health);
     assertStudioExited(dataDir, platform);
+    await ensurePreviewPort(dataDir, config.port);
     protectPackage(dataDir, platform);
 
     // Clean environment: no host AISTUDIO_* or WAA_* vars, nor any of upstream's settings, which

package/lib/studio-release.json

@@ -1,39 +1,39 @@
 {
-  "version": "0.2.14-magpie.1",
+  "version": "0.2.16-magpie.1",
   "repository": "BUKOWSKIREAL/magpie-gemini-web",
-  "tag": "studio-v0.2.14-magpie.1",
+  "tag": "studio-v0.2.16-magpie.1",
   "goVersion": "1.27.1",
   "upstream": {
-    "version": "0.2.14",
+    "version": "0.2.16",
     "repository": "https://github.com/Mag1cFall/AIStudio2API.git",
-    "commit": "370a313814099b508881807effa2a9d72f2d7e66",
+    "commit": "fd6aab611b52fbfe179fbfc1bf830c4343066e32",
     "camoufox": "152.0.4-beta.29"
   },
   "binaries": {
     "darwin-arm64": {
-      "asset": "aistudio2api-v0.2.14-magpie.1-darwin-arm64.tar.gz",
-      "sha256": "f649c21837741bdb448407f79a3bc998429b446408ef3117a897103b9a47ee72",
-      "binarySha256": "999e49572dede3a63f538e3f62ceed5f03349459bdf391fd49fd57784985e13b"
+      "asset": "aistudio2api-v0.2.16-magpie.1-darwin-arm64.tar.gz",
+      "sha256": "3dd83c7c7fef6bbf96dc7d8eb6dd7257955af6c274c0fc67ad2ecb24a7df9992",
+      "binarySha256": "6f07122038587514bebe9f15ba0b00f7d9916d4db130028669380729b2e97c97"
     },
     "darwin-x64": {
-      "asset": "aistudio2api-v0.2.14-magpie.1-darwin-amd64.tar.gz",
-      "sha256": "ece680b5dfef57b0b0e96d639b618b74570e6e194f58808d762da85fd41d9b4a",
-      "binarySha256": "970df3ac51719721d908162d0233d80711f6c3ee007e193d0a73b6e4e596ca9a"
+      "asset": "aistudio2api-v0.2.16-magpie.1-darwin-amd64.tar.gz",
+      "sha256": "4152cbb37d83680c903d1bb3e72e7eaebd80e5e0df617c20e3ba7fbffd160868",
+      "binarySha256": "a0ad46091dd4ec20f0d82ffa3f14673ac3b5c70dc4a8a0e4cc8aac658525d050"
     },
     "linux-x64": {
-      "asset": "aistudio2api-v0.2.14-magpie.1-linux-amd64.tar.gz",
-      "sha256": "f6c7b52a739e4534236f055280fcddd48e64b56fdb954a7844eb453226d5b67f",
-      "binarySha256": "316306225bcc343188d6d81635d4bd79e7e82bd5c51b1009cd25361deb3b5e61"
+      "asset": "aistudio2api-v0.2.16-magpie.1-linux-amd64.tar.gz",
+      "sha256": "7f97398ea29c2413d3c3e12aca9525213bc80b97c6667a68429ccd3e8dc27ba1",
+      "binarySha256": "deef4cc68cafff147ad24fcaed2d42389d2dbd54d081696c3d6ea95b7d0ea8fa"
     },
     "linux-arm64": {
-      "asset": "aistudio2api-v0.2.14-magpie.1-linux-arm64.tar.gz",
-      "sha256": "a5b838b9b64e78d402372cae6b88e1f3faba406747e598e976728c71da3a75ef",
-      "binarySha256": "a5e9573b9edad7fb246178fb4c3d21a0d4905789fd59abf96656d57f26b7526e"
+      "asset": "aistudio2api-v0.2.16-magpie.1-linux-arm64.tar.gz",
+      "sha256": "2fccc892f00e17b8171ab2ed5d22b4a413b6e7d8230bb911bc5e846c5dc8f717",
+      "binarySha256": "567c61bec4f7cf199eabd05ecb3420f409039064fe02a2e38ed22e8b35db3da9"
     },
     "win32-x64": {
-      "asset": "aistudio2api-v0.2.14-magpie.1-windows-amd64.zip",
-      "sha256": "ccd5b96dabebbc0f1d510959c698beb9d9af09bb65d8b0e021327970b3173384",
-      "binarySha256": "ce784c98f1558395a670421ef6cc7d36dde5313f74788f7df5772851c241ae06"
+      "asset": "aistudio2api-v0.2.16-magpie.1-windows-amd64.zip",
+      "sha256": "e7d115aacd957ffda80cf2ecadc38af8404d780bc45af01b6b945accc50d8bc7",
+      "binarySha256": "bf96178445dbb653b6876b3abe1768b880465974531d6fb12892857fbc666818"
     }
   }
 }

package/lib/studio.mjs

@@ -660,15 +660,13 @@ export const AIStudioPlugin = async (_input, options = {}) => {
     }
   }
 
-  // setupNote is a line for a sign-in that must set the service up before its login window can
-  // open: the download (from GitHub, and on Windows not through the system proxy) shows nothing
-  // until it ends, which can take minutes.
+  // setupNote says a sign-in must set the service up first, which can take minutes.
   function setupNote() {
     let proxy = '';
     try {
       proxy = downloadProxy(studioDataDir(), opts.proxy);
     } catch {}
-    const via = proxy ? `走代理 ${redactProxy(proxy)}` : '直连 GitHub，不走系统代理';
+    const via = proxy ? `走代理 ${redactProxy(proxy)}` : '按 Magpie 的代理设置';
     return `本地 AI Studio 服务还没启动：要先启动它，第一次使用或插件更新后还要先从 GitHub 下载（约 25 MB，${via}），可能要等几分钟。${SETUP_PROXY_HINT}\n`;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie-gemini-web",
-  "version": "0.5.6",
+  "version": "0.6.0",
   "description": "Gemini Web and Google AI Studio provider for Magpie, backed by gemini-web2api-go and AIStudio2API",
   "type": "module",
   "main": "./index.mjs",
@@ -27,6 +27,7 @@
     "scripts/studio.mjs",
     "scripts/studio-release.mjs",
     "scripts/studio-archive.go",
+    "scripts/studio-regzip.go",
     "scripts/studio-managed-smoke.mjs",
     "patches/",
     "native-task/lib/",