joshuafhiggins/connect4-moderator-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 2 Activity

fix: rework tournament acks #18

Merged
joshuafhiggins merged 1 commits from fix-rework-tournament-acks into main 2025-12-31 22:31:29 +00:00
Conversation 0 Commits 1 Files Changed 2 +19 -24
2 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.rs
View File

@@ -176,15 +176,14 @@ async fn handle_connection(
} }
"TOURNAMENT" => { "TOURNAMENT" => {
if parts.get(1) == Some(&"START") && parts.len() > 2 { if parts.get(1) == Some(&"START") && parts.len() > 2 {
if let Err(e) = sd if let Err(e) =
.handle_tournament_start(tx.clone(), addr, parts[2].to_string()) sd.handle_tournament_start(addr, parts[2].to_string()).await
.await
{ {
error!("handle_tournament_start: {}", e); error!("handle_tournament_start: {}", e);
let _ = send(&tx, e.to_string().as_str()); let _ = send(&tx, e.to_string().as_str());
} }
} else if parts.get(1) == Some(&"CANCEL") { } else if parts.get(1) == Some(&"CANCEL") {
if let Err(e) = sd.handle_tournament_cancel(tx.clone(), addr).await { if let Err(e) = sd.handle_tournament_cancel(addr).await {
error!("handle_tournament_cancel: {}", e); error!("handle_tournament_cancel: {}", e);
let _ = send(&tx, e.to_string().as_str()); let _ = send(&tx, e.to_string().as_str());
} }

24
src/server.rs
View File

@@ -10,7 +10,6 @@ pub struct Server {
pub tournament: WrappedTournament, pub tournament: WrappedTournament,
pub waiting_timeout: Arc<RwLock<u64>>, pub waiting_timeout: Arc<RwLock<u64>>,
pub demo_mode: Arc<RwLock<bool>>, pub demo_mode: Arc<RwLock<bool>>,
pub tournament_type: String,
} }
impl Server { impl Server {
@@ -25,7 +24,6 @@ impl Server {
tournament: Arc::new(RwLock::new(None)), tournament: Arc::new(RwLock::new(None)),
waiting_timeout: Arc::new(RwLock::new(5000)), waiting_timeout: Arc::new(RwLock::new(5000)),
demo_mode: Arc::new(RwLock::new(demo_mode)), demo_mode: Arc::new(RwLock::new(demo_mode)),
tournament_type,
} }
} }
@@ -73,7 +71,11 @@ impl Server {
Ok(()) Ok(())
} }
pub async fn handle_disconnect_cmd(&self, addr: SocketAddr, tx: UnboundedSender<Message>) -> Result<(), anyhow::Error> { pub async fn handle_disconnect_cmd(
&self,
addr: SocketAddr,
tx: UnboundedSender<Message>,
) -> Result<(), anyhow::Error> {
let clients_guard = self.clients.read().await; let clients_guard = self.clients.read().await;
let client_opt = clients_guard.get(&addr).cloned(); let client_opt = clients_guard.get(&addr).cloned();
@@ -545,7 +547,6 @@ impl Server {
pub async fn handle_tournament_start( pub async fn handle_tournament_start(
&self, &self,
tx: UnboundedSender<Message>,
addr: SocketAddr, addr: SocketAddr,
tournament_type: String, tournament_type: String,
) -> Result<(), anyhow::Error> { ) -> Result<(), anyhow::Error> {
@@ -571,7 +572,7 @@ impl Server {
drop(clients_guard); drop(clients_guard);
let mut tourney = match self.tournament_type.as_str() { let mut tourney = match tournament_type.as_str() {
"RoundRobin" => RoundRobin::new(&ready_players), "RoundRobin" => RoundRobin::new(&ready_players),
&_ => RoundRobin::new(&ready_players), &_ => RoundRobin::new(&ready_players),
}; };
@@ -580,17 +581,12 @@ impl Server {
let mut tournament_guard = self.tournament.write().await; let mut tournament_guard = self.tournament.write().await;
*tournament_guard = Some(Arc::new(RwLock::new(tourney))); *tournament_guard = Some(Arc::new(RwLock::new(tourney)));
let _ = crate::send(&tx, "TOURNAMENT:START:ACK"); self.broadcast_message_all_observers(&format!("TOURNAMENT:START:{}", tournament_type))
.await;
self.broadcast_message_all_observers(&format!("TOURNAMENT:START:{}", tournament_type)).await;
Ok(()) Ok(())
} }
pub async fn handle_tournament_cancel( pub async fn handle_tournament_cancel(&self, addr: SocketAddr) -> Result<(), anyhow::Error> {
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
) -> Result<(), anyhow::Error> {
if !self.auth_check(addr).await { if !self.auth_check(addr).await {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH")); return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
} }
@@ -604,7 +600,7 @@ impl Server {
tourney.write().await.cancel(&self).await; tourney.write().await.cancel(&self).await;
*tournament_guard = None; *tournament_guard = None;
let _ = send(&tx, "TOURNAMENT:CANCEL:ACK"); self.broadcast_message_all_observers("TOURNAMENT:CANCEL").await;
Ok(()) Ok(())
} }