diff options
| author | Ogulcan Celik <ogulcancelik@gmail.com> | 2026-07-15 02:32:52 +0300 |
|---|---|---|
| committer | Ogulcan Celik <ogulcancelik@gmail.com> | 2026-07-15 02:32:52 +0300 |
| commit | 88370e1516182ab519d22a12fa82d5780a40fee6 (patch) | |
| tree | b07be9b77abe14cdd3c1ff0e9acc1268729d8723 /src/server/headless | |
| parent | 5d24d0d214d05858e344a9e15a63856dc1328eae (diff) | |
feat: add isolated pane graphics streaming
Diffstat (limited to 'src/server/headless')
| -rw-r--r-- | src/server/headless/pane_graphics.rs | 200 | ||||
| -rw-r--r-- | src/server/headless/tests/pane_graphics.rs | 357 |
2 files changed, 557 insertions, 0 deletions
diff --git a/src/server/headless/pane_graphics.rs b/src/server/headless/pane_graphics.rs new file mode 100644 index 00000000..18174f45 --- /dev/null +++ b/src/server/headless/pane_graphics.rs @@ -0,0 +1,200 @@ +use tracing::warn; + +use super::{HeadlessServer, RenderImpact}; +use crate::api; +use crate::protocol::{ServerMessage, MAX_GRAPHICS_FRAME_SIZE}; +use crate::server::clients::{render_targets, ClientConnectionMode, DeferredRender}; + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(super) enum RetainedGraphicsOutcome { + Sent, + Deferred, + Fallback, +} + +pub(super) fn frame_pane_graphics_for_client(bytes: Vec<u8>) -> Vec<u8> { + if bytes.is_empty() { + return bytes; + } + let mut framed = Vec::with_capacity(bytes.len() + 4); + framed.extend_from_slice(b"\x1b7"); + framed.extend_from_slice(&bytes); + framed.extend_from_slice(b"\x1b8"); + framed +} + +impl HeadlessServer { + pub(super) fn pane_graphics_runtime_active(&self) -> bool { + !self.app.state.pane_graphics_layers.is_empty() + || !self.app.state.pane_graphics_streams.is_empty() + } + + pub(super) fn cancel_inactive_pane_graphics_streams(&self) { + api::cancel_inactive_pane_graphics_streams(|owner| { + self.app + .state + .pane_graphics_streams + .values() + .any(|active_owner| active_owner == owner) + }); + } + + pub(super) fn handle_pane_graphics_stream_frame( + &mut self, + msg: api::ApiRequestMessage, + ) -> RenderImpact { + if self.shutting_down { + let _ = self.handle_api_request_with_shutdown_check_inner(msg, false); + return RenderImpact::None; + } + + let internal_changed = self.drain_all_internal_events_with_forwarding(); + let response = self + .app + .handle_api_request_after_internal_events_drained(msg.request); + let succeeded = serde_json::from_str::<api::schema::SuccessResponse>(&response).is_ok(); + let _ = msg.respond_to.send(response); + + if internal_changed { + RenderImpact::Full + } else if succeeded { + RenderImpact::Graphics + } else { + RenderImpact::None + } + } + + pub(super) fn render_retained_graphics_update_and_stream(&mut self) -> RetainedGraphicsOutcome { + crate::render_prof::event("retained_graphics.attempt"); + if self.app.full_redraw_pending { + crate::render_prof::event("retained_graphics_fallback.full_redraw_pending"); + return RetainedGraphicsOutcome::Fallback; + } + + let render_targets = render_targets(&self.clients, self.foreground_client_id); + let mut app_view_size = None; + for (_, terminal_size, _, _, mode) in &render_targets { + if !matches!(mode, ClientConnectionMode::App) { + continue; + } + if app_view_size.is_some_and(|size| size != *terminal_size) { + crate::render_prof::event("retained_graphics_fallback.mixed_app_geometry"); + return RetainedGraphicsOutcome::Fallback; + } + app_view_size = Some(*terminal_size); + } + let mut deferred = false; + let mut prepared = Vec::new(); + + for (client_id, (cols, rows), cell_size, _is_foreground, mode) in render_targets { + if !matches!(mode, ClientConnectionMode::App) { + continue; + } + let Some(client) = self.clients.get_mut(&client_id) else { + crate::render_prof::event("retained_graphics_fallback.client_missing"); + return RetainedGraphicsOutcome::Fallback; + }; + if client.deferred_render() != DeferredRender::None { + deferred = true; + continue; + } + if client.graphics_surface_reset_pending || !cell_size.is_known() { + crate::render_prof::event("retained_graphics_fallback.client_state"); + return RetainedGraphicsOutcome::Fallback; + } + let Some(last_frame) = client.render_state.last_frame() else { + crate::render_prof::event("retained_graphics_fallback.no_last_frame"); + return RetainedGraphicsOutcome::Fallback; + }; + if last_frame.width != cols || last_frame.height != rows { + crate::render_prof::event("retained_graphics_fallback.frame_size_mismatch"); + return RetainedGraphicsOutcome::Fallback; + } + if client.writer.is_none() { + crate::render_prof::event("retained_graphics_fallback.writer_missing"); + return RetainedGraphicsOutcome::Fallback; + } + + let mut next_graphics_cache = client.graphics_cache.clone(); + let encode_started = crate::render_prof::timer(); + let bytes = + frame_pane_graphics_for_client(crate::kitty_graphics::encode_local_pane_graphics( + &self.app.state, + &self.app.terminal_runtimes, + cell_size, + &mut next_graphics_cache, + )); + crate::render_prof::duration_since("retained_graphics.graphics_encode", encode_started); + if bytes.len() > MAX_GRAPHICS_FRAME_SIZE { + warn!( + client_id, + graphics_bytes = bytes.len(), + max = MAX_GRAPHICS_FRAME_SIZE, + "dropping oversized retained graphics payload" + ); + continue; + } + let serialized = if bytes.is_empty() { + None + } else { + let serialize_started = crate::render_prof::timer(); + let framed = match Self::frame_server_message_with_max( + &ServerMessage::Graphics { bytes }, + MAX_GRAPHICS_FRAME_SIZE, + ) { + Ok(framed) => framed, + Err(err) => { + warn!(client_id, err = %err, "failed to serialize retained graphics"); + return RetainedGraphicsOutcome::Fallback; + } + }; + crate::render_prof::duration_since( + "retained_graphics.serialize", + serialize_started, + ); + Some(framed) + }; + prepared.push((client_id, serialized, next_graphics_cache)); + } + + let mut broken_clients = Vec::new(); + for (client_id, serialized, next_graphics_cache) in prepared { + let Some(client) = self.clients.get_mut(&client_id) else { + continue; + }; + let Some(serialized) = serialized else { + client.graphics_cache = next_graphics_cache; + client.clear_deferred_render(); + continue; + }; + let Some(writer) = client.writer.as_ref().cloned() else { + broken_clients.push(client_id); + continue; + }; + match writer.render.try_send(serialized) { + Ok(()) => { + client.graphics_cache = next_graphics_cache; + client.clear_deferred_render(); + crate::render_prof::event("retained_graphics.sent"); + } + Err(std::sync::mpsc::TrySendError::Full(_)) => { + client.defer_pane_graphics_render(); + deferred = true; + crate::render_prof::event("retained_graphics.deferred"); + } + Err(std::sync::mpsc::TrySendError::Disconnected(_)) => { + broken_clients.push(client_id); + } + } + } + for client_id in broken_clients { + self.remove_client_and_resize_if_needed(client_id); + } + + if deferred { + RetainedGraphicsOutcome::Deferred + } else { + RetainedGraphicsOutcome::Sent + } + } +} diff --git a/src/server/headless/tests/pane_graphics.rs b/src/server/headless/tests/pane_graphics.rs new file mode 100644 index 00000000..627ffc78 --- /dev/null +++ b/src/server/headless/tests/pane_graphics.rs @@ -0,0 +1,357 @@ +use super::*; + +#[test] +fn frames_preserve_cursor_without_changing_ordinary_messages() { + assert_eq!(frame_pane_graphics_for_client(Vec::new()), Vec::<u8>::new()); + assert_eq!( + frame_pane_graphics_for_client(b"graphics".to_vec()), + b"\x1b7graphics\x1b8" + ); +} + +fn enable_graphics_and_render( + server: &mut HeadlessServer, + client_rx: &std::sync::mpsc::Receiver<Vec<u8>>, +) -> FrameData { + server.app.state.kitty_graphics_enabled = true; + server.clients.get_mut(&1).unwrap().cell_size = crate::kitty_graphics::HostCellSize { + width_px: 10, + height_px: 20, + }; + server.render_and_stream(); + read_server_frame( + client_rx + .recv_timeout(Duration::from_millis(100)) + .expect("initial frame"), + ) +} + +fn set_graphics_layer(server: &mut HeadlessServer, pane_id: crate::layout::PaneId, data: Vec<u8>) { + server.app.state.pane_graphics_layers.insert( + pane_id, + crate::app::state::PaneGraphicsLayer::new( + api::schema::PaneGraphicsFormat::Png, + 1, + 1, + data, + api::schema::PaneGraphicsPlacementParams::default(), + ), + ); +} + +fn fill_render_lane(server: &HeadlessServer) { + let queued = HeadlessServer::frame_server_message(&ServerMessage::ReloadSoundConfig) + .expect("dummy frame"); + server + .clients + .get(&1) + .unwrap() + .writer + .as_ref() + .unwrap() + .render + .try_send(queued) + .expect("pre-fill render lane"); +} + +fn stream_set_message( + id: &str, + pane_id: &str, + owner: &str, + data: Vec<u8>, +) -> (api::ApiRequestMessage, std::sync::mpsc::Receiver<String>) { + let (respond_to, response_rx) = std::sync::mpsc::channel(); + ( + api::ApiRequestMessage { + request: api::schema::Request { + id: id.into(), + method: api::schema::Method::PaneGraphicsStreamSet( + api::schema::PaneGraphicsSetParams { + pane_id: pane_id.into(), + owner: owner.into(), + format: api::schema::PaneGraphicsFormat::Png, + image_width: 1, + image_height: 1, + data: Some(data), + data_base64: String::new(), + placement: api::schema::PaneGraphicsPlacementParams::default(), + }, + ), + }, + respond_to, + response_write_complete: None, + }, + response_rx, + ) +} + +#[tokio::test] +async fn retained_update_sends_only_graphics_message() { + let (mut server, client_rx, pane_id) = retained_test_server(b"aaaa"); + let baseline = enable_graphics_and_render(&mut server, &client_rx); + set_graphics_layer(&mut server, pane_id, vec![1, 2, 3]); + + assert_eq!( + server.render_retained_graphics_update_and_stream(), + RetainedGraphicsOutcome::Sent + ); + match read_server_message( + client_rx + .recv_timeout(Duration::from_millis(100)) + .expect("graphics-only update"), + ) { + ServerMessage::Graphics { bytes } => { + assert!(bytes.windows(3).any(|window| window == b"\x1b_G")); + } + other => panic!("expected graphics-only message, got {other:?}"), + } + assert_frame_data_eq( + server + .clients + .get(&1) + .unwrap() + .render_state + .last_frame() + .expect("semantic baseline"), + &baseline, + ); +} + +#[tokio::test] +async fn retained_update_defers_on_full_render_lane() { + let (mut server, client_rx, pane_id) = retained_test_server(b"aaaa"); + let _ = enable_graphics_and_render(&mut server, &client_rx); + fill_render_lane(&server); + set_graphics_layer(&mut server, pane_id, vec![4, 5, 6]); + + assert_eq!( + server.render_retained_graphics_update_and_stream(), + RetainedGraphicsOutcome::Deferred + ); + let client = server.clients.get(&1).unwrap(); + assert_eq!(client.deferred_render(), DeferredRender::Graphics); + assert!(matches!( + read_server_message(client_rx.recv_timeout(Duration::from_millis(100)).unwrap()), + ServerMessage::ReloadSoundConfig + )); + assert_eq!( + server.handle_server_event_with_render_impact(ServerEvent::ClientWriterDrained { + client_id: 1 + }), + RenderImpact::Graphics + ); +} + +#[tokio::test] +async fn retained_update_does_not_downgrade_pending_full_render() { + let (mut server, client_rx, pane_id) = retained_test_server(b"aaaa"); + let _ = enable_graphics_and_render(&mut server, &client_rx); + fill_render_lane(&server); + let client = server.clients.get_mut(&1).unwrap(); + client.request_full_redraw(); + server.render_and_stream(); + assert_eq!( + server.clients.get(&1).unwrap().deferred_render(), + DeferredRender::Full + ); + + set_graphics_layer(&mut server, pane_id, vec![7, 8, 9]); + assert_eq!( + server.render_retained_graphics_update_and_stream(), + RetainedGraphicsOutcome::Deferred + ); + assert_eq!( + server.clients.get(&1).unwrap().deferred_render(), + DeferredRender::Full + ); + assert_eq!( + server.handle_server_event_with_render_impact(ServerEvent::ClientWriterDrained { + client_id: 1 + }), + RenderImpact::Full + ); +} + +#[tokio::test] +async fn retained_update_falls_back_for_mixed_app_geometry() { + let (mut server, client_rx, _pane_id) = retained_test_server(b"aaaa"); + let _ = enable_graphics_and_render(&mut server, &client_rx); + + let (writer, _control_rx, _render_rx) = test_client_writer(); + server.clients.insert( + 2, + ClientConnection::new( + (60, 20), + crate::kitty_graphics::HostCellSize { + width_px: 10, + height_px: 20, + }, + crate::terminal_theme::TerminalTheme::default(), + None, + 2, + RenderEncoding::SemanticFrame, + Some(writer), + ), + ); + + assert_eq!( + server.render_retained_graphics_update_and_stream(), + RetainedGraphicsOutcome::Fallback + ); +} + +#[test] +fn stream_set_has_graphics_only_render_impact() { + let mut server = test_headless_server(); + let workspace = crate::workspace::Workspace::test_new("graphics"); + let pane_id = workspace.tabs[0].root_pane; + let public_pane_id = format!("{}:p1", workspace.id); + server.app.state.workspaces = vec![workspace]; + server.app.state.active = Some(0); + server.app.state.selected = 0; + server.app.state.kitty_graphics_enabled = true; + server + .app + .state + .pane_graphics_streams + .insert(pane_id, "owner-a".into()); + + let (request, response_rx) = + stream_set_message("wrong-owner", &public_pane_id, "owner-b", vec![1, 2, 3]); + assert_eq!( + server.handle_api_request_with_render_impact(request), + RenderImpact::None + ); + assert!(serde_json::from_str::<api::schema::ErrorResponse>( + &response_rx + .recv_timeout(Duration::from_millis(100)) + .unwrap() + ) + .is_ok()); + + let (request, response_rx) = + stream_set_message("stream-frame", &public_pane_id, "owner-a", vec![1, 2, 3]); + assert_eq!( + server.handle_api_request_with_render_impact(request), + RenderImpact::Graphics + ); + assert!(serde_json::from_str::<api::schema::SuccessResponse>( + &response_rx + .recv_timeout(Duration::from_millis(100)) + .unwrap() + ) + .is_ok()); + + server + .app + .event_tx + .try_send(AppEvent::UpdateReady { + version: "9.9.9".into(), + install_command: "herdr update".into(), + }) + .unwrap(); + let (request, _response_rx) = stream_set_message( + "stream-frame-with-internal-event", + &public_pane_id, + "owner-a", + vec![4, 5, 6], + ); + assert_eq!( + server.handle_api_request_with_render_impact(request), + RenderImpact::Full + ); + + server.app.state.pane_graphics_streams.clear(); + let (respond_to, _response_rx) = std::sync::mpsc::channel(); + let impact = server.handle_api_request_with_render_impact(api::ApiRequestMessage { + request: api::schema::Request { + id: "direct-frame".into(), + method: api::schema::Method::PaneGraphicsSet(api::schema::PaneGraphicsSetParams { + pane_id: public_pane_id, + owner: String::new(), + format: api::schema::PaneGraphicsFormat::Png, + image_width: 1, + image_height: 1, + data: Some(vec![1, 2, 3]), + data_base64: String::new(), + placement: api::schema::PaneGraphicsPlacementParams::default(), + }), + }, + respond_to, + response_write_complete: None, + }); + assert_eq!(impact, RenderImpact::Full); +} + +#[test] +fn rejected_or_stale_requests_do_not_schedule_rendering() { + let mut server = test_headless_server(); + let workspace = crate::workspace::Workspace::test_new("graphics"); + let pane_id = workspace.tabs[0].root_pane; + let public_pane_id = format!("{}:p1", workspace.id); + server.app.state.workspaces = vec![workspace]; + server.app.state.active = Some(0); + server.app.state.selected = 0; + + let (respond_to, response_rx) = std::sync::mpsc::channel(); + let changed = server.handle_api_request_with_shutdown_check(api::ApiRequestMessage { + request: api::schema::Request { + id: "disabled-set".into(), + method: api::schema::Method::PaneGraphicsSet(api::schema::PaneGraphicsSetParams { + pane_id: public_pane_id.clone(), + owner: String::new(), + format: api::schema::PaneGraphicsFormat::Png, + image_width: 1, + image_height: 1, + data: Some(vec![1, 2, 3]), + data_base64: String::new(), + placement: api::schema::PaneGraphicsPlacementParams::default(), + }), + }, + respond_to, + response_write_complete: None, + }); + assert!(!changed); + let response = response_rx + .recv_timeout(Duration::from_millis(100)) + .unwrap(); + assert_eq!( + serde_json::from_str::<api::schema::ErrorResponse>(&response) + .unwrap() + .error + .code, + "feature_disabled" + ); + + server.app.state.kitty_graphics_enabled = true; + server + .app + .state + .pane_graphics_streams + .insert(pane_id, "current-owner".into()); + let (respond_to, response_rx) = std::sync::mpsc::channel(); + let impact = server.handle_api_request_with_render_impact(api::ApiRequestMessage { + request: api::schema::Request { + id: "stale-close".into(), + method: api::schema::Method::PaneGraphicsStreamClose( + api::schema::PaneGraphicsStreamParams { + pane_id: public_pane_id, + owner: "stale-owner".into(), + }, + ), + }, + respond_to, + response_write_complete: None, + }); + assert_eq!(impact, RenderImpact::None); + assert_eq!( + server.app.state.pane_graphics_streams.get(&pane_id), + Some(&"current-owner".to_string()) + ); + assert!(serde_json::from_str::<api::schema::SuccessResponse>( + &response_rx + .recv_timeout(Duration::from_millis(100)) + .unwrap() + ) + .is_ok()); +} |
