Update app.py

app.py

@@ -42,33 +42,47 @@ HTML_CONTENT = """
         const wsUrl = `${protocol}//${window.location.host}/ws`;
         
         let sock = null;
+        let reconnectTimer = null;
 
         function connect() {
-            document.getElementById('status').innerText = "Connecting to shell...";
+            if (reconnectTimer) clearTimeout(reconnectTimer);
+            document.getElementById('status').innerText = "Connecting...";
+            
             try {
                 sock = new WebSocket(wsUrl);
                 
                 sock.onopen = () => {
                     document.getElementById('status').innerText = "Connected (Ready)";
+                    document.getElementById('status').style.color = "#0f0";
                     term.write('\\r\\n\\x1b[32m>>> HF Space Ubuntu Terminal Ready <<<\\x1b[0m\\r\\n');
                     term.write('\\r\\nType commands (e.g., ls, g++, vim)...\\r\\n\\r\\n');
                 };
 
                 term.onData(data => {
                     if (sock && sock.readyState === WebSocket.OPEN) {
+                        // 直接发送字符串，aiohttp 会自动处理
                         sock.send(data);
                     }
                 });
 
-                sock.onmessage = msg => term.write(msg.data);
+                sock.onmessage = event => {
+                    // 处理二进制或文本数据
+                    if (event.data instanceof ArrayBuffer) {
+                        term.write(new Uint8Array(event.data));
+                    } else {
+                        term.write(event.data);
+                    }
+                };
                 
                 sock.onclose = () => {
                     document.getElementById('status').innerText = "Disconnected. Reconnecting...";
-                    setTimeout(connect, 2000);
+                    document.getElementById('status').style.color = "#ffa500";
+                    reconnectTimer = setTimeout(connect, 2000);
                 };
                 
                 sock.onerror = () => {
                     document.getElementById('status').innerText = "Connection Error.";
+                    document.getElementById('status').style.color = "#ff0000";
                 };
             } catch (e) {
                 document.getElementById('status').innerText = "Error: " + e.message;
@@ -86,12 +100,16 @@ async def handle_http(request):
     return web.Response(text=HTML_CONTENT, content_type='text/html')
 
 async def handle_ws(request):
-    ws = web.WebSocketResponse()
+    ws = web.WebSocketResponse(heartbeat=30) # 添加心跳防止超时断开
     await ws.prepare(request)
     
-    # 连接到本地运行的 ttyd
+    reader = None
+    writer = None
+    
     try:
+        # 连接到本地运行的 ttyd
         reader, writer = await asyncio.open_connection('127.0.0.1', TTYD_PORT)
+        print("Connected to ttyd backend")
     except Exception as e:
         print(f"Failed to connect to ttyd: {e}")
         await ws.close()
@@ -103,34 +121,57 @@ async def handle_ws(request):
                 if msg.type == web.WSMsgType.BINARY:
                     writer.write(msg.data)
                 elif msg.type == web.WSMsgType.TEXT:
-                    writer.write(msg.data.encode())
+                    # ttyd 期望字节流，将文本编码为 bytes
+                    writer.write(msg.data.encode('utf-8'))
                 await writer.drain()
-        except Exception:
-            pass
+        except Exception as e:
+            print(f"WS->TTY Error: {e}")
         finally:
-            writer.close()
+            if writer:
+                writer.close()
+                try:
+                    await writer.wait_closed()
+                except:
+                    pass
 
     async def tty_to_ws():
         try:
             while True:
+                # 读取 ttyd 的输出
                 data = await reader.read(4096)
-                if not data:  # 【修复点】这里补全了判断条件
+                if not data:
                     break
+                # 发送给前端 (作为二进制，保留所有控制字符)
                 await ws.send_bytes(data)
-        except Exception:
-            pass
+        except Exception as e:
+            print(f"TTY->WS Error: {e}")
         finally:
-            writer.close()
+            if writer:
+                writer.close()
+                try:
+                    await writer.wait_closed()
+                except:
+                    pass
 
+    # 并行运行两个方向的数据流
     await asyncio.gather(ws_to_tty(), tty_to_ws())
+    
+    if not ws.closed:
+        await ws.close()
+    
     return ws
 
 async def on_startup(app):
     # 启动 ttyd 子进程
+    # 使用 --writable 确保可写 (虽然默认通常是可写的，但显式指定更安全)
+    # 注意：如果之前的 ttyd 版本不支持某些参数，这里只保留最基础的 -p
     cmd = ["/usr/local/bin/ttyd", "-p", str(TTYD_PORT), "/bin/bash"]
     print(f"Starting ttyd: {' '.join(cmd)}")
-    subprocess.Popen(cmd)
-    print("ttyd started.")
+    
+    # 启动进程
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    app['ttyd_proc'] = proc
+    print("ttyd started successfully.")
 
 def main():
     app = web.Application()
@@ -139,6 +180,7 @@ def main():
     app.on_startup.append(on_startup)
     
     print(f"Starting server on port {SERVER_PORT}...")
+    # print=None 禁止 aiohttp 自带的日志，避免干扰
     web.run_app(app, host='0.0.0.0', port=SERVER_PORT, print=lambda x: None)
 
 if __name__ == '__main__':