From 90d97e089d3b56e0e9efde3693f106d035bb88e8 Mon Sep 17 00:00:00 2001 From: Jomar Milan Date: Sat, 30 May 2026 23:06:35 -0700 Subject: Add route to accept player hand updates --- src/main.rs | 84 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 27 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 82c4f19..ec09da2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,32 +1,33 @@ mod session; mod template; -use std::collections::HashMap; -use std::net::SocketAddr; -use std::sync::{Arc, Mutex}; -use std::time::{SystemTime, UNIX_EPOCH}; -use askama::{Template}; +use crate::session::{HandObject, Session}; +use crate::template::{IndexTemplate, SessionTemplate}; +use askama::Template; use axum::extract::{Path, Query, State}; use axum::http::{header, StatusCode}; use axum::response::{Html, IntoResponse, Response}; -use axum::Router; -use axum::routing::{get}; +use axum::routing::{get, put}; +use axum::{Json, Router}; use rust_embed::Embed; -use crate::session::{Session}; -use crate::template::{IndexTemplate, SessionTemplate}; +use serde::Deserialize; +use std::collections::HashMap; +use std::net::SocketAddr; +use std::sync::{Arc, Mutex}; +use std::time::{SystemTime, UNIX_EPOCH}; #[derive(Embed)] #[folder = "assets/"] struct Asset; struct AppState { - sessions: Mutex> + sessions: Mutex>, } impl AppState { fn new() -> Self { AppState { - sessions: Mutex::new(HashMap::new()) + sessions: Mutex::new(HashMap::new()), } } } @@ -37,6 +38,7 @@ async fn main() { .route("/", get(serve_index)) .route("/dist/{*path}", get(serve_static)) .route("/session/{id}", get(visit_session).put(create_session)) + .route("/session/{id}/hands", put(update_hands)) .with_state(Arc::new(AppState::new())); let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); @@ -57,7 +59,7 @@ fn serve_template(template: impl Template) -> Response { async fn serve_index(State(state): State>) -> Response { let sessions = state.sessions.lock().unwrap(); serve_template(IndexTemplate { - sessions: &sessions + sessions: &sessions, }) } @@ -66,36 +68,48 @@ async fn serve_static(Path(path): Path) -> Response { Some(content) => { let mime = match path.split('.').last() { Some("js") => "application/javascript", - _ => "application/octet-stream" + _ => "application/octet-stream", }; ([(header::CONTENT_TYPE, mime)], content.data).into_response() } - None => (StatusCode::NOT_FOUND, "404 Not Found").into_response() + None => (StatusCode::NOT_FOUND, "404 Not Found").into_response(), } } -async fn visit_session(Path(id): Path, Query(query): Query>, State(state): State>) -> Response { +async fn visit_session( + Path(id): Path, + Query(query): Query>, + State(state): State>, +) -> Response { let passcode = query.get("passcode"); let sessions = state.sessions.lock().unwrap(); match sessions.get(&id) { - Some(session) => { - match passcode { - Some(passcode) if passcode.as_str() == session.passcode => - serve_template(SessionTemplate { - session: &session - }), - _ => (StatusCode::FORBIDDEN, "Incorrect session passcode").into_response() + Some(session) => match passcode { + Some(passcode) if passcode.as_str() == session.passcode => { + serve_template(SessionTemplate { session: &session }) } + _ => (StatusCode::FORBIDDEN, "Incorrect session passcode").into_response(), }, - None => (StatusCode::NOT_FOUND, "Session does not exist").into_response() + None => (StatusCode::NOT_FOUND, "Session does not exist").into_response(), } } -async fn create_session(Path(id): Path, Query(query): Query>, State(state): State>) -> Response { - let name = query.get("name").map(|name| name.clone()).unwrap_or("Unknown".to_string()); - let passcode = SystemTime::now().duration_since(UNIX_EPOCH).map(|duration| duration.subsec_nanos()).unwrap_or(675603000).to_string(); +async fn create_session( + Path(id): Path, + Query(query): Query>, + State(state): State>, +) -> Response { + let name = query + .get("name") + .map(|name| name.clone()) + .unwrap_or("Unknown".to_string()); + let passcode = SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|duration| duration.subsec_nanos()) + .unwrap_or(675603000) + .to_string(); let mut sessions = state.sessions.lock().unwrap(); @@ -103,4 +117,20 @@ async fn create_session(Path(id): Path, Query(query): Query, + State(state): State>, + Json(payload): Json>>, +) -> Response { + let mut sessions = state.sessions.lock().unwrap(); + + match sessions.get_mut(&id) { + Some(session) => { + session.hands = payload; + (StatusCode::NO_CONTENT, ()).into_response() + } + None => (StatusCode::NOT_FOUND, "Session does not exist").into_response(), + } +} -- cgit v1.2.3