gemini-proxy-client 1.0.5 → 1.0.7

package/dist/browser/manager.js

@@ -128,6 +128,7 @@ export class BrowserManager {
     async clickConnectButton() {
         if (!this.page)
             throw new Error('Browser not launched');
+        console.log(chalk.gray('开始查找连接按钮...'));
         // 等待页面完全加载
         await sleep(3000);
         // 第一步：点击 "Continue to the app" 按钮（如果存在）
@@ -140,87 +141,126 @@ export class BrowserManager {
             }
         }
         catch (e) {
-            // 按钮不存在，可能已经在 app 页面了
+            console.log(chalk.gray('未找到 "Continue to the app" 按钮，继续...'));
         }
-        // 第二步：设置服务器地址（如果有输入框）
-        await this.setServerAddress();
-        // 第三步：点击 Connect WS 按钮
+        // 第二步：直接在主页面查找按钮（不通过 frames）
         let clicked = false;
-        // 方法1: 通过 span 文字找到按钮
+        // 方法1: 使用 page.evaluate 直接在页面中查找并点击
         try {
-            const button = await this.page.waitForSelector('button span:has-text("Connect WS")', { timeout: 5000 });
-            if (button) {
-                // 点击父元素 button
-                await button.evaluate((el) => el.closest('button')?.click());
-                clicked = true;
-                console.log(chalk.green('✅ 点击了连接按钮'));
-            }
-        }
-        catch (e) {
-            // 继续尝试其他方法
-        }
-        // 方法2: 通过 aria-label
-        if (!clicked) {
-            try {
-                const button = await this.page.waitForSelector('button[aria-label="Connect WebSocket Proxy"]', { timeout: 3000 });
-                if (button) {
-                    await button.click();
-                    clicked = true;
-                    console.log(chalk.green('✅ 点击了连接按钮'));
+            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;
+                    }
                 }
-            }
-            catch (e) {
-                // 继续
+                return false;
+            });
+            if (clicked) {
+                console.log(chalk.green('✅ 点击了连接按钮 (主页面)'));
             }
         }
-        // 方法3: 通过 title
-        if (!clicked) {
-            try {
-                const button = await this.page.waitForSelector('button[title="Connect WebSocket Proxy"]', { timeout: 3000 });
-                if (button) {
-                    await button.click();
-                    clicked = true;
-                    console.log(chalk.green('✅ 点击了连接按钮'));
-                }
-            }
-            catch (e) {
-                // 继续
-            }
+        catch (e) {
+            console.log(chalk.gray(`主页面查找失败: ${e}`));
         }
-        // 方法4: 通过绿色背景类名
+        // 方法2: 如果主页面没找到，检查 iframe
         if (!clicked) {
             try {
-                const button = await this.page.waitForSelector('button.bg-green-500', { timeout: 3000 });
-                if (button) {
-                    await button.click();
-                    clicked = true;
-                    console.log(chalk.green('✅ 点击了连接按钮'));
+                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 中查找按钮
+                        const buttons = await frame.$$('button');
+                        console.log(chalk.gray(`    找到 ${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'))) {
+                                    await button.click();
+                                    clicked = true;
+                                    console.log(chalk.green('✅ 点击了连接按钮 (iframe)'));
+                                    break;
+                                }
+                            }
+                            catch (btnErr) {
+                                // 单个按钮处理失败，继续下一个
+                            }
+                        }
+                    }
+                    catch (frameErr) {
+                        console.log(chalk.gray(`    Frame 处理失败: ${frameErr}`));
+                    }
                 }
             }
             catch (e) {
-                // 继续
+                console.log(chalk.gray(`Frame 遍历失败: ${e}`));
             }
         }
-        // 方法5: 通过 XPath 找包含 Connect WS 文字的按钮
+        // 方法3: 使用 CSS 选择器直接查找
         if (!clicked) {
-            try {
-                const buttons = await this.page.$$('button');
-                for (const button of buttons) {
-                    const text = await button.textContent();
-                    if (text && text.includes('Connect WS')) {
+            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('✅ 点击了连接按钮'));
+                        console.log(chalk.green(`✅ 点击了连接按钮 (选择器: ${selector})`));
                         break;
                     }
                 }
-            }
-            catch (e) {
-                // 继续
+                catch (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) {
+                // 忽略调试信息获取失败
+            }
         }
         // 等待连接建立
         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.0');
+    .version('1.0.7');
 program
     .command('start')
     .description('启动客户端，连接到代理服务器')

package/package.json

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