From ede5eedc24bb44976aa7999db805820c8f4072be Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Thu, 20 Jun 2024 18:00:12 +0200 Subject: [PATCH] load html on compile time instead of runtime. Maybe fixed not found link to refer to correct url in release --- http/index.http | 4 ++++ src/resources/static/not-found.html | 2 +- src/routing/routes/index.rs | 13 +++---------- src/utils/axum.rs | 29 +++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/http/index.http b/http/index.http index 4371bf4..52c8e9b 100644 --- a/http/index.http +++ b/http/index.http @@ -2,6 +2,10 @@ GET {{url}} +### GET index page on HTTP/2 + +GET {{url}} HTTP/2 + ### GET OpenAPI page GET {{url}}/openapi diff --git a/src/resources/static/not-found.html b/src/resources/static/not-found.html index e0dc179..15f6b20 100644 --- a/src/resources/static/not-found.html +++ b/src/resources/static/not-found.html @@ -54,7 +54,7 @@

404

Oops! Page not found.

- Go back to the documentation + Go back to the documentation
diff --git a/src/routing/routes/index.rs b/src/routing/routes/index.rs index 1373e63..093c49d 100644 --- a/src/routing/routes/index.rs +++ b/src/routing/routes/index.rs @@ -2,11 +2,10 @@ use axum::extract::Path; use axum::http::StatusCode; use axum::response::{IntoResponse, Response}; +use crate::{load_html, router}; use crate::expressions::expression::Expression; -use crate::router; use crate::routing::error::{Error, ErrorKind}; use crate::routing::response::IsLegalResponse; -use crate::utils::axum::load_html; router!( get "/" => index, @@ -19,10 +18,7 @@ async fn index() -> &'static str { } async fn open_api() -> Response { - match load_html("openapi.html").await { - Ok(html) => html.into_response(), - Err(err) => (StatusCode::INTERNAL_SERVER_ERROR, err).into_response() - } + load_html!("openapi.html").into_response() } async fn is_valid(Path(path): Path) -> Response { @@ -33,8 +29,5 @@ async fn is_valid(Path(path): Path) -> Response { } pub(crate) async fn not_found() -> Response { - match load_html("not-found.html").await { - Ok(html) => (StatusCode::NOT_FOUND, html).into_response(), - Err(err) => (StatusCode::INTERNAL_SERVER_ERROR, err).into_response() - } + (StatusCode::NOT_FOUND, load_html!("not-found.html")).into_response() } diff --git a/src/utils/axum.rs b/src/utils/axum.rs index 10d694a..1eee5be 100644 --- a/src/utils/axum.rs +++ b/src/utils/axum.rs @@ -65,3 +65,32 @@ pub async fn load_html(file_path: &str) -> Result, String> { let stream = ReaderStream::new(file); Ok(Html(Body::from_stream(stream))) } + +#[macro_export] +macro_rules! load_html { + ($filename:literal) => { + axum::response::Html( + axum::body::Body::new( + $crate::absolute_path!($filename) + ) + ) + }; +} + +#[macro_export] +#[cfg(debug_assertions)] +macro_rules! absolute_path { + ($filename:literal) => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/resources/static/", $filename)) + .replace("{{docs}}", "/openapi") + }; +} + +#[macro_export] +#[cfg(not(debug_assertions))] +macro_rules! absolute_path { + ($filename:literal) => { + include_str!(concat!("/static/", $filename)) + .replace("{{docs}}", "simplify-truths/v2/openapi") + }; +}