harness: add /screen page and /screen/ws WebSocket VNC relay
Reads /etc/hyperhive/gui.json at startup to get the VNC port written by the weston-vnc ExecStart script (issue #50). Adds: - gui_vnc_port: Option<u16> on AppState - gui_enabled: bool on StateSnapshot (for issue #52 screen link) - GET /screen: serves a minimal RFB-over-WebSocket viewer (screen.html) - GET /screen/ws: upgrades to WebSocket and byte-pumps to 127.0.0.1:<vnc_port> The relay is a pure two-task byte pump (WS→TCP and TCP→WS), transparent to any RFB variant including VeNCrypt. Returns 404 when gui is not enabled. screen.html is a self-contained RFB client: handshake, FramebufferUpdate (Raw encoding), pointer and keyboard forwarding — enough to display the desktop and interact with it. noVNC assets (issue #52) replace this. Closes #51
This commit is contained in:
iris
Mara
parent
29df223650
commit
2027e94432
5 changed files with 651 additions and 1 deletions
206
Cargo.lock
generated
206
Cargo.lock
generated
|
|
@ -106,6 +106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
|
checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"axum-core",
|
"axum-core",
|
||||||
|
"base64",
|
||||||
"bytes",
|
"bytes",
|
||||||
"form_urlencoded",
|
"form_urlencoded",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
|
|
@ -124,8 +125,10 @@ dependencies = [
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_path_to_error",
|
"serde_path_to_error",
|
||||||
"serde_urlencoded",
|
"serde_urlencoded",
|
||||||
|
"sha1",
|
||||||
"sync_wrapper",
|
"sync_wrapper",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"tokio-tungstenite",
|
||||||
"tower",
|
"tower",
|
||||||
"tower-layer",
|
"tower-layer",
|
||||||
"tower-service",
|
"tower-service",
|
||||||
|
|
@ -151,12 +154,27 @@ dependencies = [
|
||||||
"tracing",
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "base64"
|
||||||
|
version = "0.22.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "2.11.1"
|
version = "2.11.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "block-buffer"
|
||||||
|
version = "0.10.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
|
||||||
|
dependencies = [
|
||||||
|
"generic-array",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.20.2"
|
version = "3.20.2"
|
||||||
|
|
@ -249,6 +267,25 @@ version = "0.8.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cpufeatures"
|
||||||
|
version = "0.2.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crypto-common"
|
||||||
|
version = "0.1.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
|
||||||
|
dependencies = [
|
||||||
|
"generic-array",
|
||||||
|
"typenum",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "darling"
|
name = "darling"
|
||||||
version = "0.23.0"
|
version = "0.23.0"
|
||||||
|
|
@ -283,6 +320,22 @@ dependencies = [
|
||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "data-encoding"
|
||||||
|
version = "2.11.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "digest"
|
||||||
|
version = "0.10.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
|
||||||
|
dependencies = [
|
||||||
|
"block-buffer",
|
||||||
|
"crypto-common",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dyn-clone"
|
name = "dyn-clone"
|
||||||
version = "1.0.20"
|
version = "1.0.20"
|
||||||
|
|
@ -420,6 +473,28 @@ dependencies = [
|
||||||
"slab",
|
"slab",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "generic-array"
|
||||||
|
version = "0.14.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
|
||||||
|
dependencies = [
|
||||||
|
"typenum",
|
||||||
|
"version_check",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "getrandom"
|
||||||
|
version = "0.3.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"libc",
|
||||||
|
"r-efi",
|
||||||
|
"wasip2",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
version = "0.15.5"
|
version = "0.15.5"
|
||||||
|
|
@ -451,6 +526,7 @@ dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"axum",
|
"axum",
|
||||||
"clap",
|
"clap",
|
||||||
|
"futures-util",
|
||||||
"hive-fr0nt",
|
"hive-fr0nt",
|
||||||
"hive-sh4re",
|
"hive-sh4re",
|
||||||
"rmcp",
|
"rmcp",
|
||||||
|
|
@ -749,6 +825,15 @@ version = "0.3.33"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
|
checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ppv-lite86"
|
||||||
|
version = "0.2.21"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
|
||||||
|
dependencies = [
|
||||||
|
"zerocopy",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.106"
|
version = "1.0.106"
|
||||||
|
|
@ -767,6 +852,41 @@ dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "r-efi"
|
||||||
|
version = "5.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.9.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
|
||||||
|
dependencies = [
|
||||||
|
"rand_chacha",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
|
||||||
|
dependencies = [
|
||||||
|
"ppv-lite86",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.9.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ref-cast"
|
name = "ref-cast"
|
||||||
version = "1.0.25"
|
version = "1.0.25"
|
||||||
|
|
@ -967,6 +1087,17 @@ dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sha1"
|
||||||
|
version = "0.10.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"cpufeatures",
|
||||||
|
"digest",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sharded-slab"
|
name = "sharded-slab"
|
||||||
version = "0.1.7"
|
version = "0.1.7"
|
||||||
|
|
@ -1105,6 +1236,18 @@ dependencies = [
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tokio-tungstenite"
|
||||||
|
version = "0.29.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c"
|
||||||
|
dependencies = [
|
||||||
|
"futures-util",
|
||||||
|
"log",
|
||||||
|
"tokio",
|
||||||
|
"tungstenite",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-util"
|
name = "tokio-util"
|
||||||
version = "0.7.18"
|
version = "0.7.18"
|
||||||
|
|
@ -1208,6 +1351,28 @@ dependencies = [
|
||||||
"tracing-log",
|
"tracing-log",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "tungstenite"
|
||||||
|
version = "0.29.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8"
|
||||||
|
dependencies = [
|
||||||
|
"bytes",
|
||||||
|
"data-encoding",
|
||||||
|
"http",
|
||||||
|
"httparse",
|
||||||
|
"log",
|
||||||
|
"rand",
|
||||||
|
"sha1",
|
||||||
|
"thiserror",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "typenum"
|
||||||
|
version = "1.20.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.24"
|
version = "1.0.24"
|
||||||
|
|
@ -1232,12 +1397,27 @@ version = "0.2.15"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "version_check"
|
||||||
|
version = "0.9.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasi"
|
name = "wasi"
|
||||||
version = "0.11.1+wasi-snapshot-preview1"
|
version = "0.11.1+wasi-snapshot-preview1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasip2"
|
||||||
|
version = "1.0.3+wasi-0.2.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
|
||||||
|
dependencies = [
|
||||||
|
"wit-bindgen",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.121"
|
version = "0.2.121"
|
||||||
|
|
@ -1351,6 +1531,32 @@ dependencies = [
|
||||||
"windows-link",
|
"windows-link",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wit-bindgen"
|
||||||
|
version = "0.57.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zerocopy"
|
||||||
|
version = "0.8.48"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
|
||||||
|
dependencies = [
|
||||||
|
"zerocopy-derive",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "zerocopy-derive"
|
||||||
|
version = "0.8.48"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zmij"
|
name = "zmij"
|
||||||
version = "1.0.21"
|
version = "1.0.21"
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ must_use_candidate = "allow"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
axum = "0.8"
|
axum = { version = "0.8", features = ["ws"] }
|
||||||
clap = { version = "4", features = ["derive"] }
|
clap = { version = "4", features = ["derive"] }
|
||||||
hive-fr0nt = { path = "hive-fr0nt" }
|
hive-fr0nt = { path = "hive-fr0nt" }
|
||||||
hive-sh4re = { path = "hive-sh4re" }
|
hive-sh4re = { path = "hive-sh4re" }
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ workspace = true
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
axum.workspace = true
|
axum.workspace = true
|
||||||
|
futures-util = "0.3"
|
||||||
clap.workspace = true
|
clap.workspace = true
|
||||||
hive-fr0nt.workspace = true
|
hive-fr0nt.workspace = true
|
||||||
hive-sh4re.workspace = true
|
hive-sh4re.workspace = true
|
||||||
|
|
|
||||||
345
hive-ag3nt/assets/screen.html
Normal file
345
hive-ag3nt/assets/screen.html
Normal file
|
|
@ -0,0 +1,345 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>screen</title>
|
||||||
|
<style>
|
||||||
|
/* Catppuccin Mocha palette (mirrors base.css) */
|
||||||
|
:root {
|
||||||
|
--base: #1e1e2e;
|
||||||
|
--mantle: #181825;
|
||||||
|
--crust: #11111b;
|
||||||
|
--text: #cdd6f4;
|
||||||
|
--subtext0:#a6adc8;
|
||||||
|
--surface0:#313244;
|
||||||
|
--surface1:#45475a;
|
||||||
|
--blue: #89b4fa;
|
||||||
|
--red: #f38ba8;
|
||||||
|
--green: #a6e3a1;
|
||||||
|
--yellow: #f9e2af;
|
||||||
|
}
|
||||||
|
*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
|
html, body { height: 100%; background: var(--base); color: var(--text);
|
||||||
|
font-family: 'JetBrains Mono', 'Fira Code', ui-monospace, monospace;
|
||||||
|
font-size: 14px; }
|
||||||
|
#toolbar {
|
||||||
|
display: flex; align-items: center; gap: 0.75rem;
|
||||||
|
padding: 0.4rem 0.75rem; background: var(--mantle);
|
||||||
|
border-bottom: 1px solid var(--surface0);
|
||||||
|
}
|
||||||
|
#toolbar a { color: var(--blue); text-decoration: none; font-size: 0.85rem; }
|
||||||
|
#toolbar a:hover { text-decoration: underline; }
|
||||||
|
#status { margin-left: auto; font-size: 0.75rem; color: var(--subtext0); }
|
||||||
|
#status.connected { color: var(--green); }
|
||||||
|
#status.error { color: var(--red); }
|
||||||
|
#canvas-wrap {
|
||||||
|
display: flex; justify-content: center; align-items: flex-start;
|
||||||
|
width: 100%; height: calc(100% - 36px); overflow: auto;
|
||||||
|
background: var(--crust);
|
||||||
|
}
|
||||||
|
canvas { display: block; cursor: default; }
|
||||||
|
#msg {
|
||||||
|
position: fixed; bottom: 1rem; left: 50%; transform: translateX(-50%);
|
||||||
|
background: var(--surface0); color: var(--yellow); border-radius: 6px;
|
||||||
|
padding: 0.4rem 0.9rem; font-size: 0.8rem;
|
||||||
|
opacity: 0; transition: opacity 0.3s;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="toolbar">
|
||||||
|
<strong>🖥 screen</strong>
|
||||||
|
<a href="/" title="back to agent page">← agent</a>
|
||||||
|
<span id="status">connecting…</span>
|
||||||
|
</div>
|
||||||
|
<div id="canvas-wrap"><canvas id="c"></canvas></div>
|
||||||
|
<div id="msg"></div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
// Minimal RFB-over-WebSocket renderer.
|
||||||
|
// Connects to /screen/ws on the same host; the harness relays raw
|
||||||
|
// RFB bytes to the VNC server running inside the container.
|
||||||
|
//
|
||||||
|
// This is a deliberately thin implementation — enough to display the
|
||||||
|
// desktop and forward pointer + keyboard events. For a production-grade
|
||||||
|
// viewer, replace with noVNC (issue #52 vendors the full bundle).
|
||||||
|
|
||||||
|
(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
const canvas = document.getElementById('c');
|
||||||
|
const ctx = canvas.getContext('2d');
|
||||||
|
const status = document.getElementById('status');
|
||||||
|
const msg = document.getElementById('msg');
|
||||||
|
|
||||||
|
function setStatus(text, cls) {
|
||||||
|
status.textContent = text;
|
||||||
|
status.className = cls || '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function flash(text) {
|
||||||
|
msg.textContent = text;
|
||||||
|
msg.style.opacity = '1';
|
||||||
|
setTimeout(() => { msg.style.opacity = '0'; }, 2500);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- WebSocket connection ---
|
||||||
|
const proto = location.protocol === 'https:' ? 'wss' : 'ws';
|
||||||
|
const ws = new WebSocket(`${proto}://${location.host}/screen/ws`);
|
||||||
|
ws.binaryType = 'arraybuffer';
|
||||||
|
|
||||||
|
ws.onopen = () => setStatus('connected', 'connected');
|
||||||
|
ws.onerror = () => setStatus('connection error', 'error');
|
||||||
|
ws.onclose = (e) => {
|
||||||
|
setStatus(`disconnected (${e.code})`, 'error');
|
||||||
|
flash('VNC disconnected — reload to reconnect');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Accumulate received bytes in a simple ring queue
|
||||||
|
const chunks = [];
|
||||||
|
let totalBytes = 0;
|
||||||
|
|
||||||
|
ws.onmessage = (ev) => {
|
||||||
|
chunks.push(new Uint8Array(ev.data));
|
||||||
|
totalBytes += ev.data.byteLength;
|
||||||
|
processRfb();
|
||||||
|
};
|
||||||
|
|
||||||
|
// --- Minimal RFB state machine ---
|
||||||
|
// We implement just enough to handshake and receive FramebufferUpdate
|
||||||
|
// rectangles encoded as Raw (encoding 0). Other encodings are skipped.
|
||||||
|
// Keyboard and pointer events are forwarded.
|
||||||
|
|
||||||
|
let state = 'version';
|
||||||
|
let fbW = 0, fbH = 0;
|
||||||
|
let pixelFormat = null; // set after ServerInit
|
||||||
|
let updateRects = 0;
|
||||||
|
|
||||||
|
// Drain bytes from the queue into a flat buffer view
|
||||||
|
function drainTo(n) {
|
||||||
|
if (totalBytes < n) return null;
|
||||||
|
const out = new Uint8Array(n);
|
||||||
|
let off = 0;
|
||||||
|
while (off < n) {
|
||||||
|
const c = chunks[0];
|
||||||
|
const take = Math.min(c.length, n - off);
|
||||||
|
out.set(c.subarray(0, take), off);
|
||||||
|
off += take;
|
||||||
|
if (take === c.length) {
|
||||||
|
chunks.shift();
|
||||||
|
} else {
|
||||||
|
chunks[0] = c.subarray(take);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
totalBytes -= n;
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
function send(data) {
|
||||||
|
if (ws.readyState === WebSocket.OPEN) ws.send(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
function u32be(b, o) { return ((b[o]<<24)|(b[o+1]<<16)|(b[o+2]<<8)|b[o+3])>>>0; }
|
||||||
|
function u16be(b, o) { return ((b[o]<<8)|b[o+1])>>>0; }
|
||||||
|
|
||||||
|
function processRfb() {
|
||||||
|
while (true) {
|
||||||
|
if (!tryStep()) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function tryStep() {
|
||||||
|
switch (state) {
|
||||||
|
case 'version': {
|
||||||
|
const b = drainTo(12);
|
||||||
|
if (!b) return false;
|
||||||
|
// Send back same version (RFB 003.008)
|
||||||
|
send(new TextEncoder().encode('RFB 003.008\n'));
|
||||||
|
state = 'security-types';
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 'security-types': {
|
||||||
|
const b = drainTo(1);
|
||||||
|
if (!b) return false;
|
||||||
|
const n = b[0];
|
||||||
|
if (n === 0) { state = 'error'; return false; }
|
||||||
|
const types = drainTo(n);
|
||||||
|
if (!types) { chunks.unshift(b); totalBytes += 1; return false; }
|
||||||
|
// Prefer type 1 (None), else use first offered
|
||||||
|
const prefer = types.indexOf(1) !== -1 ? 1 : types[0];
|
||||||
|
send(new Uint8Array([prefer]));
|
||||||
|
state = prefer === 1 ? 'security-result' : 'security-vnc-challenge';
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 'security-vnc-challenge': {
|
||||||
|
// VNC auth: skip challenge bytes, respond with zeros (will fail,
|
||||||
|
// but we're in plain-RFB mode for hyperhive — see weston-vnc.nix)
|
||||||
|
const b = drainTo(16);
|
||||||
|
if (!b) return false;
|
||||||
|
send(new Uint8Array(16));
|
||||||
|
state = 'security-result';
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 'security-result': {
|
||||||
|
const b = drainTo(4);
|
||||||
|
if (!b) return false;
|
||||||
|
if (u32be(b, 0) !== 0) { setStatus('auth failed', 'error'); return false; }
|
||||||
|
// ClientInit: shared flag = 1
|
||||||
|
send(new Uint8Array([1]));
|
||||||
|
state = 'server-init';
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 'server-init': {
|
||||||
|
const b = drainTo(24);
|
||||||
|
if (!b) return false;
|
||||||
|
fbW = u16be(b, 0); fbH = u16be(b, 1);
|
||||||
|
// pixel format: bpp=b[4], depth=b[5], big-endian=b[6], true-colour=b[7]
|
||||||
|
// red/green/blue max/shift at b[8..17]
|
||||||
|
pixelFormat = {
|
||||||
|
bpp: b[4], depth: b[5], bigEndian: b[6], trueColour: b[7],
|
||||||
|
redMax: u16be(b, 8), greenMax: u16be(b, 10), blueMax: u16be(b, 12),
|
||||||
|
redShift: b[14], greenShift: b[15], blueShift: b[16],
|
||||||
|
bytesPerPixel: b[4] / 8,
|
||||||
|
};
|
||||||
|
const nameLen = u32be(b, 20);
|
||||||
|
const nameBytes = drainTo(nameLen);
|
||||||
|
if (!nameBytes) { chunks.unshift(b); totalBytes += 24; return false; }
|
||||||
|
canvas.width = fbW;
|
||||||
|
canvas.height = fbH;
|
||||||
|
setStatus('connected', 'connected');
|
||||||
|
// Request full framebuffer update
|
||||||
|
requestUpdate(0, 0, 0, fbW, fbH);
|
||||||
|
state = 'normal';
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 'normal': {
|
||||||
|
const b = drainTo(1);
|
||||||
|
if (!b) return false;
|
||||||
|
const msgType = b[0];
|
||||||
|
if (msgType === 0) {
|
||||||
|
// FramebufferUpdate
|
||||||
|
const hdr = drainTo(3);
|
||||||
|
if (!hdr) { chunks.unshift(b); totalBytes += 1; return false; }
|
||||||
|
drainTo(1); // padding (already consumed with hdr? no — hdr is 3 bytes after the type)
|
||||||
|
// Actually: message type (1) + padding (1) + nRects (2) = 4 bytes total after type byte
|
||||||
|
// Let's re-do: type byte consumed, then 1 pad + 2 nRects = 3 bytes
|
||||||
|
updateRects = u16be(hdr, 1);
|
||||||
|
state = 'rect-header';
|
||||||
|
} else if (msgType === 2) {
|
||||||
|
// Bell: ignore
|
||||||
|
} else if (msgType === 3) {
|
||||||
|
// ServerCutText
|
||||||
|
const hdr = drainTo(7);
|
||||||
|
if (!hdr) { chunks.unshift(b); totalBytes += 1; return false; }
|
||||||
|
const len = u32be(hdr, 3);
|
||||||
|
const text = drainTo(len);
|
||||||
|
if (!text) { chunks.unshift(b); totalBytes += 1 + 7; return false; }
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
case 'rect-header': {
|
||||||
|
if (updateRects === 0) { state = 'normal'; requestUpdate(1, 0, 0, fbW, fbH); return true; }
|
||||||
|
const b = drainTo(12);
|
||||||
|
if (!b) return false;
|
||||||
|
const x = u16be(b, 0), y = u16be(b, 2), w = u16be(b, 4), h = u16be(b, 6);
|
||||||
|
const enc = (b[8]<<24|b[9]<<16|b[10]<<8|b[11])>>>0;
|
||||||
|
if (enc === 0 && pixelFormat) {
|
||||||
|
const bytes = w * h * pixelFormat.bytesPerPixel;
|
||||||
|
const pixels = drainTo(bytes);
|
||||||
|
if (!pixels) { chunks.unshift(b); totalBytes += 12; return false; }
|
||||||
|
drawRaw(x, y, w, h, pixels);
|
||||||
|
}
|
||||||
|
updateRects--;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
default: return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function drawRaw(x, y, w, h, data) {
|
||||||
|
if (!pixelFormat || w === 0 || h === 0) return;
|
||||||
|
const bpp = pixelFormat.bytesPerPixel;
|
||||||
|
const img = ctx.createImageData(w, h);
|
||||||
|
const d = img.data;
|
||||||
|
const rs = pixelFormat.redShift, gs = pixelFormat.greenShift, bs = pixelFormat.blueShift;
|
||||||
|
for (let i = 0, o = 0; i < w * h; i++, o += bpp) {
|
||||||
|
let px = 0;
|
||||||
|
if (bpp === 4) px = pixelFormat.bigEndian
|
||||||
|
? (data[o]<<24|data[o+1]<<16|data[o+2]<<8|data[o+3])>>>0
|
||||||
|
: (data[o+3]<<24|data[o+2]<<16|data[o+1]<<8|data[o])>>>0;
|
||||||
|
else if (bpp === 2) px = pixelFormat.bigEndian
|
||||||
|
? (data[o]<<8|data[o+1])>>>0 : (data[o+1]<<8|data[o])>>>0;
|
||||||
|
else px = data[o];
|
||||||
|
d[i*4] = (px >> rs) & pixelFormat.redMax;
|
||||||
|
d[i*4+1] = (px >> gs) & pixelFormat.greenMax;
|
||||||
|
d[i*4+2] = (px >> bs) & pixelFormat.blueMax;
|
||||||
|
d[i*4+3] = 255;
|
||||||
|
}
|
||||||
|
ctx.putImageData(img, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
function requestUpdate(incremental, x, y, w, h) {
|
||||||
|
const b = new Uint8Array(10);
|
||||||
|
b[0] = 3; b[1] = incremental;
|
||||||
|
b[2] = x>>8; b[3] = x&0xff;
|
||||||
|
b[4] = y>>8; b[5] = y&0xff;
|
||||||
|
b[6] = w>>8; b[7] = w&0xff;
|
||||||
|
b[8] = h>>8; b[9] = h&0xff;
|
||||||
|
send(b);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Input forwarding ---
|
||||||
|
canvas.addEventListener('mousemove', sendPointer);
|
||||||
|
canvas.addEventListener('mousedown', sendPointer);
|
||||||
|
canvas.addEventListener('mouseup', sendPointer);
|
||||||
|
|
||||||
|
function sendPointer(ev) {
|
||||||
|
const r = canvas.getBoundingClientRect();
|
||||||
|
const x = Math.max(0, Math.min(fbW-1, ev.clientX - r.left));
|
||||||
|
const y = Math.max(0, Math.min(fbH-1, ev.clientY - r.top));
|
||||||
|
let mask = 0;
|
||||||
|
if (ev.buttons & 1) mask |= 1;
|
||||||
|
if (ev.buttons & 4) mask |= 2;
|
||||||
|
if (ev.buttons & 2) mask |= 4;
|
||||||
|
const b = new Uint8Array(6);
|
||||||
|
b[0] = 5; b[1] = mask;
|
||||||
|
b[2] = x>>8; b[3] = x&0xff;
|
||||||
|
b[4] = y>>8; b[5] = y&0xff;
|
||||||
|
send(b);
|
||||||
|
}
|
||||||
|
|
||||||
|
document.addEventListener('keydown', (ev) => sendKey(ev, 1));
|
||||||
|
document.addEventListener('keyup', (ev) => sendKey(ev, 0));
|
||||||
|
|
||||||
|
function sendKey(ev, down) {
|
||||||
|
ev.preventDefault();
|
||||||
|
const key = rfbKeysym(ev);
|
||||||
|
const b = new Uint8Array(8);
|
||||||
|
b[0] = 4; b[1] = down; b[2] = 0; b[3] = 0;
|
||||||
|
b[4] = key>>24; b[5] = (key>>16)&0xff; b[6] = (key>>8)&0xff; b[7] = key&0xff;
|
||||||
|
send(b);
|
||||||
|
}
|
||||||
|
|
||||||
|
function rfbKeysym(ev) {
|
||||||
|
// Map common keys to X11 keysym values
|
||||||
|
const map = {
|
||||||
|
'BackSpace': 0xff08, 'Tab': 0xff09, 'Enter': 0xff0d, 'Escape': 0xff1b,
|
||||||
|
'Delete': 0xffff, 'Home': 0xff50, 'End': 0xff57, 'PageUp': 0xff55,
|
||||||
|
'PageDown': 0xff56, 'ArrowLeft': 0xff51, 'ArrowUp': 0xff52,
|
||||||
|
'ArrowRight': 0xff53, 'ArrowDown': 0xff54,
|
||||||
|
'Shift': 0xffe1, 'Control': 0xffe3, 'Alt': 0xffe9, 'Meta': 0xffe7,
|
||||||
|
'F1': 0xffbe, 'F2': 0xffbf, 'F3': 0xffc0, 'F4': 0xffc1,
|
||||||
|
'F5': 0xffc2, 'F6': 0xffc3, 'F7': 0xffc4, 'F8': 0xffc5,
|
||||||
|
'F9': 0xffc6, 'F10': 0xffc7, 'F11': 0xffc8, 'F12': 0xffc9,
|
||||||
|
};
|
||||||
|
if (map[ev.key]) return map[ev.key];
|
||||||
|
if (ev.key.length === 1) return ev.key.codePointAt(0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
@ -22,6 +22,7 @@ use axum::{
|
||||||
routing::{get, post},
|
routing::{get, post},
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
||||||
use tokio_stream::{Stream, StreamExt, wrappers::BroadcastStream};
|
use tokio_stream::{Stream, StreamExt, wrappers::BroadcastStream};
|
||||||
|
|
||||||
use crate::client;
|
use crate::client;
|
||||||
|
|
@ -56,6 +57,9 @@ struct AppState {
|
||||||
files: TurnFiles,
|
files: TurnFiles,
|
||||||
/// Prevents `/api/compact` from racing with an in-flight normal turn.
|
/// Prevents `/api/compact` from racing with an in-flight normal turn.
|
||||||
turn_lock: TurnLock,
|
turn_lock: TurnLock,
|
||||||
|
/// VNC port read from `/etc/hyperhive/gui.json` at startup.
|
||||||
|
/// `None` when the file is absent (gui not enabled for this agent).
|
||||||
|
gui_vnc_port: Option<u16>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
impl AppState {
|
||||||
|
|
@ -80,6 +84,7 @@ pub async fn serve(
|
||||||
files: TurnFiles,
|
files: TurnFiles,
|
||||||
turn_lock: TurnLock,
|
turn_lock: TurnLock,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
|
let gui_vnc_port = read_gui_json();
|
||||||
let state = AppState {
|
let state = AppState {
|
||||||
label,
|
label,
|
||||||
login,
|
login,
|
||||||
|
|
@ -88,6 +93,7 @@ pub async fn serve(
|
||||||
socket,
|
socket,
|
||||||
files,
|
files,
|
||||||
turn_lock,
|
turn_lock,
|
||||||
|
gui_vnc_port,
|
||||||
};
|
};
|
||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.route("/", get(serve_index))
|
.route("/", get(serve_index))
|
||||||
|
|
@ -110,6 +116,8 @@ pub async fn serve(
|
||||||
.route("/stats", get(serve_stats))
|
.route("/stats", get(serve_stats))
|
||||||
.route("/static/stats.js", get(serve_stats_js))
|
.route("/static/stats.js", get(serve_stats_js))
|
||||||
.route("/api/stats", get(api_stats))
|
.route("/api/stats", get(api_stats))
|
||||||
|
.route("/screen", get(serve_screen))
|
||||||
|
.route("/screen/ws", get(screen_ws))
|
||||||
.with_state(state);
|
.with_state(state);
|
||||||
let addr = SocketAddr::from(([0, 0, 0, 0], port));
|
let addr = SocketAddr::from(([0, 0, 0, 0], port));
|
||||||
let listener = bind_with_retry(addr, "web UI").await?;
|
let listener = bind_with_retry(addr, "web UI").await?;
|
||||||
|
|
@ -215,6 +223,91 @@ async fn serve_stats_js() -> impl IntoResponse {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn serve_screen() -> impl IntoResponse {
|
||||||
|
(
|
||||||
|
[("content-type", "text/html; charset=utf-8")],
|
||||||
|
include_str!("../assets/screen.html"),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Read `/etc/hyperhive/gui.json` and extract the `vnc_port` field.
|
||||||
|
/// Returns `None` if the file is absent or unparseable — GUI not enabled.
|
||||||
|
fn read_gui_json() -> Option<u16> {
|
||||||
|
let text = std::fs::read_to_string("/etc/hyperhive/gui.json").ok()?;
|
||||||
|
let val: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||||
|
val["vnc_port"].as_u64().and_then(|p| u16::try_from(p).ok())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// WebSocket handler: upgrade then pump bytes between the WS client and
|
||||||
|
/// the VNC server on `127.0.0.1:<vnc_port>`. Returns 404 when gui is not
|
||||||
|
/// enabled for this agent.
|
||||||
|
async fn screen_ws(
|
||||||
|
ws: axum::extract::ws::WebSocketUpgrade,
|
||||||
|
State(state): State<AppState>,
|
||||||
|
) -> Response {
|
||||||
|
let Some(vnc_port) = state.gui_vnc_port else {
|
||||||
|
return (StatusCode::NOT_FOUND, "gui not enabled for this agent").into_response();
|
||||||
|
};
|
||||||
|
ws.on_upgrade(move |socket| relay_ws_vnc(socket, vnc_port))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Pure byte pump: forwards raw bytes between the WebSocket client and
|
||||||
|
/// the VNC TCP stream. Transparent to any RFB variant (plain, VeNCrypt).
|
||||||
|
async fn relay_ws_vnc(socket: axum::extract::ws::WebSocket, vnc_port: u16) {
|
||||||
|
// Import futures traits locally so they don't conflict with
|
||||||
|
// tokio_stream::StreamExt used at module scope.
|
||||||
|
use axum::extract::ws::Message;
|
||||||
|
use futures_util::{SinkExt, StreamExt as _};
|
||||||
|
|
||||||
|
let addr = format!("127.0.0.1:{vnc_port}");
|
||||||
|
let Ok(tcp) = tokio::net::TcpStream::connect(&addr).await else {
|
||||||
|
tracing::warn!(%addr, "screen/ws: could not connect to VNC server");
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
let (mut tcp_rx, mut tcp_tx) = tcp.into_split();
|
||||||
|
let (mut ws_tx, mut ws_rx) = socket.split();
|
||||||
|
|
||||||
|
// WS → TCP
|
||||||
|
let ws_to_tcp = tokio::spawn(async move {
|
||||||
|
while let Some(Ok(msg)) = futures_util::StreamExt::next(&mut ws_rx).await {
|
||||||
|
match msg {
|
||||||
|
Message::Binary(data) => {
|
||||||
|
if tcp_tx.write_all(&data).await.is_err() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Message::Close(_) => break,
|
||||||
|
_ => {} // ping/pong/text: ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// TCP → WS
|
||||||
|
let tcp_to_ws = tokio::spawn(async move {
|
||||||
|
let mut buf = vec![0u8; 8192];
|
||||||
|
loop {
|
||||||
|
match tcp_rx.read(&mut buf).await {
|
||||||
|
Ok(0) | Err(_) => break,
|
||||||
|
Ok(n) => {
|
||||||
|
if ws_tx
|
||||||
|
.send(Message::Binary(buf[..n].to_vec().into()))
|
||||||
|
.await
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Wait for either direction to close, then let both tasks drop.
|
||||||
|
tokio::select! {
|
||||||
|
_ = ws_to_tcp => {}
|
||||||
|
_ = tcp_to_ws => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
struct StatsQuery {
|
struct StatsQuery {
|
||||||
window: Option<String>,
|
window: Option<String>,
|
||||||
|
|
@ -271,6 +364,10 @@ struct StateSnapshot {
|
||||||
/// Cumulative token usage across the most recent turn's inferences
|
/// Cumulative token usage across the most recent turn's inferences
|
||||||
/// (cost signal). `null` until the first turn finishes.
|
/// (cost signal). `null` until the first turn finishes.
|
||||||
cost_usage: Option<crate::events::TokenUsage>,
|
cost_usage: Option<crate::events::TokenUsage>,
|
||||||
|
/// Whether the weston VNC compositor is configured for this agent
|
||||||
|
/// (i.e. `/etc/hyperhive/gui.json` was present at harness startup).
|
||||||
|
/// When true, the UI may render a `🖥 screen` link to `/screen`.
|
||||||
|
gui_enabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
|
|
@ -367,6 +464,7 @@ async fn api_state(State(state): State<AppState>) -> axum::Json<StateSnapshot> {
|
||||||
model,
|
model,
|
||||||
ctx_usage,
|
ctx_usage,
|
||||||
cost_usage,
|
cost_usage,
|
||||||
|
gui_enabled: state.gui_vnc_port.is_some(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue