nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2025-02-04 11:54:42 +00:00
Code Projects Releases Packages Activity

Fix assets for production

Browse source
This commit is contained in:
Felix Ableitner 2024-12-11 12:59:43 +01:00
parent d238f69c86
commit 3040e5539b
3 changed files with 51 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Cargo.lock generated
View file

@ -1783,6 +1783,7 @@ dependencies = [
"gloo-net", "gloo-net",
"hex", "hex",
"http", "http",
"include_dir",
"jsonwebtoken", "jsonwebtoken",
"katex", "katex",
"leptos", "leptos",
@ -1797,6 +1798,7 @@ dependencies = [
"markdown-it-heading-anchors", "markdown-it-heading-anchors",
"markdown-it-sub", "markdown-it-sub",
"markdown-it-sup", "markdown-it-sup",
"mime_guess",
"once_cell", "once_cell",
"pretty_assertions", "pretty_assertions",
"rand", "rand",
@ -1975,6 +1977,25 @@ dependencies = [
"icu_properties", "icu_properties",
] ]
[[package]]
name = "include_dir"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
dependencies = [
"include_dir_macros",
]
[[package]]
name = "include_dir_macros"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
dependencies = [
"proc-macro2",
"quote",
]
[[package]] [[package]]
name = "indexmap" name = "indexmap"
version = "2.6.0" version = "2.6.0"

2
Cargo.toml
View file

@ -65,6 +65,8 @@ send_wrapper = "0.6.0"
web-sys = "0.3.72" web-sys = "0.3.72"
http = "1.1.0" http = "1.1.0"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
include_dir = "0.7.4"
mime_guess = "2.0.5"
# backend-only deps # backend-only deps
[target.'cfg(not(target_family = "wasm"))'.dependencies] [target.'cfg(not(target_family = "wasm"))'.dependencies]

57
src/backend/assets.rs
View file

@ -1,12 +1,16 @@
use super::error::MyResult;
use anyhow::anyhow;
use axum::{ use axum::{
body::Body, body::Body,
extract::{Request, State}, extract::{Request, State},
http::StatusCode,
response::{IntoResponse, Response}, response::{IntoResponse, Response},
}; };
use axum_macros::debug_handler; use axum_macros::debug_handler;
use http::{HeaderMap, HeaderName, HeaderValue};
use include_dir::include_dir;
use leptos::prelude::*; use leptos::prelude::*;
use tower::ServiceExt; use mime_guess::mime::APPLICATION_OCTET_STREAM;
use tower::util::ServiceExt;
use tower_http::services::ServeDir; use tower_http::services::ServeDir;
// from https://github.com/leptos-rs/start-axum // from https://github.com/leptos-rs/start-axum
@ -14,35 +18,28 @@ use tower_http::services::ServeDir;
#[debug_handler] #[debug_handler]
pub async fn file_and_error_handler( pub async fn file_and_error_handler(
State(options): State<LeptosOptions>, State(options): State<LeptosOptions>,
req: Request<Body>, request: Request<Body>,
) -> Result<Response<Body>, StatusCode> { ) -> MyResult<Response<Body>> {
let root = options.site_root.clone(); if cfg!(debug_assertions) {
let (parts, _) = req.into_parts(); // in debug mode serve assets directly from local folder
Ok(ServeDir::new(options.site_root.as_ref())
let mut static_parts = parts.clone();
static_parts.headers.clear();
if let Some(encodings) = parts.headers.get("accept-encoding") {
static_parts
.headers
.insert("accept-encoding", encodings.clone());
}
let res = get_static_file(Request::from_parts(static_parts, Body::empty()), &root).await?;
if res.status() == StatusCode::OK {
Ok(res.into_response())
} else {
Err(StatusCode::NOT_FOUND)
}
}
async fn get_static_file(request: Request<Body>, root: &str) -> Result<Response<Body>, StatusCode> {
// `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
// This path is relative to the cargo root
Ok(ServeDir::new(root)
.precompressed_gzip()
.precompressed_br()
.oneshot(request) .oneshot(request)
.await .await
.into_response()) .into_response())
} else {
// for production embed assets in binary
let mut headers = HeaderMap::new();
let dir = include_dir!("target/site/");
let path = request.uri().path().replacen('/', "", 1);
let content = dir.get_file(&path).ok_or(anyhow!("not found"))?;
headers.insert(
HeaderName::from_static("content-type"),
HeaderValue::from_str(
mime_guess::from_path(path)
.first_raw()
.unwrap_or_else(|| APPLICATION_OCTET_STREAM.essence_str()),
)?,
);
Ok((headers, content.contents()).into_response())
}
} }