updated vendored code with upstream: github:/andyk/ht/pull/25

Author: MatrixManAtYrService

htty-core/Cargo.lock

@@ -26,12 +26,12 @@ path = "src/rust/main.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-avt = "0.11.1"
+avt = "0.16.0"
 nix = { version = "0.28.0", features = ["term", "process", "fs", "signal"] }
 serde_json = "1.0.117"
 mio = { version = "0.8.11", features = ["os-poll", "os-ext"] }
 anyhow = "1.0.81"
-serde = "1.0.203"
+serde = { version = "1.0.203", features = ["derive"] }
 tokio = { version = "1.38.0", features = ["full"] }
 axum = { version = "0.7.5", default-features = false, features = ["http1", "ws", "query"] }
 tokio-stream = { version = "0.1.15", features = ["sync"] }

htty-core/Cargo.toml

@@ -28,10 +28,10 @@ classifiers = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/MatrixManAtYrService/ht"
-Documentation = "https://github.com/MatrixManAtYrService/ht"
-Repository = "https://github.com/MatrixManAtYrService/ht"
-Issues = "https://github.com/MatrixManAtYrService/ht/issues"
+Homepage = "https://github.com/MatrixManAtYrService/htty"
+Documentation = "https://MatrixManAtYrService.github.io/htty/htty.html"
+Repository = "https://github.com/MatrixManAtYrService/htty"
+Issues = "https://github.com/MatrixManAtYrService/htty/issues"
 
 [build-system]
 requires = ["maturin>=1.3.2"]
@@ -123,4 +123,4 @@ reportUntypedFunctionDecorator = "error"
 reportUntypedClassDecorator = "error"
 reportUntypedBaseClass = "error"
 reportUntypedNamedTuple = "error"
-# [[[end]]]
+# [[[end]]]

htty-core/pyproject.toml

