* 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>
396 lines
14 KiB
Rust
396 lines
14 KiB
Rust
use anyhow::{Context, Result};
|
|
use interprocess;
|
|
use libc;
|
|
use nix;
|
|
use signal_hook;
|
|
use zellij_utils::pane_size::Size;
|
|
|
|
use interprocess::local_socket::LocalSocketStream;
|
|
use mio::{unix::SourceFd, Events, Interest, Poll, Token};
|
|
use nix::pty::Winsize;
|
|
use nix::sys::termios;
|
|
use signal_hook::{consts::signal::*, iterator::Signals};
|
|
use std::io::prelude::*;
|
|
use std::io::IsTerminal;
|
|
use std::os::unix::io::RawFd;
|
|
use std::path::Path;
|
|
use std::sync::{Arc, Mutex};
|
|
use std::{io, thread, time};
|
|
use zellij_utils::{
|
|
data::Palette,
|
|
errors::ErrorContext,
|
|
ipc::{ClientToServerMsg, IpcReceiverWithContext, IpcSenderWithContext, ServerToClientMsg},
|
|
shared::default_palette,
|
|
};
|
|
|
|
const SIGWINCH_CB_THROTTLE_DURATION: time::Duration = time::Duration::from_millis(50);
|
|
|
|
const ENABLE_MOUSE_SUPPORT: &str =
|
|
"\u{1b}[?1000h\u{1b}[?1002h\u{1b}[?1003h\u{1b}[?1015h\u{1b}[?1006h";
|
|
const DISABLE_MOUSE_SUPPORT: &str =
|
|
"\u{1b}[?1006l\u{1b}[?1015l\u{1b}[?1003l\u{1b}[?1002l\u{1b}[?1000l";
|
|
|
|
fn into_raw_mode(pid: RawFd) {
|
|
let mut tio = termios::tcgetattr(pid).expect("could not get terminal attribute");
|
|
termios::cfmakeraw(&mut tio);
|
|
match termios::tcsetattr(pid, termios::SetArg::TCSANOW, &tio) {
|
|
Ok(_) => {},
|
|
Err(e) => panic!("error {:?}", e),
|
|
};
|
|
}
|
|
|
|
fn unset_raw_mode(pid: RawFd, orig_termios: termios::Termios) -> Result<(), nix::Error> {
|
|
termios::tcsetattr(pid, termios::SetArg::TCSANOW, &orig_termios)
|
|
}
|
|
|
|
pub(crate) fn get_terminal_size_using_fd(fd: RawFd) -> Size {
|
|
// TODO: do this with the nix ioctl
|
|
use libc::ioctl;
|
|
use libc::TIOCGWINSZ;
|
|
|
|
let mut winsize = Winsize {
|
|
ws_row: 0,
|
|
ws_col: 0,
|
|
ws_xpixel: 0,
|
|
ws_ypixel: 0,
|
|
};
|
|
|
|
// TIOCGWINSZ is an u32, but the second argument to ioctl is u64 on
|
|
// some platforms. When checked on Linux, clippy will complain about
|
|
// useless conversion.
|
|
#[allow(clippy::useless_conversion)]
|
|
unsafe {
|
|
ioctl(fd, TIOCGWINSZ.into(), &mut winsize)
|
|
};
|
|
|
|
// fallback to default values when rows/cols == 0: https://github.com/zellij-org/zellij/issues/1551
|
|
let rows = if winsize.ws_row != 0 {
|
|
winsize.ws_row as usize
|
|
} else {
|
|
24
|
|
};
|
|
|
|
let cols = if winsize.ws_col != 0 {
|
|
winsize.ws_col as usize
|
|
} else {
|
|
80
|
|
};
|
|
|
|
Size { rows, cols }
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct ClientOsInputOutput {
|
|
orig_termios: Option<Arc<Mutex<termios::Termios>>>,
|
|
send_instructions_to_server: Arc<Mutex<Option<IpcSenderWithContext<ClientToServerMsg>>>>,
|
|
receive_instructions_from_server: Arc<Mutex<Option<IpcReceiverWithContext<ServerToClientMsg>>>>,
|
|
reading_from_stdin: Arc<Mutex<Option<Vec<u8>>>>,
|
|
session_name: Arc<Mutex<Option<String>>>,
|
|
}
|
|
|
|
impl std::fmt::Debug for ClientOsInputOutput {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("ClientOsInputOutput").finish()
|
|
}
|
|
}
|
|
|
|
/// The `ClientOsApi` trait represents an abstract interface to the features of an operating system that
|
|
/// Zellij client requires.
|
|
pub trait ClientOsApi: Send + Sync + std::fmt::Debug {
|
|
/// Returns the size of the terminal associated to file descriptor `fd`.
|
|
fn get_terminal_size_using_fd(&self, fd: RawFd) -> Size;
|
|
/// Set the terminal associated to file descriptor `fd` to
|
|
/// [raw mode](https://en.wikipedia.org/wiki/Terminal_mode).
|
|
fn set_raw_mode(&mut self, fd: RawFd);
|
|
/// Set the terminal associated to file descriptor `fd` to
|
|
/// [cooked mode](https://en.wikipedia.org/wiki/Terminal_mode).
|
|
fn unset_raw_mode(&self, fd: RawFd) -> Result<(), nix::Error>;
|
|
/// Returns the writer that allows writing to standard output.
|
|
fn get_stdout_writer(&self) -> Box<dyn io::Write>;
|
|
/// Returns a BufReader that allows to read from STDIN line by line, also locks STDIN
|
|
fn get_stdin_reader(&self) -> Box<dyn io::BufRead>;
|
|
fn stdin_is_terminal(&self) -> bool {
|
|
true
|
|
}
|
|
fn stdout_is_terminal(&self) -> bool {
|
|
true
|
|
}
|
|
fn update_session_name(&mut self, new_session_name: String);
|
|
/// Returns the raw contents of standard input.
|
|
fn read_from_stdin(&mut self) -> Result<Vec<u8>, &'static str>;
|
|
/// Returns a [`Box`] pointer to this [`ClientOsApi`] struct.
|
|
fn box_clone(&self) -> Box<dyn ClientOsApi>;
|
|
/// Sends a message to the server.
|
|
fn send_to_server(&self, msg: ClientToServerMsg);
|
|
/// Receives a message on client-side IPC channel
|
|
// This should be called from the client-side router thread only.
|
|
fn recv_from_server(&self) -> Option<(ServerToClientMsg, ErrorContext)>;
|
|
fn handle_signals(&self, sigwinch_cb: Box<dyn Fn()>, quit_cb: Box<dyn Fn()>);
|
|
/// Establish a connection with the server socket.
|
|
fn connect_to_server(&self, path: &Path);
|
|
fn load_palette(&self) -> Palette;
|
|
fn enable_mouse(&self) -> Result<()>;
|
|
fn disable_mouse(&self) -> Result<()>;
|
|
// Repeatedly send action, until stdin is readable again
|
|
fn stdin_poller(&self) -> StdinPoller;
|
|
fn env_variable(&self, _name: &str) -> Option<String> {
|
|
None
|
|
}
|
|
}
|
|
|
|
impl ClientOsApi for ClientOsInputOutput {
|
|
fn get_terminal_size_using_fd(&self, fd: RawFd) -> Size {
|
|
get_terminal_size_using_fd(fd)
|
|
}
|
|
fn set_raw_mode(&mut self, fd: RawFd) {
|
|
into_raw_mode(fd);
|
|
}
|
|
fn unset_raw_mode(&self, fd: RawFd) -> Result<(), nix::Error> {
|
|
match &self.orig_termios {
|
|
Some(orig_termios) => {
|
|
let orig_termios = orig_termios.lock().unwrap();
|
|
unset_raw_mode(fd, orig_termios.clone())
|
|
},
|
|
None => {
|
|
log::warn!("trying to unset raw mode for a non-terminal session");
|
|
Ok(())
|
|
},
|
|
}
|
|
}
|
|
fn box_clone(&self) -> Box<dyn ClientOsApi> {
|
|
Box::new((*self).clone())
|
|
}
|
|
fn update_session_name(&mut self, new_session_name: String) {
|
|
*self.session_name.lock().unwrap() = Some(new_session_name);
|
|
}
|
|
fn read_from_stdin(&mut self) -> Result<Vec<u8>, &'static str> {
|
|
let session_name_at_calltime = { self.session_name.lock().unwrap().clone() };
|
|
// here we wait for a lock in case another thread is holding stdin
|
|
// this can happen for example when switching sessions, the old thread will only be
|
|
// released once it sees input over STDIN
|
|
//
|
|
// when this happens, we detect in the other thread that our session is ended (by comparing
|
|
// the session name at the beginning of the call and the one after we read from STDIN), and
|
|
// so place what we read from STDIN inside a buffer (the "reading_from_stdin" on our state)
|
|
// and release the lock
|
|
//
|
|
// then, another thread will see there's something in the buffer immediately as it acquires
|
|
// the lock (without having to wait for STDIN itself) forward this buffer and proceed to
|
|
// wait for the "real" STDIN net time it is called
|
|
let mut buffered_bytes = self.reading_from_stdin.lock().unwrap();
|
|
match buffered_bytes.take() {
|
|
Some(buffered_bytes) => Ok(buffered_bytes),
|
|
None => {
|
|
let stdin = std::io::stdin();
|
|
let mut stdin = stdin.lock();
|
|
let buffer = stdin.fill_buf().unwrap();
|
|
let length = buffer.len();
|
|
let read_bytes = Vec::from(buffer);
|
|
stdin.consume(length);
|
|
|
|
let session_name_after_reading_from_stdin =
|
|
{ self.session_name.lock().unwrap().clone() };
|
|
if session_name_at_calltime.is_some()
|
|
&& session_name_at_calltime != session_name_after_reading_from_stdin
|
|
{
|
|
*buffered_bytes = Some(read_bytes);
|
|
Err("Session ended")
|
|
} else {
|
|
Ok(read_bytes)
|
|
}
|
|
},
|
|
}
|
|
}
|
|
fn get_stdout_writer(&self) -> Box<dyn io::Write> {
|
|
let stdout = ::std::io::stdout();
|
|
Box::new(stdout)
|
|
}
|
|
|
|
fn get_stdin_reader(&self) -> Box<dyn io::BufRead> {
|
|
let stdin = ::std::io::stdin();
|
|
Box::new(stdin.lock())
|
|
}
|
|
|
|
fn stdin_is_terminal(&self) -> bool {
|
|
let stdin = ::std::io::stdin();
|
|
stdin.is_terminal()
|
|
}
|
|
|
|
fn stdout_is_terminal(&self) -> bool {
|
|
let stdout = ::std::io::stdout();
|
|
stdout.is_terminal()
|
|
}
|
|
|
|
fn send_to_server(&self, msg: ClientToServerMsg) {
|
|
match self.send_instructions_to_server.lock().unwrap().as_mut() {
|
|
Some(sender) => {
|
|
let _ = sender.send(msg);
|
|
},
|
|
None => {
|
|
log::warn!("Server not ready, dropping message.");
|
|
},
|
|
}
|
|
}
|
|
fn recv_from_server(&self) -> Option<(ServerToClientMsg, ErrorContext)> {
|
|
self.receive_instructions_from_server
|
|
.lock()
|
|
.unwrap()
|
|
.as_mut()
|
|
.unwrap()
|
|
.recv()
|
|
}
|
|
fn handle_signals(&self, sigwinch_cb: Box<dyn Fn()>, quit_cb: Box<dyn Fn()>) {
|
|
let mut sigwinch_cb_timestamp = time::Instant::now();
|
|
let mut signals = Signals::new(&[SIGWINCH, SIGTERM, SIGINT, SIGQUIT, SIGHUP]).unwrap();
|
|
for signal in signals.forever() {
|
|
match signal {
|
|
SIGWINCH => {
|
|
// throttle sigwinch_cb calls, reduce excessive renders while resizing
|
|
if sigwinch_cb_timestamp.elapsed() < SIGWINCH_CB_THROTTLE_DURATION {
|
|
thread::sleep(SIGWINCH_CB_THROTTLE_DURATION);
|
|
}
|
|
sigwinch_cb_timestamp = time::Instant::now();
|
|
sigwinch_cb();
|
|
},
|
|
SIGTERM | SIGINT | SIGQUIT | SIGHUP => {
|
|
quit_cb();
|
|
break;
|
|
},
|
|
_ => unreachable!(),
|
|
}
|
|
}
|
|
}
|
|
fn connect_to_server(&self, path: &Path) {
|
|
let socket;
|
|
loop {
|
|
match LocalSocketStream::connect(path) {
|
|
Ok(sock) => {
|
|
socket = sock;
|
|
break;
|
|
},
|
|
Err(_) => {
|
|
std::thread::sleep(std::time::Duration::from_millis(50));
|
|
},
|
|
}
|
|
}
|
|
let sender = IpcSenderWithContext::new(socket);
|
|
let receiver = sender.get_receiver();
|
|
*self.send_instructions_to_server.lock().unwrap() = Some(sender);
|
|
*self.receive_instructions_from_server.lock().unwrap() = Some(receiver);
|
|
}
|
|
fn load_palette(&self) -> Palette {
|
|
// this was removed because termbg doesn't release stdin in certain scenarios (we know of
|
|
// windows terminal and FreeBSD): https://github.com/zellij-org/zellij/issues/538
|
|
//
|
|
// let palette = default_palette();
|
|
// let timeout = std::time::Duration::from_millis(100);
|
|
// if let Ok(rgb) = termbg::rgb(timeout) {
|
|
// palette.bg = PaletteColor::Rgb((rgb.r as u8, rgb.g as u8, rgb.b as u8));
|
|
// // TODO: also dynamically get all other colors from the user's terminal
|
|
// // this should be done in the same method (OSC ]11), but there might be other
|
|
// // considerations here, hence using the library
|
|
// };
|
|
default_palette()
|
|
}
|
|
fn enable_mouse(&self) -> Result<()> {
|
|
let err_context = "failed to enable mouse mode";
|
|
let mut stdout = self.get_stdout_writer();
|
|
stdout
|
|
.write_all(ENABLE_MOUSE_SUPPORT.as_bytes())
|
|
.context(err_context)?;
|
|
stdout.flush().context(err_context)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn disable_mouse(&self) -> Result<()> {
|
|
let err_context = "failed to enable mouse mode";
|
|
let mut stdout = self.get_stdout_writer();
|
|
stdout
|
|
.write_all(DISABLE_MOUSE_SUPPORT.as_bytes())
|
|
.context(err_context)?;
|
|
stdout.flush().context(err_context)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn stdin_poller(&self) -> StdinPoller {
|
|
StdinPoller::default()
|
|
}
|
|
|
|
fn env_variable(&self, name: &str) -> Option<String> {
|
|
std::env::var(name).ok()
|
|
}
|
|
}
|
|
|
|
impl Clone for Box<dyn ClientOsApi> {
|
|
fn clone(&self) -> Box<dyn ClientOsApi> {
|
|
self.box_clone()
|
|
}
|
|
}
|
|
|
|
pub fn get_client_os_input() -> Result<ClientOsInputOutput, nix::Error> {
|
|
let current_termios = termios::tcgetattr(0).ok();
|
|
let orig_termios = current_termios.map(|termios| Arc::new(Mutex::new(termios)));
|
|
let reading_from_stdin = Arc::new(Mutex::new(None));
|
|
Ok(ClientOsInputOutput {
|
|
orig_termios,
|
|
send_instructions_to_server: Arc::new(Mutex::new(None)),
|
|
receive_instructions_from_server: Arc::new(Mutex::new(None)),
|
|
reading_from_stdin,
|
|
session_name: Arc::new(Mutex::new(None)),
|
|
})
|
|
}
|
|
|
|
pub fn get_cli_client_os_input() -> Result<ClientOsInputOutput, nix::Error> {
|
|
let orig_termios = None; // not a terminal
|
|
let reading_from_stdin = Arc::new(Mutex::new(None));
|
|
Ok(ClientOsInputOutput {
|
|
orig_termios,
|
|
send_instructions_to_server: Arc::new(Mutex::new(None)),
|
|
receive_instructions_from_server: Arc::new(Mutex::new(None)),
|
|
reading_from_stdin,
|
|
session_name: Arc::new(Mutex::new(None)),
|
|
})
|
|
}
|
|
|
|
pub const DEFAULT_STDIN_POLL_TIMEOUT_MS: u64 = 10;
|
|
|
|
pub struct StdinPoller {
|
|
poll: Poll,
|
|
events: Events,
|
|
timeout: time::Duration,
|
|
}
|
|
|
|
impl StdinPoller {
|
|
// use mio poll to check if stdin is readable without blocking
|
|
pub fn ready(&mut self) -> bool {
|
|
self.poll
|
|
.poll(&mut self.events, Some(self.timeout))
|
|
.expect("could not poll stdin for readiness");
|
|
for event in &self.events {
|
|
if event.token() == Token(0) && event.is_readable() {
|
|
return true;
|
|
}
|
|
}
|
|
false
|
|
}
|
|
}
|
|
|
|
impl Default for StdinPoller {
|
|
fn default() -> Self {
|
|
let stdin = 0;
|
|
let mut stdin_fd = SourceFd(&stdin);
|
|
let events = Events::with_capacity(128);
|
|
let poll = Poll::new().unwrap();
|
|
poll.registry()
|
|
.register(&mut stdin_fd, Token(0), Interest::READABLE)
|
|
.expect("could not create stdin poll");
|
|
|
|
let timeout = time::Duration::from_millis(DEFAULT_STDIN_POLL_TIMEOUT_MS);
|
|
|
|
Self {
|
|
poll,
|
|
events,
|
|
timeout,
|
|
}
|
|
}
|
|
}
|