fix: keep terminal sessions alive #25

Merged
jimmy merged 1 commits from dev into main 2026-03-06 16:49:54 +08:00
2 changed files with 11 additions and 1 deletions
Showing only changes of commit c9f06fbbbb - Show all commits
+4
View File
@@ -72,6 +72,8 @@ async def ws_endpoint(websocket: WebSocket, host: str = Query("nas")):
conn = await asyncssh.connect(
h["host"], username=h["user"],
client_keys=[h["key"]], known_hosts=_known_hosts,
keepalive_interval=30,
keepalive_count_max=3,
)
except Exception:
_active_sessions.discard(session_id)
@@ -108,6 +110,8 @@ async def ws_endpoint(websocket: WebSocket, host: str = Query("nas")):
else:
process.stdin.write(data)
elif "text" in msg and msg["text"]:
if msg["text"] == "__ping__":
continue
process.stdin.write(msg["text"].encode())
except WebSocketDisconnect:
pass
@@ -122,6 +122,7 @@
if (d) {
d.voice?.destroy();
d.ro?.disconnect();
if (d.heartbeat) clearInterval(d.heartbeat);
d.term?.element?.removeEventListener("dragover", d.handleDragOver);
d.term?.element?.removeEventListener("drop", d.handleDrop);
d.term?.textarea?.removeEventListener("paste", d.handlePaste);
@@ -180,6 +181,10 @@
ws.onerror = () => updateTab(tabId, { connected: false, error: "Connection failed" });
term.onData((data) => ws.readyState === 1 && ws.send(new TextEncoder().encode(data)));
const heartbeat = setInterval(() => {
if (ws.readyState === 1) ws.send("__ping__");
}, 25000);
const handleDragOver = (e) => {
e.preventDefault();
};
@@ -211,7 +216,7 @@
ro.observe(el);
const voice = new VoiceSession(() => { voiceTick++; });
voice.attach(term, ws);
tabData.set(tabId, { ws, term, ro, el, voice, handleDragOver, handleDrop, handlePaste });
tabData.set(tabId, { ws, term, ro, el, voice, heartbeat, handleDragOver, handleDrop, handlePaste });
})();
}
@@ -222,6 +227,7 @@
tabData.forEach((d) => {
d.voice?.destroy();
d.ro?.disconnect();
if (d.heartbeat) clearInterval(d.heartbeat);
d.term?.element?.removeEventListener("dragover", d.handleDragOver);
d.term?.element?.removeEventListener("drop", d.handleDrop);
d.term?.textarea?.removeEventListener("paste", d.handlePaste);