fix: more disconnect stability fixes

.gitignore

@@ -31,3 +31,7 @@ target
 /node_modules
 
 bracket_pairings.txt
+
+.cursor/
+.claude/
+.codex/

gameloop.py

@@ -21,6 +21,8 @@ async def gameloop(socket):
     match message[0]:
       case "CONNECT":
         await socket.send("READY")
+      case "RECONNECT":
+        await socket.send("READY")
 
       case "GAME":
         if message[1] == "START":

src/main.rs

@@ -305,33 +305,47 @@ async fn handle_connection(
 
   // Remove and terminate any matches
   // We may not be a client disconnecting, do this check
-  let clients_guard = sd.clients.read().await;
+  if let Some(username) = sd.usernames.read().await.get(&addr).cloned() {
-  for client in clients_guard.values() {
-    let client = client.read().await;
-    if client.addr == addr {
-      let username = client.username.clone();
     let tournament_guard = sd.tournament.read().await;
+    let client = sd.clients.read().await.get(&username).cloned().unwrap();
+    let mut client = client.write().await;
+    client.ready = false;
+
     if client.current_match.is_some() {
+      let current_match =
+        sd.matches.read().await.get(&client.current_match.unwrap()).cloned().unwrap();
+      let current_match = current_match.read().await;
+      if let Some(wait_thread) = &current_match.wait_thread {
+        wait_thread.abort();
+      }
+
+      if let Some(timeout_thread) = &current_match.timeout_thread {
+        timeout_thread.abort();
+      }
+
+      if current_match.demo_mode {
+        sd.matches.write().await.remove(&current_match.id);
+        sd.broadcast(&format!("GAME:{}:TERMINATED", current_match.id)).await;
+        sd.clients.write().await.remove(&username);
+        sd.broadcast(&format!("DISCONNECT:{}", username)).await;
+      } else {
         sd.disconnected_clients.write().await.push(username.clone());
+      }
     } else if tournament_guard.is_some() {
       let tourney = tournament_guard.clone().unwrap();
       if tourney.read().await.contains_player(username.clone()) {
         sd.disconnected_clients.write().await.push(username.clone());
-        }
+      } else {
-      }
+        sd.clients.write().await.remove(&username);
-
+        sd.broadcast(&format!("DISCONNECT:{}", username)).await;
-      drop(client);
+      }
-      drop(clients_guard);
+    } else {
-
       sd.clients.write().await.remove(&username);
-      sd.usernames.write().await.remove(&addr);
-
       sd.broadcast(&format!("DISCONNECT:{}", username)).await;
-
-      break;
     }
   }
 
+  sd.usernames.write().await.remove(&addr);
   sd.observers.write().await.remove(&addr);
 
   let mut admin_guard = sd.admin.write().await;

src/server.rs

@@ -63,11 +63,7 @@ impl Server {
       )));
     }
 
-    let mut reconnecting = false;
+    let reconnecting = self.disconnected_clients.read().await.contains(&requested_username);
-    let disconnected_guard = self.disconnected_clients.read().await;
-    if disconnected_guard.contains(&requested_username) {
-      reconnecting = true;
-    }
 
     let clients_guard = self.clients.read().await;
     let existing_client = clients_guard.get(&requested_username).cloned();
