WSMessage object

hopper/ws_server.py

@@ -1,5 +1,4 @@
 import asyncio
-import json
 import logging
 from threading import Thread
 
@@ -7,7 +6,7 @@ import websockets
 from websockets import WebSocketServerProtocol
 from websockets.exceptions import ConnectionClosedOK
 
-from hopper.models.ws_dto import GameDumpDto
+from hopper.models.ws_dto import GameDumpDto, WSGameDumpMessage
 from settings import settings
 
 
@@ -32,7 +31,7 @@ class WSServer(Thread):
             self.connected_clients.remove(websocket)
             logging.info(f"Remove client: {websocket.id}")
 
-    def _create_game_dump_message(self) -> str:
+    def _create_game_dump_message(self) -> WSGameDumpMessage:
         # avoid circular imports
         from hopper.api.dependencies import get_game_engine
 
@@ -44,7 +43,7 @@ class WSServer(Thread):
             players=engine.players,
             layers=engine.get_board_layout().layers,
         )
-        return json.dumps(game_dump.dict())
+        return WSGameDumpMessage(data=game_dump)
 
     async def send_game_dump_to_client(
         self, websocket: WebSocketServerProtocol
@@ -52,7 +51,7 @@ class WSServer(Thread):
         """Send game dump to the client"""
         message = self._create_game_dump_message()
         logging.debug(f"Sending game dump to client: {websocket.id}")
-        await websocket.send(message)
+        await websocket.send(message.to_str())
 
     async def send_game_dump(self) -> None:
         """Broadcast game state to all connected clients"""