aboutsummaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2025-06-23 19:19:37 +0200
committerGitHub <noreply@github.com>2025-06-23 19:19:37 +0200
commitc5ac7968809ddb1033b625562eae22019cccc2f4 (patch)
tree932cf07d898dfbcc6ec6a9d4cf5353c06a47accc /src/main.rs
parentfeat(ui): add optional tooltip with key hints to the compact bar (#4225) (diff)
downloadsl0ppij-c5ac7968809ddb1033b625562eae22019cccc2f4.tar.gz
sl0ppij-c5ac7968809ddb1033b625562eae22019cccc2f4.tar.xz
sl0ppij-c5ac7968809ddb1033b625562eae22019cccc2f4.zip
Feature: web-client/server to share your sessions in the browser (#4242)
* 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>
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs93
1 files changed, 91 insertions, 2 deletions
diff --git a/src/main.rs b/src/main.rs
index 10459786..731774e7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,16 +1,16 @@
mod commands;
-mod sessions;
#[cfg(test)]
mod tests;
use clap::Parser;
use zellij_utils::{
cli::{CliAction, CliArgs, Command, Sessions},
- consts::create_config_and_cache_folders,
+ consts::{create_config_and_cache_folders, VERSION},
envs,
input::config::Config,
logging::*,
setup::Setup,
+ shared::web_server_base_url_from_config,
};
fn main() {
@@ -224,6 +224,95 @@ fn main() {
opts.new_session_with_layout = None;
opts.layout = Some(layout_for_new_session.clone());
commands::start_client(opts);
+ } else if let Some(Command::Web(web_opts)) = &opts.command {
+ if web_opts.get_start() {
+ let daemonize = web_opts.daemonize;
+ commands::start_web_server(opts, daemonize);
+ } else if web_opts.stop {
+ match commands::stop_web_server() {
+ Ok(()) => {
+ println!("Stopped web server.");
+ },
+ Err(e) => {
+ eprintln!("Failed to stop web server: {}", e);
+ std::process::exit(2)
+ },
+ }
+ } else if web_opts.status {
+ let config_options = commands::get_config_options_from_cli_args(&opts)
+ .expect("Can't find config options");
+ let web_server_base_url = web_server_base_url_from_config(config_options);
+ match commands::web_server_status(&web_server_base_url) {
+ Ok(version) => {
+ let version = version.trim();
+ println!(
+ "Web server online with version: {}. Checked: {}",
+ version, web_server_base_url
+ );
+ if version != VERSION {
+ println!("");
+ println!(
+ "Note: this version differs from the current Zellij version: {}.",
+ VERSION
+ );
+ println!("Consider stopping the server with: zellij web --stop");
+ println!("And then restarting it with: zellij web --start");
+ }
+ },
+ Err(_e) => {
+ println!("Web server is offline, checked: {}", web_server_base_url);
+ },
+ }
+ } else if web_opts.create_token {
+ match commands::create_auth_token() {
+ Ok(token_and_name) => {
+ println!("Created token successfully");
+ println!("");
+ println!("{}", token_and_name);
+ },
+ Err(e) => {
+ eprintln!("Failed to create token: {}", e);
+ std::process::exit(2)
+ },
+ }
+ } else if let Some(token_name_to_revoke) = &web_opts.revoke_token {
+ match commands::revoke_auth_token(token_name_to_revoke) {
+ Ok(revoked) => {
+ if revoked {
+ println!("Successfully revoked token.");
+ } else {
+ eprintln!("Token by that name does not exist.");
+ std::process::exit(2)
+ }
+ },
+ Err(e) => {
+ eprintln!("Failed to revoke token: {}", e);
+ std::process::exit(2)
+ },
+ }
+ } else if web_opts.revoke_all_tokens {
+ match commands::revoke_all_auth_tokens() {
+ Ok(_) => {
+ println!("Successfully revoked all auth tokens");
+ },
+ Err(e) => {
+ eprintln!("Failed to revoke all auth tokens: {}", e);
+ std::process::exit(2)
+ },
+ }
+ } else if web_opts.list_tokens {
+ match commands::list_auth_tokens() {
+ Ok(token_list) => {
+ for item in token_list {
+ println!("{}", item);
+ }
+ },
+ Err(e) => {
+ eprintln!("Failed to list tokens: {}", e);
+ std::process::exit(2)
+ },
+ }
+ }
} else {
commands::start_client(opts);
}