migrate all deps to modern versions

Author: Sturdyfool11

Cargo.toml

@@ -8,22 +8,23 @@ edition = "2021"
 [dependencies]
 ansi_escapers = "0.2.0"
 async-std = { version = "1.12.0", features = ["tokio03", "tokio02", "tokio1"] }
-axum = { version = "0.6.20", features = ["tracing", "ws", "macros", "headers"] }
-axum-extra = "0.7.7"
+axum = { version = "0.8.4", features = ["tracing", "ws", "macros"] }
+axum-extra = "0.10.1"
 colorlab = {git = "https://github.com/SturdyFool10/ColorLab.git"}
-crossterm = "0.27.0"
+crossterm = "0.29.0"
 futures = "0.3.28"
 futures-util = "0.3.28"
 regex = "1.10.2"
 serde = { version = "1.0.183", features = ["derive", "serde_derive"] }
 serde_json = { version = "1.0.105", features = ["float_roundtrip"] }
 tokio = { version = "1.31.0", features = ["full", "tracing"] }
-tokio-tungstenite = "0.20.0"
-tower = { version = "0.4.13", features = ["full", "tokio"] }
-tower-http = { version = "0.4.3", features = ["full", "trace"] }
+tokio-tungstenite = "0.27.0"
+tower = { version = "0.5.2", features = ["full", "tokio"] }
+tower-http = { version = "0.6.6", features = ["full", "trace"] }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
-dashmap = "5.5.3"
+dashmap = "6.1.0"
+hyper = "1.7.0"
 
 [target.'cfg(target_os = "windows")'.build-dependencies]
 winres = "0.1"

src/controlled_program.rs

