feat(server): re-structure server logic to have middleware applied optionally (#452)

Author: LeoBorai

Cargo.lock

@@ -23,7 +23,6 @@ gloo = "0.11.0"
 gloo-file = "0.3.0"
 humansize = "2.1.3"
 http = "1.1.0"
-http-auth-basic = "0.3.3"
 http-body-util = "0.1"
 hyper = "1.4"
 hyper-util = "0.1.9"
@@ -44,8 +43,9 @@ serde_json = "1.0.128"
 tokio = "1.40"
 tokio-util = "0.7.12"
 toml = "0.8.19"
-tower-http = "0.6.1"
 tower = "0.5.1"
+tower-http = "0.6.1"
+tower-layer = "0.3.3"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
 web-sys = "0.3.72"

Cargo.toml

@@ -10,6 +10,14 @@ keywords = ["configurable", "http", "server", "serve", "static"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 
+[[bin]]
+name = "http-server"
+path = "src/bin/main.rs"
+
+[lib]
+name = "http_server_rs"
+path = "src/lib.rs"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -18,7 +26,6 @@ async-trait = { workspace = true }
 bytes = { workspace = true }
 clap = { workspace = true, features = ["env", "derive", "std"] }
 http = { workspace = true }
-http-auth-basic = { workspace = true }
 http-body-util = { workspace = true }
 hyper = { workspace = true }
 hyper-util = { workspace = true, features = ["full"] }
@@ -27,6 +34,7 @@ local-ip-address = { workspace = true }
 tokio = { workspace = true, features = ["fs", "rt-multi-thread", "signal", "macros"] }
 tower-http = { workspace = true, features = ["cors"] }
 tower = { workspace = true, features = ["util"] }
+tower-layer = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 

crates/http-server/Cargo.toml

@@ -7,8 +7,8 @@ use clap::Parser;
 use tokio::runtime::Builder;
 use tracing::{error, info};
 
-use crate::config::Config;
-use crate::server::Server;
+use http_server_rs::server::config::Config;
+use http_server_rs::server::Server;
 
 const THREAD_NAME: &str = "http-server";
 

crates/http-server/src/cli/command/mod.rs …s/http-server/src/bin/cli/command/mod.rscrates/http-server/src/cli/command/mod.rs renamed to crates/http-server/src/bin/cli/command/mod.rs crates/http-server/src/cli/command/mod.rs renamed to crates/http-server/src/bin/cli/command/mod.rs

@@ -1,7 +1,4 @@
 pub mod cli;
-pub mod config;
-pub mod plugin;
-pub mod server;
 
 use anyhow::Result;
 use clap::Parser;

…tes/http-server/src/cli/command/start.rs …http-server/src/bin/cli/command/start.rscrates/http-server/src/cli/command/start.rs renamed to crates/http-server/src/bin/cli/command/start.rs crates/http-server/src/cli/command/start.rs renamed to crates/http-server/src/bin/cli/command/start.rs

@@ -0,0 +1 @@
+pub mod server;

crates/http-server/src/cli/mod.rs crates/http-server/src/bin/cli/mod.rscrates/http-server/src/cli/mod.rs renamed to crates/http-server/src/bin/cli/mod.rs

@@ -0,0 +1,37 @@
+use std::net::IpAddr;
+use std::str::FromStr;
+
+use anyhow::{bail, Error, Result};
+
+#[derive(Clone, Debug)]
+pub struct Config {
+    /// The IP address to bind to.
+    pub host: IpAddr,
+    /// The port to bind to.
+    pub port: u16,
+    /// Enable CORS with a permissive policy.
+    pub cors: bool,
+}
+
+#[derive(Clone, Debug)]
+pub struct BasicAuth {
+    pub username: String,
+    pub password: String,
+}
+
+impl FromStr for BasicAuth {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self> {
+        let parts = s.split(":").collect::<Vec<&str>>();
+
+        if parts.len() != 2 {
+            bail!("Expected a string with a colon to separe username and password for Basic Authentication.");
+        }
+
+        Ok(BasicAuth {
+            username: parts[0].into(),
+            password: parts[1].into(),
+        })
+    }
+}