Update main.py

main.py

@@ -85,57 +85,106 @@ async def auto_click_task():
     
     try:
         for text in click_buttons:
-            # 各种选择器
+            # 方法1: 使用 getByRole 精确匹配按钮
+            try:
+                btn = page.get_by_role("button", name=text, exact=False)
+                if await btn.count() > 0 and await btn.first.is_visible(timeout=100):
+                    await btn.first.click(timeout=2000)
+                    print(f'[AutoClick] Clicked "{text}" via getByRole')
+                    return
+            except:
+                pass
+            
+            # 方法2: 使用 getByText
+            try:
+                btn = page.get_by_text(text, exact=True)
+                if await btn.count() > 0 and await btn.first.is_visible(timeout=100):
+                    await btn.first.click(timeout=2000)
+                    print(f'[AutoClick] Clicked "{text}" via getByText')
+                    return
+            except:
+                pass
+            
+            # 方法3: 各种 CSS 选择器
             selectors = [
+                # CDK Overlay (Angular Material Dialog)
+                f'.cdk-overlay-container button:has-text("{text}")',
+                f'.cdk-overlay-container [mat-button]:has-text("{text}")',
+                f'.cdk-overlay-container [mat-raised-button]:has-text("{text}")',
+                f'.cdk-overlay-container [mat-flat-button]:has-text("{text}")',
+                f'.cdk-overlay-container mat-dialog-actions button:has-text("{text}")',
+                f'.cdk-overlay-container .mat-mdc-dialog-actions button:has-text("{text}")',
+                f'.cdk-overlay-container .mdc-dialog__actions button:has-text("{text}")',
+                f'.cdk-overlay-pane button:has-text("{text}")',
+                f'mat-dialog-container button:has-text("{text}")',
                 # 标准按钮
                 f'button:has-text("{text}")',
-                f'a:has-text("{text}")',
+                f'button:text-is("{text}")',
                 f'[role="button"]:has-text("{text}")',
-                # 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'a:has-text("{text}")',
+                # Material 按钮
+                f'.mat-button:has-text("{text}")',
+                f'.mat-mdc-button:has-text("{text}")',
+                f'.mdc-button:has-text("{text}")',
+                # ms-button (Google 自定义)
+                f'[ms-button]:has-text("{text}")',
+                f'.ms-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
                     if await element.is_visible(timeout=100):
                         await element.click(timeout=2000)
-                        print(f'[AutoClick] Clicked "{text}" button in main page')
+                        print(f'[AutoClick] Clicked "{text}" via selector: {selector}')
                         return
                 except:
                     continue
             
-            # 所有 iframe 中查找
+            # 方法4: JavaScript 点击
+            try:
+                clicked = await page.evaluate(f'''() => {{
+                    const buttons = document.querySelectorAll('button, [role="button"], [mat-button], [ms-button]');
+                    for (const btn of buttons) {{
+                        if (btn.textContent.trim().toLowerCase().includes("{text.lower()}")) {{
+                            btn.click();
+                            return true;
+                        }}
+                    }}
+                    // 检查 CDK overlay
+                    const overlay = document.querySelector('.cdk-overlay-container');
+                    if (overlay) {{
+                        const overlayButtons = overlay.querySelectorAll('button, [role="button"]');
+                        for (const btn of overlayButtons) {{
+                            if (btn.textContent.trim().toLowerCase().includes("{text.lower()}")) {{
+                                btn.click();
+                                return true;
+                            }}
+                        }}
+                    }}
+                    return false;
+                }}''')
+                if clicked:
+                    print(f'[AutoClick] Clicked "{text}" via JavaScript')
+                    return
+            except:
+                pass
+            
+            # 方法5: 在 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):
-                            await element.click(timeout=2000)
-                            print(f'[AutoClick] Clicked "{text}" button in iframe')
-                            return
-                    except:
-                        continue
+                try:
+                    btn = frame.get_by_role("button", name=text, exact=False)
+                    if await btn.count() > 0 and await btn.first.is_visible(timeout=100):
+                        await btn.first.click(timeout=2000)
+                        print(f'[AutoClick] Clicked "{text}" in iframe')
+                        return
+                except:
+                    continue
                         
     except Exception as e:
         pass
@@ -293,38 +342,38 @@ async def manual_click(text: str):
         return {"status": "error", "message": "Browser not initialized"}
     
     try:
-        selectors = [
-            f'button:has-text("{text}")',
-            f'a:has-text("{text}")',
-            f'[role="button"]: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=1000):
-                    await element.click(timeout=3000)
-                    return {"status": "success", "message": f'Clicked "{text}" in main page'}
-            except:
-                continue
+        # 方法1: getByRole
+        try:
+            btn = page.get_by_role("button", name=text, exact=False)
+            if await btn.count() > 0 and await btn.first.is_visible(timeout=1000):
+                await btn.first.click(timeout=3000)
+                return {"status": "success", "message": f'Clicked "{text}" via getByRole'}
+        except:
+            pass
         
-        # iframe
-        for frame in page.frames:
-            if frame == page.main_frame:
-                continue
-            for selector in selectors[:3]:
-                try:
-                    element = frame.locator(selector).first
-                    if await element.is_visible(timeout=500):
-                        await element.click(timeout=3000)
-                        return {"status": "success", "message": f'Clicked "{text}" in iframe'}
-                except:
-                    continue
+        # 方法2: JavaScript
+        clicked = await page.evaluate(f'''() => {{
+            const buttons = document.querySelectorAll('button, [role="button"], [mat-button], [ms-button]');
+            for (const btn of buttons) {{
+                if (btn.textContent.trim().toLowerCase().includes("{text.lower()}")) {{
+                    btn.click();
+                    return true;
+                }}
+            }}
+            const overlay = document.querySelector('.cdk-overlay-container');
+            if (overlay) {{
+                const overlayButtons = overlay.querySelectorAll('button, [role="button"]');
+                for (const btn of overlayButtons) {{
+                    if (btn.textContent.trim().toLowerCase().includes("{text.lower()}")) {{
+                        btn.click();
+                        return true;
+                    }}
+                }}
+            }}
+            return false;
+        }}''')
+        if clicked:
+            return {"status": "success", "message": f'Clicked "{text}" via JavaScript'}
         
         return {"status": "error", "message": f'Button with text "{text}" not found'}
     except Exception as e:
@@ -338,79 +387,38 @@ async def debug_buttons():
         return {"status": "error", "message": "Browser not initialized"}
     
     try:
-        buttons = []
-        
-        # 主页面按钮
-        button_elements = await page.locator('button, [role="button"], a[class*="button"], a[class*="btn"]').all()
-        for i, btn in enumerate(button_elements[:30]):
-            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": "main"
-                })
-            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:
-                continue
-            try:
-                frame_buttons = await frame.locator('button, [role="button"]').all()
-                for i, btn in enumerate(frame_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": f"iframe-{frame_idx}"
-                        })
-                    except:
-                        continue
-            except:
-                continue
+        # 使用 JavaScript 获取所有按钮，包括 overlay 中的
+        buttons = await page.evaluate('''() => {
+            const results = [];
+            const allButtons = document.querySelectorAll('button, [role="button"], [mat-button], [ms-button]');
+            allButtons.forEach((btn, i) => {
+                results.push({
+                    index: i,
+                    text: btn.textContent.trim().substring(0, 50),
+                    visible: btn.offsetParent !== null,
+                    frame: 'main'
+                });
+            });
+            // CDK Overlay
+            const overlay = document.querySelector('.cdk-overlay-container');
+            if (overlay) {
+                const overlayButtons = overlay.querySelectorAll('button, [role="button"]');
+                overlayButtons.forEach((btn, i) => {
+                    results.push({
+                        index: i,
+                        text: btn.textContent.trim().substring(0, 50),
+                        visible: btn.offsetParent !== null || getComputedStyle(btn).display !== 'none',
+                        frame: 'cdk-overlay'
+                    });
+                });
+            }
+            return results;
+        }''')
         
         return {"status": "success", "count": len(buttons), "buttons": buttons}
     except Exception as e:
         return {"status": "error", "message": str(e)}
 
-@app.get("/debug/html")
-async def debug_html(selector: str = "body"):
-    """调试：获取元素HTML"""
-    global page
-    if not page:
-        return {"status": "error", "message": "Browser not initialized"}
-    
-    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 弹窗内容"""
@@ -419,12 +427,11 @@ async def debug_overlay():
         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"}
+        html = await page.evaluate('''() => {
+            const overlay = document.querySelector('.cdk-overlay-container');
+            return overlay ? overlay.innerHTML : 'No overlay found';
+        }''')
+        return {"status": "success", "html": html[:8000]}
     except Exception as e:
         return {"status": "error", "message": str(e)}