gemini-proxy-client 1.0.7 → 1.0.8

package/dist/browser/manager.js

@@ -143,124 +143,87 @@ export class BrowserManager {
         catch (e) {
             console.log(chalk.gray('未找到 "Continue to the app" 按钮，继续...'));
         }
-        // 第二步：直接在主页面查找按钮（不通过 frames）
         let clicked = false;
-        // 方法1: 使用 page.evaluate 直接在页面中查找并点击
+        // 第二步：使用 frameLocator 访问 Build App iframe
+        // Connect WS 按钮在 scf.usercontent.goog iframe 中
         try {
-            console.log(chalk.gray('尝试在主页面查找按钮...'));
-            clicked = await this.page.evaluate(() => {
-                // 查找所有按钮
-                const buttons = document.querySelectorAll('button');
-                console.log('Found buttons:', buttons.length);
-                for (const button of buttons) {
-                    const title = button.getAttribute('title');
-                    const ariaLabel = button.getAttribute('aria-label');
-                    const text = button.textContent || '';
-                    if (title === 'Connect WebSocket Proxy' ||
-                        ariaLabel === 'Connect WebSocket Proxy' ||
-                        text.includes('Connect WS')) {
-                        button.click();
-                        return true;
-                    }
-                }
-                return false;
-            });
-            if (clicked) {
-                console.log(chalk.green('✅ 点击了连接按钮 (主页面)'));
-            }
-        }
-        catch (e) {
-            console.log(chalk.gray(`主页面查找失败: ${e}`));
-        }
-        // 方法2: 如果主页面没找到，检查 iframe
-        if (!clicked) {
+            console.log(chalk.gray('查找 Build App iframe...'));
+            // 方法1: 使用 frameLocator (推荐方式)
+            const iframeLocator = this.page.frameLocator('iframe[src*="scf.usercontent.goog"]');
+            // 等待 iframe 中的按钮出现
             try {
+                const connectButton = iframeLocator.locator('button[title="Connect WebSocket Proxy"]');
+                await connectButton.waitFor({ timeout: 10000 });
+                await connectButton.click();
+                clicked = true;
+                console.log(chalk.green('✅ 点击了连接按钮 (frameLocator)'));
+            }
+            catch (e) {
+                console.log(chalk.gray(`frameLocator 方法失败: ${e}`));
+            }
+            // 方法2: 如果 frameLocator 失败，尝试通过 frames() API
+            if (!clicked) {
                 const frames = this.page.frames();
                 console.log(chalk.gray(`检查 ${frames.length} 个 frame...`));
                 for (const frame of frames) {
                     if (clicked)
                         break;
                     const frameUrl = frame.url();
-                    console.log(chalk.gray(`  Frame: ${frameUrl.substring(0, 80)}`));
-                    try {
-                        // 在每个 frame 中查找按钮
+                    // 查找 Build App iframe
+                    if (frameUrl.includes('scf.usercontent.goog')) {
+                        console.log(chalk.gray(`找到 Build App iframe: ${frameUrl.substring(0, 60)}...`));
+                        // 等待 iframe 内容加载
+                        try {
+                            await frame.waitForLoadState('domcontentloaded');
+                        }
+                        catch (e) {
+                            // 忽略
+                        }
+                        // 查找按钮
                         const buttons = await frame.$$('button');
-                        console.log(chalk.gray(`    找到 ${buttons.length} 个按钮`));
+                        console.log(chalk.gray(`  iframe 中找到 ${buttons.length} 个按钮`));
                         for (const button of buttons) {
                             try {
                                 const title = await button.getAttribute('title');
-                                const ariaLabel = await button.getAttribute('aria-label');
                                 const text = await button.textContent();
-                                if (title === 'Connect WebSocket Proxy' ||
-                                    ariaLabel === 'Connect WebSocket Proxy' ||
-                                    (text && text.includes('Connect WS'))) {
+                                console.log(chalk.gray(`    按钮: "${text?.trim()}" title="${title}"`));
+                                if (title === 'Connect WebSocket Proxy' || (text && text.includes('Connect WS'))) {
                                     await button.click();
                                     clicked = true;
-                                    console.log(chalk.green('✅ 点击了连接按钮 (iframe)'));
+                                    console.log(chalk.green('✅ 点击了连接按钮 (frame API)'));
                                     break;
                                 }
                             }
                             catch (btnErr) {
-                                // 单个按钮处理失败，继续下一个
+                                // 继续
+                            }
+                        }
+                        // 如果遍历没找到，尝试选择器
+                        if (!clicked) {
+                            try {
+                                const button = await frame.$('button[title="Connect WebSocket Proxy"]');
+                                if (button) {
+                                    await button.click();
+                                    clicked = true;
+                                    console.log(chalk.green('✅ 点击了连接按钮 (选择器)'));
+                                }
+                            }
+                            catch (e) {
+                                // 继续
                             }
                         }
-                    }
-                    catch (frameErr) {
-                        console.log(chalk.gray(`    Frame 处理失败: ${frameErr}`));
                     }
                 }
             }
-            catch (e) {
-                console.log(chalk.gray(`Frame 遍历失败: ${e}`));
-            }
         }
-        // 方法3: 使用 CSS 选择器直接查找
-        if (!clicked) {
-            const selectors = [
-                'button[title="Connect WebSocket Proxy"]',
-                'button[aria-label="Connect WebSocket Proxy"]',
-                'button:has-text("Connect WS")',
-                'button.bg-green-500:has(span:text("Connect"))',
-            ];
-            for (const selector of selectors) {
-                try {
-                    console.log(chalk.gray(`尝试选择器: ${selector}`));
-                    const button = await this.page.$(selector);
-                    if (button) {
-                        await button.click();
-                        clicked = true;
-                        console.log(chalk.green(`✅ 点击了连接按钮 (选择器: ${selector})`));
-                        break;
-                    }
-                }
-                catch (e) {
-                    // 继续尝试下一个选择器
-                }
-            }
+        catch (e) {
+            console.log(chalk.gray(`iframe 访问失败: ${e}`));
         }
         // 第三步：设置服务器地址（如果有输入框）
         await this.setServerAddress();
         if (!clicked) {
             console.log(chalk.yellow('⚠️ 未找到连接按钮，请手动点击连接'));
-            // 打印页面上所有按钮的信息以便调试
-            try {
-                const buttonInfo = await this.page.evaluate(() => {
-                    const buttons = document.querySelectorAll('button');
-                    return Array.from(buttons).map(b => ({
-                        text: b.textContent?.trim().substring(0, 50),
-                        title: b.getAttribute('title'),
-                        ariaLabel: b.getAttribute('aria-label'),
-                        className: b.className.substring(0, 50),
-                    }));
-                });
-                console.log(chalk.gray('页面按钮信息:'));
-                buttonInfo.forEach((info, i) => {
-                    console.log(chalk.gray(`  ${i + 1}. text="${info.text}" title="${info.title}" aria="${info.ariaLabel}"`));
-                });
-            }
-            catch (e) {
-                // 忽略调试信息获取失败
-            }
+            console.log(chalk.gray('提示: Connect WS 按钮在 Build App 预览 iframe 中'));
         }
         // 等待连接建立
         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.7');
+    .version('1.0.8');
 program
     .command('start')
     .description('启动客户端，连接到代理服务器')

package/package.json

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