Update api.py

api.py

@@ -257,9 +257,10 @@ async def open_browser(request: Request):
             ws_url = re.sub(r":\d+", "", ws_url)
             browser_info["webSocketDebuggerUrl"] = ws_url
             logger.info(f"Browser opened with ID: {browser_id}, Info: {browser_info}")
-            logger.info(f'port: {port}, ws_url: {ws_url}')
-    logger.info(f'port: {port}, ws_url: {ws_url}')
+            logger.info(f'port1111: {port}, ws_url: {ws_url}')
+
     BROWSERS[browser_id] = {"process": proc, "ws": ws_url, "port": port, "status": "open", "info": browser_info}
+    logger.info(f'port2222: {port}, ws_url: {ws_url}')
     return {"success": True, "msg": "success", "data": {"id": browser_id, "ws": ws_url}, "info": browser_info}
 
 
@@ -336,7 +337,7 @@ def get_browser_by_id(browser_id: str):
     return b
 
 
-async def find_browser_by_target_id(target_id: str):
+async def find_browser_by_target_id(tab_type,target_id: str):
     """
     根据 targetId 智能查找对应的浏览器实例
 
@@ -344,10 +345,12 @@ async def find_browser_by_target_id(target_id: str):
     2. 如果不是，查询所有浏览器实例的页面列表，找到匹配 target_id 的页面所在浏览器
     3. 如果找不到，返回第一个可用的浏览器实例
     """
-    # 检查是否直接是 browser_id
-    if target_id in BROWSERS:
-        return BROWSERS[target_id]
-
+    if tab_type == "browser":
+        # 查询所有浏览器实例，找到匹配的页面
+        for browser_id, browser in BROWSERS.items():
+            ws_url = browser.get("info", {}).get("webSocketDebuggerUrl", "")
+            if target_id in ws_url:
+                return browser
     # 查询所有浏览器实例，找到匹配的页面
     for browser_id, browser in BROWSERS.items():
         if browser["status"] != "open":
@@ -416,7 +419,7 @@ async def cdp_native_ws_proxy(websocket: WebSocket, tab_type: str, target_id: st
         await websocket.close()
         return
     # 智能查找 target_id 对应的浏览器实例
-    browser = await find_browser_by_target_id(target_id)
+    browser = await find_browser_by_target_id(tab_type,target_id)
     if not browser:
         await websocket.close(code=1008, reason="无法找到有效的浏览器实例")
         return