Improved live logging

.github/workflows/release.yml

@@ -104,7 +104,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           allowUpdates: true
-          body: "Релиз rexec версии ${{ env.VERSION }}. Статические сборки для Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
+          body: "Release rexec ${{ env.VERSION }}. Static build for Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
 
   upload:
     name: Upload Release Assets

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.2.0"
+version = "1.5.1"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -13,17 +13,16 @@ authors = ["AB <gh@hexor.ru>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dns-lookup = "2.0.2"
+dns-lookup = "2"
 rayon = "1.10"
-log = "0.4.0"
-env_logger = "0.10.0"
-massh = "0.6.3"
-whoami = "1.4.0"
-lazy-st = "0.2.2"
+log = "0.4"
+env_logger = "0.11"
+whoami = "1"
+lazy-st = "1"
 regex = "1"
-clap = { version = "4.3.4", features = ["derive"] }
-colored = "2.0.0"
-itertools = "0.10.5"
+clap = { version = "4.5", features = ["derive"] }
+colored = "3"
+itertools = "0.14"
 brace-expand = "0.1.0"
 question = "0.2.2"
-openssl = { version = "0.10", features = ["vendored"] }
+lazy_static = "1.5.0"

src/main.rs

@@ -1,31 +1,38 @@
-#[macro_use]
 extern crate log;
 
-use std::collections::HashMap;
 use std::fs::read_to_string;
 use std::hash::Hash;
+use std::io::{BufRead, BufReader};
 use std::net::IpAddr;
-use std::process;
+use std::process::{self, Command, Stdio};
 use std::sync::{Arc, Mutex};
+use std::thread;
 
 use clap::Parser;
 use colored::*;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
-use log::{error, info};
-use massh::{MasshClient, MasshConfig, MasshHostConfig, SshAuth};
+use lazy_static::lazy_static;
+use log::{error, info, warn};
 use question::{Answer, Question};
 use rayon::prelude::*;
 use regex::Regex;
 
-// Define args
+// Global state to track the currently open block
+lazy_static! {
+    static ref CURRENT_BLOCK: Arc<Mutex<Option<String>>> = Arc::new(Mutex::new(None));
+}
+
+// Define command-line arguments using the clap library
 #[derive(Parser, Debug)]
 #[command(author = "AB ab@hexor.ru", version, about = "Parallel SSH executor in Rust", long_about = None)]
 struct Args {
-    #[arg(short, long, default_value_t = whoami::username())]
+    /// Username for SSH connections (defaults to current system user)
+    #[arg(short = 'u', short_alias = 'l', long, default_value_t = whoami::username())]
     username: String,
 
+    /// Flag to use known_hosts file for server discovery instead of pattern expansion
     #[arg(
         short,
         long,
@@ -33,6 +40,8 @@ struct Args {
     )]
     known_hosts: bool,
 
+    /// Server name patterns with expansion syntax
+    /// Examples: 'web-[1:12]-io-{prod,dev}' expands to multiple servers
     #[arg(
         short,
         long,
@@ -41,12 +50,15 @@ struct Args {
     )]
     expression: Vec<String>,
 
+    /// Command to execute on each server
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
 
+    /// Display only exit codes without command output
     #[arg(long, default_value_t = false, help = "Show exit code ONLY")]
     code: bool,
 
+    /// Skip confirmation prompt before executing commands
     #[arg(
         short = 'f',
         long,
@@ -55,21 +67,104 @@ struct Args {
     )]
     noconfirm: bool,
 
+    /// Maximum number of parallel SSH connections
     #[arg(short, long, default_value_t = 100)]
     parallel: i32,
 }
 
-// Represent line from known_hosts file
+/// Host representation for both known_hosts entries and expanded patterns
 #[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
 struct Host {
+    /// Hostname or IP address as a string
     name: String,
+    /// Resolved IP address (if available)
     ip: Option<IpAddr>,
 }
 
