Update fun.py

fun.py

@@ -13,6 +13,7 @@ from typing import Dict
 from loguru import logger
 from starlette.responses import StreamingResponse
 import socket
+
 app = FastAPI()
 
 # 浏览器实例管理
@@ -20,6 +21,8 @@ BROWSERS: Dict[str, dict] = {}  # {browser_id: {"process": Popen, "port": int, "
 PORT_RANGE = (9300, 9700)
 CHROME_PATH = "google-chrome"  # Linux下可用命令，或自定义绝对路径
 PROFILE_BASE = "/tmp/profiles"
+
+
 def get_system_usage():
     cpu = subprocess.check_output("top -bn1 | grep 'Cpu(s)'", shell=True).decode().strip()
     mem = subprocess.check_output("free -m | grep Mem", shell=True).decode().strip()
@@ -31,6 +34,8 @@ def get_system_usage():
     logger.info(f"CPU: {cpu}, Memory: {mem}")
     info = {"CPU": {cpu}, "Memory": {mem}}
     return info
+
+
 def get_free_port():
     used_ports = {b["port"] for b in BROWSERS.values()}
     for _ in range(100):
@@ -39,9 +44,11 @@ def get_free_port():
             return port
     raise RuntimeError("No free port available")
 
+
 def gen_browser_id():
     return str(int(time.time() * 1000)) + str(random.randint(1000, 9999))
 
+
 def get_default_launch_args():
     return [
         "--disable-gpu",
@@ -58,6 +65,8 @@ def get_default_launch_args():
         "--remote-allow-origins=*",
         "--headless"
     ]
+
+
 def wait_port(host, port, timeout=5.0):
     """等待端口可用"""
     start = time.time()
@@ -69,6 +78,7 @@ def wait_port(host, port, timeout=5.0):
             time.sleep(0.1)
     return False
 
