From b64d5ba0ade334519029cef95348c25353a1f4f2 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 5 Nov 2026 23:10:27 -0500 Subject: [PATCH] mod: add test gemini endpoint --- backend/public/src/config.rs | 17 +++++++++ backend/public/src/main.rs | 71 ++++++++++++++++++++++++------------ 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/backend/public/src/config.rs b/backend/public/src/config.rs index 029adde..e459e75 100644 --- a/backend/public/src/config.rs +++ b/backend/public/src/config.rs @@ -1,5 +1,22 @@ use std::path::PathBuf; +pub enum ServeAppConfig { + Http, + Gemini, +} + +impl std::str::FromStr for ServeAppConfig { + type Err = &'static str; + + fn from_str(value: &str) -> Result { + match value { + "http" => Ok(Self::Http), + "gemini" => Ok(Self::Gemini), + _ => Err("expected \"http\" or \"gemini\""), + } + } +} + pub fn config() -> Configuration { Configuration { env: dotenvy::dotenv(), diff --git a/backend/public/src/main.rs b/backend/public/src/main.rs index 9c08f24..1636617 100644 --- a/backend/public/src/main.rs +++ b/backend/public/src/main.rs @@ -1,4 +1,5 @@ use axum::Router; +use gemi::{EndpointExt, GeminiConfig, GeminiResponse, GeminiRouter, GeminiServer}; use cache::ClientLike; use config::config; use sqlx::postgres::PgPoolOptions; @@ -115,32 +116,56 @@ async fn main() { let app_state = Arc::new(Mutex::new(state::AppInternalState::new(pool, redis_pool))); // build our application with some routes - let app = Router::new() - .merge(routes::root::RootRoute::routes()) - .merge(routes::posts::PostsRoute::routes(&app_state)) - .merge(routes::comments::CommentsRoute::routes(&app_state)) - .merge(routes::authors::AuthorsRoute::routes(&app_state)) - .merge(routes::projects::ProjectsRoute::routes(&app_state)) - .layer(CorsLayer::permissive()) - .layer( - TraceLayer::new_for_http() - .make_span_with(trace::DefaultMakeSpan::new().level(tracing::Level::INFO)) - .on_response(trace::DefaultOnResponse::new().level(tracing::Level::INFO)), - ) - .fallback(routes::root::RootRoute::not_found); - //.layer(GovernorLayer { - // config: governor_conf, - //}); + let app_env = std::env::var("SERVE_APP") + .unwrap_or_else(|_| "http".to_string()) + .parse::() + .expect("Invalid SERVE_APP value"); + + match app_env { + config::ServeAppConfig::Http => { + let state = app_state.clone(); + let app = Router::new() + .merge(routes::root::RootRoute::routes()) + .merge(routes::posts::PostsRoute::routes(&state)) + .merge(routes::comments::CommentsRoute::routes(&state)) + .merge(routes::authors::AuthorsRoute::routes(&state)) + .merge(routes::projects::ProjectsRoute::routes(&state)) + .layer(CorsLayer::permissive()) + .layer( + TraceLayer::new_for_http() + .make_span_with(trace::DefaultMakeSpan::new().level(tracing::Level::INFO)) + .on_response(trace::DefaultOnResponse::new().level(tracing::Level::INFO)), + ) + .fallback(routes::root::RootRoute::not_found); + + + // run it with hyper + let listener = TcpListener::bind("0.0.0.0:3000").await.unwrap(); + tracing::debug!("listening on {}", listener.local_addr().unwrap()); + axum::serve(listener, app) + .with_graceful_shutdown(shutdown_signal()) + .await + .unwrap(); + } + config::ServeAppConfig::Gemini => { + let gemini_state = app_state.clone(); + let mut router = GeminiRouter::default(); + router.add_route("/", hello).unwrap(); + // router.nest(prefix, endpoint) + let config = GeminiConfig::new("0.0.0.0:1965"); + let app = router.with_state(gemini_state); + let server = GeminiServer::new(app, "cert.der", "key.der", config).unwrap(); + server.serve().await.unwrap(); + } + }; - // run it with hyper - let listener = TcpListener::bind("0.0.0.0:3000").await.unwrap(); - tracing::debug!("listening on {}", listener.local_addr().unwrap()); - axum::serve(listener, app) - .with_graceful_shutdown(shutdown_signal()) - .await - .unwrap(); } +async fn hello() -> impl Into { + "Hello, Gemini!" +} + + async fn shutdown_signal() { let ctrl_c = async { signal::ctrl_c()