Merge dev to main - Immich and Terminal fixes #36

Merged
jimmy merged 5 commits from dev into main 2026-03-15 22:50:19 +08:00
Showing only changes of commit 00b5d362e7 - Show all commits
+4 -1
View File
@@ -122,6 +122,7 @@ async def ws_endpoint(websocket: WebSocket, host: str = Query("nas"), token: str
session_id = session_or_code
await websocket.accept()
logger.info("WebSocket accepted for %s (user: %s)", host, user.username)
h = HOSTS[host]
try:
@@ -134,6 +135,7 @@ async def ws_endpoint(websocket: WebSocket, host: str = Query("nas"), token: str
),
timeout=10.0
)
logger.info("SSH connection established to %s", host)
except asyncio.TimeoutError:
logger.error("SSH connection to %s timed out after 10s", host)
await _release_session(session_id)
@@ -180,11 +182,12 @@ async def ws_endpoint(websocket: WebSocket, host: str = Query("nas"), token: str
process.stdin.write(data)
elif "text" in msg and msg["text"]:
if msg["text"] == "__ping__":
logger.debug("Received ping from %s, sending pong", host)
await websocket.send_text("__pong__")
continue
process.stdin.write(msg["text"].encode())
except Exception as e:
logger.info("WebSocket receive loop ended for %s: %s", host, e)
logger.warning("WebSocket receive loop ended for %s: %s", host, e)
finally:
read_task.cancel()
process.close()