Update main.py

main.py

@@ -75,27 +75,44 @@ async def activate_task():
             print(f"[Activate] Error: {e}")
 
 async def auto_click_task():
-    """自动点击 'Got it' 按钮"""
-    global page
+    """自动点击指定按钮"""
+    global page, config
     if not page:
         return
     
-    # 匹配多种大小写形式
-    text_patterns = ["Got it", "GOT IT", "Got It", "got it", "GOTIT", "Gotit"]
+    # 从配置获取要点击的按钮文本列表
+    click_buttons = config.get("autoClickButtons", ["Got it", "GOT IT", "Accept", "I agree", "OK", "Okay", "Dismiss", "Close"])
     
     try:
-        # 1. 先在主页面查找
-        for text in text_patterns:
+        for text in click_buttons:
+            # 各种选择器
             selectors = [
+                # 标准按钮
                 f'button:has-text("{text}")',
                 f'a:has-text("{text}")',
                 f'[role="button"]:has-text("{text}")',
-                f'div:has-text("{text}"):not(:has(div:has-text("{text}")))',  # 最内层div
-                f'span:has-text("{text}")',
-                f'mat-button:has-text("{text}")',  # Angular Material
-                f'[data-mdc-dialog-action]:has-text("{text}")',  # Material Dialog
+                # Material/Angular 组件
+                f'mat-button:has-text("{text}")',
+                f'mat-dialog-actions button:has-text("{text}")',
+                f'.mat-mdc-dialog-actions button:has-text("{text}")',
+                f'.cdk-overlay-container button:has-text("{text}")',
+                f'.mdc-dialog button:has-text("{text}")',
+                f'.mdc-dialog__actions button:has-text("{text}")',
+                # 通用弹窗
+                f'[class*="dialog"] button:has-text("{text}")',
+                f'[class*="modal"] button:has-text("{text}")',
+                f'[class*="popup"] button:has-text("{text}")',
+                f'[class*="overlay"] button:has-text("{text}")',
+                f'[class*="toast"] button:has-text("{text}")',
+                f'[class*="snack"] button:has-text("{text}")',
+                f'[class*="banner"] button:has-text("{text}")',
+                f'[class*="consent"] button:has-text("{text}")',
+                # 文本匹配
+                f'span:text-is("{text}")',
+                f'div:text-is("{text}")',
             ]
             
+            # 主页面查找
             for selector in selectors:
                 try:
                     element = page.locator(selector).first
@@ -105,23 +122,12 @@ async def auto_click_task():
                         return
                 except:
                     continue
-        
-        # 2. 在所有 iframe 中查找
-        frames = page.frames
-        for frame in frames:
-            if frame == page.main_frame:
-                continue
             
-            for text in text_patterns:
-                selectors = [
-                    f'button:has-text("{text}")',
-                    f'a:has-text("{text}")',
-                    f'[role="button"]:has-text("{text}")',
-                    f'div:has-text("{text}"):not(:has(div:has-text("{text}")))',
-                    f'span:has-text("{text}")',
-                ]
-                
-                for selector in selectors:
+            # 所有 iframe 中查找
+            for frame in page.frames:
+                if frame == page.main_frame:
+                    continue
+                for selector in selectors[:5]:  # iframe中只用基础选择器
                     try:
                         element = frame.locator(selector).first
                         if await element.is_visible(timeout=100):
@@ -205,17 +211,18 @@ async def lifespan(app: FastAPI):
         )
         print(f"[Scheduler] Activate task started with interval: {interval}s")
     
-    # 自动点击 "Got it" 按钮任务
+    # 自动点击按钮任务
+    click_interval = config.get("autoClickInterval", 5)
     scheduler.add_job(
         auto_click_task,
         "interval",
-        seconds=5,
+        seconds=click_interval,
         max_instances=1,
         coalesce=True,
         misfire_grace_time=10,
         replace_existing=True
     )
-    print(f"[Scheduler] Auto-click task started with interval: 5s")
+    print(f"[Scheduler] Auto-click task started with interval: {click_interval}s")
     
     scheduler.start()
     
@@ -290,15 +297,17 @@ async def manual_click(text: str):
             f'button:has-text("{text}")',
             f'a:has-text("{text}")',
             f'[role="button"]:has-text("{text}")',
-            f'div:has-text("{text}")',
-            f'span:has-text("{text}")',
+            f'.cdk-overlay-container button:has-text("{text}")',
+            f'[class*="dialog"] button:has-text("{text}")',
+            f'div:text-is("{text}")',
+            f'span:text-is("{text}")',
         ]
         
         # 主页面
         for selector in selectors:
             try:
                 element = page.locator(selector).first
-                if await element.is_visible(timeout=500):
+                if await element.is_visible(timeout=1000):
                     await element.click(timeout=3000)
                     return {"status": "success", "message": f'Clicked "{text}" in main page'}
             except:
@@ -308,7 +317,7 @@ async def manual_click(text: str):
         for frame in page.frames:
             if frame == page.main_frame:
                 continue
-            for selector in selectors:
+            for selector in selectors[:3]:
                 try:
                     element = frame.locator(selector).first
                     if await element.is_visible(timeout=500):
@@ -333,7 +342,7 @@ async def debug_buttons():
         
         # 主页面按钮
         button_elements = await page.locator('button, [role="button"], a[class*="button"], a[class*="btn"]').all()
-        for i, btn in enumerate(button_elements[:20]):  # 最多20个
+        for i, btn in enumerate(button_elements[:30]):
             try:
                 text = await btn.inner_text(timeout=500)
                 visible = await btn.is_visible(timeout=500)
@@ -346,6 +355,24 @@ async def debug_buttons():
             except:
                 continue
         
+        # CDK Overlay (Angular Material 弹窗)
+        try:
+            overlay_buttons = await page.locator('.cdk-overlay-container button, .cdk-overlay-container [role="button"]').all()
+            for i, btn in enumerate(overlay_buttons[:10]):
+                try:
+                    text = await btn.inner_text(timeout=500)
+                    visible = await btn.is_visible(timeout=500)
+                    buttons.append({
+                        "index": i,
+                        "text": text.strip()[:50],
+                        "visible": visible,
+                        "frame": "cdk-overlay"
+                    })
+                except:
+                    continue
+        except:
+            pass
+        
         # iframe 中的按钮
         for frame_idx, frame in enumerate(page.frames):
             if frame == page.main_frame:
@@ -380,11 +407,27 @@ async def debug_html(selector: str = "body"):
     
     try:
         html = await page.locator(selector).first.inner_html(timeout=5000)
-        # 截取部分
         return {"status": "success", "html": html[:5000]}
     except Exception as e:
         return {"status": "error", "message": str(e)}
 
+@app.get("/debug/overlay")
+async def debug_overlay():
+    """调试：检查 CDK Overlay 弹窗内容"""
+    global page
+    if not page:
+        return {"status": "error", "message": "Browser not initialized"}
+    
+    try:
+        overlay = page.locator('.cdk-overlay-container')
+        if await overlay.count() > 0:
+            html = await overlay.inner_html(timeout=5000)
+            return {"status": "success", "html": html[:5000]}
+        else:
+            return {"status": "success", "html": "No overlay found"}
+    except Exception as e:
+        return {"status": "error", "message": str(e)}
+
 @app.get("/health")
 async def health_check():
     """健康检查"""