Intis/fairhopper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WS error handling

Browse Source
This commit is contained in:
Eden Kirin
2023-03-25 15:57:59 +01:00
parent 4b511c0cb8
commit ee1ce125ff
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hopper/api/views.py
View File

@ -3,15 +3,12 @@ from starlette import status
from hopper.api.dependencies import get_game_engine from hopper.api.dependencies import get_game_engine
from hopper.api.dto import ( from hopper.api.dto import (
BoardDto,
DestinationDto, DestinationDto,
ErrorResponseDto, ErrorResponseDto,
GameInfoDto, GameInfoDto,
MovePlayerResponseDto, MovePlayerResponseDto,
PingResponse, PingResponse,
PlayerDto,
PlayerInfoResponseDto, PlayerInfoResponseDto,
PositionDto,
StartGameRequestDto, StartGameRequestDto,
StartGameResponseDto, StartGameResponseDto,
) )
@ -25,7 +22,6 @@ router = APIRouter()
@router.get("/ping", response_model=PingResponse) @router.get("/ping", response_model=PingResponse)
async def ping() -> PingResponse: async def ping() -> PingResponse:
await ws_send_game_state()
return PingResponse( return PingResponse(
message="Pong!", message="Pong!",
) )

22
hopper/ws_client.py
View File

@ -1,4 +1,5 @@
import json import json
import logging
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
import websockets import websockets
@ -18,13 +19,16 @@ async def ws_send_game_state() -> None:
# avoid circular imports # avoid circular imports
from hopper.api.dependencies import get_game_engine from hopper.api.dependencies import get_game_engine
async with create_ws_client() as websocket: try:
engine = get_game_engine() async with create_ws_client() as websocket:
engine = get_game_engine()
game_state = GameStateDto( game_state = GameStateDto(
board=engine.board, board=engine.board,
destination=engine.board.destination, destination=engine.board.destination,
players=engine.players, players=engine.players,
layers=engine.get_board_layout().layers, layers=engine.get_board_layout().layers,
) )
await websocket.send(json.dumps(game_state.dict())) await websocket.send(json.dumps(game_state.dict()))
except OSError as ex:
logging.error(f"Error sending WS state: {ex}")