Format Rust code using rustfmt

.github/workflows/arm_build.yml

@@ -1,39 +0,0 @@
-name: ARM Rust static build and publish
-on: ["push"]
-# push:
-#   tags:
-#   - '*'
-#    
-env:
-  CARGO_TERM_COLOR: always
-  BUILD_TARGET: x86_64-unknown-linux-musl
-  BINARY_NAME: rexec
-jobs:
-  build:
-    name: Build static binary
-    runs-on: self-hosted
-    container:
-      image: rust:latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v3
-#     - uses: dtolnay/rust-toolchain@stable
-#     - name: Build-musl
-#       uses: gmiam/rust-musl-action@master
-#       with:
-#         args: cargo build --target $BUILD_TARGET --release
-      - name: Deps
-        run: |
-          rustup target add x86_64-unknown-linux-musl
-          cargo build --target ${{ env.BUILD_TARGET }} --release
-          
-      - name: Get version
-        run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
-      - name: Show version
-        run:  echo ${{ env.VERSION }}
-      - uses: actions/upload-artifact@v3.1.2
-        name: Upload artifact
-        with:
-          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
-          path: target/${{ env.BUILD_TARGET }}/release/${{ env.BINARY_NAME }}

.github/workflows/release.yml

@@ -1,98 +1,140 @@
 name: Rust static build and publish
+
 on:
   push:
     tags:
-    - '*'
+      - 'v*.*.*'
+
 env:
   CARGO_TERM_COLOR: always
-  BUILD_TARGET: x86_64-unknown-linux-musl
   BINARY_NAME: rexec
+
 jobs:
   build:
     name: Build static binary
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            build_target: x86_64-unknown-linux-musl
+            platform_name: linux-amd64
+          - os: windows-latest
+            build_target: x86_64-pc-windows-msvc
+            platform_name: windows-amd64
+          - os: macos-latest
+            build_target: aarch64-apple-darwin
+            platform_name: macos-arm64
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      
+      - name: Cache Cargo registry
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-registry-
+      
+      - name: Cache Cargo index
+        uses: actions/cache@v4
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-index-
+      
+      - name: Cache Cargo build
+        uses: actions/cache@v4
+        with:
+          path: target
+          key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-build-
+
       - uses: dtolnay/rust-toolchain@stable
+      
       - uses: mbrobbel/rustfmt-check@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build-musl
+          
+      - name: Install rust targets
+        run: rustup target add ${{ matrix.build_target }}
+        
+      - name: Build Linux MUSL
+        if: matrix.os == 'ubuntu-latest'
         uses: gmiam/rust-musl-action@master
         with:
-          args: cargo build --target $BUILD_TARGET --release
+          args: cargo build --target ${{ matrix.build_target }} --release
+          
+      - name: Build MacOS
+        if: matrix.os == 'macos-latest'
+        run: cargo build --target ${{ matrix.build_target }} --release
+          
+      - name: Build Windows
+        if: matrix.os == 'windows-latest'
+        run: cargo build --target ${{ matrix.build_target }} --release
+          
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
+          path: target/${{ matrix.build_target }}/release/${{ env.BINARY_NAME }}*
+
+  release:
+    name: Create Release Page
+    needs: build
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
       - name: Get version
         run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
       - name: Show version