+
 @app.get("/system/usage")
 async def system_usage():
     """
@@ -81,22 +91,25 @@ async def system_usage():
         logger.error(f"获取系统资源使用情况失败: {e}")
         return {"code": 1, "msg": "failed", "error": str(e)}
 
+
 # BitBrowser风格API
 @app.post("/browser/open")
 async def open_browser(request: Request):
     data = await request.json()
-    browser_id = data.get("id","")
+    browser_id = data.get("id", '')
     if browser_id in BROWSERS:
+        logger.info(f"Browser ID {browser_id}: {BROWSERS[browser_id]}")
         if BROWSERS[browser_id]["status"] == "open":
-            return {"code": 0, "msg": "already opened", "data": {"id": browser_id, "port": BROWSERS[browser_id]["port"]}}
-        elif BROWSERS[browser_id]["status"] == "closed":
-            port = BROWSERS[browser_id]["port"]
-            BROWSERS[browser_id]["status"] = "reopening"
+            return {"code": 0, "msg": "already opened",
+                    "data": {"id": browser_id, "port": BROWSERS[browser_id]["port"]}}
         else:
             port = get_free_port()
+            BROWSERS[browser_id]["port"] = port
     else:
+        # 新建浏览器实例
+        browser_id = gen_browser_id()
         port = get_free_port()
-    profile_dir = f"{PROFILE_BASE}/{port}"
+    profile_dir = f"{PROFILE_BASE}/{browser_id}"
     os.makedirs(profile_dir, exist_ok=True)
     # 支持自定义启动参数并去重
     launch_args = data.get("launchArgs", "")
@@ -125,11 +138,12 @@ async def open_browser(request: Request):
         resp = await client.get(f"http://127.0.0.1:{port}/json/version")
         if resp.status_code == 200:
             browser_info = resp.json()
-            browser_id = browser_info.get("webSocketDebuggerUrl").split("/")[-1]
+            ws_url = browser_info.get("webSocketDebuggerUrl")
 
             logger.info(f"Browser opened with ID: {browser_id}, Info: {browser_info}")
-    BROWSERS[browser_id] = {"process": proc, "port": port, "status": "open", "info": browser_info}
-    return {"code": 0, "msg": "success", "data": {"id": browser_id, "port": port}, "info": browser_info}
+    BROWSERS[browser_id] = {"process": proc, "ws": ws_url, "port": port, "status": "open", "info": browser_info}
+    return {"code": 0, "msg": "success", "data": {"id": browser_id, "ws": ws_url}, "info": browser_info}
+
 
 @app.post("/browser/close")
 async def close_browser(request: Request):
@@ -142,6 +156,7 @@ async def close_browser(request: Request):
     b["status"] = "closed"
     return {"code": 0, "msg": "closed", "data": {"id": browser_id}}
 
+
 @app.post("/browser/delete")
 async def delete_browser(request: Request):
     data = await request.json()
@@ -154,12 +169,13 @@ async def delete_browser(request: Request):
     except Exception:
         pass
     # 删除用户数据目录
-    profile_dir = f"{PROFILE_BASE}/{b['port']}"
+    profile_dir = f"{PROFILE_BASE}/{browser_id}"
     if os.path.exists(profile_dir):
         import shutil
         shutil.rmtree(profile_dir, ignore_errors=True)
     return {"code": 0, "msg": "deleted", "data": {"id": browser_id}}
 
+
 @app.post("/browser/update")
 async def update_browser(request: Request):
     data = await request.json()
@@ -174,12 +190,14 @@ async def update_browser(request: Request):
         data["launchArgs"] = launch_args
     return await open_browser(Request({**request.scope, "body": json.dumps(data).encode()}, receive=request._receive))
 
+
 @app.post("/browser/ports")
 async def browser_ports():
-        # 返回 {id: port} 格式
-    data = {k: str(v["port"]) for k, v in BROWSERS.items() if v["status"] == "open"}
+    # 返回 {id: port} 格式
+    data = {k: str(v["ws"]) for k, v in BROWSERS.items() if v["status"] == "open"}
     return {"success": True, "data": data}
 
+
 @app.post("/health")
 async def health():
     return {"code": 0, "msg": "ok"}
@@ -192,6 +210,7 @@ CDP_PATHS = [
     "/json/protocol",
 ]
 
+
 def get_browser_by_id(browser_id: str):
     b = BROWSERS.get(browser_id)
     if not b or b["status"] != "open":
@@ -235,6 +254,8 @@ async def find_browser_by_target_id(target_id: str):
             return browser
 
     return None
+
+
 @app.api_route("/json", methods=["GET"])
 @app.api_route("/json/list", methods=["GET"])
 @app.api_route("/json/version", methods=["GET"])
@@ -270,6 +291,7 @@ async def cdp_native_proxy(request: Request):
         headers=dict(resp.headers)
     )
 
+
 @app.websocket("/devtools/{tab_type}/{target_id}")
 async def cdp_native_ws_proxy(websocket: WebSocket, tab_type: str, target_id: str):
     if not target_id:
@@ -280,13 +302,13 @@ async def cdp_native_ws_proxy(websocket: WebSocket, tab_type: str, target_id: st
     if not browser:
         await websocket.close(code=1008, reason="无法找到有效的浏览器实例")
         return
-    
+
     await websocket.accept()
     tab_type = "page" if tab_type == "page" else "browser"
     port = browser["port"]
     target_url = f"ws://127.0.0.1:{port}/devtools/{tab_type}/{target_id}"
     logger.info(f"Forwarding to: {target_url}")
-    
+
     try:
         async with websockets.connect(target_url) as target_ws:
             async def forward_client_to_server():
@@ -296,7 +318,7 @@ async def cdp_native_ws_proxy(websocket: WebSocket, tab_type: str, target_id: st
                         await target_ws.send(data)
                 except WebSocketDisconnect:
                     pass
-            
+
             async def forward_server_to_client():
                 try:
                     while True:
@@ -304,7 +326,7 @@ async def cdp_native_ws_proxy(websocket: WebSocket, tab_type: str, target_id: st
                         await websocket.send_text(response)
                 except websockets.exceptions.ConnectionClosed:
                     pass
-            
+
             await asyncio.gather(
                 forward_client_to_server(),
                 forward_server_to_client()
@@ -315,6 +337,5 @@ async def cdp_native_ws_proxy(websocket: WebSocket, tab_type: str, target_id: st
         await websocket.close()
 
 
-
 if __name__ == "__main__":
-    uvicorn.run("fun:app", host="0.0.0.0", port=8000, reload=True)
+    uvicorn.run("fun:app", host="0.0.0.0", port=8000, reload=True)