tries

Author: syphar

src/web/routes.rs

@@ -129,7 +129,7 @@ pub(super) fn build_axum_routes() -> AxumRouter {
             "/favicon.ico",
             get_static(|| async { Redirect::permanent("/-/static/favicon.ico") }),
         )
-        .nest("/-/static/", build_static_router())
+        .nest("/-/static", build_static_router())
         .route(
             "/opensearch.xml",
             get_static(|| async { Redirect::permanent("/-/static/opensearch.xml") }),

src/web/statics.rs

@@ -2,6 +2,7 @@ use super::{cache::CachePolicy, metrics::request_recorder, routes::get_static};
 use axum::{
     extract::{Extension, Request},
     http::header::CONTENT_TYPE,
+    http::{StatusCode, Uri},
     middleware,
     middleware::Next,
     response::{IntoResponse, Response},
@@ -67,13 +68,18 @@ pub(crate) fn build_static_router() -> AxumRouter {
             "/rustdoc-2021-12-05.css",
             get_static(|| async { build_static_css_response(RUSTDOC_2021_12_05_CSS) }),
         )
-        .fallback_service(
-            get_service(ServeDir::new("static").fallback(ServeDir::new("vendor")))
-                .layer(middleware::from_fn(set_needed_static_headers))
-                .layer(middleware::from_fn(|request, next| async {
-                    request_recorder(request, next, Some("static resource")).await
-                })),
-        )
+        .fallback(fallback)
+    // .fallback_service(
+    //     get_service(ServeDir::new("static").fallback(ServeDir::new("vendor")))
+    //         .layer(middleware::from_fn(set_needed_static_headers))
+    //         .layer(middleware::from_fn(|request, next| async {
+    //             request_recorder(request, next, Some("static resource")).await
+    //         })),
+    // )
+}
+async fn fallback(uri: Uri) -> (StatusCode, String) {
+    dbg!(&uri);
+    (StatusCode::NOT_FOUND, format!("No route for {uri}"))
 }
 
 #[cfg(test)]
@@ -165,7 +171,12 @@ mod tests {
             let web = env.web_app().await;
 
             let resp = web.get(path).await?;
-            assert!(resp.status().is_success(), "{}", resp.status());
+            if !resp.status().is_success() {
+                let status = resp.status();
+                dbg!(&resp.text().await);
+                assert!(status.is_success(), "{}", status);
+                panic!("as");
+            }
             resp.assert_cache_control(CachePolicy::ForeverInCdnAndBrowser, &env.config());
             assert_eq!(
                 resp.headers().get("Content-Type"),