Update main.py

main.py

@@ -14,6 +14,9 @@ context = None
 config = None
 scheduler = AsyncIOScheduler()
 
+# WARP 代理地址
+PROXY_SERVER = "socks5://127.0.0.1:1080"
+
 def load_config():
     """加载配置文件"""
     with open("config.json", "r", encoding="utf-8") as f:
@@ -65,11 +68,11 @@ def load_cookies():
     return converted_cookies
 
 async def activate_task():
-    """定时激活任务"""
+    """定时激活任务（通过代理）"""
     if config and config.get("activateLink"):
         try:
-            async with httpx.AsyncClient() as client:
-                response = await client.get(config["activateLink"], timeout=30)
+            async with httpx.AsyncClient(proxy=PROXY_SERVER, timeout=30) as client:
+                response = await client.get(config["activateLink"])
                 print(f"[Activate] GET {config['activateLink']} - Status: {response.status_code}")
         except Exception as e:
             print(f"[Activate] Error: {e}")
@@ -84,23 +87,15 @@ async def auto_click_task():
     
     try:
         for text in click_buttons:
-            # 精确选择器列表（针对 Google AI Studio 的 Material Dialog）
             selectors = [
-                # 最精确：mat-dialog-actions 中的按钮
                 f'mat-dialog-actions button:has-text("{text}")',
                 f'mat-dialog-actions button.ms-button-primary',
-                # CDK overlay 中的按钮
                 f'.cdk-overlay-container button:has-text("{text}")',
                 f'.cdk-overlay-container button.ms-button-primary',
                 f'.cdk-overlay-pane button:has-text("{text}")',
-                # Material dialog
                 f'.mat-mdc-dialog-actions button:has-text("{text}")',
-                f'.mdc-dialog__actions button:has-text("{text}")',
-                f'mat-dialog-container button:has-text("{text}")',
-                # 通用
                 f'button.ms-button-primary:has-text("{text}")',
                 f'button:has-text("{text}")',
-                f'[role="button"]:has-text("{text}")',
             ]
             
             for selector in selectors:
@@ -110,86 +105,64 @@ async def auto_click_task():
                     if count > 0:
                         element = locator.first
                         if await element.is_visible(timeout=300):
-                            # 尝试点击
                             await element.click(timeout=3000, force=True)
-                            print(f'[AutoClick] Clicked "{text}" via selector: {selector}')
+                            print(f'[AutoClick] Clicked "{text}"')
                             return
-                except Exception as e:
+                except:
                     continue
             
-            # 备用方案：使用 JavaScript 点击
+            # JavaScript 备用
             try:
                 clicked = await page.evaluate('''(searchText) => {
-                    // 查找 mat-dialog-actions 中的按钮
                     const dialogActions = document.querySelector('mat-dialog-actions');
                     if (dialogActions) {
                         const buttons = dialogActions.querySelectorAll('button');
                         for (const btn of buttons) {
-                            const btnText = btn.textContent.trim();
-                            if (btnText.toLowerCase() === searchText.toLowerCase()) {
+                            if (btn.textContent.trim().toLowerCase() === searchText.toLowerCase()) {
                                 btn.click();
-                                return 'dialog-actions';
+                                return true;
                             }
                         }
                     }
-                    
-                    // 查找 cdk-overlay-container 中的按钮
                     const overlay = document.querySelector('.cdk-overlay-container');
                     if (overlay) {
                         const buttons = overlay.querySelectorAll('button');
                         for (const btn of buttons) {
-                            const btnText = btn.textContent.trim();
-                            if (btnText.toLowerCase() === searchText.toLowerCase()) {
-                                btn.click();
-                                return 'overlay';
-                            }
-                        }
-                    }
-                    
-                    // 查找 ms-button-primary
-                    const primaryBtns = document.querySelectorAll('button.ms-button-primary');
-                    for (const btn of primaryBtns) {
-                        const btnText = btn.textContent.trim();
-                        if (btnText.toLowerCase() === searchText.toLowerCase()) {
-                            btn.click();
-                            return 'primary-button';
-                        }
-                    }
-                    
-                    // 全局查找
-                    const allButtons = document.querySelectorAll('button');
-                    for (const btn of allButtons) {
-                        const btnText = btn.textContent.trim();
-                        if (btnText.toLowerCase() === searchText.toLowerCase()) {
-                            const rect = btn.getBoundingClientRect();
-                            if (rect.width > 0 && rect.height > 0) {
+                            if (btn.textContent.trim().toLowerCase() === searchText.toLowerCase()) {
                                 btn.click();
-                                return 'global';
+                                return true;
                             }
                         }
                     }
-                    
-                    return null;
+                    return false;
                 }''', text)
                 
                 if clicked:
