diff --git a/Game Server/Classes/Game/__pycache__/Player.cpython-311.pyc b/Game Server/Classes/Game/__pycache__/Player.cpython-311.pyc index 7b50bcd..85b3540 100644 Binary files a/Game Server/Classes/Game/__pycache__/Player.cpython-311.pyc and b/Game Server/Classes/Game/__pycache__/Player.cpython-311.pyc differ diff --git a/Game Server/Classes/System/GameManager.py b/Game Server/Classes/System/GameManager.py index 9347fc2..a4927b2 100644 --- a/Game Server/Classes/System/GameManager.py +++ b/Game Server/Classes/System/GameManager.py @@ -66,7 +66,7 @@ class GameManager: tcpSocket.send(json.dumps(payload).encode()) except Exception as e: - print(f"failed to start game due to error: {e}") + self.logger.error(f"failed to start game due to error: {e}") break # handles notifying all players that the game starts pass @@ -88,16 +88,16 @@ class GameManager: # returns the new dict in which the new player now is added def addPlayers(self, player:Player, socket:socket, clientAddr) -> dict: - self.__gameManager.getLogger().info(f"creating user with id: {player.getID}") + self.logger.info(f"creating user with id: {player.getID}") self.__players[clientAddr] = { - player: player, - socket:socket + "player": player, + "socket":socket } - self.__gameManager.getLogger().info(f"new length of user dictionary: {len(self.__players)}") + self.logger.info(f"new length of user dictionary: {len(self.__players)}") # counts participating players and starts the game if enough have joined if len(self.__players) == 2: - self.__gameManager.getLogger().info("2 players have join game starts") + self.logger.info("2 players have join game starts") self.startGame(socket) return self.__players \ No newline at end of file diff --git a/Game Server/Classes/System/Network/NetworkManger.py b/Game Server/Classes/System/Network/NetworkManger.py index 9cb2b78..ab950bf 100644 --- a/Game Server/Classes/System/Network/NetworkManger.py +++ b/Game Server/Classes/System/Network/NetworkManger.py @@ -6,7 +6,7 @@ import threading from Classes.Game.Player import Player from Classes.System.GameManager import GameManager -from Classes.System.Network.EventHandler import UDPEventHandler, TCPEventHandler +from Classes.System.Network.EventHandler import TCPEventHandler from Classes.System.World import World class NetworkManager: @@ -84,16 +84,16 @@ class NetworkManager: # if enough users for a round are connected the server has to start the game if user not in self.__gameManager.getPlayers(): if messageJson["event"] == "login": - self.logger.__gameManager.getLogger().info("user logging in") - self.logger.__gameManager.getLogger().info("task passed off to gameManager") + self.__gameManager.getLogger().info("user logging in") + self.__gameManager.getLogger().info("task passed off to gameManager") user = self.__gameManager.addPlayers(Player(messageJson["username"], messageJson["deck"]), client_socket, client_address) self.__gameManager.getLogger().info(f"connected users {len(self.__gameManager.getPlayers())}") self.__gameManager.getLogger().info(f"confirming login for user") self.send({ "event":"loginresponse", - "id": user["player"].getID(), - }) + "id": user[client_address]["player"].getID(), + }, client_address) self.__eventHandler[client_address].handleTCPEvents(messageJson, self.__gameManager, client_address) self.__gameManager.getLogger().info(f"Received message from {client_address}: {message}") @@ -109,8 +109,8 @@ class NetworkManager: except json.JSONDecodeError as e: self.__gameManager.getLogger().error(f"JSON decoding error receiving data from {client_address}: {e}") - except Exception as e: - self.__gameManager.getLogger().error(f"Error receiving data from {client_address}: {e}") + # except Exception as e: + # self.__gameManager.getLogger().error(f"UknownError receiving data from {client_address} due to error: {e}") def broadcast(self, payload:dict): for user in self.__gameManager.getPlayers().values(): diff --git a/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-311.pyc b/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-311.pyc index 207f795..5a17f8e 100644 Binary files a/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-311.pyc and b/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-311.pyc differ diff --git a/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-312.pyc b/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-312.pyc index f242cf5..fc97bd5 100644 Binary files a/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-312.pyc and b/Game Server/Classes/System/Network/__pycache__/EventHandler.cpython-312.pyc differ diff --git a/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-311.pyc b/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-311.pyc index 769b27d..30891a1 100644 Binary files a/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-311.pyc and b/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-311.pyc differ diff --git a/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-312.pyc b/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-312.pyc index f87535e..4845ff9 100644 Binary files a/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-312.pyc and b/Game Server/Classes/System/Network/__pycache__/NetworkManger.cpython-312.pyc differ diff --git a/Game Server/Classes/System/__pycache__/GameManager.cpython-311.pyc b/Game Server/Classes/System/__pycache__/GameManager.cpython-311.pyc index 52b6cf3..80b11c4 100644 Binary files a/Game Server/Classes/System/__pycache__/GameManager.cpython-311.pyc and b/Game Server/Classes/System/__pycache__/GameManager.cpython-311.pyc differ diff --git a/Game Server/Classes/System/__pycache__/GameManager.cpython-312.pyc b/Game Server/Classes/System/__pycache__/GameManager.cpython-312.pyc index 558ef15..963cabf 100644 Binary files a/Game Server/Classes/System/__pycache__/GameManager.cpython-312.pyc and b/Game Server/Classes/System/__pycache__/GameManager.cpython-312.pyc differ diff --git a/Game Server/Classes/System/__pycache__/Logger.cpython-311.pyc b/Game Server/Classes/System/__pycache__/Logger.cpython-311.pyc index c04e139..70bc9f6 100644 Binary files a/Game Server/Classes/System/__pycache__/Logger.cpython-311.pyc and b/Game Server/Classes/System/__pycache__/Logger.cpython-311.pyc differ diff --git a/Game Server/Classes/System/__pycache__/Logger.cpython-312.pyc b/Game Server/Classes/System/__pycache__/Logger.cpython-312.pyc new file mode 100644 index 0000000..ac8ea48 Binary files /dev/null and b/Game Server/Classes/System/__pycache__/Logger.cpython-312.pyc differ diff --git a/Game Server/Classes/System/__pycache__/PlayerManager.cpython-311.pyc b/Game Server/Classes/System/__pycache__/PlayerManager.cpython-311.pyc index b43d1ec..8f10d08 100644 Binary files a/Game Server/Classes/System/__pycache__/PlayerManager.cpython-311.pyc and b/Game Server/Classes/System/__pycache__/PlayerManager.cpython-311.pyc differ diff --git a/Game Server/Classes/System/__pycache__/Server.cpython-311.pyc b/Game Server/Classes/System/__pycache__/Server.cpython-311.pyc index 9c11ea7..760f001 100644 Binary files a/Game Server/Classes/System/__pycache__/Server.cpython-311.pyc and b/Game Server/Classes/System/__pycache__/Server.cpython-311.pyc differ diff --git a/Game Server/Classes/System/__pycache__/Server.cpython-312.pyc b/Game Server/Classes/System/__pycache__/Server.cpython-312.pyc index ca62d01..7700f63 100644 Binary files a/Game Server/Classes/System/__pycache__/Server.cpython-312.pyc and b/Game Server/Classes/System/__pycache__/Server.cpython-312.pyc differ diff --git a/Game Server/Classes/System/__pycache__/World.cpython-311.pyc b/Game Server/Classes/System/__pycache__/World.cpython-311.pyc index a74158d..ccd945b 100644 Binary files a/Game Server/Classes/System/__pycache__/World.cpython-311.pyc and b/Game Server/Classes/System/__pycache__/World.cpython-311.pyc differ diff --git a/Game Server/log/sokyhrdv.log b/Game Server/log/sokyhrdv.log new file mode 100644 index 0000000..5735db2 --- /dev/null +++ b/Game Server/log/sokyhrdv.log @@ -0,0 +1,29 @@ +19:08:13,964 root INFO starting up server +19:08:13,964 root INFO starting up game manager +19:08:13,965 root INFO preparing to start server +19:08:13,965 root INFO starting up network manager +19:08:13,965 root INFO starting up network manager +19:08:13,965 root INFO starting up tcp server +19:08:13,967 root INFO starting up thread for client socket accepting +19:08:18,567 root INFO Connected with ('127.0.0.1', 54324) +19:08:18,567 root INFO starting client handler thread for client at address ('127.0.0.1', 54324) +19:08:18,580 root INFO decoded message {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +19:08:18,588 root INFO user in message None +19:08:18,588 root INFO user logging in +19:08:18,589 root INFO task passed off to gameManager +19:08:18,589 root INFO creating user with id: > +19:08:18,589 root INFO new length of user dictionary: 1 +19:08:18,589 root INFO connected users 1 +19:08:18,589 root INFO confirming login for user +19:08:18,590 root INFO incommingevent {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +19:08:18,590 root INFO Received message from ('127.0.0.1', 54324): {"event": "login", "username": "player", "deck": [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +19:10:33,867 root ERROR Connection with ('127.0.0.1', 54324) forcibly closed by remote host. +19:10:36,58 root INFO Connected with ('127.0.0.1', 54355) +19:10:36,58 root INFO starting client handler thread for client at address ('127.0.0.1', 54355) +19:10:36,60 root INFO decoded message {'event': 'login', 'username': 'player', 'deck': [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]} +19:10:36,60 root INFO user in message None +19:10:36,60 root INFO user logging in +19:10:36,62 root INFO task passed off to gameManager +19:10:36,63 root INFO creating user with id: > +19:10:36,63 root INFO new length of user dictionary: 2 +19:10:36,63 root INFO 2 players have join game starts