Skip to content

fix(frontend): serve engine UI assets under ui base #5235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NathanFlurry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(frontend): serve engine UI assets under ui base #5235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions engine/packages/api-public/src/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ pub async fn router(
.route("/ui", axum::routing::get(ui::serve_index))
.route("/ui/", axum::routing::get(ui::serve_index))
.route("/ui/{*path}", axum::routing::get(ui::serve_ui))
.route("/assets/{*path}", axum::routing::get(ui::serve_asset))
// MARK: Middleware (must go after all routes)
// Add CORS layer that mirrors the request origin
.layer(
Expand Down Expand Up @@ -170,6 +171,7 @@ async fn auth_middleware(
&& path != "/"
&& path != "/ui"
&& !path.starts_with("/ui/")
&& !path.starts_with("/assets/")
&& !ctx.is_auth_handled()
{
return Err((
Expand Down
49 changes: 31 additions & 18 deletions engine/packages/api-public/src/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,38 @@ pub async fn serve_index() -> Response {
pub async fn serve_ui(Path(path): Path<String>) -> Response {
let file_path = path.trim_start_matches('/');

if let Some(file) = UI_DIR.get_file(file_path) {
let content_type = match file_path.split('.').last() {
Some("html") => "text/html",
Some("css") => "text/css",
Some("js") => "application/javascript",
Some("json") => "application/json",
Some("png") => "image/png",
Some("jpg") | Some("jpeg") => "image/jpeg",
Some("svg") => "image/svg+xml",
Some("ico") => "image/x-icon",
Some("woff") => "font/woff",
Some("woff2") => "font/woff2",
Some("ttf") => "font/ttf",
Some("eot") => "application/vnd.ms-fontobject",
_ => "application/octet-stream",
};

([(header::CONTENT_TYPE, content_type)], file.contents()).into_response()
if let Some(res) = serve_file(file_path) {
res
} else {
serve_index().await
}
}

#[tracing::instrument(skip_all)]
pub async fn serve_asset(Path(path): Path<String>) -> Response {
let file_path = format!("assets/{}", path.trim_start_matches('/'));

serve_file(&file_path).unwrap_or_else(|| StatusCode::NOT_FOUND.into_response())
}

fn serve_file(file_path: &str) -> Option<Response> {
let file = UI_DIR.get_file(file_path)?;

let content_type = match file_path.split('.').last() {
Some("html") => "text/html",
Some("css") => "text/css",
Some("js") => "application/javascript",
Some("json") => "application/json",
Some("png") => "image/png",
Some("jpg") | Some("jpeg") => "image/jpeg",
Some("svg") => "image/svg+xml",
Some("ico") => "image/x-icon",
Some("woff") => "font/woff",
Some("woff2") => "font/woff2",
Some("ttf") => "font/ttf",
Some("eot") => "application/vnd.ms-fontobject",
_ => "application/octet-stream",
};

Some(([(header::CONTENT_TYPE, content_type)], file.contents()).into_response())
}
Loading