server: edited lobby leaving logic slightly

2025-07-02 22:16:52 +02:00
parent f084a599b7
commit 68a152af42
2 changed files with 30 additions and 4 deletions
@@ -76,10 +76,23 @@ class LobbyManager:
    def leave_lobby(self, lobby_id, client_id) -> None:
        try:
            del self.active_lobbies[lobby_id].connected_clients[client_id]
+            self.broadcast_message(
+                lobby_id,
+                json.dumps({
+                    "response": "leave_lobby",
+                    "status": "ok",
+                    "client_id": client_id,
+                }),
+            )
+            if self.get_lobby_player_count(lobby_id) == 0:
+                self.delete_lobby(lobby_id)
            print(f"Deleted client {client_id} from lobby {lobby_id}")
        except KeyError:
            print(f"Client with ID {client_id} in lobby {lobby_id} not found, could not be deleted")

+    def get_lobby_player_count(self, lobby_id) -> int:
+        return len(self.active_lobbies[lobby_id].connected_clients)
+
    def get_lobby_host_client_id(self, lobby_id) -> str:
        return self.active_lobbies[lobby_id].host_client_id

@@ -175,9 +188,15 @@ class ClientConnection:
            if host_client_id == data_object["client_id"]:
                # client is host; close lobby
                lobby_clients = self.lobby_manager.get_lobby(lobby_id).connected_clients.copy()
-                for client_id in lobby_clients:
-                    self.lobby_manager.leave_lobby(lobby_id, client_id)
-                self.lobby_manager.delete_lobby(lobby_id)
+                # for client_id in lobby_clients:
+                self.lobby_manager.broadcast_message(
+                    lobby_id,
+                    json.dumps({
+                        "response": "leave_lobby_request",
+                    })
+                )
+                    # self.lobby_manager.leave_lobby(lobby_id, client_id)
+                # self.lobby_manager.delete_lobby(lobby_id)
            else:
                # client is not host; client leaves only
                self.lobby_manager.leave_lobby(lobby_id, data_object["client_id"])