network stuff and fix util semver fn

ParadigmMC · Nov 13, 2023 · 41dc4b5 · 41dc4b5
1 parent 968004a
commit 41dc4b5
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 7 deletions.
diff --git a/src/app/mod.rs b/src/app/mod.rs
@@ -102,12 +102,75 @@ impl App {
             "MOD_COUNT" => Some(self.server.mods.len().to_string()),
             "WORLD_COUNT" => Some(self.server.worlds.len().to_string()),
             "CLIENTSIDE_MOD_COUNT" => Some(self.server.clientsidemods.len().to_string()),
+
+            "NETWORK_NAME" => Some(self.network.as_ref()?.name.clone()),
+            "NETWORK_PORT" => Some(self.network.as_ref()?.port.to_string()),
+
+            "NETWORK_VELOCITY_SERVERS" => {
+                if let Some(nw) = &self.network {
+                    Some("# generated by mcman\n".to_owned() + &nw.servers.iter().map(|(name, serv)|
+                        format!(
+                            "{name} = \"{}:{}\"",
+                            std::env::var(format!("IP_{name}")).ok()
+                                .or(serv.ip_address.clone())
+                                .unwrap_or("127.0.0.1".to_owned()),
+                            std::env::var(format!("PORT_{name}")).ok()
+                                .unwrap_or(serv.port.to_string()),
+                        )
+                    ).collect::<Vec<_>>().join("\n"))
+                } else {
+                    None
+                }
+            },
+
+            "NETWORK_BUNGEECORD_SERVERS" => {
+                if let Some(nw) = &self.network {
+                    Some("# generated by mcman\nservers:".to_owned() + &nw.servers.iter().map(|(name, serv)|
+                        format!(
+                            "  {name}:\n    motd: {}\n    address: {}:{}\n    restricted: false",
+                            self.var("MOTD").unwrap_or("a mcman-powered server".to_owned()),
+                            std::env::var(format!("IP_{name}")).ok()
+                                .or(serv.ip_address.clone())
+                                .unwrap_or("127.0.0.1".to_owned()),
+                            std::env::var(format!("PORT_{name}")).ok()
+                                .unwrap_or(serv.port.to_string()),
+                        )
+                    ).collect::<Vec<_>>().join("\n"))
+                } else {
+                    None
+                }
+            },
+
+            "TECHNOBLADE" => Some("Technoblade never dies".to_owned()),
+
             k => if let Some(v) = std::env::var(k).ok() {
                 Some(v)
             } else {
                 if k.starts_with("NW_") {
                     if let Some(nw) = &self.network {
-                        nw.variables.get(k.strip_prefix("NW_").unwrap()).cloned()
+                        if k.starts_with("NW_SERVER_") {
+                            let (name, ty) = k.strip_prefix("NW_SERVER_")
+                                .unwrap()
+                                .split_once('_')?;
+
+                            let serv = nw.servers.get(&name.to_lowercase())?;
+
+                            let ip = std::env::var(format!("IP_{name}")).ok()
+                                .or(serv.ip_address.clone())
+                                .unwrap_or("127.0.0.1".to_owned());
+
+                            let port = std::env::var(format!("PORT_{name}")).ok()
+                                .unwrap_or(serv.port.to_string());
+
+                            match ty.to_lowercase().as_str() {
+                                "ip" => Some(ip),
+                                "port" => Some(port),
+                                "address" => Some(format!("{ip}:{port}")),
+                                _ => None,
+                            }
+                        } else {
+                            nw.variables.get(k.strip_prefix("NW_").unwrap()).cloned()
+                        }
                     } else {
                         None
                     }

diff --git a/src/hot_reload/mod.rs b/src/hot_reload/mod.rs
@@ -246,8 +246,11 @@ impl<'a> DevSession<'a> {
 
                     self.builder.app.info("Server process exited")?;
 
+                    is_stopping = false;
+                    child = None;
+                    stdout_lines = None;
+
                     if self.test_mode {
-                        tx.send(Command::WaitUntilExit).await?;
                         tx.send(Command::EndSession).await?;
                     }
                 },
@@ -260,6 +263,8 @@ impl<'a> DevSession<'a> {
             }
         }
 
+        // end of loop > tokio::select!
+
         if let Some(ref mut child) = &mut child {
             self.builder.app.info("Killing undead child process...")?;
             child.kill().await?;
@@ -337,7 +342,7 @@ impl<'a> DevSession<'a> {
                     drop(content);
 
                     pb.finish_and_clear();
-                    self.builder.app.success("Log uploaded to mclo.gs")?;
+                    self.builder.app.log("  - Log uploaded to mclo.gs")?;
                     mp.suspend(|| {
                         println!();
                         println!(" -- [ {} ] --", log.url);

diff --git a/src/model/network/mod.rs b/src/model/network/mod.rs
@@ -20,6 +20,7 @@ pub struct Network {
     pub name: String,
     pub proxy: String,
     pub port: u16,
+    pub servers: HashMap<String, ServerEntry>,
     pub variables: HashMap<String, String>,
 
     #[serde(skip_serializing_if = "Vec::is_empty")]
@@ -73,6 +74,7 @@ impl Default for Network {
             name: String::new(),
             proxy: "proxy".to_owned(),
             port: 25565,
+            servers: HashMap::new(),
             variables: HashMap::new(),
             plugins: vec![],
             mods: vec![],
@@ -85,4 +87,6 @@ impl Default for Network {
 #[serde(default)]
 pub struct ServerEntry {
     pub port: u16,
+    pub ip_address: Option<String>,
+    pub groups: Vec<String>,
 }
diff --git a/src/util/mod.rs b/src/util/mod.rs
@@ -1,3 +1,5 @@
+use std::cmp::Ordering;
+
 use anyhow::Result;
 use regex::Regex;
 
@@ -25,12 +27,38 @@ pub fn is_default_str(s: &str) -> bool {
 pub fn get_latest_semver(list: &[String]) -> Option<String> {
     let mut list = list
         .iter()
-        .filter_map(|s| semver::Version::parse(s).ok())
-        .collect::<Vec<_>>();
+        .map(|s| s.split('.').collect())
+        .collect::<Vec<Vec<_>>>();
+
+    list.sort_by(|a, b| {
+        let mut ia = a.iter();
+        let mut ib = b.iter();
+        loop {
+            break match (ia.next(), ib.next()) {
+                (Some(a), Some(b)) => {
+                    let a = a.parse::<i32>();
+                    let b = b.parse::<i32>();
 
-    list.sort_by(semver::Version::cmp);
+                    match (a, b) {
+                        (Ok(a), Ok(b)) => {
+                            match a.cmp(&b) {
+                                Ordering::Equal => continue,
+                                ord => ord,
+                            }
+                        }
+                        (Err(_), Ok(_)) => Ordering::Less,
+                        (Ok(_), Err(_)) => Ordering::Greater,
+                        _ => Ordering::Equal,
+                    }
+                }
+                (Some(_), None) => Ordering::Greater,
+                (None, Some(_)) => Ordering::Less,
+                _ => Ordering::Equal,
+            }
+        }
+    });
 
-    list.last().map(ToString::to_string)
+    list.last().map(|v| v.join("."))
 }
 
 /// ci.luckto.me => ci-lucko-me