Server structure

src/main.rs

@@ -1,38 +1,34 @@
 pub mod protocol;
+pub mod server;
+pub mod signature;
+
+use std::sync::Arc;
 
 use axum::{
     Router,
-    extract::{WebSocketUpgrade, ws::WebSocket},
+    extract::{State, WebSocketUpgrade},
     response::Response,
     routing::{any, get},
 };
 
-use crate::protocol::Client;
+use crate::server::Server;
 
 #[tokio::main]
-async fn main() {
+async fn main() -> anyhow::Result<()> {
+    let server = Server::new().await?;
+
     let app = Router::new()
         .route("/meta", get(|| async { "Hello, World!" }))
-        .route("/", any(ws_handler));
+        .route("/", any(ws_handler))
+        .with_state(server);
 
-    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
-    axum::serve(listener, app).await.unwrap();
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await?;
+
+    axum::serve(listener, app).await?;
+
+    Ok(())
 }
 
-async fn ws_handler(ws: WebSocketUpgrade) -> Response {
-    ws.on_upgrade(|socket: WebSocket| async {
-        match Client::initialize(socket).await {
-            Ok(mut client) => {
-                if let Err(e) = client.read_loop().await {
-                    eprintln!("Failed to handle client: {e}");
-                } else {
-                    println!("Client connection closed")
-                }
-            }
-
-            Err(e) => {
-                eprintln!("Failed to initialize client: {e}")
-            }
-        }
-    })
+async fn ws_handler(State(server): State<Arc<Server>>, ws: WebSocketUpgrade) -> Response {
+    server.ws_handler(ws).await
 }