Update main.py

main.py

@@ -80,111 +80,132 @@ async def auto_click_task():
     if not page:
         return
     
-    # 从配置获取要点击的按钮文本列表
-    click_buttons = config.get("autoClickButtons", ["Got it", "GOT IT", "Accept", "I agree", "OK", "Okay", "Dismiss", "Close"])
+    click_buttons = config.get("autoClickButtons", ["Got it", "GOT IT", "Accept", "OK", "Dismiss", "Close"])
     
     try:
         for text in click_buttons:
-            # 方法1: 使用 getByRole 精确匹配按钮
+            text_lower = text.lower()
+            
+            # 方法1: Playwright 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
+                if await btn.count() > 0:
+                    first_btn = btn.first
+                    if await first_btn.is_visible(timeout=200):
+                        await first_btn.click(timeout=2000)
+                        print(f'[AutoClick] Clicked "{text}" via getByRole')
+                        return
             except:
                 pass
             
-            # 方法2: 使用 getByText
+            # 方法2: Playwright 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
+                if await btn.count() > 0:
+                    first_btn = btn.first
+                    if await first_btn.is_visible(timeout=200):
+                        await first_btn.click(timeout=2000)
+                        print(f'[AutoClick] Clicked "{text}" via getByText')
+                        return
             except:
                 pass
             
-            # 方法3: 各种 CSS 选择器
+            # 方法3: 使用 locator
             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'button:text-is("{text}")',
+                f'text="{text}"',
+                f'button >> text="{text}"',
                 f'[role="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}")',
             ]
-            
             for selector in selectors:
                 try:
                     element = page.locator(selector).first
-                    if await element.is_visible(timeout=100):
+                    if await element.is_visible(timeout=200):
                         await element.click(timeout=2000)
-                        print(f'[AutoClick] Clicked "{text}" via selector: {selector}')
+                        print(f'[AutoClick] Clicked "{text}" via locator')
                         return
                 except:
                     continue
             
-            # 方法4: JavaScript 点击
+            # 方法4: JavaScript 全局搜索 (包括 Shadow DOM)
             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;
