Update fun.py

fun.py

@@ -17,7 +17,8 @@ import socket
 app = FastAPI()
 
 # 浏览器实例管理
-BROWSERS: Dict[str, dict] = {}  # {browser_id: {"process": Popen, "port": int, "status": str}}
+BROWSERS: Dict[str, dict] = {}  # {browser_id: {"process": Popen, "ws": str, "port": int, "status": str, "info": dict}}
+# 浏览器实例状态: open, closed
 PORT_RANGE = (9300, 9700)
 CHROME_PATH = "google-chrome"  # Linux下可用命令，或自定义绝对路径
 PROFILE_BASE = "/tmp/profiles"
@@ -27,10 +28,9 @@ 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()
     cpu = cpu.split(",")[0].split(":")[-1].strip()
-    mem = mem.split()[1:4]
-    mem = [f"{x}MB" for x in mem]
-    mem = " ".join(mem)
-    mem = f"Total: {mem[0]}, Used: {mem[1]}, Free: {mem[2]}"
+    mem_values = mem.split()[1:4]
+    mem_total, mem_used, mem_free = mem_values
+    mem = f"Total: {mem_total}MB, Used: {mem_used}MB, Free: {mem_free}MB"
     logger.info(f"CPU: {cpu}, Memory: {mem}")
     info = {"CPU": {cpu}, "Memory": {mem}}
     return info
@@ -138,8 +138,7 @@ 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()
-            ws_url = browser_info.get("webSocketDebuggerUrl")
-
+            ws_url = browser_info.get("webSocketDebuggerUrl").replace("ws://127.0.0.1", "wss://0.0.0.0")
             logger.info(f"Browser opened with ID: {browser_id}, 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}