Fix(kick): Fixed server termination and kicking

Co-authored-by: Hauke Platte <[email protected]>

Client/client.py

@@ -317,6 +317,7 @@ async def chat_message(self, message:str):
 
     async def close(self):
         await self._websocket.close()
+        exit()
 
     async def terminate(self):
         msg = {

Client/ui_client.py

@@ -127,8 +127,6 @@ async def await_commands(self):
 
         if message:
             match message["message_type"]:
-                case "lobby/join":
-                    pass
                 case "lobby/ready":
                     await self.lobby_ready(**message["args"])
                 case "lobby/kick":

Server/websocket_server.py

@@ -16,7 +16,7 @@
 class Lobby:
     def __init__(self, admin:Player, port: int = 8765) -> None:
         self._players = {}
-        #self._players = {admin.uuid : admin}
+        self._admin = admin
         self._game = None
         self._inprogress = False
         self._port = port
@@ -73,7 +73,6 @@ async def handler(self, websocket):
                             "message_type": "lobby/kick",
                             "kick_player_uuid": message_json["kick_player_uuid"],
                         }))
-
 
                     case "lobby/ready":
 
@@ -137,9 +136,10 @@ async def handler(self, websocket):
 
 
                     case "server/terminate":
-                        logger.info("Server Termination Requested")
+                        logger.info("Server Termination Requested. Checking if game is in progress.")
 
                         if self._inprogress:
+                            logger.info("Game in progress. Terminating game.")
                             if self._game.players.index(self._players[message_json["player_uuid"]]) == 1:
                                 self._game.state.set_winner(2)
                             elif self._game.players.index(self._players[message_json["player_uuid"]]) == 2:
@@ -149,15 +149,18 @@ async def handler(self, websocket):
 
                             await self._end_game()
 
-                        else:
+                        elif message_json["player_uuid"] == str(self._admin.uuid):
                             # still in lobby, can terminate without game end.
+                            logger.info("Not in game. Sender was host. Terminating server.")
                             websockets.broadcast(self._connections, json.dumps({
                                 "message_type": "game/error",
                                 "error_message": "Server terminated.",
                             }))
+
                             exit()
 
-
+                        else:
+                            logger.info("Not in game. Sender was not host. Ignoring termination request.")
 
                     case _:
                         await websocket.send(json.dumps({"message_type": "error", "error": "Unknown message type"}))
@@ -172,10 +175,10 @@ async def handler(self, websocket):
 
                 else:
                     # request a ping from everyone and delete player list to wait for join messages.
+                    self._players = {}
                     websockets.broadcast(self._connections, json.dumps({
                             "message_type": "lobby/ping",
                         }))
-                    self._players = {}
 
                 # End this connection loop
                 break

UI/multi.py

@@ -32,6 +32,7 @@ def __init__(self, master, *args, opponent=player_type.unknown, local_players, q
         self.master.network_events['lobby/status'] = self._update_lobby
         self.master.network_events['game/start'] = self._start_game
         self.master.network_events['lobby/kick'] = self._lobby_kick
+        self.master.network_events['lobby/connect_error'] = lambda *args: self._connect_error() #error is thrown when the server is not reachable anymore
         self.bind('<Destroy>', lambda *args: self.on_destroy())
         self.ready = False
         if opponent not in [player_type.unknown, player_type.local]:
@@ -66,11 +67,21 @@ def _display_widgets(self):
         self.btnExit.grid(sticky=tk.E+tk.W+tk.N+tk.S, column=5, row=1)
         self.btnStatistics.grid(sticky=tk.E+tk.W+tk.N+tk.S, column=5, row=2)
 
+    def _connect_error(self):
+        self.master.show_menu()
+        msg = messages(type='info', message=f'Connection to the server was lost!')
+        msg.display()
+
     def _menu(self):
         list(self.master.out_queue.values())[0].put({'message_type': 'server/terminate', 'args' :{} })
         self.master.show_menu()
 
     def _update_lobby(self, queue):
+        if(len(self.playerlist) > 0):
+            for player in self.playerlist:
+                for object in player:
+                    object.grid_forget()
+                    object.destroy()
         self.playerlist = []
         for player in queue['player']:
             rdy = '\u2611' if player.ready else ''
@@ -97,11 +108,13 @@ def _start_game(self, queue):
     def on_destroy(self):
         del self.master.network_events['lobby/status']
         del self.master.network_events['game/start']
+        del self.master.network_events['lobby/kick']
+        del self.master.network_events['lobby/connect_error']
 
     def _lobby_kick(self, queue):
+        self._menu()
         msg = messages(type='info', message=f'You have been kicked from the lobby by the host')
         msg.display()
-        self._menu()
 
     def _show_statistics(self):
         self.master.cache_current_frame()