diff --git a/src/backend/autobeerpong/client.py b/src/backend/autobeerpong/client.py index 2c63063..ece43d1 100644 --- a/src/backend/autobeerpong/client.py +++ b/src/backend/autobeerpong/client.py @@ -37,6 +37,7 @@ class Client: def disconnect(self): self.state = ClientState.DISCONNECTED self.websocket = None + self.ready = False async def send(self, msg_dict: MessageRaw_T) -> None: assert self.websocket is not None diff --git a/src/backend/autobeerpong/server.py b/src/backend/autobeerpong/server.py index d8c578f..10857f9 100644 --- a/src/backend/autobeerpong/server.py +++ b/src/backend/autobeerpong/server.py @@ -1,6 +1,7 @@ import json import asyncio +from websockets import Data from websockets.asyncio.server import ServerConnection, serve from websockets.exceptions import ConnectionClosedOK @@ -54,7 +55,8 @@ class AutobeerpongServer: await client.send(msg_raw) async def update_server_state(self) -> None: - if self.context.state is ServerState.LOBBY: + state = self.context.state + if state is ServerState.LOBBY: players = list( filter( lambda x: x.state is ClientState.PLAYER, @@ -64,23 +66,14 @@ class AutobeerpongServer: if self.context.lobby.is_players_full() and all([player.ready for player in players]): # all players are ready, advance server state to match - self.context.state = ServerState.MATCH - # send match start message to all connected clients - start_match = StartMatchMessage( - {"messageType": "startMatch", "messageContent": {}} - ) + await self.transition_to_match() - await self.broadcast(start_match.to_raw()) - - match = Match() - match.resolve() - - await self.broadcast(match.to_raw()) - - elif self.context.state is ServerState.MATCH: + elif state is ServerState.MATCH: + if not self.context.lobby.is_players_full(): + await self.transition_to_lobby() pass - def get_lobby_state(self) -> LobbyStateMessage: + async def broadcast_lobby_state(self): players = list( filter( lambda x: x.state is ClientState.PLAYER, @@ -94,7 +87,7 @@ class AutobeerpongServer: ) ) - return LobbyStateMessage( + lobby_message = LobbyStateMessage( { "messageType": "lobbyState", "messageContent": { @@ -104,22 +97,40 @@ class AutobeerpongServer: } ) + await self.broadcast(lobby_message.to_raw()) + + + async def transition_to_match(self): + self.context.state = ServerState.MATCH + # send match start message to all connected clients + start_match = StartMatchMessage( + {"messageType": "startMatch", "messageContent": {}} + ) + + await self.broadcast(start_match.to_raw()) + + match = Match() + match.resolve() + + await self.broadcast(match.to_raw()) + + + async def transition_to_lobby(self): + self.context.state = ServerState.LOBBY + players = filter( + lambda x: x.state is ClientState.PLAYER, + self.context.lobby._clients.values(), + ) + for player in players: + player.ready = False + + await self.broadcast_lobby_state() + async def handler(self, websocket: ServerConnection) -> None: client_context = ClientContext(websocket) async for msg in websocket: - message_raw: MessageRaw_T = json.loads(msg) - message_type = str(message_raw.get("messageType")) - - if message_type is None: - raise Exception("Message has no messageType property.") - - MessageClass = self.message_map.get(message_type) - - if MessageClass is None: - raise Exception(f"Unknown messageType: {message_type}.") - - message = MessageClass(message_raw) + message = self.to_message(msg) await message.execute( server_context=self.context, @@ -127,15 +138,32 @@ class AutobeerpongServer: ) if message.triggers_broadcast: - await self.broadcast(self.get_lobby_state().to_raw()) - await self.update_server_state() + await self.broadcast_lobby_state() + + await self.update_server_state() if client_context.has_joined: self.context.clients[client_context.get_client_id()].disconnect() try: - await self.broadcast(self.get_lobby_state().to_raw()) + await self.broadcast_lobby_state() except ConnectionClosedOK: pass + finally: + await self.update_server_state() + + def to_message(self, data: Data) -> Message: + message_raw: MessageRaw_T = json.loads(data) + message_type = str(message_raw.get("messageType")) + + if message_type is None: + raise Exception("Message has no messageType property.") + + MessageClass = self.message_map.get(message_type) + + if MessageClass is None: + raise Exception(f"Unknown messageType: {message_type}.") + + return MessageClass(message_raw) async def _start(self) -> None: async with serve( diff --git a/src/frontend/src/GameElements/Ball.ts b/src/frontend/src/GameElements/Ball.ts index 0b7879a..0046868 100644 --- a/src/frontend/src/GameElements/Ball.ts +++ b/src/frontend/src/GameElements/Ball.ts @@ -39,6 +39,7 @@ export class Ball extends BaseActor { } onInitialize(engine: Engine): void { + this.z = -1; // Place the ball behind other actors. const { configuration } = this; const { radius } = configuration; diff --git a/src/frontend/src/Scenes/BaseScene.ts b/src/frontend/src/Scenes/BaseScene.ts index 541ffa9..e255d7b 100644 --- a/src/frontend/src/Scenes/BaseScene.ts +++ b/src/frontend/src/Scenes/BaseScene.ts @@ -14,7 +14,7 @@ export class BaseScene extends Scene { } protected updateActorVisibility(actor: Actor, visible: boolean): void { - const previousVisible = this.actors.includes(actor); + const previousVisible = actor.isAdded; if (visible && !previousVisible) { this.add(actor);