Format Rust code using rustfmt

Bump
Added host ordering
2025-07-08 01:04:07 +00:00 · 2025-06-27 11:15:08 +00:00 · 2025-05-05 17:31:12 +03:00 · 2025-05-05 17:29:39 +03:00 · 2025-04-08 18:46:13 +01:00 · 2025-04-08 18:38:56 +01:00
9 changed files with 518 additions and 213 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@ -0,0 +1,10 @@
+pkgbase = rexec
+	pkgdesc = Parallel SSH executor
+	pkgver = 1.0.6
+	pkgrel = 1
+	url = https://github.com/house-of-vanity/rexec
+	arch = x86_64
+	license = WTFPL
+	makedepends = cargo
+
+pkgname = rexec
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,80 +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
-      - uses: actions/upload-artifact@v2
-        name: Upload artifact
+          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 }}_x86_64-linux-musl
-          path: target/x86_64-unknown-linux-musl/release/${{ env.BINARY_NAME }}
-
-#  build_arch:
-#    name: Arch Linux package
-#    runs-on: ubuntu-latest
-#    permissions:
-#      contents: write
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Install latest nightly
-#      uses: actions-rs/toolchain@v1
-#      with:
-#        toolchain: stable
-#        override: true
-#        target: x86_64-unknown-linux-musl
-#        components: rustfmt
-#    - name: Install cargo-aur
-#      run: cargo install cargo-aur
-#    - name: Build PKGBUILD
-#      uses: actions-rs/cargo@v1
-#      with:
-#        command: aur
-#    - uses: actions/upload-artifact@v2
-#      name: Upload artifact PKGBUILD
-#      with:
-#          path: PKGBUILD
-#          name: PKGBUILD
+          name: ${{ env.BINARY_NAME }}_${{ matrix.platform_name }}
+          path: target/${{ matrix.build_target }}/release/${{ env.BINARY_NAME }}*

  release:
-    name: Release binary
-    needs: ["build"]
+    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/download-artifact@master
-      id: download_binary
-      with:
-        name: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-        path: ${{ env.BINARY_NAME }}_x86_64-linux-musl
-#    - uses: actions/download-artifact@master
-#      id: download_pkgbuild
-#      with:
-#        name: PKGBUILD
-#        path: PKGBUILD
-    - uses: ncipollo/release-action@v1
-      name: Update release page
-      with:
-        artifacts: "${{ steps.download_binary.outputs.download-path }}/*"
-        allowUpdates: true
-        body: Static build for x86_64-linux using MUSL
+      - 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: ncipollo/release-action@v1
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          allowUpdates: true
+          body: "Release rexec ${{ env.VERSION }}. Static build for Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
+
+  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@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
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,7 @@
 target
 pkg
 *zst
+.rustup
+.cargo
+.viminfo
+.bash_history
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,20 @@ 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
+
+- Ci 
+
 ## [1.0.4] - 2023-08-14

 ### Changed
--- a/Cargo.lock
+++ b/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"
@ -110,6 +110,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@ -163,7 +169,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
 "ansi_term",
 "atty",
- "bitflags",
+ "bitflags 1.3.2",
 "strsim 0.8.0",
 "textwrap",
 "unicode-width",
@ -189,7 +195,7 @@ checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
 dependencies = [
 "anstream",
 "anstyle",
- "bitflags",
+ "bitflags 1.3.2",
 "clap_lex",
 "strsim 0.10.0",
 ]
@ -238,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"
@ -325,6 +356,21 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.0"
@ -429,7 +475,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
 dependencies = [
 "base64 0.13.1",
- "bitflags",
+ "bitflags 1.3.2",
 "bytes",
 "headers-core",
 "http",
@ -785,13 +831,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

 [[package]]
-name = "openssl-sys"
-version = "0.9.88"
+name = "openssl"
+version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617"
+checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+dependencies = [
+ "bitflags 2.4.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "openssl-src"
+version = "111.27.0+1.1.1v"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b"
 dependencies = [
 "cc",
 "libc",
+ "openssl-src",
 "pkg-config",
 "vcpkg",
 ]
@ -972,13 +1054,33 @@ 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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]

 [[package]]
@ -987,7 +1089,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]

 [[package]]
@ -1009,7 +1111,7 @@ checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"

 [[package]]
 name = "rexec"
