diff options
| author | Aram Drevekenin <aram@poor.dev> | 2025-06-23 19:19:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-23 19:19:37 +0200 |
| commit | c5ac7968809ddb1033b625562eae22019cccc2f4 (patch) | |
| tree | 932cf07d898dfbcc6ec6a9d4cf5353c06a47accc /zellij-utils/assets/prost/api.event.rs | |
| parent | feat(ui): add optional tooltip with key hints to the compact bar (#4225) (diff) | |
| download | sl0ppij-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 'zellij-utils/assets/prost/api.event.rs')
| -rw-r--r-- | zellij-utils/assets/prost/api.event.rs | 106 |
1 files changed, 102 insertions, 4 deletions
diff --git a/zellij-utils/assets/prost/api.event.rs b/zellij-utils/assets/prost/api.event.rs index 7ec6e076..a1240693 100644 --- a/zellij-utils/assets/prost/api.event.rs +++ b/zellij-utils/assets/prost/api.event.rs @@ -9,7 +9,7 @@ pub struct EventNameList { pub struct Event { #[prost(enumeration="EventType", tag="1")] pub name: i32, - #[prost(oneof="event::Payload", tags="2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27")] + #[prost(oneof="event::Payload", tags="2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29")] pub payload: ::core::option::Option<event::Payload>, } /// Nested message and enum types in `Event`. @@ -68,17 +68,35 @@ pub mod event { #[prost(message, tag="26")] PastedTextPayload(super::PastedTextPayload), #[prost(message, tag="27")] + WebServerStatusPayload(super::WebServerStatusPayload), + #[prost(message, tag="28")] + FailedToStartWebServerPayload(super::FailedToStartWebServerPayload), + #[prost(message, tag="29")] InterceptedKeyPayload(super::super::key::Key), } } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] +pub struct FailedToStartWebServerPayload { + #[prost(string, tag="1")] + pub error: ::prost::alloc::string::String, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] pub struct PastedTextPayload { #[prost(string, tag="1")] pub pasted_text: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] +pub struct WebServerStatusPayload { + #[prost(enumeration="WebServerStatusIndication", tag="1")] + pub web_server_status_indication: i32, + #[prost(string, optional, tag="2")] + pub payload: ::core::option::Option<::prost::alloc::string::String>, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] pub struct FailedToChangeHostFolderPayload { #[prost(string, optional, tag="1")] pub error_message: ::core::option::Option<::prost::alloc::string::String>, @@ -313,7 +331,11 @@ pub struct SessionManifest { pub available_layouts: ::prost::alloc::vec::Vec<LayoutInfo>, #[prost(message, repeated, tag="7")] pub plugins: ::prost::alloc::vec::Vec<PluginInfo>, - #[prost(message, repeated, tag="8")] + #[prost(bool, tag="8")] + pub web_clients_allowed: bool, + #[prost(uint32, tag="9")] + pub web_client_count: u32, + #[prost(message, repeated, tag="10")] pub tab_history: ::prost::alloc::vec::Vec<ClientTabHistory>, } #[allow(clippy::derive_partial_eq_without_eq)] @@ -464,7 +486,19 @@ pub struct ModeUpdatePayload { #[prost(string, optional, tag="8")] pub shell: ::core::option::Option<::prost::alloc::string::String>, #[prost(bool, optional, tag="9")] + pub web_clients_allowed: ::core::option::Option<bool>, + #[prost(enumeration="WebSharing", optional, tag="10")] + pub web_sharing: ::core::option::Option<i32>, + #[prost(bool, optional, tag="11")] pub currently_marking_pane_group: ::core::option::Option<bool>, + #[prost(bool, optional, tag="12")] + pub is_web_client: ::core::option::Option<bool>, + #[prost(string, optional, tag="13")] + pub web_server_ip: ::core::option::Option<::prost::alloc::string::String>, + #[prost(uint32, optional, tag="14")] + pub web_server_port: ::core::option::Option<u32>, + #[prost(bool, optional, tag="15")] + pub web_server_capability: ::core::option::Option<bool>, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -531,8 +565,10 @@ pub enum EventType { FailedToChangeHostFolder = 28, PastedText = 29, ConfigWasWrittenToDisk = 30, - BeforeClose = 31, - InterceptedKeyPress = 32, + WebServerStatus = 31, + BeforeClose = 32, + FailedToStartWebServer = 34, + InterceptedKeyPress = 35, } impl EventType { /// String value of the enum field names used in the ProtoBuf definition. @@ -572,7 +608,9 @@ impl EventType { EventType::FailedToChangeHostFolder => "FailedToChangeHostFolder", EventType::PastedText => "PastedText", EventType::ConfigWasWrittenToDisk => "ConfigWasWrittenToDisk", + EventType::WebServerStatus => "WebServerStatus", EventType::BeforeClose => "BeforeClose", + EventType::FailedToStartWebServer => "FailedToStartWebServer", EventType::InterceptedKeyPress => "InterceptedKeyPress", } } @@ -610,12 +648,43 @@ impl EventType { "FailedToChangeHostFolder" => Some(Self::FailedToChangeHostFolder), "PastedText" => Some(Self::PastedText), "ConfigWasWrittenToDisk" => Some(Self::ConfigWasWrittenToDisk), + "WebServerStatus" => Some(Self::WebServerStatus), "BeforeClose" => Some(Self::BeforeClose), + "FailedToStartWebServer" => Some(Self::FailedToStartWebServer), "InterceptedKeyPress" => Some(Self::InterceptedKeyPress), _ => None, } } } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] +#[repr(i32)] +pub enum WebServerStatusIndication { + Online = 0, + Offline = 1, + DifferentVersion = 2, +} +impl WebServerStatusIndication { + /// String value of the enum field names used in the ProtoBuf definition. + /// + /// The values are not transformed in any way and thus are considered stable + /// (if the ProtoBuf definition does not change) and safe for programmatic use. + pub fn as_str_name(&self) -> &'static str { + match self { + WebServerStatusIndication::Online => "Online", + WebServerStatusIndication::Offline => "Offline", + WebServerStatusIndication::DifferentVersion => "DifferentVersion", + } + } + /// Creates an enum from field names used in the ProtoBuf definition. + pub fn from_str_name(value: &str) -> ::core::option::Option<Self> { + match value { + "Online" => Some(Self::Online), + "Offline" => Some(Self::Offline), + "DifferentVersion" => Some(Self::DifferentVersion), + _ => None, + } + } +} /// duplicate of plugin_command.PaneType because protobuffs don't like recursive imports #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] @@ -713,3 +782,32 @@ impl MouseEventName { } } } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] +#[repr(i32)] +pub enum WebSharing { + On = 0, + Off = 1, + Disabled = 2, +} +impl WebSharing { + /// String value of the enum field names used in the ProtoBuf definition. + /// + /// The values are not transformed in any way and thus are considered stable + /// (if the ProtoBuf definition does not change) and safe for programmatic use. + pub fn as_str_name(&self) -> &'static str { + match self { + WebSharing::On => "On", + WebSharing::Off => "Off", + WebSharing::Disabled => "Disabled", + } + } + /// Creates an enum from field names used in the ProtoBuf definition. + pub fn from_str_name(value: &str) -> ::core::option::Option<Self> { + match value { + "On" => Some(Self::On), + "Off" => Some(Self::Off), + "Disabled" => Some(Self::Disabled), + _ => None, + } + } +} |
