chore: add fallback

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

Author: explodingcamera

Cargo.lock

@@ -47,7 +47,7 @@ tracing-subscriber={version="0.3", features=["env-filter"]}
 ahash="0.8"
 
 # web
-axum="0.8"
+axum={version="0.8", features=["macros"]}
 axum-extra={version="0.12", default-features=false, features=["cookie", "typed-header"]}
 http="1.4"
 headers="0.4"

Cargo.toml

@@ -19,13 +19,14 @@ use tower_http::{
 };
 
 use crate::app::{Liwan, models::Event};
+use crate::web::webext::serve;
 
 pub use session::{MaybeExtract, SessionId, SessionUser};
 use webext::StaticFile;
 
 #[derive(RustEmbed, Clone)]
 #[folder = "./web/dist"]
-struct _Files;
+pub struct Files;
 
 #[derive(RustEmbed, Clone)]
 #[folder = "./tracker"]
@@ -82,13 +83,12 @@ pub async fn start_webserver(app: Arc<Liwan>, events: Sender<Event>) -> Result<(
         .nest("/api", routes::event::router().layer(event_cors))
         .nest("/api/dashboard", dashboard)
         .route_service("/script.js", StaticFile::<Script>::new("script.min.js").layer(script_cors).into_service())
+        .fallback(axum::routing::get(serve))
         .layer(CompressionLayer::new())
         .layer(set_headers)
         .with_state(RouterState { app: app.clone(), events })
         .finish_api(&mut api);
 
-    // todo: serve files with webext::call
-
     match app.onboarding.token()? {
         Some(onboarding) => {
             let get_started = format!("{}/setup?t={}", app.config.base_url, onboarding);

src/web/mod.rs

@@ -8,10 +8,11 @@ use std::task::{Context, Poll};
 
 use aide::OperationOutput;
 use aide::axum::IntoApiResponse;
-use axum::body::{Body, Bytes};
+use axum::body::Body;
+use axum::extract::Request;
 use axum::response::IntoResponse;
 use axum::{Json, extract};
-use http::{Request, Response, StatusCode, header};
+use http::{Response, StatusCode, header};
 use rust_embed::RustEmbed;
 use schemars::JsonSchema;
 use serde::Serialize;
@@ -90,10 +91,7 @@ impl IntoResponse for ApiError {
     }
 }
 
-pub async fn call<E: RustEmbed + Send + Sync>(
-    orig_uri: extract::OriginalUri,
-    req: Request<Bytes>,
-) -> Result<impl IntoResponse, StatusCode> {
+pub(super) async fn serve(orig_uri: extract::OriginalUri, req: Request) -> Result<impl IntoResponse, StatusCode> {
     let mut path = req.uri().path().trim_start_matches('/').trim_end_matches('/').to_string();
     if path.is_empty() {
         path = "index.html".to_string();
@@ -109,11 +107,11 @@ pub async fn call<E: RustEmbed + Send + Sync>(
         path = parts.join("/");
     }
 
-    let file = if let Some(content) = E::get(&path) {
+    let file = if let Some(content) = Files::get(&path) {
         Some(content)
     } else {
         path = format!("{path}/index.html");
-        E::get(&path)
+        Files::get(&path)
     };
 
     let orig_path = orig_uri.path();
@@ -209,3 +207,5 @@ macro_rules! http_bail {
 }
 
 pub(crate) use http_bail;
+
+use crate::web::Files;