-version = "1.0.5"
+version = "1.2.1"
 dependencies = [
 "brace-expand",
 "clap 4.3.4",
@ -1020,7 +1122,9 @@ dependencies = [
 "lazy-st",
 "log",
 "massh",
+ "openssl",
 "question",
+ "rayon",
 "regex",
 "whoami",
 ]
@ -1031,7 +1135,7 @@ version = "0.37.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "errno",
 "io-lifetimes",
 "libc",
@ -1188,7 +1292,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "libc",
 "libssh2-sys",
 "parking_lot 0.11.2",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.0.6"
+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,7 @@ 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"
+openssl = { version = "0.10", features = ["vendored"] }
--- a/17
+++ b/17
@ -1,25 +1,14 @@
 # Maintainer: AB <gh@hexor.ru>
 pkgname=rexec
-pkgver=1.0.4.r0.g3cf1e79
+pkgver=some_ver
 pkgrel=1
 pkgdesc="Parallel SSH executor"
 url="https://github.com/house-of-vanity/rexec"
 license=("WTFPL")
 arch=("x86_64")
-makedepends=("cargo")
-
-pkgver() {
-    (git describe --long --tags || echo "$pkgver") | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-build() {
-    return 0
-}

 package() {
-    cd ..
-    usrdir="$pkgdir/usr"
-    mkdir -p $usrdir
-    cargo install --no-track --path . --root "$usrdir"
+  install -Dm755 "$startdir/target/x86_64-unknown-linux-musl/release/rexec" "$pkgdir/usr/bin/rexec"
 }

+
--- a/README.md
+++ b/README.md
@ -1,14 +1,20 @@
 # rexec
-Parallel SSH executor in Rust. It can read servers from `~/.ssh/known_hosts`
-
-or even expand servers from bash expanshion line `cassandra.{prod,dev}.example.com`
+**Parallel SSH executor** in Rust with static binary. It can read servers from `~/.ssh/known_hosts`

+or even expand servers from bash expanshion line `cassandra-[1:5].{prod,dev}.example.com`

 [![Rust-static-build](https://github.com/house-of-vanity/rexec/actions/workflows/release.yml/badge.svg)](https://github.com/house-of-vanity/rexec/actions/workflows/release.yml)
+---

+## Usage
+```shell                                                    
+            _|_|_|_|   _|      _|   _|_|_|_|     _|_|_|  
+ _|  _|_|   _|           _|  _|     _|         _|        
+ _|_|       _|_|_|         _|       _|_|_|     _|        
+ _|         _|           _|  _|     _|         _|        
+ _|         _|_|_|_|   _|      _|   _|_|_|_|     _|_|_|  
+                                                        

-```shell
-[ab@test]$ ./rexec -k admin-gce-sc.* --help
 Parallel SSH executor in Rust

 Usage: rexec [OPTIONS] --expression <EXPRESSION> --command <COMMAND>
@ -24,39 +30,33 @@ Options:
  -h, --help                     Print help
  -V, --version                  Print version
 ```
+---

+![image](https://github.com/house-of-vanity/rexec/assets/4666566/4c52915d-2bc1-46b9-9833-b0d7c0527f2d)
+
+
+## Examples
 ```shell
-[ab@test debug]$ ./rexec -u ab -k -c uptime -e admin.* -f
+$ 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 ] 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 ] 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.

+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 ] admin.gnb-prod.**
-Code 0 
-STDOUT:                                                    
- 23:31:21 up 294 days, 14:14,  0 users,  load average: 0.53, 0.64, 0.52
-
-STDERR:
-                                                                                                                       
-[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
-                                                           
-STDERR:
-
-[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
-                             
-STDERR:
-no server running on /tmp/tmux-1019/default                                                                            
-open terminal failed: not a terminal
+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
 ```
--- a/src/main.rs
+++ b/src/main.rs
@ -6,16 +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 dialoguer::Confirm;
 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
@ -35,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,
@ -157,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 {
@ -191,89 +199,204 @@ 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
-        || match Question::new(&*format!(
-            "Continue on following {} servers?",
-            &config.hosts.len()
-        ))
-        .confirm()
-        {
-            Answer::YES => true,
-            Answer::NO => false,
-            _ => unreachable!(),
-        })
+    if !massh_hosts.is_empty()
+        && (args.noconfirm
+            || match Question::new(&*format!(
+                "Continue on following {} servers?",
+                &massh_hosts.len()
+            ))
+            .confirm()
+            {
+                Answer::YES => true,
+                Answer::NO => false,
+                _ => unreachable!(),
+            })
    {
-        info!("\n");
-        info!("Run command on {} servers.", &config.hosts.len());
-        info!("\n");
+        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();
-            info!(
-                "{}",
-                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;
-                }
-            };
-            if output.exit_status == 0 {
-                println!("Code {}", output.exit_status);
-            } else {
-                error!("Code {}", output.exit_status);
-            };
-            if !args.code {
-                println!("STDOUT:\n{}", String::from_utf8(output.stdout).unwrap());
-                println!("STDERR:\n{}", String::from_utf8(output.stderr).unwrap());
+        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 batch_massh = MasshClient::from(&batch_config);
+
+            // 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");
Author	SHA1	Message	Date
github-actions[bot]	de31eeef7a	Format Rust code using rustfmt	2025-06-27 11:15:08 +00:00
Ultradesu	aea2a927c2	Bump	2025-05-05 17:31:12 +03:00
Ultradesu	e1c2363113	Added host ordering	2025-05-05 17:29:39 +03:00
Ultradesu	d8cdfbbf59	Update CI	2025-04-08 18:46:13 +01:00
Ultradesu	1257eed28b	Update CI	2025-04-08 18:38:56 +01:00
Ultradesu	86d49f1e73	Added parallel DNS resolver.	2025-04-08 18:16:01 +01:00
House of Vanity	9acd8f2243	Update CHANGELOG.md	2023-09-13 16:38:54 +03:00
Alexandr Bogomyakov	2ef0f8f320	Fix CI	2023-09-08 12:32:21 +03:00
Alexandr Bogomyakov	c5920780a2	Fix CI	2023-09-07 18:27:35 +03:00
Alexandr Bogomyakov	52f4e54bc4	Fix CI	2023-09-07 18:26:18 +03:00
Alexandr Bogomyakov	9dc659cea1	Fix CI	2023-09-07 18:24:54 +03:00
Alexandr Bogomyakov	1235e17f6b	Fix CI	2023-09-07 17:55:38 +03:00
Alexandr Bogomyakov	aaa28eae67	Fix CI	2023-09-07 17:54:43 +03:00
Alexandr Bogomyakov	c016ef8a0f	Added multiple -e	2023-09-07 17:41:12 +03:00
House of Vanity	13ab3f3dbd	Update README.md	2023-09-07 17:01:23 +03:00
Alexandr Bogomyakov	70136e9074	Improve readability	2023-09-07 16:05:38 +03:00
Alexandr Bogomyakov	2334c1a8f3	Fix logging	2023-09-07 15:34:13 +03:00
Alexandr Bogomyakov	da6ae2ce37	Improve readability	2023-09-07 15:33:15 +03:00
Alexandr Bogomyakov	e2cc36adf1	Drop ARM build	2023-09-07 15:06:24 +03:00
Alexandr Bogomyakov	080ce8984a	Improve readability	2023-09-07 15:04:51 +03:00
Alexandr Bogomyakov	b360e29666	Improve readability	2023-09-07 14:58:29 +03:00
Alexandr Bogomyakov	1d26a9c6be	ARM build	2023-09-01 00:22:15 +03:00
Alexandr Bogomyakov	48e7e2a4e4	ARM build	2023-09-01 00:20:43 +03:00
Alexandr Bogomyakov	aa0a4e8bd2	ARM build	2023-09-01 00:15:46 +03:00
Alexandr Bogomyakov	554b68b51e	ARM build	2023-09-01 00:09:38 +03:00
Alexandr Bogomyakov	c206ddaef2	ARM build	2023-09-01 00:08:55 +03:00
Alexandr Bogomyakov	e620348834	ARM build	2023-09-01 00:01:58 +03:00
Alexandr Bogomyakov	dc1a67fe01	ARM build	2023-08-31 23:59:47 +03:00
Alexandr Bogomyakov	1d208149f5	ARM build	2023-08-31 23:51:25 +03:00
Alexandr Bogomyakov	093157b6ef	ARM build	2023-08-31 23:49:32 +03:00
House of Vanity	04da0fb97c	Update README.md	2023-08-31 23:34:02 +03:00
House of Vanity	967d9c0e7d	Update README.md	2023-08-31 23:31:44 +03:00
House of Vanity	eb0fd40d9f	Update README.md	2023-08-31 23:31:10 +03:00
House of Vanity	d0bbb29078	Update README.md	2023-08-31 23:30:37 +03:00
House of Vanity	5a388853c5	Update README.md	2023-08-31 23:25:16 +03:00
House of Vanity	41bf46c408	Update README.md	2023-08-31 23:19:26 +03:00
Alexandr Bogomyakov	a2b05a7fa6	Fix	2023-08-31 23:15:26 +03:00
Alexandr Bogomyakov	d71e05116d	Make Arch build	2023-08-31 23:08:48 +03:00
Alexandr Bogomyakov	5e71c45333	Make Arch build	2023-08-31 23:07:52 +03:00
Alexandr Bogomyakov	2831080df8	Make Arch build	2023-08-31 23:07:05 +03:00
Alexandr Bogomyakov	32299e2fb7	Make Arch build	2023-08-31 22:59:11 +03:00
Alexandr Bogomyakov	4640733950	Make Arch build	2023-08-31 22:51:03 +03:00
Alexandr Bogomyakov	f56ad72e4c	Fix	2023-08-31 22:35:07 +03:00
Alexandr Bogomyakov	6f771c430a	Fix	2023-08-31 22:31:04 +03:00
Alexandr Bogomyakov	01d84f9c6f	Fix	2023-08-31 22:30:28 +03:00
Alexandr Bogomyakov	f5df314095	Fix	2023-08-31 22:29:20 +03:00
Alexandr Bogomyakov	b885d494fd	Fix	2023-08-31 21:54:27 +03:00
Alexandr Bogomyakov	ca0e7d960b	Fix	2023-08-31 21:51:41 +03:00
Alexandr Bogomyakov	65dd6ee75f	Fix	2023-08-31 21:46:47 +03:00
Alexandr Bogomyakov	2def401b09	Fix	2023-08-31 21:44:45 +03:00
Alexandr Bogomyakov	e2eb5f9092	Fix	2023-08-31 21:37:19 +03:00
Alexandr Bogomyakov	e8778cb130	Fix	2023-08-31 21:31:16 +03:00
Alexandr Bogomyakov	6b27fb2d67	Fix	2023-08-31 21:28:37 +03:00
Alexandr Bogomyakov	100cdd9ab9	Fix	2023-08-31 21:27:36 +03:00
Alexandr Bogomyakov	4cec9d9904	Fix	2023-08-31 21:25:45 +03:00
Alexandr Bogomyakov	e62a682da0	Fix	2023-08-31 21:21:53 +03:00
github-actions[bot]	7307c83cfa	Format Rust code using rustfmt	2023-08-31 18:15:17 +00:00
Alexandr Bogomyakov	86c4e6def8	Fix	2023-08-31 21:14:15 +03:00
Alexandr Bogomyakov	fe9fa483a3	Fix	2023-08-31 21:13:12 +03:00
Alexandr Bogomyakov	e6c1a63382	Fix	2023-08-31 21:11:45 +03:00
Alexandr Bogomyakov	5ce837d28b	123	2023-08-31 21:10:51 +03:00
Alexandr Bogomyakov	0de6d20ca5	Fix	2023-08-31 21:07:33 +03:00
Alexandr Bogomyakov	a040881cfa	Fix	2023-08-31 21:07:02 +03:00
Alexandr Bogomyakov	5a4bf1f784	Fix	2023-08-31 20:03:34 +03:00
Alexandr Bogomyakov	a77a7cd089	Fix	2023-08-31 19:55:59 +03:00
Alexandr Bogomyakov	fcf91e3f89	Fix	2023-08-31 19:50:22 +03:00
Alexandr Bogomyakov	76a3bc9f55	Fix	2023-08-31 19:43:02 +03:00
Alexandr Bogomyakov	bd324ea0c5	Fix	2023-08-31 19:38:34 +03:00
Alexandr Bogomyakov	93b38e60c5	Fix	2023-08-31 19:37:10 +03:00
Alexandr Bogomyakov	86ebbf3a9e	Fix	2023-08-31 19:33:02 +03:00
Alexandr Bogomyakov	697fba1935	Fix	2023-08-31 19:30:19 +03:00
Alexandr Bogomyakov	9b92477a4e	Fix	2023-08-31 19:03:24 +03:00
Alexandr Bogomyakov	8f8aa85e82	Fix	2023-08-31 19:02:01 +03:00