-        run:  echo ${{ env.VERSION }}
-      - uses: actions/upload-artifact@v3.1.2
-        name: Upload artifact
+        run: echo ${{ env.VERSION }}
+      - uses: ncipollo/release-action@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
-          path: target/${{ env.BUILD_TARGET }}/release/${{ env.BINARY_NAME }}
-  build_arch:
-    name: Arch Linux package
-    runs-on: ubuntu-latest
-    needs: ["build"]
-    container:
-      image: archlinux:base-devel
-      options: --user 1001
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v3
-      - name: Get version
-        run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
-      - uses: actions/download-artifact@master
-        name: Download
-        id: download_binary
-        with:
-          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
-          path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
-      - name: Prepare build env
-        run: |
-          mkdir -p target/${{ env.BUILD_TARGET }}/release/
-          mv ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}/rexec target/${{ env.BUILD_TARGET }}/release/
-          sed -i -e "s/some_ver/${{ env.VERSION }}/" PKGBUILD
-      - name: Build ZST package
-        run: |
-          makepkg -f
-      - uses: actions/upload-artifact@v3.1.2
-        name: Upload artifact
-        with:
-          name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
-          path: ${{ github.workspace }}/*zst
+          allowUpdates: true
+          body: "Release rexec ${{ env.VERSION }}. Static build for Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
 
-
-  release:
-    name: Making New Release ^_^
-    needs:
-      - build
-      - build_arch
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
+  upload:
+    name: Upload Release Assets
+    needs: release
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            platform_name: linux-amd64
+          - os: windows-latest
+            platform_name: windows-amd64
+          - os: macos-latest
+            platform_name: macos-arm64
     steps:
-    - uses: actions/checkout@v3
-    - name: Get version
-      run: echo "VERSION=$(grep -P '^version = \"\d+\.\d+\.\d+\"' Cargo.toml | awk -F '\"' '{print $2}')" >> $GITHUB_ENV
-    - uses: actions/download-artifact@master
-      name: Download binary
-      id: download_binary
-      with:
-        name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
-        path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}
-    - uses: actions/download-artifact@master
-      id: download_pkg
-      name: Download ZST package
-      with:
-        name: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
-        path: ${{ env.BINARY_NAME }}_${{ env.VERSION }}_${{ env.BUILD_TARGET }}.zst
-    - uses: ncipollo/release-action@v1
-      name: Update release page
-      with:
-        artifacts: "${{ steps.download_binary.outputs.download-path }}/*,${{ steps.download_pkg.outputs.download-path }}/*"
-        allowUpdates: true
-        body: Static musl build for x86_64-linux and Arch Linux package
+      - uses: actions/checkout@v4
+      
+      - uses: actions/download-artifact@v4
+        name: Download ${{ matrix.platform_name }} artifact
+        with:
+          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
+          path: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
+          
+      - name: Upload Release Asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.release.outputs.upload_url }}
+          asset_path: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}/${{ env.BINARY_NAME }}${{ matrix.platform_name == 'windows-amd64' && '.exe' || '' }}
+          asset_name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}${{ matrix.platform_name == 'windows-amd64' && '.exe' || '' }}
+          asset_content_type: application/octet-stream

CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+
+## [1.1.0] - 2023-09-13
+
+### Improved
+
+- Logging. Fix bugs 
+
+
 ## [1.0.7] - 2023-08-31
 
 ### Changed

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -244,6 +244,31 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1029,6 +1054,26 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -1066,7 +1111,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rexec"
-version = "1.0.8"
+version = "1.2.1"
 dependencies = [
  "brace-expand",
  "clap 4.3.4",
@@ -1079,6 +1124,7 @@ dependencies = [
  "massh",
  "openssl",
  "question",
+ "rayon",
  "regex",
  "whoami",
 ]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.0.8"
+version = "1.2.1"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -14,6 +14,7 @@ authors = ["AB <gh@hexor.ru>"]
 
 [dependencies]
 dns-lookup = "2.0.2"
+rayon = "1.10"
 log = "0.4.0"
 env_logger = "0.10.0"
 massh = "0.6.3"
@@ -22,7 +23,6 @@ lazy-st = "0.2.2"
 regex = "1"
 clap = { version = "4.3.4", features = ["derive"] }
 colored = "2.0.0"
-#dialoguer = "0.10.4"
 itertools = "0.10.5"
 brace-expand = "0.1.0"
 question = "0.2.2"

README.md

@@ -32,63 +32,31 @@ Options:
 ```
 ---
 
+![image](https://github.com/house-of-vanity/rexec/assets/4666566/4c52915d-2bc1-46b9-9833-b0d7c0527f2d)
+
+
 ## Examples
 ```shell
-[ab@test]$ rexec -e 'cassandra-gce-sc-[1:3].bbs-prod.*' -u ab -c 'df -h /srv/cassandra'
+$ rexec -f \
+    -e 'cassandra-gce-or-[1:2]' \
+    -u ab \
+    -c 'uname -r; date'
 [INFO ] Using string expansion to build server list.
 [INFO ] Matched hosts:
-[INFO ] cassandra-gce-sc-1.bbs-prod.* [35.221.18.35]
-[INFO ] cassandra-gce-sc-2.bbs-prod.* [35.212.13.174]
-[INFO ] cassandra-gce-sc-3.bbs-prod.* [35.211.213.123]
-Continue on following 3 servers? y
-[INFO ] 
-    
-[INFO ] Run command on 3 servers.
-[INFO ] 
-    
-[INFO ] cassandra-gce-sc-2.bbs-prod.*
-Code 0
-STDOUT:
-Filesystem                     Size  Used Avail Use% Mounted on
-/dev/mapper/storage-cassandra  1.0T  613G  411G  60% /srv/cassandra
+[INFO ] cassandra-gce-or-1.prod.example.com [2.22.123.79]
+[INFO ] cassandra-gce-or-2.prod.example.com [2.22.123.158]
+Continue on following 2 servers? y
+[INFO ] Run command on 2 servers.
 
-[INFO ] cassandra-gce-sc-1.bbs-prod.*
-Code 0
-STDOUT:
-Filesystem                     Size  Used Avail Use% Mounted on
-/dev/mapper/storage-cassandra  1.0T  594G  430G  59% /srv/cassandra
+cassandra-gce-or-1.prod.example.com
+Exit code [0] / stdout 45 bytes / stderr 0 bytes
+STDOUT
+║ 5.15.0-1040-gcp
+║ Thu Sep  7 13:44:40 UTC 2023
 
-[INFO ] cassandra-gce-sc-3.bbs-prod.*
-Code 0
-STDOUT:
-Filesystem                     Size  Used Avail Use% Mounted on
-/dev/mapper/storage-cassandra  1.0T  523G  502G  52% /srv/cassandra
-```
----
-
-```shell
-[ab@test]$ ./rexec -u ab -k -c uptime -e admin.* -f
-[INFO ] Matched hosts:
-[INFO ] admin-gce-sc-1.lca-prod.** [35.211.27.195]
-[INFO ] admin-gce-sc-1.mmk-prod.** [35.211.79.202]
-[ERROR] admin-gce-sc-1.led-prod.** couldn't be resolved.
-[INFO ] admin-gce-sc-1.msq-dev.** [35.211.0.24]
-[ERROR] admin-gce-sc-1.hui-dev.** couldn't be resolved.
-    
-[INFO ] Run command on 3 servers.
-
-[INFO ] admin.gnb-prod.**
-Code 0 
-STDOUT:                                                    
- 23:31:21 up 294 days, 14:14,  0 users,  load average: 0.53, 0.64, 0.52
-                                                                                                                       
-[INFO ] admin.abe-prod.**
-Code 0 
-STDOUT:                                                    
- 23:31:22 up 154 days,  9:24,  0 users,  load average: 0.31, 0.25, 0.18
-
-[INFO ] admin-gce-be-1.toy-prod.**
-Code 0                                                     
-STDOUT:
- 23:31:22 up 98 days,  6:20,  0 users,  load average: 0.88, 0.74, 0.80
+cassandra-gce-or-2.prod.example.com
+Exit code [0] / stdout 45 bytes / stderr 0 bytes
+STDOUT
+║ 5.15.0-1040-gcp
+║ Thu Sep  7 13:44:40 UTC 2023
 ```

src/main.rs

@@ -6,15 +6,17 @@ use std::fs::read_to_string;
 use std::hash::Hash;
 use std::net::IpAddr;
 use std::process;
+use std::sync::{Arc, Mutex};
 
 use clap::Parser;
 use colored::*;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
-use log::{error, info};
+use log::{error, info, warn};
 use massh::{MasshClient, MasshConfig, MasshHostConfig, SshAuth};
 use question::{Answer, Question};
+use rayon::prelude::*;
 use regex::Regex;
 
 // Define args
@@ -34,9 +36,10 @@ struct Args {
     #[arg(
         short,
         long,
+        num_args = 1..,
         help = "Expression to build server list. List and range expansion are supported. Example: 'web-[1:12]-io-{prod,dev}'"
     )]
-    expression: String,
+    expression: Vec<String>,
 
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
@@ -156,30 +159,36 @@ fn main() {
     let hosts = if args.known_hosts {
         info!("Using ~/.ssh/known_hosts to build server list.");
         let known_hosts = read_known_hosts();
-        // Build regex
-        let re = match Regex::new(&args.expression) {
-            Ok(result) => result,
-            Err(e) => {
-                error!("Error parsing regex. {}", e);
-                process::exit(1);
-            }
-        };
-        // match hostnames from known_hosts to regex
-        known_hosts
-            .into_iter()
-            .filter(|r| re.is_match(&r.name.clone()))
-            .collect()
+        let mut all_hosts = Vec::new();
+        for expression in args.expression.iter() {
+            let re = match Regex::new(expression) {
+                Ok(result) => result,
+                Err(e) => {
+                    error!("Error parsing regex. {}", e);
+                    process::exit(1);
+                }
+            };
+            let matched: Vec<Host> = known_hosts
+                .clone()
+                .into_iter()
+                .filter(|r| re.is_match(&r.name.clone()))
+                .collect();
+            all_hosts.extend(matched);
+        }
+        all_hosts
     } else {
         info!("Using string expansion to build server list.");
-        expand_string(&args.expression)
+        let mut all_hosts = Vec::new();
+        for expression in args.expression.iter() {
+            all_hosts.extend(expand_string(expression));
+        }
+        all_hosts
     };
 
-    // Dedup hosts from known_hosts file
+    // Dedup hosts from known_hosts file but preserve original order
     let matched_hosts: Vec<_> = hosts.into_iter().unique().collect();
 
     // Build MasshHostConfig hostnames list
-    let mut massh_hosts: Vec<MasshHostConfig> = vec![];
-    let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new();
     if args.parallel != 100 {
         warn!("Parallelism: {} thread{}", &args.parallel, {
             if args.parallel != 1 {
@@ -190,41 +199,82 @@ fn main() {
         });
     }
 
-    info!("Matched hosts:");
-    for host in matched_hosts.iter() {
-        let ip = match lookup_host(&host.name) {
-            Ok(ip) => ip[0],
-            Err(_) => {
-                error!("{} couldn't be resolved.", &host.name.red());
-                continue;
-            }
-        };
-        info!("{} [{}]", &host.name, ip);
-        hosts_and_ips.insert(ip, host.name.clone());
-        massh_hosts.push(MasshHostConfig {
-            addr: ip,
-            auth: None,
-            port: None,
-            user: None,
-        })
+    // Store hosts with their indices to preserve order
+    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));
     }
-    // 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);
+
+    info!("Matched hosts:");
+
+    // Do DNS resolution in parallel but store results for ordered display later
+    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];
+                let mut results = resolved_ips_with_indices.lock().unwrap();
+                results.push((host.name.clone(), ip, *idx));
+            }
+            Ok(_) => {
+                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(_) => {
+                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,
+                ));
+            }
+        });
+
+    // Sort by original index to ensure hosts are displayed in order
+    let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
+    resolved_hosts.sort_by_key(|(_, _, idx)| *idx);
+
+    // Now print the hosts in the correct order
+    for (hostname, ip, _) in &resolved_hosts {
+        if ip.is_unspecified() {
+            error!("DNS resolve failed: {}", hostname.red());
+        } else {
+            info!("{} [{}]", hostname, ip);
+        }
+    }
+
+    // Create massh_hosts in the correct order
+    let mut hosts_and_ips: HashMap<IpAddr, (String, usize)> = HashMap::new();
+    let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
+
+    for (hostname, ip, idx) in resolved_hosts {
+        // Skip hosts that couldn't be resolved
+        if !ip.is_unspecified() {
+            hosts_and_ips.insert(ip, (hostname.clone(), idx));
+            massh_hosts.push(MasshHostConfig {
+                addr: ip,
+                auth: None,
+                port: None,
+                user: None,
+            });
+        }
+    }
+
+    // Process hosts in batches to maintain order
+    let batch_size = args.parallel as usize;
 
     // Ask for confirmation
-    if config.hosts.len() != 0
-        && (args.noconfirm == true
+    if !massh_hosts.is_empty()
+        && (args.noconfirm
             || match Question::new(&*format!(
                 "Continue on following {} servers?",
-                &config.hosts.len()
+                &massh_hosts.len()
             ))
             .confirm()
             {
@@ -233,78 +283,120 @@ fn main() {
                 _ => unreachable!(),
             })
     {
-        info!("Run command on {} servers.", &config.hosts.len());
+        info!("Run command on {} servers.", &massh_hosts.len());
 
-        // 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);
+        let mut processed = 0;
 
-        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;
-                }
+        while processed < massh_hosts.len() {
+            let end = std::cmp::min(processed + batch_size, massh_hosts.len());
+
+            // Create a new config and vector for this batch
+            let mut batch_hosts = Vec::new();
+            for host in &massh_hosts[processed..end] {
+                batch_hosts.push(MasshHostConfig {
+                    addr: host.addr,
+                    auth: None,
+                    port: None,
+                    user: None,
+                });
+            }
+
+            // Create a new MasshClient for this batch
+            let batch_config = MasshConfig {
+                default_auth: SshAuth::Agent,
+                default_port: 22,
+                default_user: args.username.clone(),
+                threads: batch_hosts.len() as u64,
+                timeout: 0,
+                hosts: batch_hosts,
             };
-            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 [{}] / stdout {} bytes / stderr {} bytes",
-                    code_string,
-                    output.stdout.len(),
-                    output.stderr.len()
-                )
-                .bold()
-            );
 
-            if !args.code {
-                match String::from_utf8(output.stdout) {
-                    Ok(stdout) => match stdout.as_str() {
-                        "" => {}
-                        _ => {
-                            println!("{}", "STDOUT".bold().blue());
+            let batch_massh = MasshClient::from(&batch_config);
 
-                            for line in stdout.lines() {
-                                println!("{} {}", "║".green(), line);
-                            }
-                        }
-                    },
-                    Err(_) => {}
-                }
-                match String::from_utf8(output.stderr) {
-                    Ok(stderr) => match stderr.as_str() {
-                        "" => {}
-                        _ => {
-                            println!("{}", "STDERR".bold().bright_red());
-                            for line in stderr.lines() {
-                                println!("{} {}", "║".red(), line);
-                            }
-                        }
-                    },
-                    Err(_) => {}
+            // Run commands on this batch
+            let rx = batch_massh.execute(args.command.clone());
+
+            // Collect all results from this batch before moving to the next
+            let mut batch_results = Vec::new();
+
+            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();
+
+                if let Some((hostname, idx)) = hosts_and_ips.get(&ip) {
+                    batch_results.push((hostname.clone(), ip, result, *idx));
+                } else {
+                    error!("Unexpected IP address in result: {}", ip);
                 }
             }
+
+            // Sort the batch results by index to ensure they're displayed in order
+            batch_results.sort_by_key(|(_, _, _, idx)| *idx);
+
+            // Display the results
+            for (hostname, _ip, result, _) in batch_results {
+                println!("\n{}", hostname.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 [{}] / stdout {} bytes / stderr {} bytes",
+                        code_string,
+                        output.stdout.len(),
+                        output.stderr.len()
+                    )
+                    .bold()
+                );
+
+                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(_) => {}
+                    }
+                }
+            }
+
+            processed = end;
         }
     } else {
         warn!("Stopped");