-                }}''')
+                clicked = await page.evaluate('''(textToFind) => {
+                    function findAndClick(root, text) {
+                        const lowerText = text.toLowerCase();
+                        
+                        // 搜索普通元素
+                        const elements = root.querySelectorAll('button, [role="button"], a, span, div');
+                        for (const el of elements) {
+                            const elText = el.textContent || el.innerText || '';
+                            if (elText.trim().toLowerCase() === lowerText || 
+                                elText.trim().toLowerCase().includes(lowerText)) {
+                                // 确保元素可见
+                                const rect = el.getBoundingClientRect();
+                                if (rect.width > 0 && rect.height > 0) {
+                                    el.click();
+                                    return true;
+                                }
+                            }
+                        }
+                        
+                        // 搜索 Shadow DOM
+                        const allElements = root.querySelectorAll('*');
+                        for (const el of allElements) {
+                            if (el.shadowRoot) {
+                                if (findAndClick(el.shadowRoot, text)) {
+                                    return true;
+                                }
+                            }
+                        }
+                        
+                        return false;
+                    }
+                    
+                    return findAndClick(document, textToFind);
+                }''', text)
+                
                 if clicked:
                     print(f'[AutoClick] Clicked "{text}" via JavaScript')
                     return
             except:
                 pass
             
-            # 方法5: 在 iframe 中查找
+            # 方法5: iframe 中查找
             for frame in page.frames:
                 if frame == page.main_frame:
                     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):
+                    if await btn.count() > 0 and await btn.first.is_visible(timeout=200):
                         await btn.first.click(timeout=2000)
                         print(f'[AutoClick] Clicked "{text}" in iframe')
                         return
                 except:
                     continue
+                
+                # iframe 内 JavaScript
+                try:
+                    clicked = await frame.evaluate('''(textToFind) => {
+                        const lowerText = textToFind.toLowerCase();
+                        const elements = document.querySelectorAll('button, [role="button"], a, span, div');
+                        for (const el of elements) {
+                            const elText = el.textContent || el.innerText || '';
+                            if (elText.trim().toLowerCase().includes(lowerText)) {
+                                const rect = el.getBoundingClientRect();
+                                if (rect.width > 0 && rect.height > 0) {
+                                    el.click();
+                                    return true;
+                                }
+                            }
+                        }
+                        return false;
+                    }''', text)
+                    
+                    if clicked:
+                        print(f'[AutoClick] Clicked "{text}" in iframe via JS')
+                        return
+                except:
+                    continue
                         
     except Exception as e:
         pass
@@ -342,96 +363,231 @@ async def manual_click(text: str):
         return {"status": "error", "message": "Browser not initialized"}
     
     try:
-        # 方法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
+        # JavaScript 全局搜索点击
+        clicked = await page.evaluate('''(textToFind) => {
+            function findAndClick(root, text) {
+                const lowerText = text.toLowerCase();
+                const elements = root.querySelectorAll('button, [role="button"], a, span, div');
+                for (const el of elements) {
+                    const elText = el.textContent || el.innerText || '';
+                    if (elText.trim().toLowerCase() === lowerText || 
+                        elText.trim().toLowerCase().includes(lowerText)) {
+                        const rect = el.getBoundingClientRect();
+                        if (rect.width > 0 && rect.height > 0) {
+                            el.click();
+                            return true;
+                        }
+                    }
+                }
+                const allElements = root.querySelectorAll('*');
+                for (const el of allElements) {
+                    if (el.shadowRoot) {
+                        if (findAndClick(el.shadowRoot, text)) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+            return findAndClick(document, textToFind);
+        }''', text)
         
-        # 方法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'}
         
+        # iframe
+        for frame in page.frames:
+            if frame == page.main_frame:
+                continue
+            try:
+                clicked = await frame.evaluate('''(textToFind) => {
+                    const lowerText = textToFind.toLowerCase();
+                    const elements = document.querySelectorAll('button, [role="button"], a, span, div');
+                    for (const el of elements) {
+                        const elText = el.textContent || el.innerText || '';
+                        if (elText.trim().toLowerCase().includes(lowerText)) {
+                            const rect = el.getBoundingClientRect();
+                            if (rect.width > 0 && rect.height > 0) {
+                                el.click();
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }''', text)
+                
+                if clicked:
+                    return {"status": "success", "message": f'Clicked "{text}" in iframe'}
+            except:
+                continue
+        
         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():
-    """调试：列出页面上所有按钮"""
+    """调试：列出所有按钮（包括 Shadow DOM 和 iframe）"""
     global page
     if not page:
         return {"status": "error", "message": "Browser not initialized"}
     
     try:
-        # 使用 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) => {
+            
+            function findButtons(root, frameName) {
+                const elements = root.querySelectorAll('button, [role="button"], a[class*="btn"], [ms-button]');
+                elements.forEach((el, i) => {
+                    const text = (el.textContent || el.innerText || '').trim();
+                    const rect = el.getBoundingClientRect();
                     results.push({
-                        index: i,
-                        text: btn.textContent.trim().substring(0, 50),
-                        visible: btn.offsetParent !== null || getComputedStyle(btn).display !== 'none',
-                        frame: 'cdk-overlay'
+                        index: results.length,
+                        text: text.substring(0, 80),
+                        visible: rect.width > 0 && rect.height > 0,
+                        frame: frameName,
+                        tag: el.tagName.toLowerCase()
                     });
                 });
+                
+                // Shadow DOM
+                const allElements = root.querySelectorAll('*');
+                allElements.forEach(el => {
+                    if (el.shadowRoot) {
+                        findButtons(el.shadowRoot, frameName + '-shadow');
+                    }
+                });
             }
+            
+            findButtons(document, 'main');
             return results;
         }''')
         
+        # iframe 按钮
+        for idx, frame in enumerate(page.frames):
+            if frame == page.main_frame:
+                continue
+            try:
+                frame_buttons = await frame.evaluate('''(frameIdx) => {
+                    const results = [];
+                    const elements = document.querySelectorAll('button, [role="button"], a');
+                    elements.forEach((el, i) => {
+                        const text = (el.textContent || el.innerText || '').trim();
+                        const rect = el.getBoundingClientRect();
+                        results.push({
+                            index: i,
+                            text: text.substring(0, 80),
+                            visible: rect.width > 0 && rect.height > 0,
+                            frame: 'iframe-' + frameIdx,
+                            tag: el.tagName.toLowerCase()
+                        });
+                    });
+                    return results;
+                }''', idx)
+                buttons.extend(frame_buttons)
+            except:
+                continue
+        
         return {"status": "success", "count": len(buttons), "buttons": buttons}
     except Exception as e:
         return {"status": "error", "message": str(e)}
 
-@app.get("/debug/overlay")
-async def debug_overlay():
-    """调试：检查 CDK Overlay 弹窗内容"""
+@app.get("/debug/search")
+async def debug_search(text: str):
+    """调试：搜索包含指定文本的所有元素"""
     global page
     if not page:
         return {"status": "error", "message": "Browser not initialized"}
     
     try:
-        html = await page.evaluate('''() => {
-            const overlay = document.querySelector('.cdk-overlay-container');
-            return overlay ? overlay.innerHTML : 'No overlay found';
-        }''')
-        return {"status": "success", "html": html[:8000]}
+        elements = await page.evaluate('''(searchText) => {
+            const results = [];
+            const lowerText = searchText.toLowerCase();
+            
+            function searchInRoot(root, frameName) {
+                const walker = document.createTreeWalker(
+                    root,
+                    NodeFilter.SHOW_ELEMENT,
+                    null,
+                    false
+                );
+                
+                let node;
+                while (node = walker.nextNode()) {
+                    const text = (node.textContent || '').trim();
+                    if (text.toLowerCase().includes(lowerText)) {
+                        const rect = node.getBoundingClientRect();
+                        results.push({
+                            tag: node.tagName.toLowerCase(),
+                            text: text.substring(0, 100),
+                            visible: rect.width > 0 && rect.height > 0,
+                            frame: frameName,
+                            className: node.className ? node.className.substring(0, 50) : '',
+                            id: node.id || ''
+                        });
+                    }
+                    
+                    if (node.shadowRoot) {
+                        searchInRoot(node.shadowRoot, frameName + '-shadow');
+                    }
+                }
+            }
+            
+            searchInRoot(document, 'main');
+            return results.slice(0, 50);  // 限制数量
+        }''', text)
+        
+        # iframe
+        for idx, frame in enumerate(page.frames):
+            if frame == page.main_frame:
+                continue
+            try:
+                frame_elements = await frame.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)) {
+                            const rect = el.getBoundingClientRect();
+                            results.push({
+                                tag: el.tagName.toLowerCase(),
+                                text: text.substring(0, 100),
+                                visible: rect.width > 0 && rect.height > 0,
+                                frame: 'iframe-' + arguments[1],
+                                className: el.className ? el.className.substring(0, 50) : '',
+                                id: el.id || ''
+                            });
+                        }
+                    });
+                    return results.slice(0, 20);
+                }''', text, idx)
+                elements.extend(frame_elements)
+            except:
+                continue
+        
+        return {"status": "success", "count": len(elements), "elements": elements}
+    except Exception as e:
+        return {"status": "error", "message": str(e)}
+
+@app.get("/debug/frames")
+async def debug_frames():
+    """调试：列出所有 frames"""
+    global page
+    if not page:
+        return {"status": "error", "message": "Browser not initialized"}
+    
+    try:
+        frames = []
+        for idx, frame in enumerate(page.frames):
+            frames.append({
+                "index": idx,
+                "name": frame.name,
+                "url": frame.url,
+                "is_main": frame == page.main_frame
+            })
+        return {"status": "success", "count": len(frames), "frames": frames}
     except Exception as e:
         return {"status": "error", "message": str(e)}