feat: auto dismiss overlay

browser/navigation.py

@@ -3,6 +3,7 @@ import os
 from playwright.sync_api import Page, expect
 from utils.paths import logs_dir
 from utils.common import ensure_dir
+from browser.ws_helper import reconnect_ws, get_ws_status, dismiss_interaction_modal
 
 class KeepAliveError(Exception):
     pass
@@ -79,6 +80,10 @@ def handle_successful_navigation(page: Page, logger, cookie_file_config, shutdow
     # 等待页面加载和渲染
     time.sleep(15)
 
+    # 记录初始WS状态
+    last_ws_status = get_ws_status(page, logger)
+    logger.info(f"初始WS状态: {last_ws_status}")
+
     # 添加Cookie验证计数器
     click_counter = 0
 
@@ -89,9 +94,26 @@ def handle_successful_navigation(page: Page, logger, cookie_file_config, shutdow
             break
 
         try:
+            # 检测并关闭interaction-modal遮罩层（如果出现）
+            dismiss_interaction_modal(page, logger)
+
             page.click('body')
             click_counter += 1
 
+            # 检查WS状态是否发生变化
+            current_ws_status = get_ws_status(page, logger)
+            if current_ws_status != last_ws_status:
+                logger.warning(f"WS状态变更: {last_ws_status} -> {current_ws_status}")
+                
+                # 如果不是CONNECTED状态，尝试重连
+                if current_ws_status != "CONNECTED":
+                    logger.info("WS断开，尝试重连...")
+                    reconnect_ws(page, logger)
+                    current_ws_status = get_ws_status(page, logger)
+                    logger.info(f"重连后WS状态: {current_ws_status}")
+                
+                last_ws_status = current_ws_status
+
             # 每360次点击（1小时）执行一次完整的Cookie验证
             if cookie_validator and click_counter >= 360:  # 360 * 10秒 = 3600秒 = 1小时
                 is_valid = cookie_validator.validate_cookies_in_main_thread()

browser/ws_helper.py

@@ -0,0 +1,193 @@
+import time
+import random
+from playwright.sync_api import Page, FrameLocator
+
+
+def get_preview_frame(page: Page, logger=None) -> FrameLocator:
+    """
+    获取预览iframe的FrameLocator。
+    """
+    try:
+        # 查找title为"Preview"的iframe
+        frame = page.frame_locator('iframe[title="Preview"]')
+        return frame
+    except Exception as e:
+        if logger:
+            logger.warning(f"获取Preview iframe失败: {e}")
+        return None
+
+
+def get_ws_status(page: Page, logger=None) -> str:
+    """
+    获取页面中WS连接状态（在iframe内部）。
+    返回: CONNECTED, IDLE, CONNECTING 或 UNKNOWN
+    """
+    try:
+        frame = get_preview_frame(page, logger)
+        if not frame:
+            return "UNKNOWN"
+        
+        # 在iframe内查找包含 "WS:" 的状态文本元素
+        # 根据截图，状态显示为 "WS: CONNECTED" 等格式
+        status_element = frame.locator('text=/WS:\\s*(CONNECTED|IDLE|CONNECTING)/i').first
+        if status_element.is_visible(timeout=3000):
+            text = status_element.text_content()
+            if text:
+                if "CONNECTED" in text.upper():
+                    return "CONNECTED"
+                elif "IDLE" in text.upper():
+                    return "IDLE"
+                elif "CONNECTING" in text.upper():
+                    return "CONNECTING"
+        return "UNKNOWN"
+    except Exception as e:
+        if logger:
+            logger.warning(f"获取WS状态时出错: {e}")
+        return "UNKNOWN"
+
+
+def click_disconnect(page: Page, logger=None) -> bool:
+    """
+    点击Disconnect按钮断开WS连接（在iframe内部）。
+    """
+    try:
+        frame = get_preview_frame(page, logger)
+        if not frame:
+            return False
+        
+        disconnect_btn = frame.locator('button:has-text("Disconnect")')
+        if disconnect_btn.count() > 0 and disconnect_btn.first.is_visible(timeout=3000):
+            disconnect_btn.first.click(timeout=5000)
+            if logger:
+                logger.info("已点击 Disconnect 按钮")
+            time.sleep(1)
+            return True
+        if logger:
+            logger.warning("未找到可见的 Disconnect 按钮")
+        return False
+    except Exception as e:
+        if logger:
+            logger.warning(f"点击 Disconnect 按钮失败: {e}")
+        return False
+
+
+def click_connect(page: Page, logger=None) -> bool:
+    """
+    点击Connect按钮建立WS连接（在iframe内部）。
+    """
+    try:
+        frame = get_preview_frame(page, logger)
+        if not frame:
+            return False
+        
+        connect_btn = frame.locator('button:has-text("Connect")')
+        if connect_btn.count() > 0 and connect_btn.first.is_visible(timeout=3000):
+            connect_btn.first.click(timeout=5000)
+            if logger:
+                logger.info("已点击 Connect 按钮")
+            time.sleep(1)
+            return True
+        if logger:
+            logger.warning("未找到可见的 Connect 按钮")
+        return False
+    except Exception as e:
+        if logger:
+            logger.warning(f"点击 Connect 按钮失败: {e}")
+        return False
+
+
+def wait_for_ws_connected(page: Page, logger=None, timeout: int = 30) -> bool:
+    """
+    等待WS状态变为CONNECTED。
+    """
+    start_time = time.time()
+    while time.time() - start_time < timeout:
+        status = get_ws_status(page, logger)
+        if status == "CONNECTED":
+            return True
+        time.sleep(1)
+    return False
+
+
+def reconnect_ws(page: Page, logger=None) -> str:
+    """
+    执行断开再连接的流程，并返回最终WS状态。
+    流程：关闭遮罩 -> Disconnect -> 等待IDLE -> Connect -> 等待CONNECTED -> 获取状态
+    """
+    if logger:
+        logger.info("开始执行WS重连流程: Disconnect -> Connect")
+    
+    # 先关闭 interaction-modal 遮罩层（如果存在）
+    dismiss_interaction_modal(page, logger)
+    
+    # 先断开连接
+    click_disconnect(page, logger)
+    time.sleep(2)
+    
+    # 检查是否变为IDLE
+    status = get_ws_status(page, logger)
+    if logger:
+        logger.info(f"断开后WS状态: {status}")
+    
+    # 再连接
+    click_connect(page, logger)
+    time.sleep(2)
+    
+    # 等待连接成功
+    if wait_for_ws_connected(page, logger, timeout=15):
+        status = get_ws_status(page, logger)
+        if logger:
+            logger.info(f"重连后WS状态: {status}")
+        return status
+    else:
+        status = get_ws_status(page, logger)
+        if logger:
+            logger.warning(f"WS重连超时，当前状态: {status}")
+        return status
+
+
+def dismiss_interaction_modal(page: Page, logger=None) -> bool:
+    """
+    检测并关闭 interaction-modal 遮罩层。
+    通过在 iframe 区域内模拟鼠标移动来触发遮罩层关闭。
+    
+    返回: True 如果成功关闭遮罩，False 如果未找到遮罩或关闭失败
+    """
+    try:
+        modal = page.locator('div.interaction-modal')
+        if modal.count() == 0 or not modal.first.is_visible(timeout=500):
+            return False
+        
+        if logger:
+            logger.info("检测到 interaction-modal 遮罩层，尝试关闭...")
+        
+        iframe = page.locator('iframe[title="Preview"]')
+        if iframe.count() > 0:
+            iframe_box = iframe.first.bounding_box()
+            if iframe_box:
+                # 随机起点
+                curr_x = iframe_box['x'] + random.randint(50, int(iframe_box['width']) - 50)
+                curr_y = iframe_box['y'] + random.randint(50, int(iframe_box['height']) - 50)
+                
+                # 持续连续移动直到遮罩关闭，最多尝试30次
+                for i in range(30):
+                    # 从当前位置随机移动一段距离
+                    delta_x = random.randint(-30, 30)
+                    delta_y = random.randint(-20, 20)
+                    curr_x = max(iframe_box['x'] + 20, min(iframe_box['x'] + iframe_box['width'] - 20, curr_x + delta_x))
+                    curr_y = max(iframe_box['y'] + 20, min(iframe_box['y'] + iframe_box['height'] - 20, curr_y + delta_y))
+                    
+                    page.mouse.move(curr_x, curr_y)
+                    time.sleep(0.05)
+                    
+                    # 每次移动后检查遮罩是否关闭
+                    if modal.count() == 0 or not modal.first.is_visible(timeout=100):
+                        if logger:
+                            logger.info("已成功关闭 interaction-modal 遮罩层")
+                        return True
+        
+        return False
+    except Exception as e:
+        if logger:
+            logger.debug(f"关闭 interaction-modal 时出错: {e}")
+        return False