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

misc(refactor): move Server type to its own module

Browse Source
This commit is contained in:
Joshua Higgins
2025-12-30 22:51:52 -05:00
Unverified
parent b416dc17ad
commit 23feed3f21
6 changed files with 846 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/tournaments/round_robin.rs
View File

@@ -2,7 +2,7 @@ use std::{collections::HashMap, net::SocketAddr};
use async_trait::async_trait;
use crate::*;
use crate::{server::Server, *};
#[derive(Clone)]
pub struct RoundRobin {
@@ -94,7 +94,7 @@ impl Tournament for RoundRobin {
result
}
async fn next(&mut self, clients: &Clients, matches: &Matches, observers: &Observers) {
async fn next(&mut self, server: &Server) {
if self.is_completed {
return;
}
@@ -117,7 +117,7 @@ impl Tournament for RoundRobin {
if self.is_completed() {
// Send scores
let clients_guard = clients.read().await;
let clients_guard = server.clients.read().await;
let mut player_scores: Vec<(String, u32)> = Vec::new();
for (_, player_addr) in self.players.iter() {
let mut player = clients_guard.get(player_addr).unwrap().write().await;
@@ -135,20 +135,20 @@ impl Tournament for RoundRobin {
}
message.pop();
broadcast_message_all_observers(observers, &message).await;
server.broadcast_message_all_observers(&message).await;
} else {
// Create next matches
self.create_matches(clients, matches).await;
self.create_matches(&server.clients, &server.matches).await;
}
}
async fn start(&mut self, clients: &Clients, matches: &Matches) {
self.create_matches(clients, matches).await;
async fn start(&mut self, server: &Server) {
self.create_matches(&server.clients, &server.matches).await;
}
async fn cancel(&mut self, clients: &Clients, matches: &Matches, observers: &Observers) {
async fn cancel(&mut self, server: &Server) {
for (_, addr) in self.players.iter() {
let clients_guard = clients.read().await;
let clients_guard = server.clients.read().await;
let client = clients_guard.get(addr);
if client.is_none() {
@@ -167,7 +167,7 @@ impl Tournament for RoundRobin {
drop(client);
drop(clients_guard);
terminate_match(match_id, matches, clients, observers, false).await;
server.terminate_match(match_id).await;
if !client_ready {
let _ = send(&client_connection, "TOURNAMENT:END");