@@ -136,6 +136,20 @@ impl Drop for ControlledProgramInstance {
 
 impl ControlledProgramInstance {
     pub fn new(name: &str, exe_path: &str, arguments: Vec<String>, working_dir: String) -> Self {
+        use std::fs;
+        use std::path::Path;
+
+        // Ensure the working directory exists, create if it doesn't
+        let working_dir_path = Path::new(&working_dir);
+        if !working_dir_path.exists() {
+            if let Err(e) = fs::create_dir_all(&working_dir_path) {
+                panic!(
+                    "Failed to create working directory {:?}: {}",
+                    working_dir_path, e
+                );
+            }
+        }
+
         let mut process = Command::new(exe_path);
         let mut process = process //this line needs to be here to prevent dropped value error
             .stdin(Stdio::piped()) //pipe stdin

src/html_src/index.js

@@ -1,3 +1,5 @@
+window.lastLogLineCount = window.lastLogLineCount || {};
+
 function closeMenu() {
   $("#menu").animate(
     {
@@ -502,17 +504,18 @@ $(document).ready(function () {
           var server = obj.servers[index];
           let serverName = server.name;
           addDropdownNoDupe(serverName, !server.active);
-          if (justStarted) {
-            // Do not update config here, wait for ConfigInfo
-            var lines = server.output.split("\r\n");
-            for (linePos in lines) {
-              var line = lines[linePos];
-              var p = $('<p class="STDOutMessage"></p>').appendTo(
-                "." + serverName + "Out",
-              )[0];
+          var outDiv = $("." + serverName + "Out");
+          var lines = server.output.split("\r\n");
+          var lastCount = window.lastLogLineCount[serverName] || 0;
+          // Only append new lines
+          for (let i = lastCount; i < lines.length; i++) {
+            var line = lines[i];
+            if (line.trim() !== "") {
+              var p = $('<p class="STDOutMessage"></p>').appendTo(outDiv)[0];
               p.innerHTML = line;
             }
           }
+          window.lastLogLineCount[serverName] = lines.length;
         }
         window.serverInfoObj = obj;
         break;
@@ -521,6 +524,10 @@ $(document).ready(function () {
         // Split on <br> (or <br/>), so each log line is its own <p>
         var lines = str.split(/<br\s*\/?>/i);
         var outDiv = $("." + obj.server_name + "Out")[0];
+        if (!outDiv) {
+          console.warn("Output div not found for server:", obj.server_name);
+          break;
+        }
         var shouldScroll = outDiv.scrollTop == outDiv.scrollHeight;
         lines.forEach(function (line) {
           if (line.trim() !== "") {

src/main.rs

@@ -56,8 +56,53 @@ async fn main() -> Result<(), String> {
     {
         info!("Starting {} tasks", handles.len());
     }
+    // Spawn shutdown handler to kill all child processes on exit
+    let app_state_clone = app_state.clone();
+    let shutdown = async move |reason: &str| {
+        info!(
+            "Shutdown signal received ({}), terminating all child processes...",
+            reason
+        );
+        let mut servers = app_state_clone.servers.lock().await;
+        for server in servers.iter_mut() {
+            let _ = server.stop().await;
+        }
+        info!("All child processes terminated.");
+        std::process::exit(0);
+    };
+
+    // Ctrl+C handler
+    let app_state_clone_ctrlc = app_state.clone();
+    tokio::spawn({
+        let shutdown = shutdown.clone();
+        async move {
+            use tokio::signal;
+            signal::ctrl_c().await.expect("Failed to listen for ctrl_c");
+            shutdown("ctrl_c").await;
+        }
+    });
+
+    // T key handler
+    let app_state_clone_t = app_state.clone();
+    tokio::spawn({
+        let shutdown = shutdown.clone();
+        async move {
+            use crossterm::event::{poll, read, Event, KeyCode};
+            use tokio::task::yield_now;
+            loop {
+                yield_now().await;
+                if poll(std::time::Duration::from_millis(25)).expect("Failed to poll for events") {
+                    if let Event::Key(key_event) = read().expect("Failed to read event") {
+                        if key_event.code == KeyCode::Char('t') {
+                            shutdown("T key").await;
+                        }
+                    }
+                }
+            }
+        }
+    });
+
     let _ = tokio::spawn(async_listener!("t", app_state)).await;
-    info!("Termination key pressed, closing the app.");
     exit(0);
 }
 

src/master.rs

@@ -48,7 +48,7 @@ impl SlaveConnection {
             };
             let messag = serde_json::to_string(&request_message).unwrap();
             // Send requestInfo message
-            let message = Message::Text(messag);
+            let message = tokio_tungstenite::tungstenite::Message::Text(messag.into());
             let _res = stream.send(message).await;
 
             // Read response
@@ -120,7 +120,7 @@ impl SlaveConnection {
                                             }
                                         }
                                         "ServerOutput" => {
-                                            let _ = app_state.tx.send(text.clone());
+                                            let _ = app_state.tx.send(text.to_string());
                                         }
                                         _ => {}
                                     }
@@ -152,7 +152,7 @@ impl SlaveConnection {
         let message = serde_json::to_string(&stdin_message).unwrap();
         // Send stdin message
         if let Some(stream) = &mut self.stream {
-            let message = Message::Text(message);
+            let message = tokio_tungstenite::tungstenite::Message::Text(message.into());
 
             let _ = tokio::time::timeout(Duration::from_secs_f64(1. / 1000.), stream.send(message))
                 .await;

src/servers.rs

@@ -3,6 +3,14 @@ use crate::{
 };
 use tracing::*;
 
+// Helper to format exit code message for web console
+pub fn format_exit_message(exit_code: impl std::fmt::Display) -> String {
+    format!(
+        "<span style=\"color: var(--warning, #FFA500);\">[Server exited with code {}]</span>",
+        exit_code
+    )
+}
+
 // Helper function to send server termination message to web console
 pub async fn send_termination_message(
     state: &AppState,
@@ -12,10 +20,7 @@ pub async fn send_termination_message(
 ) {
     let termination_msg = ConsoleOutput {
         r#type: "ServerOutput".to_owned(),
-        output: format!(
-            "<span style=\"color: yellow;\">Program has stopped execution: StopCode: {}</span>",
-            exit_code
-        ),
+        output: format_exit_message(exit_code),
         server_name,
         server_type,
     };

src/slave.rs

@@ -17,8 +17,11 @@ pub async fn start_slave(_state: AppState) {
     info!("Starting server on {}", address.replace("0.0.0.0", "*"));
 
     let stateful_router = router.with_state(_state);
-    axum::Server::bind(&address.parse().unwrap())
-        .serve(stateful_router.into_make_service())
+    use axum::serve;
+    use tokio::net::TcpListener;
+
+    let listener = TcpListener::bind(&address).await.unwrap();
+    serve(listener, stateful_router.into_make_service())
         .await
         .unwrap();
 }

src/webserver.rs

@@ -3,11 +3,12 @@ use axum::{
     body::Body,
     extract::State,
     http::StatusCode,
-    response::{IntoResponse, Response},
+    response::{Html, IntoResponse, Response},
     routing::get,
     Router,
 };
-use axum_extra::response::*;
+use axum_extra::response::JavaScript;
+
 use tower_http::services::ServeDir;
 use tracing::*;
 
@@ -38,22 +39,25 @@ async fn handle_icon(State(_state): State<AppState>) -> impl IntoResponse {
 }
 #[no_mangle]
 pub async fn start_web_server(_state: AppState) {
-    let router = get_router(_state.clone()).await; //.route("/ws", get(handle_socket))
+    use axum::serve;
+    use tokio::net::TcpListener;
+
+    let router = get_router(_state.clone()).await;
     let config = _state.config.lock().await;
     let mut address = config.interface.clone();
     address += (":".to_owned() + config.port.clone().as_str()).as_str();
     drop(config);
     info!("Starting server on {}", address.replace("0.0.0.0", "*"));
 
     let stateful_router = router.with_state(_state);
-    axum::Server::bind(&address.parse().unwrap())
-        .serve(stateful_router.into_make_service())
+    let listener = TcpListener::bind(&address).await.unwrap();
+    serve(listener, stateful_router.into_make_service())
         .await
         .unwrap();
 }
 #[no_mangle]
 async fn main_serve(State(_state): State<AppState>) -> Html<String> {
-    Html::from(
+    Html(
         include_str!("html_src/index.html")
             .to_owned()
             .replace("styles!();", include_str!("html_src/style.css")),