updates

protossbot/src/main.rs

@@ -11,11 +11,15 @@ fn main() {
 
   let game_state = Arc::new(Mutex::new(GameState::default()));
 
-  // // Start the webserver in a separate thread
+  // Start the webserver in a separate thread
-  // std::thread::spawn(|| {
+  std::thread::spawn(|| {
-  //   let rt = tokio::runtime::Runtime::new().unwrap();
+    let rt = tokio::runtime::Runtime::new().unwrap();
-  //   rt.block_on(start_webserver());
+    rt.block_on(async {
-  // });
+      start_webserver().await;
+      // Keep the runtime alive indefinitely to prevent TLS cleanup issues
+      std::future::pending::<()>().await;
+    });
+  });
 
   rsbwapi::start(move |_game| ProtosBot::new(game_state.clone()));
 }
@@ -25,19 +29,40 @@ async fn start_webserver() {
   use leptos::*;
   use leptos_axum::{generate_route_list, LeptosRoutes};
   use protoss_bot_web::App;
+  use tower_http::services::ServeDir;
 
-  let conf = get_configuration(None).await.unwrap();
+  let leptos_options = LeptosOptions {
-  let leptos_options = conf.leptos_options;
+    output_name: "protoss-bot-web".to_string(),
+    site_root: "target/site".to_string(),
+    site_pkg_dir: "pkg".to_string(),
+    env: leptos_config::Env::DEV,
+    site_addr: "127.0.0.1:3333".parse().unwrap(),
+    reload_port: 3001,
+    hash_file: "".to_string(),
+    hash_files: false,
+    ..Default::default()
+  };
   let addr = leptos_options.site_addr;
   let routes = generate_route_list(App);
 
   let app = Router::new()
     .leptos_routes(&leptos_options, routes, App)
+    .nest_service("/pkg", ServeDir::new("web/style"))
     .with_state(leptos_options);
 
+  match tokio::net::TcpListener::bind(&addr).await {
+    Ok(listener) => {
       println!("Web server listening on http://{}", &addr);
-  let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
+      if let Err(e) = axum::serve(listener, app.into_make_service()).await {
-  axum::serve(listener, app.into_make_service())
+        eprintln!("Web server error: {}", e);
-    .await
+      }
-    .unwrap();
+    }
+    Err(e) => {
+      eprintln!(
+        "Failed to bind to {}: {}. Is the port already in use?",
+        &addr, e
+      );
+      eprintln!("Skipping web server startup.");
+    }
+  }
 }

protossbot/web/Cargo.toml

@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { version = "0.6", features = ["csr"] }
+leptos = { version = "0.6", default-features = false, features = ["ssr"] }
-leptos_axum = { version = "0.6" }
+leptos_axum = { version = "0.6", default-features = false }
-leptos_meta = { version = "0.6" }
+leptos_meta = { version = "0.6", default-features = false, features = ["ssr"] }
-leptos_router = { version = "0.6" }
+leptos_router = { version = "0.6", default-features = false, features = ["ssr"] }
 axum = "0.7"
 tokio = { version = "1", features = ["full"] }
 tower = "0.4"
@@ -16,5 +16,9 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 lazy_static = "1.4"
 
+[features]
+default = ["ssr"]
+ssr = ["leptos/ssr", "leptos_meta/ssr", "leptos_router/ssr"]
+
 [lib]
 crate-type = ["cdylib", "rlib"]

protossbot/web/Cargo.toml.leptos

@@ -9,7 +9,7 @@ site-root = "target/site"
 site-pkg-dir = "pkg"
 style-file = "style/main.css"
 assets-dir = "public"
-site-addr = "127.0.0.1:3000"
+site-addr = "127.0.0.1:3001"
 reload-port = 3001
 browserquery = "defaults"
 watch = false

protossbot/web/src/lib.rs

@@ -13,7 +13,7 @@ pub fn App() -> impl IntoView {
   provide_meta_context();
 
   view! {
-        <Stylesheet id="leptos" href="/pkg/protoss-bot-web.css"/>
+      <Stylesheet id="leptos" href="/pkg/main.css"/>
       <Title text="Protoss Bot Control"/>
       <Router>
           <main>
@@ -27,14 +27,15 @@ pub fn App() -> impl IntoView {
 
 #[component]
 fn HomePage() -> impl IntoView {
-    let (game_speed, set_game_speed) = create_signal(20);
+  let (game_speed, set_game_speed) = create_signal(0);
 
-    let set_speed = move |speed: i32| {
+  let set_speed = create_action(move |speed: &i32| {
+    let speed = *speed;
+    async move {
       set_game_speed.set(speed);
-        spawn_local(async move {
       let _ = set_game_speed_server(speed).await;
+    }
   });
-    };
 
   view! {
       <div class="container">
@@ -45,11 +46,26 @@ fn HomePage() -> impl IntoView {
               <p>"Current Speed: " {game_speed}</p>
 
               <div class="button-group">
-                    <button on:click=move |_| set_speed(0)>"Slowest (0)"</button>
+                  <button
-                    <button on:click=move |_| set_speed(10)>"Slower (10)"</button>
+                      class:selected=move || game_speed.get() == -1
-                    <button on:click=move |_| set_speed(20)>"Normal (20)"</button>
+                      on:click=move |_| set_speed.dispatch(-1)>
-                    <button on:click=move |_| set_speed(30)>"Fast (30)"</button>
+                      "Fastest (-1)"
-                    <button on:click=move |_| set_speed(42)>"Fastest (42)"</button>
+                  </button>
+                  <button
+                      class:selected=move || game_speed.get() == 0
+                      on:click=move |_| set_speed.dispatch(0)>
+                      "Fast (0)"
+                  </button>
+                  <button
+                      class:selected=move || game_speed.get() == 1
+                      on:click=move |_| set_speed.dispatch(1)>
+                      "Normal (1)"
+                  </button>
+                  <button
+                      class:selected=move || game_speed.get() == 42
+                      on:click=move |_| set_speed.dispatch(42)>
+                      "Slowest (42)"
+                  </button>
               </div>
           </div>
       </div>

protossbot/web/style/main.css

@@ -1,5 +1,7 @@
 body {
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
+    Cantarell, sans-serif;
   margin: 0;
   padding: 20px;
   background-color: #1a1a1a;
@@ -45,7 +47,7 @@ button {
   cursor: pointer;
   font-size: 14px;
   font-weight: 500;
-    transition: background-color 0.2s;
+  transition: all 0.2s;
 }
 
 button:hover {
@@ -56,6 +58,16 @@ button:active {
   background-color: #2a5f9a;
 }
 
+button.selected {
+  background-color: #28a745;
+  box-shadow: 0 0 10px rgba(40, 167, 69, 0.5);
+  font-weight: 700;
+}
+
+button.selected:hover {
+  background-color: #218838;
+}
+
 p {
   color: #cccccc;
   margin: 10px 0;

protossbot/web/style/protoss-bot-web.js

@@ -0,0 +1,5 @@
+// Dummy module for SSR-only mode
+export default function () {
+  console.log("SSR-only mode - no client-side hydration");
+  return Promise.resolve({});
+}