searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2024-12-23 13:10:06 +01:00
Code Issues Releases Wiki Activity

improve mini dashboard routing

Browse Source
This commit is contained in:
marin postma 2021-06-22 21:48:51 +02:00
parent 7ec752ed1c
commit b1a5ef0aab
No known key found for this signature in database
GPG Key ID: 6088B7721C3E39F9
1 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
meilisearch-http/src/lib.rs
View File

@ -15,64 +15,83 @@ pub use option::Opt;
#[macro_export] #[macro_export]
macro_rules! create_app { macro_rules! create_app {
($data:expr, $enable_frontend:expr) => {{ ($data:expr, $enable_frontend:expr) => {
use actix_cors::Cors; {
use actix_web::middleware::TrailingSlash; use actix_cors::Cors;
use actix_web::App; use actix_web::middleware::TrailingSlash;
use actix_web::{middleware, web}; use actix_web::{App, HttpResponse};
use meilisearch_http::error::payload_error_handler; use actix_web::{middleware, web};
use meilisearch_http::routes::*; use meilisearch_http::error::payload_error_handler;
use meilisearch_http::routes::*;
#[cfg(feature = "mini-dashboard")] #[cfg(feature = "mini-dashboard")]
use actix_web_static_files::ResourceFiles; use actix_web_static_files::Resource;
#[cfg(feature = "mini-dashboard")] #[cfg(feature = "mini-dashboard")]
mod dashboard { mod dashboard {
include!(concat!(env!("OUT_DIR"), "/generated.rs")); include!(concat!(env!("OUT_DIR"), "/generated.rs"));
} }
let app = App::new() let app = App::new()
.data($data.clone()) .data($data.clone())
.app_data( .app_data(
web::JsonConfig::default() web::JsonConfig::default()
.limit($data.http_payload_size_limit()) .limit($data.http_payload_size_limit())
.content_type(|_mime| true) // Accept all mime types .content_type(|_mime| true) // Accept all mime types
.error_handler(|err, _req| payload_error_handler(err).into()), .error_handler(|err, _req| payload_error_handler(err).into()),
) )
.app_data( .app_data(
web::QueryConfig::default() web::QueryConfig::default()
.error_handler(|err, _req| payload_error_handler(err).into()), .error_handler(|err, _req| payload_error_handler(err).into()),
) )
.configure(document::services) .configure(document::services)
.configure(index::services) .configure(index::services)
.configure(search::services) .configure(search::services)
.configure(settings::services) .configure(settings::services)
.configure(health::services) .configure(health::services)
.configure(stats::services) .configure(stats::services)
.configure(key::services) .configure(key::services)
.configure(dump::services); .configure(dump::services);
#[cfg(feature = "mini-dashboard")] #[cfg(feature = "mini-dashboard")]
let app = if $enable_frontend { let app = if $enable_frontend {
let generated = dashboard::generate(); let mut app = app;
let service = ResourceFiles::new("/", generated); let generated = dashboard::generate();
app.service(service) let mut scope = web::scope("/");
} else { // Generate routes for mini-dashboard assets
app.service(running) for (path, resource) in generated.into_iter() {
}; let Resource {mime_type, data, ..} = resource;
// Redirect index.html to /
if path == "index.html" {
app = app.service(web::resource("/").route(web::get().to(move || {
HttpResponse::Ok().content_type(mime_type).body(data)
})));
} else {
scope = scope.service(web::resource(path).route(web::get().to(move || {
HttpResponse::Ok().content_type(mime_type).body(data)
})));
}
}
app.service(scope)
} else {
app.service(running)
};
#[cfg(not(feature = "mini-dashboard"))] #[cfg(not(feature = "mini-dashboard"))]
let app = app.service(running); let app = app.service(running);
app.wrap( app.wrap(
Cors::default() Cors::default()
.send_wildcard() .send_wildcard()
.allowed_headers(vec!["content-type", "x-meili-api-key"]) .allowed_headers(vec!["content-type", "x-meili-api-key"])
.allow_any_origin() .allow_any_origin()
.allow_any_method() .allow_any_method()
.max_age(86_400), // 24h .max_age(86_400), // 24h
) )
.wrap(middleware::Logger::default()) .wrap(middleware::Logger::default())
.wrap(middleware::Compress::default()) .wrap(middleware::Compress::default())
.wrap(middleware::NormalizePath::new(TrailingSlash::Trim)) .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
}}; .default_service(
web::route().to(|| HttpResponse::NotFound()))
}
};
} }