@@ -105,42 +101,24 @@ impl Server {
     let mut client = client_guard.write().await;
     client.addr = addr;
     client.connection = tx.clone();
-    // I don't think this will fail
-    let match_id = client.current_match.unwrap();
-    let client_color = client.color;
 
-    drop(client);
+    if let Some(current_match_id) = client.current_match {
-
+      let current_match = self.matches.read().await.get(&current_match_id).cloned().unwrap();
-    let matches_guard = self.matches.read().await;
+      let mut current_match = current_match.write().await;
-    let mut the_match = matches_guard.get(&match_id).unwrap().write().await;
+      current_match.ledger.clear();
-    if the_match.demo_mode {
+      current_match.board = vec![vec![Color::None; 6]; 7];
-      drop(the_match);
+      let opponent_username = if current_match.player1 == requested_username {
-      drop(matches_guard);
+        current_match.player2.clone()
-      self.terminate_match(match_id).await;
-      return Ok(());
       } else {
-      the_match.ledger.clear();
+        current_match.player1.clone()
-      the_match.board = vec![vec![Color::None; 6]; 7];
-      let opponent_username = if the_match.player1 == requested_username {
-        the_match.player2.clone()
-      } else {
-        the_match.player1.clone()
       };
 
-      if the_match.wait_thread.is_some() {
-        the_match.wait_thread.as_ref().unwrap().abort();
-      }
-
-      if the_match.timeout_thread.is_some() {
-        the_match.timeout_thread.as_ref().unwrap().abort();
-      }
-
       let clients_guard = self.clients.read().await;
       let opponent = clients_guard.get(&opponent_username).unwrap().read().await;
       let _ = send(&opponent.connection, "GAME:TERMINATED");
       let _ = send(
         &tx,
-        &format!("GAME:START:{}", bool::from(client_color) as u8),
+        &format!("GAME:START:{}", bool::from(client.color) as u8),
       );
       let _ = send(
         &opponent.connection,
@@ -170,14 +148,14 @@ impl Server {
 
     if let Some(client_guard) = found_client {
       self.disconnected_clients.write().await.retain(|name| name != &requested_username);
+      self.usernames.write().await.insert(addr, requested_username.clone());
       let mut client = client_guard.write().await;
       client.addr = addr;
       client.connection = tx.clone();
 
-      let _ = send(&tx, "RECONNECT:ACK");
+      if let Some(current_match_id) = client.current_match {
-
         let matches_guard = self.matches.read().await;
-      let the_match = matches_guard.get(&client.current_match.unwrap()).unwrap().read().await;
+        let the_match = matches_guard.get(&current_match_id).unwrap().read().await;
 
         let last = the_match.ledger.last();
         if last.is_some() && last.unwrap().0 != client.color {
@@ -185,6 +163,20 @@ impl Server {
             &tx,
             &format!("OPPONENT:{}", the_match.ledger.last().unwrap().1),
           );
+        } else if last.is_none() && client.color == Color::Red {
+          let _ = send(&tx, "GAME:START:1");
+        }
+      } else {
+        // Clear they're state just in case, even if it's not terminated
+        let _ = send(&tx, "GAME:TERMINATED");
+      }
+
+      let tournament = self.tournament.read().await.as_ref().cloned();
+      if let Some(tourney) = tournament {
+        let tourney = tourney.read().await;
+        if !tourney.contains_player(requested_username) {
+          let _ = send(&tx, "RECONNECT:ACK");
+        }
       }
     } else {
       return Err(anyhow::anyhow!(format!(
@@ -266,7 +258,8 @@ impl Server {
     let username = username.unwrap();
 
     if clients_guard.get(&username).unwrap().read().await.ready {
-      return Err(anyhow::anyhow!("ERROR:INVALID:READY"));
+      let _ = send(&tx, "READY:ACK");
+      return Ok(());
     }
 
     let mut client = clients_guard.get(&username).unwrap().write().await;
@@ -281,6 +274,7 @@ impl Server {
       let mut client = clients_guard.get(&username).unwrap().write().await;
       let mut opponent = clients_guard.get(&opponent_username).unwrap().write().await;
 
+      if opponent.ready {
         let match_id: u32 = gen_match_id(&self.matches).await;
         let new_match = Arc::new(RwLock::new(Match::new(
           match_id,
@@ -329,6 +323,7 @@ impl Server {
 
         return Ok(());
       }
+    }
 
     let clients_guard = self.clients.read().await;
     let mut client = clients_guard.get(&username).unwrap().write().await;
@@ -1384,19 +1379,26 @@ impl Server {
     self.broadcast(&format!("GAME:{}:TERMINATED", the_match.id)).await;
 
     let clients_guard = self.clients.read().await;
+
     if the_match.player1 != SERVER_PLAYER_USERNAME.to_string() {
-      let mut player1 = clients_guard.get(&the_match.player1).unwrap().write().await;
+      let player1 = clients_guard.get(&the_match.player1).cloned();
+      if let Some(player1) = player1 {
+        let mut player1 = player1.write().await;
         let _ = send(&player1.connection, "GAME:TERMINATED");
         player1.current_match = None;
         player1.color = Color::None;
       }
+    }
 
     if the_match.player2 != SERVER_PLAYER_USERNAME.to_string() {
-      let mut player2 = clients_guard.get(&the_match.player2).unwrap().write().await;
+      let player2 = clients_guard.get(&the_match.player2).cloned();
+      if let Some(player2) = player2 {
+        let mut player2 = player2.write().await;
         let _ = send(&player2.connection, "GAME:TERMINATED");
         player2.current_match = None;
         player2.color = Color::None;
       }
+    }
     drop(clients_guard);
 
     drop(the_match);