add query command

Author: 0x7d8

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mcvcli"
 description = "A command line interface for managing Minecraft servers."
-version = "2.3.7"
+version = "2.4.0"
 edition = "2024"
 license = "MIT"
 homepage = "https://github.com/mcjars/mcvcli"
@@ -38,3 +38,4 @@ rand = "0.9.0"
 ipipe = "0.11.7"
 xz2 = "0.1.7"
 atoi = "2.0.0"
+msp = "0.1.2"

Cargo.toml

@@ -7,6 +7,7 @@ pub mod java;
 pub mod lookup;
 pub mod mods;
 pub mod profile;
+pub mod query;
 pub mod start;
 pub mod status;
 pub mod stop;

src/commands/mod.rs

@@ -0,0 +1,167 @@
+use clap::ArgMatches;
+use colored::Colorize;
+
+pub async fn query(matches: &ArgMatches) -> i32 {
+    let mut address = matches
+        .get_one::<String>("address")
+        .expect("required")
+        .to_string();
+    let use_query = matches.get_one::<bool>("query").expect("required");
+
+    if !address.contains(':') {
+        address.push_str(":25565");
+    }
+
+    println!(
+        "{} {}{}",
+        "querying server".bright_black(),
+        address.bright_cyan(),
+        "...".bright_black()
+    );
+
+    let (host, port) = match address.split_once(':') {
+        Some((host, port)) => (host.to_string(), port.parse::<u16>().unwrap_or(25565)),
+        None => (address.clone(), 25565),
+    };
+
+    let server = msp::Conf::create_with_port(&host, port);
+
+    if *use_query {
+        let status = match server.query_full() {
+            Ok(status) => status,
+            Err(e) => {
+                println!("{}: {}", "Error".red(), e);
+                return 1;
+            }
+        };
+
+        println!("{:?}", status);
+    } else {
+        match server.get_server_status() {
+            Ok(status) => {
+                println!(
+                    "{} {}{} {}",
+                    "querying server".bright_black(),
+                    address.bright_cyan(),
+                    "...".bright_black(),
+                    "DONE".green().bold()
+                );
+                println!();
+
+                println!("{}", address.bright_cyan().underline());
+                println!(
+                    "  {} {}",
+                    "version:".bright_black(),
+                    status.version.name.cyan()
+                );
+                println!(
+                    "  {} {}",
+                    "protocol:".bright_black(),
+                    status.version.protocol.to_string().cyan()
+                );
+
+                println!("  {}", "players:".bright_black());
+                println!(
+                    "    {} {}",
+                    "online:".bright_black(),
+                    status.players.online.to_string().cyan()
+                );
+                println!(
+                    "    {} {}",
+                    "max:".bright_black(),
+                    status.players.max.to_string().cyan()
+                );
+                println!("    {}", "sample:".bright_black());
+                for player in status.players.sample {
+                    println!("      {}", player.name.cyan());
+                }
+
+                println!("  {}", "motd:".bright_black());
+                for line in status.description.text.lines() {
+                    println!("    {}", line.cyan());
+                }
+            }
+            Err(_) => {
+                let status = match server.get_netty_server_status() {
+                    Ok(status) => status,
+                    Err(_) => match server.get_legacy_server_status() {
+                        Ok(status) => status,
+                        Err(_) => {
+                            let status = match server.get_beta_legacy_server_status() {
+                                Ok(status) => status,
+                                Err(e) => {
+                                    println!("{}: {}", "Error".red(), e);
+                                    return 1;
+                                }
+                            };
+
+                            println!(
+                                "{} {}{} {}",
+                                "querying server".bright_black(),
+                                address.bright_cyan(),
+                                "...".bright_black(),
+                                "DONE".green().bold()
+                            );
+                            println!();
+
+                            println!("{}", address.bright_cyan().underline());
+                            println!("  {}", "players:".bright_black());
+                            println!(
+                                "    {} {}",
+                                "online:".bright_black(),
+                                status.online_players.to_string().cyan()
+                            );
+                            println!(
+                                "    {} {}",
+                                "max:".bright_black(),
+                                status.max_players.to_string().cyan()
+                            );
+
+                            return 0;
+                        }
+                    },
+                };
+
+                println!(
+                    "{} {}{} {}",
+                    "querying server".bright_black(),
+                    address.bright_cyan(),
+                    "...".bright_black(),
+                    "DONE".green().bold()
+                );
+                println!();
+
+                println!("{}", address.bright_cyan().underline());
+                println!(
+                    "  {} {}",
+                    "version:".bright_black(),
+                    status.server_version.cyan()
+                );
+                println!(
+                    "  {} {}",
+                    "protocol:".bright_black(),
+                    status.protocol_version.to_string().cyan()
+                );
+
+                println!("  {}", "players:".bright_black());
+                println!(
+                    "    {} {}",
+                    "online:".bright_black(),
+                    status.online_players.to_string().cyan()
+                );
+                println!(
+                    "    {} {}",
+                    "max:".bright_black(),
+                    status.max_players.to_string().cyan()
+                );
+
+                println!("  {}", "motd:".bright_black());
+                for line in status.motd.lines() {
+                    println!("    {}", line.cyan());
+                }
+            }
+        };
+    }
+
+    0
+}

src/commands/query.rs

@@ -251,6 +251,26 @@ fn cli() -> Command {
                 )
                 .arg_required_else_help(true),
         )
+        .subcommand(
+            Command::new("query")
+                .about("Queries the Minecraft server for information")
+                .arg(
+                    Arg::new("address")
+                        .help("The address of the Minecraft server to query (e.g., `example.com:25565`)")
+                        .num_args(1)
+                        .required(true),
+                )
+                .arg(
+                    Arg::new("query")
+                        .long("query")
+                        .short('q')
+                        .help("Use the query protocol to get more information (requires server to have query enabled)")
+                        .num_args(0)
+                        .default_value("false")
+                        .value_parser(clap::value_parser!(bool))
+                        .required(false),
+                )
+        )
         .subcommand(
             Command::new("version")
                 .about("Gets the installed version of the Minecraft server")
@@ -477,6 +497,9 @@ async fn main() {
         Some(("lookup", sub_matches)) => {
             std::process::exit(commands::lookup::lookup(sub_matches).await)
         }
+        Some(("query", sub_matches)) => {
+            std::process::exit(commands::query::query(sub_matches).await)
+        }
         Some(("version", sub_matches)) => {
             std::process::exit(commands::version::version(sub_matches).await)
         }