lda/wakey
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 18 Wiki Activity

(tried to) prioritize terminal input

Browse Source 
refresh interactive sessions
This commit is contained in:
lda
2026-07-15 09:17:01 +07:00 Verified
parent f459bb6914
commit 7ac482431a
7 changed files with 206 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wakey-agent/src/protocol.rs
+3
View File
@@ -57,6 +57,7 @@ pub struct AgentTerminalSession {
#[serde(tag = "type", rename_all = "snake_case")]
pub enum TerminalControl {
Resize { rows: u16, cols: u16 },
Refresh,
Ready,
Exited { exit_code: Option<i32> },
Error { code: String, message: String },
@@ -335,6 +336,8 @@ mod tests {
};
let json = serde_json::to_string(&resize).expect("serialize resize");
assert_eq!(json, r#"{"type":"resize","rows":40,"cols":160}"#);
let refresh = serde_json::to_string(&TerminalControl::Refresh).expect("serialize refresh");
assert_eq!(refresh, r#"{"type":"refresh"}"#);
let inventory = ClientMessage::TerminalSessions {
sessions: vec![AgentTerminalSession {
wakey-agent/src/terminal.rs
+63 -52
View File
@@ -178,11 +178,7 @@ async fn run_terminal(
return Err(err);
}
};
let wakey::wakey_linux::terminal::TerminalPty {
mut reader,
mut writer,
mut child,
} = terminal;
let (mut reader, mut writer, mut child) = terminal.into_parts();
let process_group = child.id();
info!(terminal_id = %terminal_id, shell = %config.terminal.shell.display(), "terminal PTY ready");
@@ -197,6 +193,7 @@ async fn run_terminal(
let mut observed_status = None;
loop {
tokio::select! {
biased;
_ = &mut cancel => {
requested_close = true;
break;
@@ -205,18 +202,42 @@ async fn run_terminal(
observed_status = Some(status.context("failed waiting for terminal child")?);
break;
}
read = reader.read(&mut output) => {
match read {
Ok(0) => break,
Ok(count) => send_terminal_output(
Message::Binary(output[..count].to_vec().into()),
&mut relay_output,
&mut replay,
&mut replay_bytes,
).await,
// Linux PTY masters commonly report EIO after the slave closes.
Err(err) if err.raw_os_error() == Some(5) => break,
Err(err) => return Err(err).context("failed to read PTY output"),
incoming = relay_input_rx.recv() => {
let Some(message) = incoming else { break; };
match message {
RelayInput::Binary { generation, bytes } if generation == relay_generation => {
if bytes.len() > MAX_TERMINAL_FRAME_BYTES {
anyhow::bail!("terminal input frame exceeds size limit");
}
writer.write_all(&bytes).await.context("failed to write PTY input")?;
}
RelayInput::Resize { generation, rows, cols } if generation == relay_generation => {
validate_size(rows, cols)?;
writer.resize(rows, cols)?;
}
RelayInput::Refresh { generation } if generation == relay_generation => {
if let Err(err) = writer.refresh() {
warn!(terminal_id = %terminal_id, error = %err, "terminal redraw signal failed");
}
}
RelayInput::Close { generation } if generation == relay_generation => {
requested_close = true;
break;
}
RelayInput::Connected { generation, output } if generation == relay_generation => {
relay_output = Some(output.clone());
while let Some(frame) = replay.pop_front() {
replay_bytes = replay_bytes.saturating_sub(message_size(&frame));
if output.send(frame).await.is_err() {
relay_output = None;
break;
}
}
}
RelayInput::Disconnected { generation } if generation == relay_generation => {
relay_output = None;
}
_ => {}
}
}
credential = relay_credentials.recv() => {
@@ -249,37 +270,18 @@ async fn run_terminal(
let _ = relay_input_tx.send(RelayInput::Disconnected { generation });
}));
}
incoming = relay_input_rx.recv() => {
let Some(message) = incoming else { break; };
match message {
RelayInput::Binary { generation, bytes } if generation == relay_generation => {
if bytes.len() > MAX_TERMINAL_FRAME_BYTES {
anyhow::bail!("terminal input frame exceeds size limit");
}
writer.write_all(&bytes).await.context("failed to write PTY input")?;
}
RelayInput::Resize { generation, rows, cols } if generation == relay_generation => {
validate_size(rows, cols)?;
wakey::wakey_linux::terminal::resize_terminal(&writer, rows, cols)?;
}
RelayInput::Close { generation } if generation == relay_generation => {
requested_close = true;
break;
}
RelayInput::Connected { generation, output } if generation == relay_generation => {
relay_output = Some(output.clone());
while let Some(frame) = replay.pop_front() {
replay_bytes = replay_bytes.saturating_sub(message_size(&frame));
if output.send(frame).await.is_err() {
relay_output = None;
break;
}
}
}
RelayInput::Disconnected { generation } if generation == relay_generation => {
relay_output = None;
}
_ => {}
read = reader.read(&mut output) => {
match read {
Ok(0) => break,
Ok(count) => send_terminal_output(
Message::Binary(output[..count].to_vec().into()),
&mut relay_output,
&mut replay,
&mut replay_bytes,
).await,
// Linux PTY masters commonly report EIO after the slave closes.
Err(err) if err.raw_os_error() == Some(5) => break,
Err(err) => return Err(err).context("failed to read PTY output"),
}
}
}
@@ -315,6 +317,9 @@ enum RelayInput {
rows: u16,
cols: u16,
},
Refresh {
generation: u64,
},
Close {
generation: u64,
},
@@ -367,10 +372,7 @@ async fn run_terminal_relay(relay: RelayConnection) -> Result<()> {
let mut output = relay.output_rx;
loop {
tokio::select! {
outgoing = output.recv() => {
let Some(message) = outgoing else { break; };
sink.send(message).await.context("failed to send terminal relay output")?;
}
biased;
incoming = source.next() => {
let Some(message) = incoming else { break; };
match message.context("terminal relay websocket receive failed")? {
@@ -391,6 +393,11 @@ async fn run_terminal_relay(relay: RelayConnection) -> Result<()> {
})
.map_err(|_| anyhow::anyhow!("terminal worker stopped"))?;
}
TerminalControl::Refresh => {
relay.input.send(RelayInput::Refresh {
generation: relay.generation,
}).map_err(|_| anyhow::anyhow!("terminal worker stopped"))?;
}
TerminalControl::Close => {
let _ = relay.input.send(RelayInput::Close {
generation: relay.generation,
@@ -407,6 +414,10 @@ async fn run_terminal_relay(relay: RelayConnection) -> Result<()> {
Message::Frame(_) => {}
}
}
outgoing = output.recv() => {
let Some(message) = outgoing else { break; };
sink.send(message).await.context("failed to send terminal relay output")?;
}
}
}
Ok(())