1 files changed, 28 insertions, 8 deletions

diff --git a/src/routes/instances.rs b/src/routes/instances.rs
index e4f62f0..8dd6a62 100644
--- a/src/routes/instances.rs
+++ b/src/routes/instances.rs
@@ -19,7 +19,6 @@ struct InstanceListTemplate {
     is_superuser: bool,
     password_change_required: bool,
     instances: Vec<InstanceInfo>,
-    has_active: bool,
 }
 
 #[derive(Template)]
@@ -42,7 +41,6 @@ struct EditInstanceTemplate {
     instance: Instance,
     current_seed: Option<String>,
     max_memory_mb: u32,
-    error: Option<String>,
 }
 
 struct InstanceInfo {
@@ -119,7 +117,6 @@ async fn list_instances(
         .filter_map(|r| r.ok())
         .collect();
 
-    let has_active = instances.iter().any(|i| i.is_active);
     drop(stmt);
     drop(conn);
 
@@ -128,7 +125,6 @@ async fn list_instances(
         is_superuser: account.is_superuser,
         password_change_required: account.password_change_required,
         instances,
-        has_active,
     };
 
     Ok(Html(template.render().unwrap_or_default()))
@@ -283,7 +279,6 @@ async fn edit_form(
         instance,
         current_seed,
         max_memory_mb: state.config.max_memory_mb,
-        error: None,
     };
 
     Ok(Html(template.render().unwrap_or_default()))
@@ -428,6 +423,7 @@ async fn activate_instance(
     // Pull image + start container in background so the UI stays responsive
     let docker = state.docker.clone();
     let db = state.db.clone();
+    let rcon_pw = instance.rcon_password.clone();
     tokio::spawn(async move {
         {
             let conn = db.conn();
@@ -439,9 +435,33 @@ async fn activate_instance(
         }
         match docker.start_container(&instance).await {
             Ok(()) => {
+                {
+                    let conn = db.conn();
+                    conn.execute(
+                        "UPDATE instances SET container_state = 'booting' WHERE is_active = 1",
+                        [],
+                    )
+                    .ok();
+                }
+                // Wait for Minecraft to be ready via RCON
+                let rcon = crate::rcon::RconClient::new(rcon_pw);
+                for _ in 0..30 {
+                    tokio::time::sleep(std::time::Duration::from_secs(2)).await;
+                    if rcon.send_command_async("list".into()).await.is_ok() {
+                        let conn = db.conn();
+                        conn.execute(
+                            "UPDATE instances SET container_state = 'running' WHERE is_active = 1",
+                            [],
+                        )
+                        .ok();
+                        tracing::info!("Server is ready (RCON responded)");
+                        return;
+                    }
+                }
+                tracing::error!("Server did not become ready within 60 seconds");
                 let conn = db.conn();
                 conn.execute(
-                    "UPDATE instances SET container_state = 'running' WHERE is_active = 1",
+                    "UPDATE instances SET container_state = 'error' WHERE is_active = 1",
                     [],
                 )
                 .ok();
@@ -458,7 +478,7 @@ async fn activate_instance(
         }
     });
 
-    Ok(Redirect::to("/"))
+    Ok(Redirect::to("/instances"))
 }
 
 async fn deactivate_instance(
@@ -475,7 +495,7 @@ async fn deactivate_instance(
     .ok();
     drop(conn);
 
-    Ok(Redirect::to("/"))
+    Ok(Redirect::to("/instances"))
 }
 
 fn generate_rcon_password() -> String {