Display the minecraft server version

[minecraft_web.git] / backend / src / minecraft_controller.rs

diff --git a/backend/src/minecraft_controller.rs b/backend/src/minecraft_controller.rs
index a644c4d..545e8c2 100644 (file)
--- a/backend/src/minecraft_controller.rs
+++ b/backend/src/minecraft_controller.rs
@@ -1,7 +1,5 @@
-use sysinfo::{ ProcessExt, SystemExt };\r
-\r
 use std::{ fs, time::SystemTime };\r
-\r
+use sysinfo::{ ProcessExt, SystemExt };\r
 use chrono::{ DateTime, offset::Local };\r
 \r
 #[derive(Clone, Debug)]\r
@@ -11,6 +9,7 @@ pub struct MinecraftExe {
     uptime: u64, // [s].\r
     world_size: u64, // [B].\r
     active_players: Vec<String>,\r
+    version: String,\r
     last_backup: Option<SystemTime>,\r
 }\r
 \r
@@ -42,6 +41,10 @@ impl MinecraftExe {
         }\r
     }\r
 \r
+    pub fn format_version(&self) -> String {\r
+        self.version.clone()\r
+    }\r
+\r
     pub fn format_last_backup(&self) -> String {\r
         match self.last_backup {\r
             Some(t) => {\r
@@ -75,6 +78,7 @@ const MINECRAFT_PROCESS_NAME: &str = "java";
 \r
 struct StatusFromRcon {\r
     players: Vec<String>,\r
+    version: String,\r
 }\r
 \r
 fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {\r
@@ -88,19 +92,32 @@ fn get_status_from_rcon(rcon_password: &str) -> StatusFromRcon {
                         match client.send_command("list".to_string()) {\r
                             Ok(resp) =>\r
                                 match resp.body.find(':') {\r
-                                    Some(i) => resp.body[i + 1..resp.body.len() - 1].split(',').map(|nick| nick.trim().to_string()).collect(),\r
-                                    None => Vec::new()\r
+                                    Some(i) if i < resp.body.len() -1 =>\r
+                                        resp.body[i + 1..resp.body.len()]\r
+                                            .split(',')\r
+                                            .map(|nick| nick.trim().to_string())\r
+                                            .filter(|nick| !nick.is_empty())\r
+                                            .collect(),\r
+                                    _ => Vec::new()\r
                                 },\r
                             Err(_e) => {\r
                                 println!("Error from 'list' command");\r
                                 Vec::new()\r
                             },\r
+                        },\r
+                    version:\r
+                        match client.send_command("list".to_string()) {\r
+                            Ok(resp) => resp.body,\r
+                            Err(_e) => {\r
+                                println!("Error from 'version' command");\r
+                                String::new()\r
+                            }\r
                         }\r
                 }\r
             },\r
             Err(_e) => {\r
                 println!("Authentication error");\r
-                StatusFromRcon { players: Vec::new() }\r
+                StatusFromRcon { players: Vec::new(), version: String::new() }\r
             },\r
         };\r
 \r
@@ -127,23 +144,22 @@ fn get_last_backup_datetime(backup_path: &str) -> Option<SystemTime> {
 pub fn get_minecraft_executable_information(world_path: &str, backup_path: &str, rcon_password: &str) -> Option<MinecraftExe> {\r
     let mut system = sysinfo::System::new_all();\r
     system.refresh_system();\r
-    let processes = system.get_process_by_name(MINECRAFT_PROCESS_NAME);\r
+    let mut processes = system.processes_by_name(MINECRAFT_PROCESS_NAME);\r
 \r
     // TODO: find the correct process by checking the correct jar name in parameters.\r
-    if processes.len() >= 1 {\r
-        let process = processes.first().unwrap();\r
-\r
+    if let Some(process) = processes.next() {\r
         let world_size = match fs_extra::dir::get_size(world_path) { Ok(l) => l, Err(_) => 0u64 };\r
 \r
         let status_from_rcon = get_status_from_rcon(rcon_password);\r
 \r
         Some(\r
             MinecraftExe {\r
-                memory: process.memory(),\r
-                load_average_5min: system.get_load_average().five / system.get_processors().len() as f64 * 100.,\r
+                memory: process.memory() / 3, // Because the Java garbage collector ZGC reports three times more the real memory usage: https://stackoverflow.com/a/62934057/212675\r
+                load_average_5min: system.load_average().five / system.processors().len() as f64 * 100.,\r
                 uptime: std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs() - process.start_time(),\r
                 world_size,\r
                 active_players: status_from_rcon.players,\r
+                version: status_from_rcon.version,\r
                 last_backup: get_last_backup_datetime(backup_path)\r
             }\r
         )\r