Skip to content
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

Jump to bottom

chore(axum): Correct web page router #55

Merged
merged 3 commits into from
Sep 24, 2023
Merged

chore(axum): Correct web page router #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70ee135
Merge pull request #1 from photino/main
andeya Sep 24, 2023
0a80071
chore(axum): Correct web page router
andeya Sep 24, 2023
7e0f1e9
Merge branch 'photino:main' into main
andeya Sep 24, 2023
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
47 changes: 38 additions & 9 deletions zino/src/application/axum_cluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ use crate::{endpoint, middleware, AxumExtractor};
use axum::{
error_handling::HandleErrorLayer,
extract::{rejection::LengthLimitError, DefaultBodyLimit},
http::StatusCode,
middleware::from_fn,
http::{StatusCode, Uri, uri::PathAndQuery},
body::Body,
response::Response as AxumResponse,
middleware::{from_fn, Next},
routing, BoxError, Router, Server,
};
use std::{
convert::Infallible, fs, net::SocketAddr, path::PathBuf, sync::LazyLock, time::Duration,
convert::Infallible, fs, net::SocketAddr, path::PathBuf, sync::LazyLock, time::Duration, str::FromStr,
};
use tokio::runtime::Builder;
use tower::{
Expand All @@ -30,6 +32,7 @@ use zino_core::{
response::{FullResponse, Response},
schedule::{AsyncCronJob, Job, JobScheduler},
};
use crate::{Request, Result};

/// An HTTP server cluster for `axum`.
#[derive(Default)]
Expand Down Expand Up @@ -124,15 +127,41 @@ impl Application for AxumCluster {
let index_file = public_dir.join("index.html");
let not_found_file = public_dir.join("404.html");
let serve_file = ServeFile::new(index_file);
let serve_dir = ServeDir::new(public_dir)
.precompressed_gzip()
.precompressed_br()
.append_index_html_on_directories(true)
.not_found_service(ServeFile::new(not_found_file));
let mut serve_dir = Router::new()
.nest_service(public_route_name, ServeDir::new(public_dir)
.precompressed_gzip()
.precompressed_br()
.append_index_html_on_directories(true)
.not_found_service(ServeFile::new(not_found_file)));
if public_route_name == "/page" {
serve_dir = serve_dir.layer(from_fn(
// Correct the uri path to achieve the following goals:
// /page -> page-dir/index.html
// /page/login -> page-dir/login.html
async move |req: Request, next: Next<Body>| -> Result<AxumResponse> {
let (mut head, body) = axum::http::Request::<Body>::from(req).into_parts();
let uri_path = head.uri.path();
if uri_path == "/page" {
let path_query = format!("/page/index.html?{}", head.uri.query().unwrap_or_default());
let mut parts = head.uri.into_parts();
parts.path_and_query = PathAndQuery::from_str(path_query.as_str()).ok();
head.uri = Uri::from_parts(parts).unwrap();
} else if let Some((p, name)) = uri_path.rsplit_once("/") {
if name.len() > 0 && !name.contains(".") {
let path_query = format!("{p}/{name}.html?{}", head.uri.query().unwrap_or_default());
let mut parts = head.uri.into_parts();
parts.path_and_query = PathAndQuery::from_str(path_query.as_str()).ok();
head.uri = Uri::from_parts(parts).unwrap();
}
}
Ok(next.run(axum::http::request::Request::from_parts(head, body)).await)
},
))
}

let mut app = Router::new()
.route_service("/", serve_file)
.nest_service(public_route_name, serve_dir)
.merge(serve_dir)
.route("/sse", routing::get(endpoint::sse_handler))
.route("/websocket", routing::get(endpoint::websocket_handler));
for route in &default_routes {
Expand Down
1 change: 1 addition & 0 deletions zino/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
html_logo_url = "https://user-images.githubusercontent.com/3446306/267670333-ac29d670-4c81-47ca-bc8c-94ec11aa28f6.svg"
)]
#![feature(async_fn_in_trait)]
#![feature(async_closure)]
#![feature(doc_auto_cfg)]
#![feature(lazy_cell)]
#![feature(let_chains)]
Expand Down
Loading