diff --git a/dashboard/src/vms.rs b/dashboard/src/vms.rs index df237b28e34decaa9107dfe6793afa6b9380acf4..0f0ad8ca5dbfab4a5ead9834409e90bfc2b2f5cc 100644 --- a/dashboard/src/vms.rs +++ b/dashboard/src/vms.rs @@ -115,13 +115,19 @@ async fn bridge(socket: WebSocket, stream: tokio::net::UnixStream) { }; let downstream = async { let mut buffer = vec![0; 65536]; + let mut heartbeat = tokio::time::interval(Duration::from_secs(15)); + heartbeat.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); loop { - let count = read.read(&mut buffer).await?; - if count == 0 { - break; - } - send.send(Message::Binary(Bytes::copy_from_slice(&buffer[..count]))) - .await + let message = tokio::select! { + result = read.read(&mut buffer) => { + let count = result?; + if count == 0 { break; } + Message::Binary(Bytes::copy_from_slice(&buffer[..count])) + } + _ = heartbeat.tick() => Message::Ping(Bytes::new()), + }; + tokio::time::timeout(Duration::from_secs(5), send.send(message)) + .await.map_err(std::io::Error::other)? .map_err(std::io::Error::other)?; } Ok::<_, std::io::Error>(()) diff --git a/dashboard/web/components/VMConsole.tsx b/dashboard/web/components/VMConsole.tsx index 3079ba17f2736bf29b8adba802689595a648bb7a..d53aa23255135ddc8436eda7f212e483af6e84b2 100644 --- a/dashboard/web/components/VMConsole.tsx +++ b/dashboard/web/components/VMConsole.tsx @@ -21,6 +21,7 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e const enabled = createMemo(() => props.enabled); const preparing = () => !!props.setup && props.setup !== "ready"; let reconnectTimer: number | undefined; + let retryDelay = 1000; let attempt = 0; let video!: HTMLVideoElement; let canvas!: HTMLCanvasElement; @@ -185,15 +186,17 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e if (current !== attempt || disposed) return; setState("Disconnected"); disconnect(); - if (preparing() && props.setup !== "failed") { - setProblem(""); - reconnectTimer = window.setTimeout(connect, 1000); - } else setProblem(message); + setProblem(preparing() && props.setup !== "failed" ? "" : message); + if (enabled() && props.setup !== "failed") { + reconnectTimer = window.setTimeout(connect, retryDelay); + retryDelay = Math.min(retryDelay * 2, 30000); + } }; const timeout = window.setTimeout(() => fail("The screen couldn't connect. Reconnect to try again."), 20000); const ready = () => { if (current !== attempt || disposed || video.readyState < 2 || input?.readyState !== "open") return; clearTimeout(timeout); + retryDelay = 1000; setState("Connected"); }; disconnect = () => { @@ -352,7 +355,7 @@ export function VMConsole(props: { name: string; platform: Domain["platform"]; e setProblem(""); } }); - createEffect(() => { if (props.active && connected() && !preparing()) video.focus(); else release(); }); + createEffect(() => { if (!props.active || !connected() || preparing()) release(); }); createEffect(on(() => props.setup, setup => { if (setup === "ready" && enabled() && state() === "Disconnected") void connect(); }, { defer: true })); diff --git a/dashboard/web/pages/VMs.css b/dashboard/web/pages/VMs.css index 43b3386cb626bc2af116cab51f1fe77092b79259..e073c00e6c44aa69de9dd15661a30bf420749b97 100644 --- a/dashboard/web/pages/VMs.css +++ b/dashboard/web/pages/VMs.css @@ -132,6 +132,12 @@ .vm-active .list-body.flush { margin: 0; padding: 0; overflow: hidden; } .vm-active .list-body.flush > .vm-workspace { margin: 0; flex: 1; min-height: 0; } .vm-workspace { display: flex; flex-direction: column; } +.vm-home { display: none; } +@media (max-width: 640px) { + .shell:has(.vm-active) { grid-template-columns: minmax(0, 1fr); } + .shell:has(.vm-active) > .sidebar { display: none; } + .vm-home { display: inline-flex; } +} .vm-console-screen[hidden] { display: none; } .vm-workspace .vm-detail { padding: 20px var(--gutter); overflow: auto; flex: 1; min-height: 0; } .vm-menu { position: relative; font-size: 12px; } diff --git a/dashboard/web/pages/VMs.tsx b/dashboard/web/pages/VMs.tsx index 75167d16c9305cf9832d667b28e1bdddc7505699..96f573443acd3e6b078e3b803142287d6c6a09b9 100644 --- a/dashboard/web/pages/VMs.tsx +++ b/dashboard/web/pages/VMs.tsx @@ -633,6 +633,7 @@ export function VMs() { }>{(name) => { const [access] = createResource(() => name, (name) => parseResponse(api.vms[":name"].access.$get({ param: { name } }))); + const login = lastGood(access); const [consoleOpened, setConsoleOpened] = createSignal(false); createEffect(() => { if (activeTab() === "console") setConsoleOpened(true); }); return vm.name === name)} fallback={ @@ -644,9 +645,10 @@ export function VMs() { clipboard={vm().capabilities.includes("clipboard") ? async (text) => { await parseResponse(api.vms[":name"].clipboard.$post({ param: { name }, json: { text } })); } : undefined} content={(toolbar) => <> - + } toolbar={<> + @@ -668,9 +670,9 @@ export function VMs() { }}> - {(login) => - - + {(credentials) => + + } } /> };