Handle connection error in ws handler

Dockerfile

@@ -1,12 +1,13 @@
-FROM python:3.10.11-alpine3.17
+FROM python:3.10.11-alpine3.17 as env-builder
 
-# take arguments
-ARG INTERNAL_API_PORT
-ARG INTERNAL_WS_PORT
+# handle optional arguments
+ARG INTERNAL_API_PORT=8010
+ARG INTERNAL_WS_PORT=8011
 
 RUN \
-    pip install pip -U && \
-    pip install poetry --no-cache-dir
+    apk add --no-cache gcc musl-dev libffi-dev && \
+    pip install pip -U --no-cache-dir --prefer-binary && \
+    pip install poetry --no-cache-dir --prefer-binary
 
 WORKDIR /app
 
@@ -29,6 +30,18 @@ RUN \
     # install python libs
     pip install -r requirements.txt --no-cache-dir --prefer-binary
 
+
+FROM python:3.10.11-alpine3.17 as runner
+
+WORKDIR /app
+COPY --from=env-builder /venv /venv
+
+# set python thingies and activate virtual environment
+ENV \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    PATH="/venv/bin:$PATH"
+
 # copy all relevant files
 COPY ./.docker/* ./
 COPY ./hopper ./hopper

Makefile

@@ -38,10 +38,11 @@ docker-clean:
 
 docker-build:
 	@docker \
-		build . \
+		buildx build \
 			--build-arg INTERNAL_API_PORT=$(INTERNAL_API_PORT) \
 			--build-arg INTERNAL_WS_PORT=$(INTERNAL_WS_PORT) \
-			-t $(CONTAINER_NAME)
+			--tag $(CONTAINER_NAME) \
+			.
 
 docker-run:
 	@docker \

README.md

@@ -62,10 +62,59 @@ EndPlayer --> UnlockGame: Unlock game\n for all players
 
 ## FairHopper Game Server
 
+### Start server as docker container
+
+Build image:
+```sh
+docker build . -t CONTAINER_NAME
+```
+
+Create docker container:
+```sh
+docker \
+  create \
+  --publish EXTERNAL_API_PORT:8010 \
+  --publish EXTERNAL_WS_PORT:8011 \
+  --name=CONTAINER_NAME \
+  IMAGE_NAME
+```
+
+Parameters:
+- `EXTERNAL_API_PORT` - REST API port
+- `EXTERNAL_WS_PORT` - Websockets port
+- `CONTAINER_NAME` - FairHopper container name
+- `IMAGE_NAME` - FairHopper image name
+
+Start docker container:
+```sh
+docker start CONTAINER_NAME -d
+```
+
+Stop docker container:
+```sh
+docker stop CONTAINER_NAME
+```
+
+Example:
+```sh
+docker build . -t fairhopper-service
+docker \
+  run \
+  --publish 8010:8010 \
+  --publish 8011:8011 \
+  --name=fairhopper-service \
+  fairhopper \
+  --detach
+docker start fairhopper-service -d
+docker stop fairhopper-service
+```
+
+### Start server on local machine
+
 Requirements:
 - Python 3.10+
 
-### Install virtual envirnonment
+#### Install virtual envirnonment
 
 Project uses [Poetry](https://python-poetry.org), ultimate dependency management software for Python.
 
@@ -79,14 +128,14 @@ Install virtual environment:
 poetry install
 ```
 
-### Setting up
+#### Setting up
 
 Copy `settings_template.py` to `settings.py`.
 
 Edit `settings.py` and customize application.
 
 
-### Starting FairHopper Game Server
+#### Starting FairHopper Game Server
 
 ```sh
 make run

hopper/api/views.py

@@ -17,7 +17,12 @@ from hopper.api.dto import (
 )
 from hopper.engine import GameEngine
 from hopper.enums import Direction, PlayerMoveResult
-from hopper.errors import Collision, GameLockForMovement, PositionOutOfBounds, PurchaseForbiddenForPlayer
+from hopper.errors import (
+    Collision,
+    GameLockForMovement,
+    PositionOutOfBounds,
+    PurchaseForbiddenForPlayer,
+)
 from hopper.models.player import Player
 from settings import settings
 
@@ -167,7 +172,24 @@ async def get_product(id: str) -> ProductDto:
     )
 
 
-@router.post("/player/{id}/product/purchase", response_model=ProductDto)
+@router.post(
+    "/player/{id}/product/purchase",
+    response_model=ProductDto,
+    responses={
+        status.HTTP_200_OK: {
+            "model": ProductDto,
+            "description": "Product purchased",
+        },
+        status.HTTP_403_FORBIDDEN: {
+            "model": ErrorResponseDto,
+            "description": "Purchase forbidden for this player",
+        },
+        status.HTTP_404_NOT_FOUND: {
+            "model": ErrorResponseDto,
+            "description": " Player with id not found, probably kicked out",
+        },
+    },
+)
 async def purchase_product(
     body: PurchaseProductDto,
     engine: GameEngine = Depends(get_game_engine),

hopper/ws_server.py

@@ -5,7 +5,7 @@ from typing import Iterable, Optional
 
 import websockets
 from websockets import WebSocketServerProtocol
-from websockets.exceptions import ConnectionClosedOK
+from websockets.exceptions import ConnectionClosedOK, ConnectionClosedError
 
 from hopper.models.player import Player
 from hopper.models.product import Product
@@ -44,6 +44,10 @@ class WSServer(Thread):
                     # we're expecting nothing from client, but read if client sends a message
                     await websocket.recv()
                 except ConnectionClosedOK:
+                    logging.info(f"Connection closed OK for client: {websocket.id}")
+                    connected = False
+                except ConnectionClosedError:
+                    logging.info(f"Connection closed error for client: {websocket.id}")
                     connected = False
         finally:
             self.connected_clients.remove(websocket)