Added capability to host multiple servers

dist/user.html

@@ -59,10 +59,27 @@ <h2>Welcome {{ user }}!</h2>
     <p>{{ status }}</p>
     <div class="button-container">
       <a class="cool-link" href="/logout"><button class="cool-button">Logout</button></a>
-      <a class="cool-link" href="/action/boot"><button class="cool-button">Start Server</button></a>
+
+      <input placeholder="What server ID do you want to boot?" id="server">
+      <button class="cool-button" onclick="boot()">Start Server</button>
       {{ extra }}
     </div>
   </div>
 </body>
 
+<script>
+  function boot() {
+    let data = document.getElementById("server");
+
+    document.getElementById("server").value = ""
+
+    fetch('/action/boot/' + data, {
+      method: "GET",
+      headers: {'Content-Type': 'application/json'},
+    }).then(res => {
+      console.log("Request complete! response:", res);
+    });
+  }
+</script>
+
 </html>

roast-options.toml

@@ -13,5 +13,10 @@ admin_pass = "pass"
 main_user = "User"
 main_pass = "pass"
 
-# File that runs your server
-run_path = "echo \"Hello World\""
+[[runnables]]
+name = "Numbers"
+path = "./run.sh"
+
+[[runnables]]
+name = "Numbers 2"
+path = "./run.sh"

src/auth.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::blocks_in_conditions)]
+
 use std::{collections::HashMap, sync::Mutex};
 
 use lazy_static::lazy_static;

src/config.rs

@@ -1,5 +1,27 @@
 use serde::Deserialize;
 
+#[derive(Deserialize)]
+pub struct RunPath {
+    pub name: String,
+    pub path: String,
+}
+
+#[derive(Deserialize)]
+pub struct Config {
+    pub address: String,
+    pub port: u16,
+
+    pub runnables: Vec<RunPath>,
+
+    pub admin_user: String,
+    pub admin_pass: String,
+
+    pub main_user: String,
+    pub main_pass: String,
+}
+
+/*
+
 #[derive(Deserialize)]
 pub struct Config {
     pub address: String,
@@ -13,3 +35,5 @@ pub struct Config {
     pub main_user: String,
     pub main_pass: String,
 }
+
+*/

src/main.rs

@@ -51,7 +51,7 @@ lazy_static! {
     static ref COMMAND: RwLock<ServerCommand> = {
         let command = ServerCommand::new(
             Command::new("sh")
-                .arg(CONFIG.run_path.clone())
+                .arg(CONFIG.runnables[0].path.clone())
                 .stdin(Stdio::piped())
                 .stdout(Stdio::piped())
                 .spawn()

src/website/action.rs

@@ -30,8 +30,8 @@ pub async fn command(command: Json<CommandForm>, cookies: &CookieJar<'_>) -> &'s
     "Complete"
 }
 
-#[get("/boot")]
-pub fn boot(cookies: &CookieJar<'_>) -> Redirect {
+#[get("/boot/<com>")]
+pub fn boot(cookies: &CookieJar<'_>, com: String) -> Redirect {
     if logged_in(cookies).is_none() {
         return Redirect::to(uri!("/"));
     }
@@ -41,8 +41,16 @@ pub fn boot(cookies: &CookieJar<'_>) -> Redirect {
     if command.running {
         Redirect::to(uri!("/user"))
     } else {
+        let path = match CONFIG.runnables.iter().find(|x| x.name == com) {
+            Some(s) => s,
+            None => &CONFIG.runnables[0],
+        }
+        .path
+        .clone();
+
         *command = ServerCommand::new(
-            Command::new(CONFIG.run_path.clone())
+            Command::new("sh")
+                .arg(path)
                 .stdin(Stdio::piped())
                 .stdout(Stdio::piped())
                 .spawn()