-                    print(f'[AutoClick] Clicked "{text}" via JavaScript ({clicked})')
+                    print(f'[AutoClick] Clicked "{text}" via JS')
                     return
-            except Exception as e:
+            except:
                 pass
                         
-    except Exception as e:
+    except:
         pass
 
 async def init_browser():
-    """初始化浏览器"""
+    """初始化浏览器（使用 WARP 代理）"""
     global browser, page, context, config
     
     config = load_config()
     cookies = load_cookies()
     
     playwright = await async_playwright().start()
-    browser = await playwright.chromium.launch(headless=True)
+    
+    # 使用 WARP SOCKS5 代理
+    browser = await playwright.chromium.launch(
+        headless=True,
+        proxy={
+            "server": PROXY_SERVER
+        }
+    )
+    
     context = await browser.new_context(
         viewport={"width": 1920, "height": 1080},
         user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
@@ -201,8 +174,8 @@ async def init_browser():
             try:
                 if cookie.get("name") and cookie.get("value") and cookie.get("domain"):
                     valid_cookies.append(cookie)
-            except Exception as e:
-                print(f"[Cookie] Skip invalid cookie: {e}")
+            except:
+                pass
         
         if valid_cookies:
             try:
@@ -210,14 +183,6 @@ async def init_browser():
                 print(f"[Browser] Loaded {len(valid_cookies)} cookies")
             except Exception as e:
                 print(f"[Browser] Error loading cookies: {e}")
-                success_count = 0
-                for cookie in valid_cookies:
-                    try:
-                        await context.add_cookies([cookie])
-                        success_count += 1
-                    except Exception as ce:
-                        print(f"[Cookie] Failed to add cookie '{cookie.get('name')}' for {cookie.get('domain')}: {ce}")
-                print(f"[Browser] Loaded {success_count}/{len(valid_cookies)} cookies individually")
     
     page = await context.new_page()
     
@@ -239,7 +204,6 @@ async def lifespan(app: FastAPI):
     """应用生命周期管理"""
     await init_browser()
     
-    # 定时激活任务
     if config and config.get("activateLink"):
         interval = config.get("activateInterval", 60)
         scheduler.add_job(
@@ -252,7 +216,6 @@ async def lifespan(app: FastAPI):
         )
         print(f"[Scheduler] Activate task started with interval: {interval}s")
     
-    # 自动点击按钮任务
     click_interval = config.get("autoClickInterval", 5)
     scheduler.add_job(
         auto_click_task,
@@ -326,123 +289,13 @@ async def navigate_to(url: str):
     except Exception as e:
         return {"status": "warning", "message": f"Navigation completed with issue: {e}"}
 
-@app.get("/click")
-async def manual_click(text: str):
-    """手动点击包含指定文本的按钮"""
-    global page
-    if not page:
-        return {"status": "error", "message": "Browser not initialized"}
-    
+@app.get("/ip")
+async def get_ip():
+    """获取当前出口 IP（验证 WARP 是否生效）"""
     try:
-        # 尝试用选择器点击
-        selectors = [
-            f'mat-dialog-actions button:has-text("{text}")',
-            f'.cdk-overlay-container button:has-text("{text}")',
-            f'button.ms-button-primary:has-text("{text}")',
-            f'button:has-text("{text}")',
-        ]
-        
-        for selector in selectors:
-            try:
-                locator = page.locator(selector)
-                if await locator.count() > 0:
-                    element = locator.first
-                    if await element.is_visible(timeout=1000):
-                        await element.click(timeout=3000, force=True)
-                        return {"status": "success", "message": f'Clicked "{text}" via selector: {selector}'}
-            except:
-                continue
-        
-        # JavaScript 备用
-        clicked = await page.evaluate('''(searchText) => {
-            const dialogActions = document.querySelector('mat-dialog-actions');
-            if (dialogActions) {
-                const buttons = dialogActions.querySelectorAll('button');
-                for (const btn of buttons) {
-                    if (btn.textContent.trim().toLowerCase() === searchText.toLowerCase()) {
-                        btn.click();
-                        return 'dialog-actions';
-                    }
-                }
-            }
-            
-            const allButtons = document.querySelectorAll('button');
-            for (const btn of allButtons) {
-                if (btn.textContent.trim().toLowerCase() === searchText.toLowerCase()) {
-                    btn.click();
-                    return 'global';
-                }
-            }
-            return null;
-        }''', text)
-        
-        if clicked:
-            return {"status": "success", "message": f'Clicked "{text}" via JavaScript ({clicked})'}
-        
-        return {"status": "error", "message": f'Button with text "{text}" not found'}
-    except Exception as e:
-        return {"status": "error", "message": str(e)}
-
-@app.get("/debug/buttons")
-async def debug_buttons():
-    """调试：列出所有按钮"""
-    global page
-    if not page:
-        return {"status": "error", "message": "Browser not initialized"}
-    
-    try:
-        buttons = await page.evaluate('''() => {
-            const results = [];
-            const allButtons = document.querySelectorAll('button, [role="button"]');
-            allButtons.forEach((btn, i) => {
-                const rect = btn.getBoundingClientRect();
-                results.push({
-                    index: i,
-                    text: btn.textContent.trim().substring(0, 50),
-                    visible: rect.width > 0 && rect.height > 0,
-                    className: btn.className.substring(0, 50),
-                    inDialog: !!btn.closest('mat-dialog-container'),
-                    inOverlay: !!btn.closest('.cdk-overlay-container')
-                });
-            });
-            return results;
-        }''')
-        
-        return {"status": "success", "count": len(buttons), "buttons": buttons}
-    except Exception as e:
-        return {"status": "error", "message": str(e)}
-
-@app.get("/debug/search")
-async def debug_search(text: str):
-    """调试：搜索包含指定文本的所有元素"""
-    global page
-    if not page:
-        return {"status": "error", "message": "Browser not initialized"}
-    
-    try:
-        elements = await page.evaluate('''(searchText) => {
-            const results = [];
-            const lowerText = searchText.toLowerCase();
-            const allElements = document.querySelectorAll('*');
-            
-            allElements.forEach(el => {
-                const text = (el.textContent || '').trim();
-                if (text.toLowerCase().includes(lowerText) && text.length < 200) {
-                    const rect = el.getBoundingClientRect();
-                    results.push({
-                        tag: el.tagName.toLowerCase(),
-                        text: text.substring(0, 100),
-                        visible: rect.width > 0 && rect.height > 0,
-                        className: (el.className || '').substring(0, 50),
-                        id: el.id || ''
-                    });
-                }
-            });
-            
-            return results.slice(0, 50);
-        }''', text)
-        
-        return {"status": "success", "count": len(elements), "elements": elements}
+        async with httpx.AsyncClient(proxy=PROXY_SERVER, timeout=10) as client:
+            response = await client.get("https://api.ipify.org?format=json")
+            return response.json()
     except Exception as e:
         return {"status": "error", "message": str(e)}
 
@@ -453,4 +306,4 @@ async def health_check():
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host="0.0.0.0", port=7860)