* work * moar work * notes * work * separate to terminal and control channels * stdin working * serve html web client initial * serve static assets loaded with include_dir * merge * enable_web_server config parameter * compile time flag to disable web server capability * rustfmt * add license to all xterm.js assets * mouse working except copy/paste * helpful comment * web client improvements - move script to js file - add favicon - add nerd font - change title TODO: investigate if font license embedded in otf is sufficient * get mouse to work properly * kitty keyboard support initial * fix wrong type in preload link * wip axum websocket handlers - upgrade axum to v0.8.1, enable ws feature - begin setup of websocket handlers - tidy up imports * replace control listener * handle terminal websocket with axum * cleanup Cargo.toml * kitty fixes and bracketed paste * fix(mouse): pane not found crash * initial session switching infra * add `web_client_font` option * session switching, creation and resurrection working through the session manager * move session module to zellij-utils and share logic with web-client * some cleanups * require restart for enable-web-server * use session name from router * write config to disk and watch for config changes * rename session name to ipc path * add basic panic handler, make render_to_client exit on channel close * use while let instead of loop * handle websocket close * add mouse motions * make clipboard work * add weblink handling and webgl rendering * add todo * fix: use session name instead of patch on session switch * use "default" layout for new sessions * ui indication for session being shared * share this session ui * plugin assets * Fix process crash on mac with notify watcher. Use poll watcher instead of recommended as a workaround. * make url session switching and creation work * start welcome screen on root url * scaffold control messages, set font from config * set dimensions on session start * bring back session name from url * send bytes on terminal websocket instead of json - create web client os input and id before websocket connection * draft ui * work * refactor ui * remove otf font, remove margins to avoid scrollbar * version query endpoint for server status * web session info query endpoint * refactor: move stuff around * add web client info to session metadata * make tests pass * populate real data in session list * remove unnecessary endpoint * add web_client node to config, add font option * remove web_client_font * allow disabling the web session through the config - WIP * formalize sharing/not-sharing configuration * fix tests * allow shutting down web server * display error when web clients are forbidden to attach * only show sessions that allow web clients if this is a web client * style(fmt): rustfmt * fix: query web server from Zellij rather than from each plugin * remove log spam * handle some error paths better in the web client * allow controlling the web server through the cli * allow configuring the web server's ip/port * fix tests and format code * use direct WebServerStatus event instead of piggy-backing on SessionInfo * plugin revamp initial * make plugin responsive * adjust plugin title * refactor: share plugin * refactor: share plugin * add cors middleware * some fixes for running without a compiled web server capability * display error when starting the share plugin without web server support * clarify config * add pipelines to compile zellij without web support * display error when unable to start web server * only query web server when share plugin is running * refactor(web-client): connection table * give zellij_server_listener access to the control channel * fixes and clarifications * refactor: consolidate generate_unique_session_name * give proper error when trying to attach to a forbidden session * change browser URL when switching sessions * add keyboard shortcut * enforce https when bound to non-loopback ip * initial authentication token implementation * background color from theme * initial web client theme config * basic token generation ui * refactor set config message creation * also set body background * allow editing scrollback for plugins too * set scrollback to 0 * properly parse colors in config * generate token from plugin * nice login modals * initial token management screen * implement token authentication * refactor(share): token management screen * style(fmt): rustfmt * fix(plugin): some minor bugs * refactor(share): main screen * refactor(share): token screen * refactor(share): main * refactor(share): ui components * fix(responsiveness): properly send usage_width to the render function * fix cli commands and add some verbosity * add support for settings ansi and selection colors * add cursor and cursor accent * basic web client tests * fix tests * refactor: web client * use session tokens for authentication * improve modals * move shutdown to ipc * refactor: ipc logic * serialize theme config for web client * update tests * refactor: move some stuff around to prepare for config hot reload * config live reloading for the web clients * change remember-me UI wording * improve xterm.js link handling * make sure terminal is focused on mousemove * remove deprecated sharing indication from compact-bar * gate deps and functionality behind the web_server_compatibility feature * feat(build): add --no-web flag in all the places * fix some other build flows * add new assets * update CI for no-web (untested) * make more dependencies optional * update axum-extra * add web client configuration options * gracefully close connections on server exit * tests for graceful connection closing * handle client-side reconnect when server is down * fix: make sure ipc bus folder exists before starting * add commands to manage login tokens from the cli * style(fmt): rustfmt * some cleanups * fix(ux): allow alt-right-click on the web client without opening the context menu * fix: prevent attaching to welcome screen * fix: reload config issues * fix long socket path on macos * normalize config conversion and fix color gap in browser * revoke session_token cookie if it is not valid * fix: visual bug with multiple clients in extremely small screen sizes * fix: only include rusqlite for the web server capability builds * update e2e snapshots * refactor(web): client side js * some cleanups * moar cleanups * fix(tests): wait for server instead of using a fixed timeout * debug CI * fix(tests): use spawn_blocking for running the test web server * fix(tests): wait for http rather than tcp port * fix(tests): properly pass config path - hopefully this is the issue... * success! bring back the rest of the tests * attempt to fix the macos CI issue * docs(changelog): add PR --------- Co-authored-by: Thomas Linford <linford.t@gmail.com>
146 lines
5 KiB
Rust
146 lines
5 KiB
Rust
use crate::os_input_output::ClientOsApi;
|
|
use crate::web_client::control_message::WebServerToWebClientControlMessage;
|
|
use crate::web_client::types::{ClientChannels, ClientConnectionBus, ConnectionTable};
|
|
use axum::extract::ws::{CloseFrame, Message};
|
|
use tokio::sync::mpsc::UnboundedSender;
|
|
use tokio_util::sync::CancellationToken;
|
|
|
|
impl ConnectionTable {
|
|
pub fn add_new_client(&mut self, client_id: String, client_os_api: Box<dyn ClientOsApi>) {
|
|
self.client_id_to_channels
|
|
.insert(client_id, ClientChannels::new(client_os_api));
|
|
}
|
|
|
|
pub fn add_client_control_tx(
|
|
&mut self,
|
|
client_id: &str,
|
|
control_channel_tx: UnboundedSender<Message>,
|
|
) {
|
|
self.client_id_to_channels
|
|
.get_mut(client_id)
|
|
.map(|c| c.add_control_tx(control_channel_tx));
|
|
}
|
|
|
|
pub fn add_client_terminal_tx(
|
|
&mut self,
|
|
client_id: &str,
|
|
terminal_channel_tx: UnboundedSender<String>,
|
|
) {
|
|
self.client_id_to_channels
|
|
.get_mut(client_id)
|
|
.map(|c| c.add_terminal_tx(terminal_channel_tx));
|
|
}
|
|
|
|
pub fn add_client_terminal_channel_cancellation_token(
|
|
&mut self,
|
|
client_id: &str,
|
|
terminal_channel_cancellation_token: CancellationToken,
|
|
) {
|
|
self.client_id_to_channels.get_mut(client_id).map(|c| {
|
|
c.add_terminal_channel_cancellation_token(terminal_channel_cancellation_token)
|
|
});
|
|
}
|
|
|
|
pub fn get_client_os_api(&self, client_id: &str) -> Option<&Box<dyn ClientOsApi>> {
|
|
self.client_id_to_channels.get(client_id).map(|c| &c.os_api)
|
|
}
|
|
|
|
pub fn get_client_terminal_tx(&self, client_id: &str) -> Option<UnboundedSender<String>> {
|
|
self.client_id_to_channels
|
|
.get(client_id)
|
|
.and_then(|c| c.terminal_channel_tx.clone())
|
|
}
|
|
|
|
pub fn get_client_control_tx(&self, client_id: &str) -> Option<UnboundedSender<Message>> {
|
|
self.client_id_to_channels
|
|
.get(client_id)
|
|
.and_then(|c| c.control_channel_tx.clone())
|
|
}
|
|
|
|
pub fn remove_client(&mut self, client_id: &str) {
|
|
if let Some(mut client_channels) = self.client_id_to_channels.remove(client_id).take() {
|
|
client_channels.cleanup();
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ClientConnectionBus {
|
|
pub fn send_stdout(&mut self, stdout: String) {
|
|
match self.stdout_channel_tx.as_ref() {
|
|
Some(stdout_channel_tx) => {
|
|
let _ = stdout_channel_tx.send(stdout);
|
|
},
|
|
None => {
|
|
self.get_stdout_channel_tx();
|
|
if let Some(stdout_channel_tx) = self.stdout_channel_tx.as_ref() {
|
|
let _ = stdout_channel_tx.send(stdout);
|
|
} else {
|
|
log::error!("Failed to send STDOUT message to client");
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
pub fn send_control(&mut self, message: WebServerToWebClientControlMessage) {
|
|
let message = Message::Text(serde_json::to_string(&message).unwrap().into());
|
|
match self.control_channel_tx.as_ref() {
|
|
Some(control_channel_tx) => {
|
|
let _ = control_channel_tx.send(message);
|
|
},
|
|
None => {
|
|
self.get_control_channel_tx();
|
|
if let Some(control_channel_tx) = self.control_channel_tx.as_ref() {
|
|
let _ = control_channel_tx.send(message);
|
|
} else {
|
|
log::error!("Failed to send control message to client");
|
|
}
|
|
},
|
|
}
|
|
}
|
|
pub fn close_connection(&mut self) {
|
|
let close_frame = CloseFrame {
|
|
code: axum::extract::ws::close_code::NORMAL,
|
|
reason: "Connection closed".into(),
|
|
};
|
|
let close_message = Message::Close(Some(close_frame));
|
|
match self.control_channel_tx.as_ref() {
|
|
Some(control_channel_tx) => {
|
|
let _ = control_channel_tx.send(close_message);
|
|
},
|
|
None => {
|
|
self.get_control_channel_tx();
|
|
if let Some(control_channel_tx) = self.control_channel_tx.as_ref() {
|
|
let _ = control_channel_tx.send(close_message);
|
|
} else {
|
|
log::error!("Failed to send close message to client");
|
|
}
|
|
},
|
|
}
|
|
self.connection_table
|
|
.lock()
|
|
.unwrap()
|
|
.remove_client(&self.web_client_id);
|
|
}
|
|
|
|
fn get_control_channel_tx(&mut self) {
|
|
if let Some(control_channel_tx) = self
|
|
.connection_table
|
|
.lock()
|
|
.unwrap()
|
|
.get_client_control_tx(&self.web_client_id)
|
|
{
|
|
self.control_channel_tx = Some(control_channel_tx);
|
|
}
|
|
}
|
|
|
|
fn get_stdout_channel_tx(&mut self) {
|
|
if let Some(stdout_channel_tx) = self
|
|
.connection_table
|
|
.lock()
|
|
.unwrap()
|
|
.get_client_terminal_tx(&self.web_client_id)
|
|
{
|
|
self.stdout_channel_tx = Some(stdout_channel_tx);
|
|
}
|
|
}
|
|
}
|