-// Read known_hosts file
+/// Find common domain suffix across all hostnames to simplify output display
+///
+/// This function analyzes all hostnames to identify a common domain suffix
+/// which can be shortened during display to improve readability.
+///
+/// # Arguments
+/// * `hostnames` - A slice of strings containing all server hostnames
+///
+/// # Returns
+/// * `Option<String>` - The common suffix if found, or None
+fn find_common_suffix(hostnames: &[String]) -> Option<String> {
+    if hostnames.is_empty() {
+        return None;
+    }
+
+    // Don't truncate if only one host
+    if hostnames.len() == 1 {
+        return None;
+    }
+
+    let first = &hostnames[0];
+
+    // Start with assumption that the entire first hostname is the common suffix
+    let mut common = first.clone();
+
+    // Iterate through remaining hostnames, reducing the common part
+    for hostname in hostnames.iter().skip(1) {
+        // Exit early if no common part remains
+        if common.is_empty() {
+            return None;
+        }
+
+        // Find common suffix with current hostname
+        let mut new_common = String::new();
+
+        // Search for common suffix by comparing characters from right to left
+        let mut common_chars = common.chars().rev();
+        let mut hostname_chars = hostname.chars().rev();
+
+        loop {
+            match (common_chars.next(), hostname_chars.next()) {
+                (Some(c1), Some(c2)) if c1 == c2 => new_common.insert(0, c1),
+                _ => break,
+            }
+        }
+
+        common = new_common;
+    }
+
+    // Ensure the common part is a valid domain suffix (starts with a dot)
+    if common.is_empty() || !common.starts_with('.') {
+        return None;
+    }
+
+    // Return the identified common suffix
+    Some(common)
+}
+
+/// Shorten hostname by removing the common suffix and replacing with an asterisk
+///
+/// # Arguments
+/// * `hostname` - The original hostname
+/// * `common_suffix` - Optional common suffix to remove
+///
+/// # Returns
+/// * `String` - Shortened hostname or original if no common suffix
+fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
+    match common_suffix {
+        Some(suffix) if hostname.ends_with(suffix) => {
+            let short_name = hostname[..hostname.len() - suffix.len()].to_string();
+            format!("{}{}", short_name, "*")
+        }
+        _ => hostname.to_string(),
+    }
+}
+
+/// Read and parse the SSH known_hosts file to extract server names
+///
+/// # Returns
+/// * `Vec<Host>` - List of hosts found in the known_hosts file
 fn read_known_hosts() -> Vec<Host> {
     let mut result: Vec<Host> = Vec::new();
 
+    // Read known_hosts file from the user's home directory
     for line in read_to_string(format!("/home/{}/.ssh/known_hosts", whoami::username()))
         .unwrap()
         .lines()
@@ -84,18 +179,45 @@ fn read_known_hosts() -> Vec<Host> {
     result
 }
 
+/// Expand a numeric range in the format [start:end] to a list of strings
+///
+/// # Arguments
+/// * `start` - Starting number (inclusive)
+/// * `end` - Ending number (inclusive)
+///
+/// # Returns
+/// * `Vec<String>` - List of numbers as strings
 fn expand_range(start: i32, end: i32) -> Vec<String> {
     (start..=end).map(|i| i.to_string()).collect()
 }
 
+/// Expand a comma-separated list in the format {item1,item2,item3} to a list of strings
+///
+/// # Arguments
+/// * `list` - Comma-separated string to expand
+///
+/// # Returns
+/// * `Vec<String>` - List of expanded items
 fn expand_list(list: &str) -> Vec<String> {
     list.split(',').map(|s| s.to_string()).collect()
 }
 
+/// Expand a server pattern string with range and list notation into individual hostnames
+///
+/// Supports two expansion types:
+/// - Range expansion: server-[1:5] → server-1, server-2, server-3, server-4, server-5
+/// - List expansion: server-{prod,dev} → server-prod, server-dev
+///
+/// # Arguments
+/// * `s` - Pattern string to expand
+///
+/// # Returns
+/// * `Vec<Host>` - List of expanded Host objects
 fn expand_string(s: &str) -> Vec<Host> {
     let mut hosts: Vec<Host> = Vec::new();
     let mut result = vec![s.to_string()];
 
+    // First expand all range expressions [start:end]
     while let Some(r) = result.iter().find(|s| s.contains('[')) {
         let r = r.clone();
         let start = r.find('[').unwrap();
@@ -122,6 +244,7 @@ fn expand_string(s: &str) -> Vec<Host> {
         }
     }
 
+    // Then expand all list expressions {item1,item2}
     while let Some(r) = result.iter().find(|s| s.contains('{')) {
         let r = r.clone();
         let start = r.find('{').unwrap();
@@ -140,6 +263,7 @@ fn expand_string(s: &str) -> Vec<Host> {
         }
     }
 
+    // Convert all expanded strings to Host objects
     for hostname in result {
         hosts.push(Host {
             name: hostname.to_string(),
@@ -149,14 +273,174 @@ fn expand_string(s: &str) -> Vec<Host> {
     hosts
 }
 
+/// Execute a command on a single host using the system SSH client
+///
+/// This function runs an SSH command using the system's SSH client,
+/// capturing and displaying output in real-time with proper formatting.
+///
+/// # Arguments
+/// * `hostname` - Target server hostname
+/// * `username` - SSH username
+/// * `command` - Command to execute
+/// * `common_suffix` - Optional common suffix for hostname display formatting
+/// * `code_only` - Whether to display only exit codes
+///
+/// # Returns
+/// * `Result<i32, String>` - Exit code on success or error message
+fn execute_ssh_command(
+    hostname: &str,
+    username: &str,
+    command: &str,
+    common_suffix: &Option<String>,
+    code_only: bool,
+) -> Result<i32, String> {
+    let display_name = shorten_hostname(hostname, common_suffix);
+
+    // Build the SSH command with appropriate options
+    let mut ssh_cmd = Command::new("ssh");
+    ssh_cmd
+        .arg("-o")
+        .arg("StrictHostKeyChecking=no")
+        .arg("-o")
+        .arg("BatchMode=yes")
+        .arg(format!("{}@{}", username, hostname))
+        .arg(command)
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped());
+
+    // Execute the command
+    let mut child = match ssh_cmd.spawn() {
+        Ok(child) => child,
+        Err(e) => return Err(format!("Failed to start SSH process: {}", e)),
+    };
+
+    // Function to handle output lines with proper block management
+    let handle_output = |line: String, display_name: &str, code_only: bool, is_stderr: bool| {
+        if !code_only {
+            let mut current_block = CURRENT_BLOCK.lock().unwrap();
+
+            // Check if we need to close the previous block and open a new one
+            match current_block.as_ref() {
+                Some(open_host) if open_host != display_name => {
+                    // Close the previous block
+                    println!("└ {} ┘", open_host.yellow());
+                    // Open new block
+                    println!("┌ {} ┐", display_name.yellow());
+                    *current_block = Some(display_name.to_string());
+                }
+                None => {
+                    // Open new block
+                    println!("┌ {} ┐", display_name.yellow());
+                    *current_block = Some(display_name.to_string());
+                }
+                Some(_) => {
+                    // Same host, continue with current block
+                }
+            }
+
+            // Print the log line with colored separator based on stream type
+            let separator = if is_stderr {
+                "│".red()
+            } else {
+                "│".green()
+            };
+            println!(
+                "{} {} {} {}",
+                separator,
+                display_name.yellow(),
+                separator,
+                line
+            );
+        }
+    };
+
+    // Capture and display stdout in real-time using a dedicated thread
+    let stdout = child.stdout.take().unwrap();
+    let display_name_stdout = display_name.clone();
+    let code_only_stdout = code_only;
+    let stdout_thread = thread::spawn(move || {
+        let reader = BufReader::new(stdout);
+
+        for line in reader.lines() {
+            match line {
+                Ok(line) => {
+                    handle_output(line, &display_name_stdout, code_only_stdout, false);
+                    // false = stdout
+                }
+                Err(_) => break,
+            }
+        }
+    });
+
+    // Capture and display stderr in real-time using a dedicated thread
+    let stderr = child.stderr.take().unwrap();
+    let display_name_stderr = display_name.clone();
+    let code_only_stderr = code_only;
+    let stderr_thread = thread::spawn(move || {
+        let reader = BufReader::new(stderr);
+
+        for line in reader.lines() {
+            match line {
+                Ok(line) => {
+                    handle_output(line, &display_name_stderr, code_only_stderr, true);
+                    // true = stderr
+                }
+                Err(_) => break,
+            }
+        }
+    });
+
+    // Wait for command to complete
+    let status = match child.wait() {
+        Ok(status) => status,
+        Err(e) => return Err(format!("Failed to wait for SSH process: {}", e)),
+    };
+
+    // Wait for stdout and stderr threads to complete
+    stdout_thread.join().unwrap();
+    stderr_thread.join().unwrap();
+
+    // Close the block if this host was the last one to output
+    if !code_only {
+        let mut current_block = CURRENT_BLOCK.lock().unwrap();
+        if let Some(open_host) = current_block.as_ref() {
+            if open_host == &display_name {
+                println!("└ {} ┘", display_name.yellow());
+                *current_block = None;
+            }
+        }
+    }
+
+    // Format exit code with color (green for success, red for failure)
+    let exit_code = status.code().unwrap_or(-1);
+    let code_string = if exit_code == 0 {
+        format!("{}", exit_code.to_string().green())
+    } else {
+        format!("{}", exit_code.to_string().red())
+    };
+
+    // For code-only mode, just show hostname and exit code
+    if code_only {
+        println!("{}: [{}]", display_name.yellow(), code_string);
+    }
+
+    Ok(exit_code)
+}
+
+/// Main entry point for the application
 fn main() {
+    // Initialize logging with minimal formatting (no timestamp, no target)
     env_logger::Builder::from_env(Env::default().default_filter_or("info"))
         .format_timestamp(None)
         .format_target(false)
         .init();
+
+    // Parse command-line arguments
     let args = Args::parse();
 
+    // Build the list of target hosts based on user selection method
     let hosts = if args.known_hosts {
+        // Use regex pattern matching against known_hosts file
         info!("Using ~/.ssh/known_hosts to build server list.");
         let known_hosts = read_known_hosts();
         let mut all_hosts = Vec::new();
@@ -177,6 +461,7 @@ fn main() {
         }
         all_hosts
     } else {
+        // Use pattern expansion syntax (ranges and lists)
         info!("Using string expansion to build server list.");
         let mut all_hosts = Vec::new();
         for expression in args.expression.iter() {
@@ -185,10 +470,10 @@ fn main() {
         all_hosts
     };
 
-    // Dedup hosts from known_hosts file
+    // Remove duplicate hosts while preserving original order
     let matched_hosts: Vec<_> = hosts.into_iter().unique().collect();
 
-    // Build MasshHostConfig hostnames list
+    // Log parallelism setting if not using the default
     if args.parallel != 100 {
         warn!("Parallelism: {} thread{}", &args.parallel, {
             if args.parallel != 1 {
@@ -199,144 +484,143 @@ fn main() {
         });
     }
 
-    info!("Matched hosts:");
-    let resolved_ips = Arc::new(Mutex::new(Vec::<(String, IpAddr)>::new()));
+    // Store hosts with their original indices to preserve ordering
+    let mut host_with_indices: Vec<(Host, usize)> = Vec::new();
+    for (idx, host) in matched_hosts.iter().enumerate() {
+        host_with_indices.push((host.clone(), idx));
+    }
 
-    matched_hosts.par_iter().for_each(|host| {
-        match lookup_host(&host.name) {
+    info!("Matched hosts:");
+
+    // Perform DNS resolution for all hosts in parallel
+    // Results are stored with original indices to maintain order
+    let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
+
+    host_with_indices
+        .par_iter()
+        .for_each(|(host, idx)| match lookup_host(&host.name) {
             Ok(ips) if !ips.is_empty() => {
                 let ip = ips[0];
-
-                info!("{} [{}]", &host.name, ip);
-
-                let mut results = resolved_ips.lock().unwrap();
-                results.push((host.name.clone(), ip));
+                let mut results = resolved_ips_with_indices.lock().unwrap();
+                results.push((host.name.clone(), ip, *idx));
             }
             Ok(_) => {
-                error!("DNS resolved, but IP not found: {}", &host.name.red());
+                let mut results = resolved_ips_with_indices.lock().unwrap();
+                results.push((
+                    host.name.clone(),
+                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
+                    *idx,
+                ));
             }
             Err(_) => {
-                error!("DNS resolve failed: {}", &host.name.red());
+                let mut results = resolved_ips_with_indices.lock().unwrap();
+                results.push((
+                    host.name.clone(),
+                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
+                    *idx,
+                ));
             }
-        }
-    });
+        });
 
-    let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new();
-    let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
+    // Sort hosts by original index to maintain consistent display order
+    let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
+    resolved_hosts.sort_by_key(|(_, _, idx)| *idx);
 
-    if let Ok(results) = resolved_ips.lock() {
-        for (hostname, ip) in results.iter() {
-            hosts_and_ips.insert(*ip, hostname.clone());
-            massh_hosts.push(MasshHostConfig {
-                addr: *ip,
-                auth: None,
-                port: None,
-                user: None,
-            });
+    // Display all matched hosts with their resolved IPs
+    for (hostname, ip, _) in &resolved_hosts {
+        if ip.is_unspecified() {
+            error!("DNS resolve failed: {}", hostname.red());
+        } else {
+            info!("{} [{}]", hostname, ip);
         }
     }
 
-    // Build MasshConfig using massh_hosts vector
-    let config = MasshConfig {
-        default_auth: SshAuth::Agent,
-        default_port: 22,
-        default_user: args.username,
-        threads: args.parallel as u64,
-        timeout: 0,
-        hosts: massh_hosts,
-    };
-    let massh = MasshClient::from(&config);
+    // Filter out hosts that couldn't be resolved
+    let valid_hosts: Vec<(String, IpAddr, usize)> = resolved_hosts
+        .into_iter()
+        .filter(|(_, ip, _)| !ip.is_unspecified())
+        .collect();
 
-    // Ask for confirmation
-    if config.hosts.len() != 0
-        && (args.noconfirm == true
-            || match Question::new(&*format!(
-                "Continue on following {} servers?",
-                &config.hosts.len()
-            ))
-            .confirm()
-            {
-                Answer::YES => true,
-                Answer::NO => false,
-                _ => unreachable!(),
-            })
-    {
-        info!("Run command on {} servers.", &config.hosts.len());
+    // Exit if no valid hosts remain
+    if valid_hosts.is_empty() {
+        error!("No valid hosts to connect to");
+        process::exit(1);
+    }
 
-        // Run a command on all the configured hosts.
-        // Receive the result of the command for each host and print its output.
-        let rx = massh.execute(args.command);
+    // Find common domain suffix to optimize display
+    let hostnames: Vec<String> = valid_hosts
+        .iter()
+        .map(|(hostname, _, _)| hostname.clone())
+        .collect();
+    let common_suffix = find_common_suffix(&hostnames);
 
-        while let Ok((host, result)) = rx.recv() {
-            let ip: String = host.split('@').collect::<Vec<_>>()[1]
-                .split(':')
-                .collect::<Vec<_>>()[0]
-                .to_string();
-            let ip = ip.parse::<IpAddr>().unwrap();
-            println!(
-                "\n{}",
-                hosts_and_ips
-                    .get(&ip)
-                    .unwrap_or(&"Couldn't parse IP".to_string())
-                    .to_string()
-                    .yellow()
-                    .bold()
-                    .to_string()
-            );
-            let output = match result {
-                Ok(output) => output,
-                Err(e) => {
-                    error!("Can't access server: {}", e);
-                    continue;
-                }
-            };
-            let code_string = if output.exit_status == 0 {
-                format!("{}", output.exit_status.to_string().green())
-            } else {
-                format!("{}", output.exit_status.to_string().red())
-            };
-            println!(
-                "{}",
-                format!(
-                    "Exit code [{}] | std out/err [{}/{}] bytes",
-                    code_string,
-                    output.stdout.len(),
-                    output.stderr.len()
-                )
-                .bold()
-            );
+    // Inform user about display optimization if common suffix found
+    if let Some(suffix) = &common_suffix {
+        info!(
+            "Common domain suffix found: '{}' (will be displayed as '*')",
+            suffix
+        );
+    }
 
-            if !args.code {
-                match String::from_utf8(output.stdout) {
-                    Ok(stdout) => match stdout.as_str() {
-                        "" => {}
-                        _ => {
-                            let prefix = if output.exit_status != 0 {
-                                format!("{}", "│".cyan())
-                            } else {
-                                format!("{}", "│".green())
-                            };
-                            for line in stdout.lines() {
-                                println!("{} {}", prefix, line);
-                            }
-                        }
-                    },
-                    Err(_) => {}
-                }
-                match String::from_utf8(output.stderr) {
-                    Ok(stderr) => match stderr.as_str() {
-                        "" => {}
-                        _ => {
-                            for line in stderr.lines() {
-                                println!("{} {}", "║".red(), line);
-                            }
-                        }
-                    },
-                    Err(_) => {}
-                }
+    // Ask for confirmation before proceeding (unless --noconfirm is specified)
+    if !args.noconfirm
+        && match Question::new(&*format!(
+            "Continue on following {} servers?",
+            &valid_hosts.len()
+        ))
+        .confirm()
+        {
+            Answer::YES => true,
+            Answer::NO => {
+                warn!("Stopped");
+                process::exit(0);
             }
+            _ => unreachable!(),
         }
-    } else {
-        warn!("Stopped");
+    {
+        info!("Run command on {} servers.", &valid_hosts.len());
+    }
+
+    // Execute commands using system SSH client
+    let batch_size = args.parallel as usize;
+    let mut processed = 0;
+
+    while processed < valid_hosts.len() {
+        let end = std::cmp::min(processed + batch_size, valid_hosts.len());
+        let batch = &valid_hosts[processed..end];
+
+        // Create a thread for each host in the current batch
+        let mut handles = Vec::new();
+
+        for (hostname, _, _) in batch {
+            let hostname = hostname.clone();
+            let username = args.username.clone();
+            let command = args.command.clone();
+            let common_suffix_clone = common_suffix.clone();
+            let code_only = args.code;
+
+            // Execute SSH command in a separate thread
+            let handle = thread::spawn(move || {
+                match execute_ssh_command(
+                    &hostname,
+                    &username,
+                    &command,
+                    &common_suffix_clone,
+                    code_only,
+                ) {
+                    Ok(_) => (),
+                    Err(e) => error!("Error executing command on {}: {}", hostname, e),
+                }
+            });
+
+            handles.push(handle);
+        }
+
+        // Wait for all threads in this batch to complete
+        for handle in handles {
+            handle.join().unwrap();
+        }
+
+        processed = end;
     }
 }