gemini-proxy-client 1.0.9 → 1.0.11

package/dist/browser/manager.js

@@ -144,9 +144,9 @@ export class BrowserManager {
             console.log(chalk.gray('未找到 "Continue to the app" 按钮，继续...'));
         }
         let clicked = false;
+        let buildAppFrame = null;
         // 第二步：关闭可能存在的模态框
         try {
-            // 尝试点击模态框外部或关闭按钮
             const modalSelectors = [
                 '.interaction-modal',
                 '[class*="modal"]',
@@ -157,7 +157,6 @@ export class BrowserManager {
                     const modal = await this.page.$(selector);
                     if (modal) {
                         console.log(chalk.gray(`发现模态框: ${selector}，尝试关闭...`));
-                        // 尝试按 Escape 键关闭
                         await this.page.keyboard.press('Escape');
                         await sleep(500);
                     }
@@ -171,7 +170,6 @@ export class BrowserManager {
             // 忽略
         }
         // 第三步：使用 frames() API 访问 Build App iframe
-        // Connect WS 按钮在 scf.usercontent.goog iframe 中
         try {
             console.log(chalk.gray('查找 Build App iframe...'));
             const frames = this.page.frames();
@@ -183,6 +181,7 @@ export class BrowserManager {
                 // 查找 Build App iframe (可能是 blob: URL 或 scf.usercontent.goog)
                 if (frameUrl.includes('scf.usercontent.goog') || frameUrl.startsWith('blob:')) {
                     console.log(chalk.gray(`找到 Build App iframe: ${frameUrl.substring(0, 60)}...`));
+                    buildAppFrame = frame;
                     // 等待 iframe 内容加载
                     try {
                         await frame.waitForLoadState('domcontentloaded');
@@ -190,41 +189,31 @@ export class BrowserManager {
                     catch (e) {
                         // 忽略
                     }
-                    // 查找按钮
-                    const buttons = await frame.$$('button');
-                    console.log(chalk.gray(`  iframe 中找到 ${buttons.length} 个按钮`));
-                    for (const button of buttons) {
-                        try {
-                            const title = await button.getAttribute('title');
-                            const text = await button.textContent();
-                            console.log(chalk.gray(`    按钮: "${text?.trim()}" title="${title}"`));
-                            if (title === 'Connect WebSocket Proxy' || (text && text.includes('Connect WS'))) {
-                                // 使用 force: true 强制点击，忽略遮挡
-                                await button.click({ force: true });
-                                clicked = true;
-                                console.log(chalk.green('✅ 点击了连接按钮'));
-                                break;
+                    // 直接使用 evaluate 在 iframe 中执行点击
+                    // 这样可以绑过任何遮挡问题
+                    try {
+                        clicked = await frame.evaluate(() => {
+                            const btn = document.querySelector('button[title="Connect WebSocket Proxy"]');
+                            if (btn) {
+                                // 使用 dispatchEvent 触发真实的点击事件
+                                const clickEvent = new MouseEvent('click', {
+                                    bubbles: true,
+                                    cancelable: true,
+                                    view: window
+                                });
+                                btn.dispatchEvent(clickEvent);
+                                return true;
                             }
-                        }
-                        catch (btnErr) {
-                            console.log(chalk.gray(`    点击失败: ${btnErr}`));
+                            return false;
+                        });
+                        if (clicked) {
+                            console.log(chalk.green('✅ 点击了连接按钮'));
                         }
                     }
-                    // 如果遍历没找到，尝试选择器
-                    if (!clicked) {
-                        try {
-                            const button = await frame.$('button[title="Connect WebSocket Proxy"]');
-                            if (button) {
-                                await button.click({ force: true });
-                                clicked = true;
-                                console.log(chalk.green('✅ 点击了连接按钮 (选择器)'));
-                            }
-                        }
-                        catch (e) {
-                            console.log(chalk.gray(`选择器点击失败: ${e}`));
-                        }
+                    catch (e) {
+                        console.log(chalk.gray(`evaluate 点击失败: ${e}`));
                     }
-                    // 如果还是没成功，尝试 evaluate 直接执行点击
+                    // 如果 dispatchEvent 失败，尝试直接调用 onclick
                     if (!clicked) {
                         try {
                             clicked = await frame.evaluate(() => {
@@ -236,11 +225,11 @@ export class BrowserManager {
                                 return false;
                             });
                             if (clicked) {
-                                console.log(chalk.green('✅ 点击了连接按钮 (evaluate)'));
+                                console.log(chalk.green('✅ 点击了连接按钮 (click())'));
                             }
                         }
                         catch (e) {
-                            console.log(chalk.gray(`evaluate 点击失败: ${e}`));
+                            console.log(chalk.gray(`click() 失败: ${e}`));
                         }
                     }
                 }
@@ -249,14 +238,36 @@ export class BrowserManager {
         catch (e) {
             console.log(chalk.gray(`iframe 访问失败: ${e}`));
         }
-        // 第四步：设置服务器地址（如果有输入框）
-        await this.setServerAddress();
         if (!clicked) {
             console.log(chalk.yellow('⚠️ 未找到连接按钮，请手动点击连接'));
-            console.log(chalk.gray('提示: Connect WS 按钮在 Build App 预览 iframe 中'));
+            return;
+        }
+        // 第四步：等待并验证连接成功（按钮文字变成 "Disconnect WS"）
+        console.log(chalk.gray('等待 WebSocket 连接...'));
+        let connected = false;
+        for (let i = 0; i < 15; i++) { // 最多等待 15 秒
+            await sleep(1000);
+            if (buildAppFrame) {
+                try {
+                    const buttonText = await buildAppFrame.evaluate(() => {
+                        const btn = document.querySelector('button[title="Connect WebSocket Proxy"], button[title="Disconnect WebSocket Proxy"]');
+                        return btn?.textContent?.trim() || '';
+                    });
+                    console.log(chalk.gray(`  检测按钮文字: "${buttonText}"`));
+                    if (buttonText.includes('Disconnect')) {
+                        connected = true;
+                        console.log(chalk.green('✅ WebSocket 连接成功！'));
+                        break;
+                    }
+                }
+                catch (e) {
+                    // 忽略
+                }
+            }
+        }
+        if (!connected) {
+            console.log(chalk.yellow('⚠️ WebSocket 连接可能未成功，请检查'));
         }
-        // 等待连接建立
-        await sleep(3000);
     }
     /**
      * 设置服务器地址

package/dist/cli.js

@@ -12,7 +12,7 @@ const program = new Command();
 program
     .name('gemini-client')
     .description('Gemini Proxy Build App 客户端 - 使用 Camoufox 自动保持连接')
-    .version('1.0.9');
+    .version('1.0.11');
 program
     .command('start')
     .description('启动客户端，连接到代理服务器')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gemini-proxy-client",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Gemini Proxy Build App 客户端 - 使用 Camoufox 自动保持连接",
   "main": "dist/index.js",
   "bin": {