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

misc(refactor): extract command handlers and centralize error handling

Browse Source 
- Move command-specific logic out of main.rs into Server::handle_* methods
  (parsing remains in main and handlers accept already-parsed input).
- Handlers now return Result and return Err("ERROR:...") instead of sending
  error messages directly to clients.
- main.rs now logs handler errors to console and sends the error string to
  the client (removed `continue` statements after error sends).
- Move end_game_check from main.rs into lib.rs for reuse.
- Update handler implementations to follow the new error-returning pattern.
This commit is contained in:
Joshua Higgins
2025-12-30 22:26:26 -05:00
Unverified
parent b5d71051a6
commit b416dc17ad
5 changed files with 1143 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
src/lib.rs
View File

@@ -1,14 +1,20 @@
use std::{collections::HashMap, net::SocketAddr, sync::Arc}; use std::{collections::HashMap, net::SocketAddr, sync::Arc};
use rand::Rng; use rand::Rng;
use tokio::sync::{RwLock, mpsc::{UnboundedSender, error::SendError}}; use tokio::sync::{
mpsc::{error::SendError, UnboundedSender},
RwLock,
};
use tokio_tungstenite::tungstenite::Message; use tokio_tungstenite::tungstenite::Message;
use tracing::error; use tracing::error;
use crate::{tournaments::Tournament, types::{Client, Color, Match}}; use crate::{
tournaments::Tournament,
types::{Client, Color, Match},
};
pub mod types;
pub mod tournaments; pub mod tournaments;
pub mod types;
pub type Clients = Arc<RwLock<HashMap<SocketAddr, Arc<RwLock<Client>>>>>; pub type Clients = Arc<RwLock<HashMap<SocketAddr, Arc<RwLock<Client>>>>>;
pub type Usernames = Arc<RwLock<HashMap<String, SocketAddr>>>; pub type Usernames = Arc<RwLock<HashMap<String, SocketAddr>>>;
@@ -18,26 +24,28 @@ pub type WrappedTournament = Arc<RwLock<Option<Arc<RwLock<dyn Tournament + Send
pub async fn broadcast_message(addrs: &Vec<SocketAddr>, observers: &Observers, msg: &str) { pub async fn broadcast_message(addrs: &Vec<SocketAddr>, observers: &Observers, msg: &str) {
for addr in addrs { for addr in addrs {
let observers_guard = observers.read().await; let observers_guard = observers.read().await;
let tx = observers_guard.get(addr); let tx = observers_guard.get(addr);
if tx.is_none() { continue; } if tx.is_none() {
continue;
}
let _ = send(tx.unwrap(), msg); let _ = send(tx.unwrap(), msg);
} }
} }
pub async fn broadcast_message_all_observers(observers: &Observers, msg: &str) { pub async fn broadcast_message_all_observers(observers: &Observers, msg: &str) {
let observers_guard = observers.read().await; let observers_guard = observers.read().await;
for (_, tx) in observers_guard.iter() { for (_, tx) in observers_guard.iter() {
let _ = send(tx, msg); let _ = send(tx, msg);
} }
} }
pub async fn watch(matches: &Matches, new_match_id: u32, addr: SocketAddr) -> Result<(), String> { pub async fn watch(matches: &Matches, new_match_id: u32, addr: SocketAddr) -> Result<(), String> {
let matches_guard = matches.read().await; let matches_guard = matches.read().await;
for match_guard in matches_guard.values() { for match_guard in matches_guard.values() {
let mut found = false; let mut found = false;
let mut a_match = match_guard.write().await; let mut a_match = match_guard.write().await;
for i in 0..a_match.viewers.len() { for i in 0..a_match.viewers.len() {
if a_match.viewers[i] == addr { if a_match.viewers[i] == addr {
a_match.viewers.remove(i); a_match.viewers.remove(i);
@@ -51,75 +59,138 @@ pub async fn watch(matches: &Matches, new_match_id: u32, addr: SocketAddr) -> Re
} }
} }
let result = matches_guard.get(&new_match_id); let result = matches_guard.get(&new_match_id);
if result.is_none() { if result.is_none() {
return Err("Match not found".to_string()); return Err("Match not found".to_string());
} }
result.unwrap().write().await.viewers.push(addr); result.unwrap().write().await.viewers.push(addr);
Ok(()) Ok(())
} }
pub async fn auth_check(admin: &Arc<RwLock<Option<SocketAddr>>>, addr: SocketAddr) -> bool { pub async fn auth_check(admin: &Arc<RwLock<Option<SocketAddr>>>, addr: SocketAddr) -> bool {
if admin.read().await.is_none() || admin.read().await.unwrap() != addr { if admin.read().await.is_none() || admin.read().await.unwrap() != addr {
return false; return false;
} }
true true
} }
pub async fn gen_match_id(matches: &Matches) -> u32 { pub async fn gen_match_id(matches: &Matches) -> u32 {
let matches_guard = matches.read().await; let matches_guard = matches.read().await;
let mut result = rand::rng().random_range(100000..=999999); let mut result = rand::rng().random_range(100000..=999999);
while matches_guard.get(&result).is_some() { while matches_guard.get(&result).is_some() {
result = rand::rng().random_range(100000..=999999); result = rand::rng().random_range(100000..=999999);
} }
result result
} }
pub async fn terminate_match(match_id: u32, matches: &Matches, clients: &Clients, observers: &Observers, demo_mode: bool) { pub async fn terminate_match(
let matches_guard = matches.read().await; match_id: u32,
let the_match = matches_guard.get(&match_id); matches: &Matches,
if the_match.is_none() { clients: &Clients,
error!("Tried to call terminate_match on invalid matchID: {}", match_id); observers: &Observers,
} demo_mode: bool,
let the_match = the_match.unwrap().read().await; ) {
let matches_guard = matches.read().await;
let the_match = matches_guard.get(&match_id);
if the_match.is_none() {
error!(
"Tried to call terminate_match on invalid matchID: {}",
match_id
);
}
let the_match = the_match.unwrap().read().await;
if the_match.wait_thread.is_some() { if the_match.wait_thread.is_some() {
the_match.wait_thread.as_ref().unwrap().abort(); the_match.wait_thread.as_ref().unwrap().abort();
} }
broadcast_message(&the_match.viewers, observers, "GAME:TERMINATED").await; broadcast_message(&the_match.viewers, observers, "GAME:TERMINATED").await;
let clients_guard = clients.read().await; let clients_guard = clients.read().await;
let mut player1 = clients_guard.get(&the_match.player1).unwrap().write().await; let mut player1 = clients_guard.get(&the_match.player1).unwrap().write().await;
let _ = send(&player1.connection, "GAME:TERMINATED"); let _ = send(&player1.connection, "GAME:TERMINATED");
player1.current_match = None; player1.current_match = None;
player1.color = Color::None; player1.color = Color::None;
drop(player1); drop(player1);
if !demo_mode { if !demo_mode {
let mut player2 = clients_guard.get(&the_match.player2).unwrap().write().await; let mut player2 = clients_guard.get(&the_match.player2).unwrap().write().await;
let _ = send(&player2.connection, "GAME:TERMINATED"); let _ = send(&player2.connection, "GAME:TERMINATED");
player2.current_match = None; player2.current_match = None;
player2.color = Color::None; player2.color = Color::None;
drop(player2); drop(player2);
} }
drop(clients_guard); drop(clients_guard);
drop(the_match); drop(the_match);
drop(matches_guard); drop(matches_guard);
matches.write().await.remove(&match_id); matches.write().await.remove(&match_id);
} }
pub fn random_move(board: &[Vec<Color>]) -> usize { pub fn random_move(board: &[Vec<Color>]) -> usize {
let mut random = rand::rng().random_range(0..7); let mut random = rand::rng().random_range(0..7);
while board[random][5] != Color::None { while board[random][5] != Color::None {
random = rand::rng().random_range(0..7); random = rand::rng().random_range(0..7);
} }
random random
}
pub fn end_game_check(board: &[Vec<Color>]) -> (Color, bool) {
let mut result = (Color::None, false);
let mut any_empty = true;
for x in 0..7 {
for y in 0..6 {
let color = board[x][y].clone();
let mut horizontal_end = true;
let mut vertical_end = true;
let mut diagonal_end_up = true;
let mut diagonal_end_down = true;
if any_empty && color == Color::None {
any_empty = false;
}
for i in 0..4 {
if x + i >= 7 || board[x + i][y] != color && horizontal_end {
horizontal_end = false;
}
if y + i >= 6 || board[x][y + i] != color && vertical_end {
vertical_end = false;
}
if x + i >= 7 || y + i >= 6 || board[x + i][y + i] != color && diagonal_end_up {
diagonal_end_up = false;
}
if x + i >= 7
|| (y as i32 - i as i32) < 0
|| board[x + i][y - i] != color && diagonal_end_down
{
diagonal_end_down = false;
}
}
if horizontal_end || vertical_end || diagonal_end_up || diagonal_end_down {
result = (color.clone(), false);
break;
}
}
if result.0 != Color::None {
break;
}
}
if any_empty && result.0 == Color::None {
result.1 = true;
}
result
} }
pub fn send(tx: &UnboundedSender<Message>, text: &str) -> Result<(), SendError<Message>> { pub fn send(tx: &UnboundedSender<Message>, text: &str) -> Result<(), SendError<Message>> {

789
src/main.rs
View File

@@ -1,15 +1,12 @@
use connect4_moderator_server::{*}; use connect4_moderator_server::types::*;
use connect4_moderator_server::types::{*}; use connect4_moderator_server::*;
use connect4_moderator_server::tournaments::{*};
use futures_util::{SinkExt, StreamExt}; use futures_util::{SinkExt, StreamExt};
use rand::Rng;
use std::env; use std::env;
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::Arc; use std::sync::Arc;
use tokio::net::{TcpListener, TcpStream}; use tokio::net::{TcpListener, TcpStream};
use tokio::sync::RwLock;
use tokio_tungstenite::{accept_async, tungstenite::Message}; use tokio_tungstenite::{accept_async, tungstenite::Message};
use tracing::{error, info, warn}; use tracing::{error, info};
// TODO: Allow random "player1" in demo mode // TODO: Allow random "player1" in demo mode
// TODO: Support reconnecting behaviors // TODO: Support reconnecting behaviors
@@ -26,31 +23,31 @@ async fn main() -> Result<(), anyhow::Error> {
let args: Vec<String> = env::args().collect(); let args: Vec<String> = env::args().collect();
let demo_mode = args.get(1).is_some() && args.get(1).unwrap() == "demo"; let demo_mode = args.get(1).is_some() && args.get(1).unwrap() == "demo";
let tournament_type = if !demo_mode { let tournament_type = if !demo_mode {
if let Some(tourney) = args.get(1) { if let Some(tourney) = args.get(1) {
tourney.clone() tourney.clone()
} else { } else {
"round_robin".to_string() "round_robin".to_string()
} }
} else { "round_robin".to_string() }; } else {
let admin_password = env::var("ADMIN_AUTH").unwrap_or_else(|_| String::from("admin")); "round_robin".to_string()
info!("Admin password: {}", admin_password); };
let admin_password = Arc::new(admin_password); let admin_password = env::var("ADMIN_AUTH").unwrap_or_else(|_| String::from("admin"));
info!("Admin password: {}", admin_password);
let admin_password = Arc::new(admin_password);
let addr = "0.0.0.0:8080"; let addr = "0.0.0.0:8080";
let listener = TcpListener::bind(&addr).await?; let listener = TcpListener::bind(&addr).await?;
info!("WebSocket server listening on: {}", addr); info!("WebSocket server listening on: {}", addr);
let server_data = Arc::new( let server_data = Arc::new(Server::new(
Server::new(admin_password.as_ref().clone(), demo_mode, tournament_type) admin_password.as_ref().clone(),
); demo_mode,
tournament_type,
));
while let Ok((stream, addr)) = listener.accept().await { while let Ok((stream, addr)) = listener.accept().await {
tokio::spawn(handle_connection( tokio::spawn(handle_connection(stream, addr, server_data.clone()));
stream,
addr,
server_data.clone(),
));
} }
Ok(()) Ok(())
@@ -84,534 +81,163 @@ async fn handle_connection(
match msg { match msg {
Ok(Message::Text(text)) => { Ok(Message::Text(text)) => {
info!("Received text from {}: {}", addr, text); info!("Received text from {}: {}", addr, text);
let parts: Vec<&str> = text.split(':').collect();
if text.starts_with("CONNECT:") { let cmd = parts[0];
let requested_username = text.split(":").collect::<Vec<&str>>()[1].to_string(); match cmd {
"CONNECT" => {
if requested_username.is_empty() { if parts.len() > 1 {
let _ = send(&tx, &format!("ERROR:INVALID:ID:{}", requested_username)); let requested_username = parts[1].to_string();
continue; if let Err(e) =
} sd.handle_connect(addr, tx.clone(), requested_username).await
{
let mut is_taken = false; error!("handle_connect: {}", e);
let clients_guard = sd.clients.read().await; let _ = send(&tx, e.to_string().as_str());
for client in clients_guard.values() {
if requested_username == client.read().await.username {
let _ = send(&tx, &format!("ERROR:INVALID:ID:{}", requested_username));
is_taken = true;
break;
}
}
if is_taken {
continue;
}
drop(clients_guard);
// not taken
sd.observers.write().await.remove(&addr);
sd.usernames.write().await.insert(requested_username.clone(), addr);
sd.clients.write().await.insert(
addr.to_string().parse()?,
Arc::new(RwLock::new(Client::new(
requested_username,
tx.clone(),
addr.to_string().parse()?,
))),
);
let _ = send(&tx, "CONNECT:ACK");
}
else if text == "READY" {
let clients_guard = sd.clients.read().await;
if clients_guard.get(&addr).is_none() {
let _ = send(&tx, "ERROR:INVALID");
continue;
}
if clients_guard.get(&addr).unwrap().read().await.ready {
let _ = send(&tx, "ERROR:INVALID");
continue;
}
let mut client = clients_guard.get(&addr).unwrap().write().await;
client.ready = true;
let _ = send(&tx, "READY:ACK");
if sd.demo_mode {
let match_id: u32 = gen_match_id(&sd.matches).await;
let new_match = Arc::new(RwLock::new(Match::new(
match_id,
addr.to_string().parse()?,
addr.to_string().parse()?,
)));
sd.matches.write().await.insert(match_id, new_match.clone());
client.ready = false;
client.current_match = Some(match_id);
client.color = Color::Red;
let _ = send(&tx, "GAME:START:1");
}
}
else if text.starts_with("PLAY:") {
let clients_guard = sd.clients.read().await;
let client = clients_guard.get(&addr);
// Check if client is valid
if client.is_none() || client.unwrap().read().await.current_match.is_none()
{
let _ = send(&tx, "ERROR:INVALID:MOVE");
continue;
}
let client = client.unwrap().read().await;
let matches_guard = sd.matches.read().await;
let current_match =
matches_guard.get(&client.current_match.unwrap()).unwrap().read().await;
let opponent_addr =
if addr == current_match.player1 {
current_match.player2
} else {
current_match.player1
};
let opponent_connection =
if addr == current_match.player1 {
clients_guard.get(&current_match.player2).unwrap().read().await.connection.clone()
} else {
clients_guard.get(&current_match.player1).unwrap().read().await.connection.clone()
};
let opponent_username =
if addr == current_match.player1 {
clients_guard.get(&current_match.player2).unwrap().read().await.username.clone()
} else {
clients_guard.get(&current_match.player1).unwrap().read().await.username.clone()
};
// Check if it's their move
let mut invalid = false;
if (current_match.ledger.is_empty() && current_match.player1 != addr) ||
(current_match.ledger.last().is_some() && current_match.ledger.last().unwrap().0 == client.color)
{
let _ = send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
let column_parse = text.split(":").collect::<Vec<&str>>()[1].parse::<usize>();
drop(current_match);
drop(matches_guard);
let mut matches_guard = sd.matches.write().await;
let mut current_match = matches_guard
.get_mut(&client.current_match.unwrap())
.unwrap()
.write()
.await;
// Check if valid move
if let Ok(column) = column_parse {
if column >= 7 && !invalid {
let _ = send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
if current_match.board[column][5] != Color::None && !invalid {
let _ = send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
} else {
let _ = send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
// Terminate games if a player makes an invalid move
if invalid {
let current_match_id = current_match.id;
let viewers = current_match.viewers.clone();
drop(current_match);
drop(matches_guard);
drop(client);
drop(clients_guard);
if sd.demo_mode {
terminate_match(current_match_id, &sd.matches, &sd.clients, &sd.observers, sd.demo_mode).await;
tx.send(Message::Close(None))?;
} else {
let _ = send(&tx, "GAME:LOSS");
let _ = send(&opponent_connection, "GAME:WINS");
broadcast_message(&viewers, &sd.observers, &format!("GAME:WIN:{}", opponent_username)).await;
let mut clients_guard = sd.clients.write().await;
let mut client = clients_guard.get_mut(&addr).unwrap().write().await;
client.current_match = None;
client.color = Color::None;
drop(client);
let mut opponent = clients_guard.get_mut(&opponent_addr).unwrap().write().await;
opponent.current_match = None;
opponent.color = Color::None;
opponent.score += 1;
drop(opponent);
sd.matches.write().await.remove(&current_match_id).unwrap();
}
continue;
} else {
// Place it
current_match.place_token(client.color.clone(), column_parse.clone()?);
current_match.move_to_dispatch = (client.color.clone(), column_parse.clone()?);
}
// broadcast the move to viewers
broadcast_message(
&current_match.viewers,
&sd.observers,
&format!("GAME:MOVE:{}:{}", client.username, column_parse.clone()?),
)
.await;
// Check game end conditions
let (winner, filled) = end_game_check(&current_match.board);
if winner != Color::None {
if winner == client.color {
let _ = send(&tx, "GAME:WINS");
if !sd.demo_mode {
let _ = send(&opponent_connection, "GAME:LOSS");
} }
broadcast_message(
&current_match.viewers,
&sd.observers,
&format!("GAME:WIN:{}", client.username),
)
.await;
} else { } else {
let _ = send(&tx, "GAME:LOSS"); let _ = send(&tx, "ERROR:INVALID:ID:");
if !sd.demo_mode { }
let _ = send(&opponent_connection, "GAME:WINS"); }
"READY" => {
if let Err(e) = sd.handle_ready(addr, tx.clone()).await {
error!("handle_ready: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
}
"PLAY" => {
if parts.len() > 1 {
match parts[1].parse::<usize>() {
Ok(column) => {
if let Err(e) = sd.handle_play(addr, tx.clone(), column).await {
error!("handle_play: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
}
Err(_) => {
let _ = send(&tx, "ERROR:INVALID:MOVE");
}
} }
broadcast_message( } else {
&current_match.viewers, let _ = send(&tx, "ERROR:INVALID:MOVE");
&sd.observers,
&format!("GAME:WIN:{}", opponent_username),
)
.await;
} }
} else if filled { }
let _ = send(&tx, "GAME:DRAW"); "PLAYER" => {
if !sd.demo_mode { if parts.get(1) == Some(&"LIST") {
let _ = send(&opponent_connection, "GAME:DRAW"); if let Err(e) = sd.handle_player_list(tx.clone()).await {
error!("handle_player_list: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
} }
broadcast_message(&current_match.viewers, &sd.observers, "GAME:DRAW").await;
} }
"GAME" => {
// remove match from matchmaker if parts.get(1) == Some(&"LIST") {
if winner != Color::None || filled { if let Err(e) = sd.handle_game_list(tx.clone()).await {
let current_match_id = current_match.id; error!("handle_game_list: {}", e);
let _ = send(&tx, e.to_string().as_str());
drop(client); }
drop(current_match); } else if parts.get(1) == Some(&"WATCH") && parts.len() > 2 {
drop(clients_guard); match parts[2].parse::<u32>() {
Ok(match_id) => {
let clients_guard = sd.clients.read().await; if let Err(e) =
let mut client = clients_guard.get(&addr).unwrap().write().await; sd.handle_game_watch(tx.clone(), match_id, addr).await
if client.color == winner { {
client.score += 1; error!("handle_game_watch: {}", e);
} let _ = send(&tx, e.to_string().as_str());
client.current_match = None; }
client.color = Color::None; }
drop(client); Err(_) => {
let _ = send(&tx, "ERROR:INVALID:WATCH");
let mut opponent = clients_guard.get(&opponent_addr).unwrap().write().await; }
if opponent.color == winner { }
opponent.score += 1; } else if parts.get(1) == Some(&"TERMINATE") && parts.len() > 2 {
} match parts[2].parse::<u32>() {
opponent.current_match = None; Ok(match_id) => {
opponent.color = Color::None; if let Err(e) =
drop(opponent); sd.handle_game_terminate(tx.clone(), addr, match_id).await
matches_guard.remove(&current_match_id).unwrap(); {
error!("handle_game_terminate: {}", e);
if !sd.demo_mode && matches_guard.is_empty() { let _ = send(&tx, e.to_string().as_str());
drop(matches_guard); }
drop(clients_guard); }
Err(_) => {
let mut tournament_guard = sd.tournament.write().await; let _ = send(&tx, "ERROR:INVALID:TERMINATE");
let tourney = tournament_guard.as_mut().unwrap(); }
tourney.write().await.next(&sd.clients, &sd.matches, &sd.observers).await; }
if tourney.read().await.is_completed() { }
*tournament_guard = None; }
} "ADMIN" => {
} if parts.get(1) == Some(&"AUTH") && parts.len() > 2 {
if let Err(e) =
continue; sd.handle_admin_auth(tx.clone(), addr, parts[2].to_string()).await
{
error!("handle_admin_auth: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
} else if parts.get(1) == Some(&"KICK") && parts.len() > 2 {
if let Err(e) =
sd.handle_admin_kick(tx.clone(), addr, parts[2].to_string()).await
{
error!("handle_admin_kick: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
}
}
"TOURNAMENT" => {
if parts.get(1) == Some(&"START") {
if let Err(e) = sd.handle_tournament_start(tx.clone(), addr).await {
error!("handle_tournament_start: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
} else if parts.get(1) == Some(&"CANCEL") {
if let Err(e) = sd.handle_tournament_cancel(tx.clone(), addr).await {
error!("handle_tournament_cancel: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
} else if parts.get(1) == Some(&"WAIT") && parts.len() > 2 {
match parts[2].parse::<f64>() {
Ok(v) => {
if let Err(e) =
sd.handle_tournament_wait(tx.clone(), addr, v).await
{
error!("handle_tournament_wait: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
}
Err(_) => {
let _ = send(&tx, "ERROR:INVALID:TOURNAMENT");
}
}
}
}
"GET" => {
if parts.get(1) == Some(&"MOVE_WAIT") {
if let Err(e) = sd.handle_get_move_wait(tx.clone()).await {
error!("handle_get_move_wait: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
} else if parts.get(1) == Some(&"TOURNAMENT_STATUS") {
if let Err(e) = sd.handle_get_tournament_status(tx.clone()).await {
error!("handle_get_tournament_status: {}", e);
let _ = send(&tx, e.to_string().as_str());
}
}
}
_ => {
let _ = send(&tx, "ERROR:UNKNOWN");
} }
let connection_to_send = if !sd.demo_mode { opponent_connection.clone() } else { tx.clone() };
let column = if !sd.demo_mode { column_parse.clone()? } else { random_move(&current_match.board) };
if sd.demo_mode {
let move_to_dispatch = current_match.move_to_dispatch.clone();
current_match.ledger.push(move_to_dispatch);
current_match.move_to_dispatch = (Color::Yellow, column);
current_match.place_token(Color::Yellow, column);
}
let waiting = *sd.waiting_timeout.read().await as i64 + (rand::rng().random_range(0..=50) - 25);
let matches_move = sd.matches.clone();
let observers_move = sd.observers.clone();
let match_id_move = current_match.id;
let demo_mode_move = sd.demo_mode;
current_match.wait_thread = Some(tokio::spawn(async move {
tokio::time::sleep(tokio::time::Duration::from_millis(waiting as u64)).await;
let mut matches_guard = matches_move.write().await;
let mut current_match = matches_guard.get_mut(&match_id_move).unwrap().write().await;
let move_to_dispatch = current_match.move_to_dispatch.clone();
current_match.ledger.push(move_to_dispatch);
current_match.move_to_dispatch = (Color::None, 0);
if demo_mode_move {
broadcast_message(
&current_match.viewers,
&observers_move,
&format!("GAME:MOVE:{}:{}", "demo", column),
).await;
}
drop(current_match);
drop(matches_guard);
let _ = send(&connection_to_send, &format!("OPPONENT:{}", column));
}));
}
else if text == "PLAYER:LIST" {
let clients_guard = sd.clients.read().await;
let mut to_send = "PLAYER:LIST:".to_string();
for client_guard in clients_guard.values() {
let player = client_guard.read().await;
to_send += player.username.as_str(); to_send += ",";
to_send += if player.ready { "true" } else { "false" }; to_send += ",";
to_send += if player.current_match.is_some() { "true" } else { "false" };
to_send += "|";
}
to_send.remove(to_send.len() - 1);
let _ = send(&tx, to_send.as_str());
}
else if text == "GAME:LIST" {
let matches_guard = sd.matches.read().await;
let clients_guard = sd.clients.read().await;
let mut to_send = "GAME:LIST:".to_string();
for match_guard in matches_guard.values() {
let a_match = match_guard.read().await;
let player1 = clients_guard.get(&a_match.player1).unwrap().read().await;
let player2 = clients_guard.get(&a_match.player2).unwrap().read().await;
to_send += a_match.id.to_string().as_str();
to_send += ","; to_send += player1.username.as_str(); to_send += ",";
to_send += if player1.username == player2.username { "demo" } else { player2.username.as_str() };
to_send += "|";
}
to_send.remove(to_send.len() - 1);
let _ = send(&tx, to_send.as_str());
}
else if text.starts_with("GAME:WATCH:") {
let match_id_parse = text.split(":").collect::<Vec<&str>>()[2].parse::<u32>();
match match_id_parse {
Ok(match_id) => {
let result = watch(&sd.matches, match_id, addr).await;
if result.is_err() { let _ = send(&tx, "ERROR:INVALID:WATCH"); continue; }
let clients_guard = sd.clients.read().await;
let matches_guard = sd.matches.read().await;
let the_match = matches_guard.get(&match_id).unwrap().read().await;
let player1 = clients_guard.get(&the_match.player1).unwrap().read().await.username.clone();
let mut player2 = clients_guard.get(&the_match.player2).unwrap().read().await.username.clone();
if sd.demo_mode { player2 = "demo".to_string(); }
let ledger = the_match.ledger.clone();
drop(clients_guard);
drop(the_match);
drop(matches_guard);
let mut message = format!("GAME:WATCH:ACK:{},{},{}|", match_id, player1, player2);
for a_move in ledger {
if a_move.0 == Color::Red {
message += &format!("{},{}|", player1, a_move.1);
} else {
message += &format!("{},{}|", player2, a_move.1);
}
}
message.pop();
let _ = send(&tx, &message);
}
Err(_) => { let _ = send(&tx, "ERROR:INVALID:WATCH"); continue; }
}
}
else if text.starts_with("ADMIN:AUTH:") {
if sd.admin.read().await.is_some() {
let _ = send(&tx, "ERROR:INVALID:AUTH");
continue;
}
let password_parse = text.split(":").collect::<Vec<&str>>()[2];
if password_parse != *sd.admin_password {
let _ = send(&tx, "ERROR:INVALID:AUTH");
continue;
}
let mut admin_guard = sd.admin.write().await;
*admin_guard = Some(addr.to_string().parse()?);
let _ = send(&tx, "ADMIN:AUTH:ACK");
}
else if text.starts_with("ADMIN:KICK:") {
if !auth_check(&sd.admin, addr).await {
let _ = send(&tx, "ERROR:INVALID:AUTH");
}
let kick_username = text.split(":").collect::<Vec<&str>>()[2];
let usernames_guard = sd.usernames.read().await;
let clients_guard = sd.clients.read().await;
let kick_addr_result = usernames_guard.get(kick_username);
match kick_addr_result {
Some(kick_addr) => {
let kick_client = clients_guard.get(kick_addr).unwrap().read().await;
kick_client.connection.send(Message::Close(None))?;
},
None => {
let _ = send(&tx, "ERROR:INVALID:KICK");
continue
}
}
}
else if text.starts_with("GAME:TERMINATE:") {
if !auth_check(&sd.admin, addr).await {
let _ = send(&tx, "ERROR:INVALID:AUTH");
}
let match_id_parse = text.split(":").collect::<Vec<&str>>()[2].parse::<u32>();
if match_id_parse.is_err() { let _ = send(&tx, "ERROR:INVALID:TERMINATE"); continue; }
terminate_match(match_id_parse?, &sd.matches, &sd.clients, &sd.observers, sd.demo_mode).await;
if !sd.demo_mode && sd.matches.read().await.is_empty() {
let mut tournament_guard = sd.tournament.write().await;
let tourney = tournament_guard.as_mut().unwrap();
tourney.write().await.next(&sd.clients, &sd.matches, &sd.observers).await;
if tourney.read().await.is_completed() {
*tournament_guard = None;
}
}
}
else if text == "TOURNAMENT:START" {
if !auth_check(&sd.admin, addr).await {
let _ = send(&tx, "ERROR:INVALID:AUTH");
}
if sd.tournament.read().await.is_some() || sd.demo_mode {
let _ = send(&tx, "ERROR:INVALID:TOURNAMENT");
continue;
}
let mut clients_guard = sd.clients.write().await;
let mut ready_players = Vec::new();
for (client_addr, client_guard) in clients_guard.iter_mut() {
if client_guard.read().await.ready {
ready_players.push(*client_addr);
}
}
if ready_players.len() < 3 {
let _ = send(&tx, "ERROR:INVALID:TOURNAMENT");
continue;
}
drop(clients_guard);
let mut tourney = match sd.tournament_type.as_str() {
"round_robin" => RoundRobin::new(&ready_players),
&_ => RoundRobin::new(&ready_players),
};
tourney.start(&sd.clients, &sd.matches).await;
let mut tournament_guard = sd.tournament.write().await;
*tournament_guard = Some(Arc::new(RwLock::new(tourney)));
let _ = send(&tx, "TOURNAMENT:START:ACK");
}
else if text == "TOURNAMENT:CANCEL" {
if !auth_check(&sd.admin, addr).await {
let _ = send(&tx, "ERROR:INVALID:AUTH");
}
if sd.tournament.read().await.is_none() || sd.demo_mode {
let _ = send(&tx, "ERROR:INVALID:TOURNAMENT");
continue;
}
let mut tournament_guard = sd.tournament.write().await;
let tourney = tournament_guard.as_mut().unwrap();
tourney.write().await.cancel(&sd.clients, &sd.matches, &sd.observers).await;
*tournament_guard = None;
let _ = send(&tx, "TOURNAMENT:CANCEL:ACK");
}
else if text.starts_with("TOURNAMENT:WAIT:") {
if !auth_check(&sd.admin, addr).await {
let _ = send(&tx, "ERROR:INVALID:AUTH");
}
let new_timeout = text.split(":").collect::<Vec<&str>>()[2].parse::<f64>()?;
*sd.waiting_timeout.write().await = (new_timeout * 1000.0) as u64;
}
else if text == "GET:MOVE_WAIT" {
let mut msg = "GET:MOVE_WAIT:".to_string();
msg += &(*sd.waiting_timeout.read().await as f64 / 1000f64).to_string();
let _ = send(&tx, &msg);
}
else if text == "GET:TOURNAMENT_STATUS" {
let status = sd.tournament.read().await.is_some();
if sd.demo_mode {
let _ = send(&tx, "GET:TOURNAMENT_STATUS:DEMO");
} else {
let mut msg = "GET:TOURNAMENT_STATUS:".to_string();
msg += status.to_string().as_str();
let _ = send(&tx, &msg);
}
}
else {
let _ = send(&tx, "ERROR:UNKNOWN");
} }
} }
Ok(Message::Close(_)) => { Ok(Message::Close(_)) => {
info!("Client {} disconnected", addr); info!("Client {} disconnected", addr);
break; break;
} }
Ok(Message::Binary(_)) => { let _ = send(&tx, "ERROR:UNKNOWN"); } Ok(Message::Binary(_)) => {
Ok(_) => {}, // Ping packets, we can ignore, they get handled for us let _ = send(&tx, "ERROR:UNKNOWN");
}
Ok(_) => {} // Ping packets, we can ignore, they get handled for us
Err(e) => { Err(e) => {
error!("WebSocket error for {}: {}", addr, e); error!("WebSocket error for {}: {}", addr, e);
break; break;
}, }
} }
} }
@@ -619,25 +245,32 @@ async fn handle_connection(
send_task.abort(); send_task.abort();
// Remove and terminate any matches // Remove and terminate any matches
// We may not be a client disconnecting, do this check // We may not be a client disconnecting, do this check
let clients_guard = sd.clients.read().await; let clients_guard = sd.clients.read().await;
if clients_guard.get(&addr).is_some() { if clients_guard.get(&addr).is_some() {
let client = clients_guard.get(&addr).unwrap().read().await; let client = clients_guard.get(&addr).unwrap().read().await;
let username = client.username.clone(); let username = client.username.clone();
if let Some(match_id) = client.current_match { if let Some(match_id) = client.current_match {
drop(client); drop(client);
terminate_match(match_id, &sd.matches, &sd.clients, &sd.observers, sd.demo_mode).await; terminate_match(
} else { match_id,
drop(client); &sd.matches,
} &sd.clients,
&sd.observers,
sd.demo_mode,
)
.await;
} else {
drop(client);
}
drop(clients_guard); drop(clients_guard);
sd.clients.write().await.remove(&addr); sd.clients.write().await.remove(&addr);
sd.usernames.write().await.remove(&username); sd.usernames.write().await.remove(&username);
} }
sd.observers.write().await.remove(&addr); sd.observers.write().await.remove(&addr);
let mut admin_guard = sd.admin.write().await; let mut admin_guard = sd.admin.write().await;
if let Some(admin_addr) = *admin_guard { if let Some(admin_addr) = *admin_guard {
@@ -651,55 +284,3 @@ async fn handle_connection(
Ok(()) Ok(())
} }
fn end_game_check(board: &[Vec<Color>]) -> (Color, bool) {
let mut result = (Color::None, false);
let mut any_empty = true;
for x in 0..7 {
for y in 0..6 {
let color = board[x][y].clone();
let mut horizontal_end = true;
let mut vertical_end = true;
let mut diagonal_end_up = true;
let mut diagonal_end_down = true;
if any_empty && color == Color::None {
any_empty = false;
}
for i in 0..4 {
if x + i >= 7 || board[x + i][y] != color && horizontal_end {
horizontal_end = false;
}
if y + i >= 6 || board[x][y + i] != color && vertical_end {
vertical_end = false;
}
if x + i >= 7 || y + i >= 6 || board[x + i][y + i] != color && diagonal_end_up {
diagonal_end_up = false;
}
if x + i >= 7 || (y as i32 - i as i32) < 0 ||
board[x + i][y - i] != color && diagonal_end_down {
diagonal_end_down = false;
}
}
if horizontal_end || vertical_end || diagonal_end_up || diagonal_end_down {
result = (color.clone(), false);
break;
}
}
if result.0 != Color::None {
break;
}
}
if any_empty && result.0 == Color::None {
result.1 = true;
}
result
}

14
src/tournaments/mod.rs
View File

@@ -2,16 +2,18 @@ use std::net::SocketAddr;
use async_trait::async_trait; use async_trait::async_trait;
use crate::{*}; use crate::*;
pub mod round_robin; pub mod round_robin;
pub use round_robin::RoundRobin; pub use round_robin::RoundRobin;
#[async_trait] #[async_trait]
pub trait Tournament { pub trait Tournament {
fn new(ready_players: &[SocketAddr]) -> Self where Self: Sized; fn new(ready_players: &[SocketAddr]) -> Self
async fn next(&mut self, clients: &Clients, matches: &Matches, observers: &Observers); where
async fn start(&mut self, clients: &Clients, matches: &Matches); Self: Sized;
async fn cancel(&mut self, clients: &Clients, matches: &Matches, observers: &Observers); async fn next(&mut self, clients: &Clients, matches: &Matches, observers: &Observers);
fn is_completed(&self) -> bool; async fn start(&mut self, clients: &Clients, matches: &Matches);
async fn cancel(&mut self, clients: &Clients, matches: &Matches, observers: &Observers);
fn is_completed(&self) -> bool;
} }

259
src/tournaments/round_robin.rs
View File

@@ -2,173 +2,180 @@ use std::{collections::HashMap, net::SocketAddr};
use async_trait::async_trait; use async_trait::async_trait;
use crate::{*}; use crate::*;
#[derive(Clone)] #[derive(Clone)]
pub struct RoundRobin { pub struct RoundRobin {
pub players: HashMap<u32, SocketAddr>, pub players: HashMap<u32, SocketAddr>,
pub top_half: Vec<u32>, pub top_half: Vec<u32>,
pub bottom_half: Vec<u32>, pub bottom_half: Vec<u32>,
pub is_completed: bool, pub is_completed: bool,
} }
impl RoundRobin { impl RoundRobin {
async fn create_matches(&self, clients: &Clients, matches: &Matches) { async fn create_matches(&self, clients: &Clients, matches: &Matches) {
let clients_guard = clients.read().await; let clients_guard = clients.read().await;
for (i, id) in self.top_half.iter().enumerate() { for (i, id) in self.top_half.iter().enumerate() {
let player1_addr = self.players.get(id).unwrap(); let player1_addr = self.players.get(id).unwrap();
let player2_addr = self.players.get(self.bottom_half.get(i).unwrap()); let player2_addr = self.players.get(self.bottom_half.get(i).unwrap());
if player2_addr.is_none() { continue; } if player2_addr.is_none() {
let player2_addr = player2_addr.unwrap(); continue;
}
let player2_addr = player2_addr.unwrap();
let match_id: u32 = gen_match_id(matches).await; let match_id: u32 = gen_match_id(matches).await;
let new_match = Arc::new(RwLock::new(Match::new( let new_match = Arc::new(RwLock::new(Match::new(
match_id, match_id,
*player1_addr, *player1_addr,
*player2_addr, *player2_addr,
))); )));
let match_guard = new_match.read().await; let match_guard = new_match.read().await;
let mut player1 = clients_guard.get(player1_addr).unwrap().write().await; let mut player1 = clients_guard.get(player1_addr).unwrap().write().await;
player1.current_match = Some(match_id); player1.current_match = Some(match_id);
player1.ready = false; player1.ready = false;
if match_guard.player1 == *player1_addr { if match_guard.player1 == *player1_addr {
player1.color = Color::Red; player1.color = Color::Red;
let _ = send(&player1.connection, "GAME:START:1"); let _ = send(&player1.connection, "GAME:START:1");
} else { } else {
player1.color = Color::Yellow; player1.color = Color::Yellow;
let _ = send(&player1.connection, "GAME:START:0"); let _ = send(&player1.connection, "GAME:START:0");
} }
drop(player1); drop(player1);
let mut player2 = clients_guard.get(player2_addr).unwrap().write().await; let mut player2 = clients_guard.get(player2_addr).unwrap().write().await;
player2.current_match = Some(match_id); player2.current_match = Some(match_id);
player2.ready = false; player2.ready = false;
if match_guard.player1 == *player2_addr { if match_guard.player1 == *player2_addr {
player2.color = Color::Red; player2.color = Color::Red;
let _ = send(&player2.connection, "GAME:START:1"); let _ = send(&player2.connection, "GAME:START:1");
} else { } else {
player2.color = Color::Yellow; player2.color = Color::Yellow;
let _ = send(&player2.connection, "GAME:START:0"); let _ = send(&player2.connection, "GAME:START:0");
} }
drop(player2); drop(player2);
matches.write().await.insert(match_id, new_match.clone()); matches.write().await.insert(match_id, new_match.clone());
} }
} }
} }
#[async_trait] #[async_trait]
impl Tournament for RoundRobin { impl Tournament for RoundRobin {
fn new(ready_players: &[SocketAddr]) -> RoundRobin { fn new(ready_players: &[SocketAddr]) -> RoundRobin {
let mut result = RoundRobin { let mut result = RoundRobin {
players: HashMap::new(), players: HashMap::new(),
top_half: Vec::new(), top_half: Vec::new(),
bottom_half: Vec::new(), bottom_half: Vec::new(),
is_completed: false, is_completed: false,
}; };
let size = ready_players.len(); let size = ready_players.len();
for (id, player) in ready_players.iter().enumerate() { for (id, player) in ready_players.iter().enumerate() {
result.players.insert(id as u32, *player); result.players.insert(id as u32, *player);
} }
for i in 0..size / 2 { for i in 0..size / 2 {
result.top_half.push(i as u32); result.top_half.push(i as u32);
} }
for i in size / 2..size { for i in size / 2..size {
result.bottom_half.push(i as u32); result.bottom_half.push(i as u32);
} }
result result
} }
async fn next(&mut self, clients: &Clients, matches: &Matches, observers: &Observers) { async fn next(&mut self, clients: &Clients, matches: &Matches, observers: &Observers) {
if self.is_completed { if self.is_completed {
return; return;
} }
if self.top_half.len() <= 1 || self.bottom_half.is_empty() { if self.top_half.len() <= 1 || self.bottom_half.is_empty() {
self.is_completed = true; self.is_completed = true;
return; return;
} }
let last_from_top = self.top_half.pop().unwrap(); let last_from_top = self.top_half.pop().unwrap();
let first_from_bottom = self.bottom_half.remove(0); let first_from_bottom = self.bottom_half.remove(0);
self.top_half.insert(1, first_from_bottom); self.top_half.insert(1, first_from_bottom);
self.bottom_half.push(last_from_top); self.bottom_half.push(last_from_top);
let expected_bottom_start = self.top_half.len() as u32; let expected_bottom_start = self.top_half.len() as u32;
if self.top_half[1] == 1 && self.bottom_half[0] == expected_bottom_start { if self.top_half[1] == 1 && self.bottom_half[0] == expected_bottom_start {
self.is_completed = true; self.is_completed = true;
} }
if self.is_completed() { if self.is_completed() {
// Send scores // Send scores
let clients_guard = clients.read().await; let clients_guard = clients.read().await;
let mut player_scores: Vec<(String, u32)> = Vec::new(); let mut player_scores: Vec<(String, u32)> = Vec::new();
for (_, player_addr) in self.players.iter() { for (_, player_addr) in self.players.iter() {
let mut player = clients_guard.get(player_addr).unwrap().write().await; let mut player = clients_guard.get(player_addr).unwrap().write().await;
let _ = send(&player.connection.clone(), "TOURNAMENT:END"); let _ = send(&player.connection.clone(), "TOURNAMENT:END");
player_scores.push((player.username.clone(), player.score)); player_scores.push((player.username.clone(), player.score));
player.score = 0; player.score = 0;
player.round_robin_id = 0; player.round_robin_id = 0;
} }
player_scores.sort_by(|a, b| b.1.cmp(&a.1)); player_scores.sort_by(|a, b| b.1.cmp(&a.1));
let mut message = "TOURNAMENT:END:".to_string(); let mut message = "TOURNAMENT:END:".to_string();
for (player, score) in player_scores.iter() { for (player, score) in player_scores.iter() {
message.push_str(&format!("{},{}|", player, score)) message.push_str(&format!("{},{}|", player, score))
} }
message.pop(); message.pop();
broadcast_message_all_observers(observers, &message).await; broadcast_message_all_observers(observers, &message).await;
} } else {
else { // Create next matches
// Create next matches self.create_matches(clients, matches).await;
self.create_matches(clients, matches).await; }
} }
}
async fn start(&mut self, clients: &Clients, matches: &Matches) { async fn start(&mut self, clients: &Clients, matches: &Matches) {
self.create_matches(clients, matches).await; self.create_matches(clients, matches).await;
} }
async fn cancel(&mut self, clients: &Clients, matches: &Matches, observers: &Observers) { async fn cancel(&mut self, clients: &Clients, matches: &Matches, observers: &Observers) {
for (_, addr) in self.players.iter() { for (_, addr) in self.players.iter() {
let clients_guard = clients.read().await; let clients_guard = clients.read().await;
let client = clients_guard.get(addr); let client = clients_guard.get(addr);
if client.is_none() { continue; } if client.is_none() {
let client = client.unwrap().read().await; continue;
let client_connection = client.connection.clone(); }
let client_ready = client.ready; let client = client.unwrap().read().await;
let client_connection = client.connection.clone();
let client_ready = client.ready;
let match_id = client.current_match; let match_id = client.current_match;
if match_id.is_none() { continue; } if match_id.is_none() {
let match_id = match_id.unwrap(); continue;
}
let match_id = match_id.unwrap();
drop(client); drop(client);
drop(clients_guard); drop(clients_guard);
terminate_match(match_id, matches, clients, observers, false).await; terminate_match(match_id, matches, clients, observers, false).await;
if !client_ready { if !client_ready {
let _ = send(&client_connection, "TOURNAMENT:END"); let _ = send(&client_connection, "TOURNAMENT:END");
} }
} }
} }
fn is_completed(&self) -> bool { self.is_completed } fn is_completed(&self) -> bool {
self.is_completed
}
} }

764
src/types.rs
View File

@@ -8,106 +8,710 @@ use tokio::sync::RwLock;
use tokio_tungstenite::tungstenite::Message; use tokio_tungstenite::tungstenite::Message;
pub struct Server { pub struct Server {
pub clients: Clients, pub clients: Clients,
pub usernames: Usernames, pub usernames: Usernames,
pub observers: Observers, pub observers: Observers,
pub matches: Matches, pub matches: Matches,
pub admin: Arc<RwLock<Option<SocketAddr>>>, pub admin: Arc<RwLock<Option<SocketAddr>>>,
pub admin_password: Arc<String>, pub admin_password: Arc<String>,
pub tournament: WrappedTournament, pub tournament: WrappedTournament,
pub waiting_timeout: Arc<RwLock<u64>>, pub waiting_timeout: Arc<RwLock<u64>>,
pub demo_mode: bool, pub demo_mode: bool,
pub tournament_type: String, pub tournament_type: String,
} }
impl Server { impl Server {
pub fn new(admin_password: String, demo_mode: bool, tournament_type: String) -> Server { pub fn new(admin_password: String, demo_mode: bool, tournament_type: String) -> Server {
Server { Server {
clients: Arc::new(RwLock::new(HashMap::new())), clients: Arc::new(RwLock::new(HashMap::new())),
usernames: Arc::new(RwLock::new(HashMap::new())), usernames: Arc::new(RwLock::new(HashMap::new())),
observers: Arc::new(RwLock::new(HashMap::new())), observers: Arc::new(RwLock::new(HashMap::new())),
matches: Arc::new(RwLock::new(HashMap::new())), matches: Arc::new(RwLock::new(HashMap::new())),
admin: Arc::new(RwLock::new(None)), admin: Arc::new(RwLock::new(None)),
admin_password: Arc::new(admin_password), admin_password: Arc::new(admin_password),
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, demo_mode,
tournament_type, tournament_type,
} }
} }
// Handler for CONNECT:<username>
pub async fn handle_connect(
&self,
addr: SocketAddr,
tx: UnboundedSender<Message>,
requested_username: String,
) -> Result<(), anyhow::Error> {
if requested_username.is_empty() {
return Err(anyhow::anyhow!(format!(
"ERROR:INVALID:ID:{}",
requested_username
)));
}
let clients_guard = self.clients.read().await;
for client in clients_guard.values() {
if requested_username == client.read().await.username {
return Err(anyhow::anyhow!(format!(
"ERROR:INVALID:ID:{}",
requested_username
)));
}
}
drop(clients_guard);
// not taken
self.observers.write().await.remove(&addr);
self.usernames.write().await.insert(requested_username.clone(), addr);
self.clients.write().await.insert(
addr.to_string().parse()?,
Arc::new(RwLock::new(Client::new(
requested_username,
tx.clone(),
addr.to_string().parse()?,
))),
);
let _ = crate::send(&tx, "CONNECT:ACK");
Ok(())
}
// Handler for READY
pub async fn handle_ready(
&self,
addr: SocketAddr,
tx: UnboundedSender<Message>,
) -> Result<(), anyhow::Error> {
let clients_guard = self.clients.read().await;
if clients_guard.get(&addr).is_none() {
return Err(anyhow::anyhow!("ERROR:INVALID"));
}
if clients_guard.get(&addr).unwrap().read().await.ready {
return Err(anyhow::anyhow!("ERROR:INVALID"));
}
let mut client = clients_guard.get(&addr).unwrap().write().await;
client.ready = true;
let _ = crate::send(&tx, "READY:ACK");
if self.demo_mode {
let match_id: u32 = crate::gen_match_id(&self.matches).await;
let new_match = Arc::new(RwLock::new(Match::new(
match_id,
addr.to_string().parse()?,
addr.to_string().parse()?,
)));
self.matches.write().await.insert(match_id, new_match.clone());
client.ready = false;
client.current_match = Some(match_id);
client.color = Color::Red;
let _ = crate::send(&tx, "GAME:START:1");
}
Ok(())
}
// Handler for PLAY (column already parsed)
pub async fn handle_play(
&self,
addr: SocketAddr,
tx: UnboundedSender<Message>,
column: usize,
) -> Result<(), anyhow::Error> {
let clients_guard = self.clients.read().await;
let client_opt = clients_guard.get(&addr);
// Check if client is valid
if client_opt.is_none() || client_opt.unwrap().read().await.current_match.is_none() {
return Err(anyhow::anyhow!("ERROR:INVALID:MOVE"));
}
let client = client_opt.unwrap().read().await;
let matches_guard = self.matches.read().await;
let current_match = matches_guard.get(&client.current_match.unwrap()).unwrap().read().await;
let opponent_addr = if addr == current_match.player1 {
current_match.player2
} else {
current_match.player1
};
let opponent_connection = if addr == current_match.player1 {
clients_guard.get(&current_match.player2).unwrap().read().await.connection.clone()
} else {
clients_guard.get(&current_match.player1).unwrap().read().await.connection.clone()
};
let opponent_username = if addr == current_match.player1 {
clients_guard.get(&current_match.player2).unwrap().read().await.username.clone()
} else {
clients_guard.get(&current_match.player1).unwrap().read().await.username.clone()
};
// Check if it's their move
let mut invalid = false;
if (current_match.ledger.is_empty() && current_match.player1 != addr)
|| (current_match.ledger.last().is_some()
&& current_match.ledger.last().unwrap().0 == client.color)
{
let _ = crate::send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
drop(current_match);
drop(matches_guard);
let mut matches_guard = self.matches.write().await;
let mut current_match =
matches_guard.get_mut(&client.current_match.unwrap()).unwrap().write().await;
// Check if valid move
if column >= 7 && !invalid {
let _ = crate::send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
if current_match.board[column][5] != Color::None && !invalid {
let _ = crate::send(&tx, "ERROR:INVALID:MOVE");
invalid = true;
}
// Terminate games if a player makes an invalid move
if invalid {
let current_match_id = current_match.id;
let viewers = current_match.viewers.clone();
drop(current_match);
drop(matches_guard);
drop(client);
drop(clients_guard);
if self.demo_mode {
crate::terminate_match(
current_match_id,
&self.matches,
&self.clients,
&self.observers,
self.demo_mode,
)
.await;
tx.send(Message::Close(None))?;
} else {
let _ = crate::send(&tx, "GAME:LOSS");
let _ = crate::send(&opponent_connection, "GAME:WINS");
crate::broadcast_message(
&viewers,
&self.observers,
&format!("GAME:WIN:{}", opponent_username),
)
.await;
let mut clients_guard = self.clients.write().await;
let mut client = clients_guard.get_mut(&addr).unwrap().write().await;
client.current_match = None;
client.color = Color::None;
drop(client);
let mut opponent = clients_guard.get_mut(&opponent_addr).unwrap().write().await;
opponent.current_match = None;
opponent.color = Color::None;
opponent.score += 1;
drop(opponent);
self.matches.write().await.remove(&current_match_id).unwrap();
}
return Ok(());
} else {
// Place it
current_match.place_token(client.color.clone(), column);
current_match.move_to_dispatch = (client.color.clone(), column);
}
// broadcast the move to viewers
crate::broadcast_message(
&current_match.viewers,
&self.observers,
&format!("GAME:MOVE:{}:{}", client.username, column),
)
.await;
// Check game end conditions
let (winner, filled) = crate::end_game_check(&current_match.board);
if winner != Color::None {
if winner == client.color {
let _ = crate::send(&tx, "GAME:WINS");
if !self.demo_mode {
let _ = crate::send(&opponent_connection, "GAME:LOSS");
}
crate::broadcast_message(
&current_match.viewers,
&self.observers,
&format!("GAME:WIN:{}", client.username),
)
.await;
} else {
let _ = crate::send(&tx, "GAME:LOSS");
if !self.demo_mode {
let _ = crate::send(&opponent_connection, "GAME:WINS");
}
crate::broadcast_message(
&current_match.viewers,
&self.observers,
&format!("GAME:WIN:{}", opponent_username),
)
.await;
}
} else if filled {
let _ = crate::send(&tx, "GAME:DRAW");
if !self.demo_mode {
let _ = crate::send(&opponent_connection, "GAME:DRAW");
}
crate::broadcast_message(&current_match.viewers, &self.observers, "GAME:DRAW").await;
}
// remove match from matchmaker
if winner != Color::None || filled {
let current_match_id = current_match.id;
drop(client);
drop(current_match);
drop(clients_guard);
let clients_guard = self.clients.read().await;
let mut client = clients_guard.get(&addr).unwrap().write().await;
if client.color == winner {
client.score += 1;
}
client.current_match = None;
client.color = Color::None;
drop(client);
let mut opponent = clients_guard.get(&opponent_addr).unwrap().write().await;
if opponent.color == winner {
opponent.score += 1;
}
opponent.current_match = None;
opponent.color = Color::None;
drop(opponent);
matches_guard.remove(&current_match_id).unwrap();
if !self.demo_mode && matches_guard.is_empty() {
drop(matches_guard);
drop(clients_guard);
let mut tournament_guard = self.tournament.write().await;
let tourney = tournament_guard.as_mut().unwrap();
tourney.write().await.next(&self.clients, &self.matches, &self.observers).await;
if tourney.read().await.is_completed() {
*tournament_guard = None;
}
}
return Ok(());
}
let connection_to_send = if !self.demo_mode {
opponent_connection.clone()
} else {
tx.clone()
};
let column_to_use = if !self.demo_mode {
column
} else {
crate::random_move(&current_match.board)
};
if self.demo_mode {
let move_to_dispatch = current_match.move_to_dispatch.clone();
current_match.ledger.push(move_to_dispatch);
current_match.move_to_dispatch = (Color::Yellow, column_to_use);
current_match.place_token(Color::Yellow, column_to_use);
}
let waiting =
*self.waiting_timeout.read().await as i64 + (rand::rng().random_range(0..=50) - 25);
let matches_move = self.matches.clone();
let observers_move = self.observers.clone();
let match_id_move = current_match.id;
let demo_mode_move = self.demo_mode;
current_match.wait_thread = Some(tokio::spawn(async move {
tokio::time::sleep(tokio::time::Duration::from_millis(waiting as u64)).await;
let mut matches_guard = matches_move.write().await;
let mut current_match = matches_guard.get_mut(&match_id_move).unwrap().write().await;
let move_to_dispatch = current_match.move_to_dispatch.clone();
current_match.ledger.push(move_to_dispatch);
current_match.move_to_dispatch = (Color::None, 0);
if demo_mode_move {
crate::broadcast_message(
&current_match.viewers,
&observers_move,
&format!("GAME:MOVE:{}:{}", "demo", column_to_use),
)
.await;
}
drop(current_match);
drop(matches_guard);
let _ = crate::send(&connection_to_send, &format!("OPPONENT:{}", column_to_use));
}));
Ok(())
}
pub async fn handle_player_list(
&self,
tx: UnboundedSender<Message>,
) -> Result<(), anyhow::Error> {
let clients_guard = self.clients.read().await;
let mut to_send = "PLAYER:LIST:".to_string();
for client_guard in clients_guard.values() {
let player = client_guard.read().await;
to_send += player.username.as_str();
to_send += ",";
to_send += if player.ready { "true" } else { "false" };
to_send += ",";
to_send += if player.current_match.is_some() {
"true"
} else {
"false"
};
to_send += "|";
}
if !to_send.ends_with(":") {
to_send.remove(to_send.len() - 1);
}
let _ = crate::send(&tx, to_send.as_str());
Ok(())
}
pub async fn handle_game_list(
&self,
tx: UnboundedSender<Message>,
) -> Result<(), anyhow::Error> {
let matches_guard = self.matches.read().await;
let clients_guard = self.clients.read().await;
let mut to_send = "GAME:LIST:".to_string();
for match_guard in matches_guard.values() {
let a_match = match_guard.read().await;
let player1 = clients_guard.get(&a_match.player1).unwrap().read().await;
let player2 = clients_guard.get(&a_match.player2).unwrap().read().await;
to_send += a_match.id.to_string().as_str();
to_send += ",";
to_send += player1.username.as_str();
to_send += ",";
to_send += if player1.username == player2.username {
"demo"
} else {
player2.username.as_str()
};
to_send += "|";
}
if !to_send.ends_with(":") {
to_send.remove(to_send.len() - 1);
}
let _ = crate::send(&tx, to_send.as_str());
Ok(())
}
pub async fn handle_game_watch(
&self,
tx: UnboundedSender<Message>,
match_id: u32,
addr: SocketAddr,
) -> Result<(), anyhow::Error> {
let result = crate::watch(&self.matches, match_id, addr).await;
if result.is_err() {
return Err(anyhow::anyhow!("ERROR:INVALID:WATCH"));
}
let clients_guard = self.clients.read().await;
let matches_guard = self.matches.read().await;
let the_match = matches_guard.get(&match_id).unwrap().read().await;
let player1 = clients_guard.get(&the_match.player1).unwrap().read().await.username.clone();
let mut player2 =
clients_guard.get(&the_match.player2).unwrap().read().await.username.clone();
if self.demo_mode {
player2 = "demo".to_string();
}
let ledger = the_match.ledger.clone();
drop(clients_guard);
drop(the_match);
drop(matches_guard);
let mut message = format!("GAME:WATCH:ACK:{},{},{}|", match_id, player1, player2);
for a_move in ledger {
if a_move.0 == Color::Red {
message += &format!("{},{}|", player1, a_move.1);
} else {
message += &format!("{},{}|", player2, a_move.1);
}
}
message.pop();
let _ = crate::send(&tx, &message);
Ok(())
}
pub async fn handle_admin_auth(
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
password: String,
) -> Result<(), anyhow::Error> {
if self.admin.read().await.is_some() {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
if password != *self.admin_password {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
let mut admin_guard = self.admin.write().await;
*admin_guard = Some(addr.to_string().parse()?);
let _ = crate::send(&tx, "ADMIN:AUTH:ACK");
Ok(())
}
pub async fn handle_admin_kick(
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
kick_username: String,
) -> Result<(), anyhow::Error> {
if !crate::auth_check(&self.admin, addr).await {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
let usernames_guard = self.usernames.read().await;
let clients_guard = self.clients.read().await;
let kick_addr_result = usernames_guard.get(&kick_username);
match kick_addr_result {
Some(kick_addr) => {
let kick_client = clients_guard.get(kick_addr).unwrap().read().await;
kick_client.connection.send(Message::Close(None))?;
}
None => return Err(anyhow::anyhow!("ERROR:INVALID:KICK")),
}
Ok(())
}
pub async fn handle_game_terminate(
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
match_id: u32,
) -> Result<(), anyhow::Error> {
if !crate::auth_check(&self.admin, addr).await {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
crate::terminate_match(
match_id,
&self.matches,
&self.clients,
&self.observers,
self.demo_mode,
)
.await;
if !self.demo_mode && self.matches.read().await.is_empty() {
let mut tournament_guard = self.tournament.write().await;
let tourney = tournament_guard.as_mut().unwrap();
tourney.write().await.next(&self.clients, &self.matches, &self.observers).await;
if tourney.read().await.is_completed() {
*tournament_guard = None;
}
}
Ok(())
}
pub async fn handle_tournament_start(
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
) -> Result<(), anyhow::Error> {
if !crate::auth_check(&self.admin, addr).await {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
if self.tournament.read().await.is_some() || self.demo_mode {
return Err(anyhow::anyhow!("ERROR:INVALID:TOURNAMENT"));
}
let mut clients_guard = self.clients.write().await;
let mut ready_players = Vec::new();
for (client_addr, client_guard) in clients_guard.iter_mut() {
if client_guard.read().await.ready {
ready_players.push(*client_addr);
}
}
if ready_players.len() < 3 {
return Err(anyhow::anyhow!("ERROR:INVALID:TOURNAMENT"));
}
drop(clients_guard);
let mut tourney = match self.tournament_type.as_str() {
"round_robin" => crate::tournaments::round_robin::RoundRobin::new(&ready_players),
&_ => crate::tournaments::round_robin::RoundRobin::new(&ready_players),
};
tourney.start(&self.clients, &self.matches).await;
let mut tournament_guard = self.tournament.write().await;
*tournament_guard = Some(Arc::new(RwLock::new(tourney)));
let _ = crate::send(&tx, "TOURNAMENT:START:ACK");
Ok(())
}
pub async fn handle_tournament_cancel(
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
) -> Result<(), anyhow::Error> {
if !crate::auth_check(&self.admin, addr).await {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
if self.tournament.read().await.is_none() || self.demo_mode {
return Err(anyhow::anyhow!("ERROR:INVALID:TOURNAMENT"));
}
let mut tournament_guard = self.tournament.write().await;
let tourney = tournament_guard.as_mut().unwrap();
tourney.write().await.cancel(&self.clients, &self.matches, &self.observers).await;
*tournament_guard = None;
let _ = crate::send(&tx, "TOURNAMENT:CANCEL:ACK");
Ok(())
}
pub async fn handle_tournament_wait(
&self,
tx: UnboundedSender<Message>,
addr: SocketAddr,
new_timeout: f64,
) -> Result<(), anyhow::Error> {
if !crate::auth_check(&self.admin, addr).await {
return Err(anyhow::anyhow!("ERROR:INVALID:AUTH"));
}
*self.waiting_timeout.write().await = (new_timeout * 1000.0) as u64;
Ok(())
}
pub async fn handle_get_move_wait(
&self,
tx: UnboundedSender<Message>,
) -> Result<(), anyhow::Error> {
let mut msg = "GET:MOVE_WAIT:".to_string();
msg += &(*self.waiting_timeout.read().await as f64 / 1000f64).to_string();
let _ = crate::send(&tx, &msg);
Ok(())
}
pub async fn handle_get_tournament_status(
&self,
tx: UnboundedSender<Message>,
) -> Result<(), anyhow::Error> {
let status = self.tournament.read().await.is_some();
if self.demo_mode {
let _ = crate::send(&tx, "GET:TOURNAMENT_STATUS:DEMO");
} else {
let mut msg = "GET:TOURNAMENT_STATUS:".to_string();
msg += status.to_string().as_str();
let _ = crate::send(&tx, &msg);
}
Ok(())
}
} }
#[derive(PartialEq, Clone)] #[derive(PartialEq, Clone)]
pub enum Color { pub enum Color {
Red, Red,
Yellow, Yellow,
None, None,
} }
#[derive(Clone)] #[derive(Clone)]
pub struct Client { pub struct Client {
pub username: String, pub username: String,
pub connection: UnboundedSender<Message>, pub connection: UnboundedSender<Message>,
pub ready: bool, pub ready: bool,
pub color: Color, pub color: Color,
pub current_match: Option<u32>, pub current_match: Option<u32>,
pub round_robin_id: u32, pub round_robin_id: u32,
pub score: u32, pub score: u32,
pub addr: SocketAddr, pub addr: SocketAddr,
} }
impl Client { impl Client {
pub fn new(username: String, connection: UnboundedSender<Message>, addr: SocketAddr) -> Client { pub fn new(username: String, connection: UnboundedSender<Message>, addr: SocketAddr) -> Client {
Client { Client {
username, username,
connection, connection,
ready: false, ready: false,
color: Color::None, color: Color::None,
current_match: None, current_match: None,
round_robin_id: 0, round_robin_id: 0,
score: 0, score: 0,
addr, addr,
} }
} }
} }
pub struct Match { pub struct Match {
pub id: u32, pub id: u32,
pub board: Vec<Vec<Color>>, pub board: Vec<Vec<Color>>,
pub viewers: Vec<SocketAddr>, pub viewers: Vec<SocketAddr>,
pub ledger: Vec<(Color, usize)>, pub ledger: Vec<(Color, usize)>,
pub move_to_dispatch: (Color, usize), pub move_to_dispatch: (Color, usize),
pub wait_thread: Option<tokio::task::JoinHandle<()>>, pub wait_thread: Option<tokio::task::JoinHandle<()>>,
pub player1: SocketAddr, pub player1: SocketAddr,
pub player2: SocketAddr, pub player2: SocketAddr,
} }
impl Match { impl Match {
pub fn new(id: u32, player1: SocketAddr, player2: SocketAddr) -> Match { pub fn new(id: u32, player1: SocketAddr, player2: SocketAddr) -> Match {
let first = if rand::rng().random_range(0..=1) == 0 { let first = if rand::rng().random_range(0..=1) == 0 {
player1.to_string().parse().unwrap() player1.to_string().parse().unwrap()
} else { } else {
player2.to_string().parse().unwrap() player2.to_string().parse().unwrap()
}; };
Match { Match {
id, id,
board: vec![vec![Color::None; 6]; 7], board: vec![vec![Color::None; 6]; 7],
viewers: Vec::new(), viewers: Vec::new(),
ledger: Vec::new(), ledger: Vec::new(),
move_to_dispatch: (Color::None, 0), move_to_dispatch: (Color::None, 0),
wait_thread: None, wait_thread: None,
player1: if player1 == first { player1 } else { player2 }, player1: if player1 == first { player1 } else { player2 },
player2: if player1 == first { player2 } else { player1 }, player2: if player1 == first { player2 } else { player1 },
} }
} }
pub fn place_token(&mut self, color: Color, column: usize) { pub fn place_token(&mut self, color: Color, column: usize) {
for i in 0..6 { for i in 0..6 {
if self.board[column][i] == Color::None { if self.board[column][i] == Color::None {
self.board[column][i] = color; self.board[column][i] = color;
break; break;
} }
} }
} }
} }