@@ -86,7 +86,7 @@ async fn alis_message(
     use session::Event::*;
 
     match event {
-        Ok(Init(time, cols, rows, seq, _text)) => Some(Ok(json_message(json!({
+        Ok(Init(time, cols, rows, _pid, seq, _text)) => Some(Ok(json_message(json!({
             "time": time,
             "cols": cols,
             "rows": rows,
@@ -166,7 +166,7 @@ async fn event_stream_message(
     use session::Event::*;
 
     match event {
-        Ok(e @ Init(_, _, _, _, _)) if sub.init => Some(Ok(json_message(e.to_json()))),
+        Ok(e @ Init(..)) if sub.init => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Output(_, _)) if sub.output => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Resize(_, _, _)) if sub.resize => Some(Ok(json_message(e.to_json()))),
         Ok(e @ Snapshot(_, _, _, _)) if sub.snapshot => Some(Ok(json_message(e.to_json()))),

htty-core/src/rust/api/http.rs

@@ -76,7 +76,7 @@ pub async fn start(
                 use session::Event::*;
 
                 match event {
-                    Some(Ok(e @ Init(_, _, _, _, _))) if sub.init => {
+                    Some(Ok(e @ Init(..))) if sub.init => {
                         println!("{}", e.to_json());
                     }
 

htty-core/src/rust/api/stdio.rs

@@ -3,13 +3,33 @@ use anyhow::{bail, Result};
 use nix::pty;
 use std::{fmt::Display, net::SocketAddr, ops::Deref, str::FromStr, path::PathBuf, env};
 
+#[derive(Debug, Clone, Copy, Default)]
+pub enum StyleMode {
+    #[default]
+    Plain,
+    Styled,
+}
+
+impl FromStr for StyleMode {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "plain" => Ok(StyleMode::Plain),
+            "styled" => Ok(StyleMode::Styled),
+            _ => Err(format!("invalid style mode: {s}. Valid options: plain, styled")),
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Cli {
     pub command: Option<Commands>,
     pub size: Size,
     pub shell_command: Vec<String>,
     pub listen: Option<SocketAddr>,
     pub subscribe: Option<Subscription>,
+    pub style_mode: StyleMode,
 }
 
 #[derive(Debug)]
@@ -33,6 +53,7 @@ fn parse_args(args: &[String]) -> Result<Cli> {
         shell_command: vec!["bash".to_string()],
         listen: None,
         subscribe: None,
+        style_mode: StyleMode::default(),
     };
 
     let mut i = 1; // Skip program name
@@ -75,6 +96,13 @@ fn parse_args(args: &[String]) -> Result<Cli> {
                 i += 1;
                 cli.subscribe = Some(args[i].parse().map_err(|e: String| anyhow::anyhow!(e))?);
             }
+            "--style-mode" | "-s" => {
+                if i + 1 >= args.len() {
+                    bail!("--style-mode requires a value");
+                }
+                i += 1;
+                cli.style_mode = args[i].parse().map_err(|e: String| anyhow::anyhow!(e))?;
+            }
             "wait-exit" => {
                 if i + 1 >= args.len() {
                     bail!("wait-exit requires a signal file path");
@@ -122,6 +150,7 @@ fn print_help(program_name: &str) {
     println!("      --size <COLSxROWS>        Terminal size [default: 120x40]");
     println!("  -l, --listen [<LISTEN_ADDR>]  Enable HTTP server");
     println!("      --subscribe <EVENTS>      Subscribe to events");
+    println!("  -s, --style-mode <MODE>       Style mode for snapshots [default: plain]");
     println!("  -h, --help                    Print help");
     println!("  -V, --version                 Print version");
 }

htty-core/src/rust/cli.rs

@@ -37,7 +37,7 @@ async fn main() -> Result<()> {
     start_http_api(cli.listen, clients_tx.clone()).await?;
     let api = start_stdio_api(command_tx.clone(), clients_tx, cli.subscribe.unwrap_or_default());
     let pty = start_pty(cli.shell_command.clone(), &cli.size, input_rx, output_tx, pid_tx, exit_code_tx, command_tx.clone())?;
-    let session = build_session(&cli.size);
+    let session = build_session(&cli.size, cli.style_mode);
     run_event_loop(output_rx, input_tx, command_rx, clients_rx, pid_rx, exit_code_rx, session, api, &cli).await?;
     pty.await?
 }
@@ -68,8 +68,10 @@ async fn handle_waitexit(signal_file: PathBuf) -> Result<()> {
     Ok(())
 }
 
-fn build_session(size: &cli::Size) -> Session {
-    Session::new(size.cols(), size.rows())
+fn build_session(size: &cli::Size, style_mode: cli::StyleMode) -> Session {
+    let mut session = Session::new(size.cols(), size.rows());
+    session.set_style_mode(style_mode);
+    session
 }
 
 fn start_stdio_api(

htty-core/src/rust/main.rs

@@ -1,3 +1,4 @@
+use crate::cli::StyleMode;
 use anyhow::Result;
 use futures_util::{stream, Stream, StreamExt};
 use serde_json::json;
@@ -13,11 +14,12 @@ pub struct Session {
     start_time: Instant,
     last_event_time: Instant,
     pending_pid: Option<i32>,
+    style_mode: StyleMode,
 }
 
 #[derive(Clone, Debug)]
 pub enum Event {
-    Init(f64, usize, usize, String, String),
+    Init(f64, usize, usize, i32, String, String),
     Output(f64, String),
     Resize(f64, usize, usize),
     Snapshot(usize, usize, String, String),
@@ -46,6 +48,7 @@ impl Session {
             start_time: now,
             last_event_time: now,
             pending_pid: None,
+            style_mode: StyleMode::Plain,
         }
     }
 
@@ -107,7 +110,11 @@ impl Session {
     }
 
     pub fn cursor_key_app_mode(&self) -> bool {
-        self.vt.arrow_key_app_mode()
+        self.vt.cursor_key_app_mode()
+    }
+
+    pub fn set_style_mode(&mut self, style_mode: StyleMode) {
+        self.style_mode = style_mode;
     }
 
     pub fn subscribe(&self) -> Subscription {
@@ -117,6 +124,7 @@ impl Session {
             self.elapsed_time(),
             cols,
             rows,
+            self.pending_pid.unwrap_or(0),
             self.vt.dump(),
             self.text_view(),
         );
@@ -148,11 +156,12 @@ impl Session {
 impl Event {
     pub fn to_json(&self) -> serde_json::Value {
         match self {
-            Event::Init(_time, cols, rows, seq, text) => json!({
+            Event::Init(_time, cols, rows, pid, seq, text) => json!({
                 "type": "init",
                 "data": json!({
                     "cols": cols,
                     "rows": rows,
+                    "pid": pid,
                     "seq": seq,
                     "text": text,
                 })
@@ -215,7 +224,7 @@ impl Event {
 }
 
 fn build_vt(cols: usize, rows: usize) -> avt::Vt {
-    avt::Vt::builder().size(cols, rows).resizable(true).build()
+    avt::Vt::builder().size(cols, rows).build()
 }
 
 fn resize_vt(vt: &mut avt::Vt, cols: usize, rows: usize) {

htty-core/src/rust/session.rs

@@ -51,10 +51,10 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/MatrixManAtYrService/ht"
-Documentation = "https://github.com/MatrixManAtYrService/ht"
-Repository = "https://github.com/MatrixManAtYrService/ht"
-Issues = "https://github.com/MatrixManAtYrService/ht/issues"
+Homepage = "https://github.com/MatrixManAtYrService/htty"
+Documentation = "https://MatrixManAtYrService.github.io/htty/htty.html"
+Repository = "https://github.com/MatrixManAtYrService/htty"
+Issues = "https://github.com/MatrixManAtYrService/htty/issues"
 
 [project.scripts]
 htty = "htty.cli:htty_sync"

htty/pyproject.toml

@@ -4,8 +4,9 @@
 
 let
   version = import ./version.nix { inherit pkgs; };
-in {
+in
+{
   HTTY_VERSION = version.version;
   HTTY_COMMON_RUFF_TOML = builtins.readFile ../../common/ruff.toml;
   HTTY_COMMON_PYRIGHT_TOML = builtins.readFile ../../common/pyright.toml;
-}
+}