Update qemu/web_interface.py

qemu/web_interface.py

@@ -13,6 +13,7 @@ from typing import Optional, Dict
 import json
 import os
 import sys
+import subprocess
 
 # Add parent directory to path for imports
 current_dir = Path(__file__).parent
@@ -34,6 +35,7 @@ app.mount("/static", StaticFiles(directory=str(static_path)), name="static")
 
 # Global QEMU manager instance
 qemu: Optional[QEMUManager] = None
+websockify_process: Optional[subprocess.Popen] = None
 
 class VMConnection:
 
@@ -58,6 +60,24 @@ class VMConnection:
 
 vm_connection = VMConnection()
 
+def start_websockify(vnc_port: int, websocket_port: int = 6080):
+    """Start websockify proxy for VNC"""
+    global websockify_process
+    
+    if websockify_process:
+        websockify_process.terminate()
+        websockify_process.wait()
+    
+    cmd = [
+        "websockify",
+        f"{websocket_port}",
+        f"localhost:{vnc_port}"
+    ]
+    
+    websockify_process = subprocess.Popen(cmd)
+    logger.info(f"Started websockify proxy on port {websocket_port} for VNC port {vnc_port}")
+    return websocket_port
+
 @app.get("/")
 async def get_index():
     """Serve main HTML interface"""
@@ -77,9 +97,10 @@ async def vm_websocket(websocket: WebSocket):
                 # Start fresh OS installation
                 if qemu:
                     vnc_port = await qemu.install_os(message["iso_url"])
+                    websocket_port = start_websockify(vnc_port)
                     await websocket.send_json({
                         "type": "vnc_info",
-                        "port": vnc_port
+                        "port": websocket_port
                     })
                     
             elif message["type"] == "boot":
@@ -87,9 +108,10 @@ async def vm_websocket(websocket: WebSocket):
                 if qemu:
                     try:
                         vnc_port = await qemu.boot_os()
+                        websocket_port = start_websockify(vnc_port)
                         await websocket.send_json({
                             "type": "vnc_info",
-                            "port": vnc_port
+                            "port": websocket_port
                         })
                     except FileNotFoundError:
                         await websocket.send_json({
@@ -119,9 +141,16 @@ async def startup_event():
 @app.on_event("shutdown")
 async def shutdown_event():
     """Cleanup on shutdown"""
+    global websockify_process
+    
     if qemu:
         await qemu.shutdown()
         logger.info("QEMU manager shut down")
+        
+    if websockify_process:
+        websockify_process.terminate()
+        websockify_process.wait()
+        logger.info("Websockify proxy shut down")
 
 
 def main():
@@ -130,4 +159,6 @@ def main():
     uvicorn.run(app, host="0.0.0.0", port=8080)
 
 if __name__ == "__main__":
-    main()
+    main()
+
+