Fix static files serve

Cargo.toml

@@ -23,7 +23,7 @@ bench = false
 anyhow = "1"
 arc-swap = "1.7"
 async-trait = "0.1.81"
-axum = { version = "0.7.5", features = ["ws"] }
+axum = { version = "0.8.1", features = ["ws"] }
 bytes = { version = "1.7", features = ["serde"] }
 byteorder = "1.5.0"
 chrono = { version = "0.4", features = ["serde"] }

src/lib/drivers/rest/mod.rs

@@ -151,7 +151,7 @@ impl Rest {
             let json_string = parse_query(&mavlink_json);
             data::update((mavlink_json.header, mavlink_json.message));
 
-            websocket::broadcast(uuid, ws::Message::Text(json_string)).await;
+            websocket::broadcast(uuid, ws::Message::Text(json_string.into())).await;
         }
 
         debug!("Driver sender task stopped!");

src/lib/web/routes/mod.rs

@@ -14,13 +14,13 @@ use tracing::*;
 
 use crate::cli;
 
-static HTML_DIST: Dir = include_dir!("src/webpage/dist");
+static HTML_DIST: Dir = include_dir!("$CARGO_MANIFEST_DIR/src/webpage/dist");
 
 #[instrument(level = "trace")]
 pub fn router() -> Router {
     let app = Router::new()
         .route_service("/", get(root))
-        .route("/:path", get(root))
+        .route_service("/{*path}", get(root))
         .nest("/v1", v1::router())
         .fallback(handle_404())
         .layer(CorsLayer::permissive())

src/lib/web/routes/v1/log.rs

@@ -25,13 +25,21 @@ async fn log_websocket_connection(socket: WebSocket) {
     let (mut receiver, history) = crate::logger::HISTORY.lock().unwrap().subscribe();
 
     for message in history {
-        if websocket_sender.send(Message::Text(message)).await.is_err() {
+        if websocket_sender
+            .send(Message::Text(message.into()))
+            .await
+            .is_err()
+        {
             return;
         }
     }
 
     while let Ok(message) = receiver.recv().await {
-        if websocket_sender.send(Message::Text(message)).await.is_err() {
+        if websocket_sender
+            .send(Message::Text(message.into()))
+            .await
+            .is_err()
+        {
             break;
         }
     }

src/lib/web/routes/v1/rest/mod.rs

@@ -13,9 +13,9 @@ pub fn router() -> Router {
             "/mavlink",
             get(mavlink::mavlink).post(mavlink::post_mavlink),
         )
-        .route("/mavlink/*path", get(mavlink::mavlink))
+        .route("/mavlink/{*path}", get(mavlink::mavlink))
         .route(
-            "/mavlink/message_id_from_name/*name",
+            "/mavlink/message_id_from_name/{*name}",
             get(mavlink::message_id_from_name),
         )
 }

src/lib/web/routes/v1/rest/websocket.rs

@@ -70,7 +70,7 @@ async fn websocket_connection(socket: WebSocket, addr: SocketAddr) {
         match message {
             ws::Message::Text(text) => {
                 trace!("WS client received from {identifier}: {text}");
-                if let Err(error) = state.message_tx.send(text.clone()) {
+                if let Err(error) = state.message_tx.send(text.to_string().into()) {
                     error!("Failed to send message to main loop: {error:?}");
                 }
                 broadcast(identifier, ws::Message::Text(text)).await;

src/lib/web/routes/v1/stats.rs

@@ -98,7 +98,7 @@ async fn hub_messages_stats_websocket_connection(socket: WebSocket, addr: Socket
                     }
                 };
 
-                if let Err(error) = sender.send(ws::Message::Text(json)).await {
+                if let Err(error) = sender.send(ws::Message::Text(json.into())).await {
                     warn!("Failed to send message to WebSocket: {error:?}");
                     return;
                 }
@@ -154,7 +154,7 @@ async fn hub_stats_websocket_connection(socket: WebSocket, addr: SocketAddr) {
                     }
                 };
 
-                if let Err(error) = sender.send(ws::Message::Text(json)).await {
+                if let Err(error) = sender.send(ws::Message::Text(json.into())).await {
                     warn!("Failed to send message to WebSocket: {error:?}");
                     return;
                 }
@@ -210,7 +210,7 @@ async fn drivers_stats_websocket_connection(socket: WebSocket, addr: SocketAddr)
                     }
                 };
 
-                if let Err(error) = sender.send(ws::Message::Text(json)).await {
+                if let Err(error) = sender.send(ws::Message::Text(json.into())).await {
                     warn!("Failed to send message to WebSocket: {error:?}");
                     return;
                 }