eta357/LibreTunes-Nix-Test
1
0
Fork 0
Code Pull Requests Actions Activity

Switch to axum server

Browse Source
This commit is contained in:
Ethan Girouard 2024-03-01 14:23:52 -05:00
parent 213e43e835
commit f587a70155
Signed by: eta357
GPG Key ID: 7BCDC36DFD11C146
1 changed files with 17 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main.rs
View File

@ -12,61 +12,37 @@ extern crate diesel;
extern crate diesel_migrations; extern crate diesel_migrations;
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]
#[actix_web::main] #[tokio::main]
async fn main() -> std::io::Result<()> { async fn main() {
use actix_identity::IdentityMiddleware; use axum::Router;
use actix_session::storage::RedisSessionStore; use leptos::*;
use actix_session::SessionMiddleware; use leptos_axum::{generate_route_list, LeptosRoutes};
use actix_web::cookie::Key; use libretunes::app::*;
use dotenv::dotenv; use dotenv::dotenv;
dotenv().ok(); dotenv().ok();
// Bring the database up to date // Bring the database up to date
libretunes::database::migrate(); libretunes::database::migrate();
let session_secret_key = if let Ok(key) = std::env::var("SESSION_SECRET_KEY") {
Key::from(key.as_bytes())
} else {
Key::generate()
};
let redis_url = std::env::var("REDIS_URL").expect("REDIS_URL must be set"); let redis_url = std::env::var("REDIS_URL").expect("REDIS_URL must be set");
let redis_store = RedisSessionStore::new(redis_url).await.unwrap();
use actix_files::Files;
use actix_web::*;
use leptos::*;
use leptos_actix::{generate_route_list, LeptosRoutes};
use libretunes::app::*;
let conf = get_configuration(None).await.unwrap(); let conf = get_configuration(None).await.unwrap();
let addr = conf.leptos_options.site_addr; let leptos_options = conf.leptos_options;
let addr = leptos_options.site_addr;
// Generate the list of routes in your Leptos App // Generate the list of routes in your Leptos App
let routes = generate_route_list(App); let routes = generate_route_list(App);
let app = Router::new()
.leptos_routes(&leptos_options, routes, App)
.with_state(leptos_options);
println!("listening on http://{}", &addr); println!("listening on http://{}", &addr);
HttpServer::new(move || { axum::Server::bind(&addr)
let leptos_options = &conf.leptos_options; .serve(app.into_make_service())
let site_root = &leptos_options.site_root; .await
.unwrap();
App::new()
.route("/api/{tail:.*}", leptos_actix::handle_server_fns())
// serve JS/WASM/CSS from `pkg`
.service(Files::new("/pkg", format!("{site_root}/pkg")))
// serve other assets from the `assets` directory
.service(Files::new("/assets", site_root))
// serve the favicon from /favicon.ico
.service(favicon)
.leptos_routes(leptos_options.to_owned(), routes.to_owned(), App)
.app_data(web::Data::new(leptos_options.to_owned()))
.wrap(IdentityMiddleware::default())
.wrap(SessionMiddleware::new(redis_store.clone(), session_secret_key.clone()))
//.wrap(middleware::Compress::default())
})
.bind(&addr)?
.run()
.await
} }
#[cfg(feature = "ssr")] #[cfg(feature = "ssr")]