Compare commits
17 Commits
product-se
...
95015aeb3a
| Author | SHA1 | Date | |
|---|---|---|---|
| 95015aeb3a | |||
| 21a69c7515 | |||
| 82259f4522 | |||
| 53dbc47553 | |||
| aac949275d | |||
| 476d186e7e | |||
| 60c0256354 | |||
| eebe1090d3 | |||
| 1d2db6e16b | |||
| 34a970e550 | |||
| e46edcc821 | |||
| 9a2b5befd3 | |||
| 9425e0fff0 | |||
| d4d03b78f9 | |||
| c30529c087 | |||
| 80c7c80451 | |||
| d45aca6c30 |
11
.docker/run.sh
Executable file
11
.docker/run.sh
Executable file
@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
PORT=${FAIRHOPPER_API_PORT=8010}
|
||||||
|
|
||||||
|
echo "Starting FairHopper game server on port ${PORT}"
|
||||||
|
|
||||||
|
uvicorn \
|
||||||
|
main:app \
|
||||||
|
--host 0.0.0.0 \
|
||||||
|
--port ${PORT} \
|
||||||
|
--workers=1
|
||||||
40
.docker/settings.py
Normal file
40
.docker/settings.py
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
import os
|
||||||
|
import logging
|
||||||
|
|
||||||
|
from hopper.models.config import (
|
||||||
|
BoardSettings,
|
||||||
|
DebugSettings,
|
||||||
|
GameSettings,
|
||||||
|
InactivityWatchdogSettings,
|
||||||
|
Settings,
|
||||||
|
WSServerSettings,
|
||||||
|
)
|
||||||
|
from hopper.models.product import Product
|
||||||
|
|
||||||
|
settings = Settings(
|
||||||
|
game=GameSettings(),
|
||||||
|
board=BoardSettings(
|
||||||
|
WIDTH=20,
|
||||||
|
HEIGHT=20,
|
||||||
|
OBSTACLE_COUNT=0,
|
||||||
|
),
|
||||||
|
inacivity_watchdog=InactivityWatchdogSettings(),
|
||||||
|
purchase_timeout=5,
|
||||||
|
log_level=logging.INFO,
|
||||||
|
products=[
|
||||||
|
Product(name="CocaCola", id="cocacola-id"),
|
||||||
|
Product(name="Pepsi", id="pepsi-id"),
|
||||||
|
Product(name="Fanta", id="fanta-id"),
|
||||||
|
Product(name="Snickers", id="snickers-id"),
|
||||||
|
Product(name="Mars", id="mars-id"),
|
||||||
|
Product(name="Burek", id="burek-id"),
|
||||||
|
],
|
||||||
|
ws_server=WSServerSettings(
|
||||||
|
HOST="0.0.0.0",
|
||||||
|
PORT=int(os.environ.get("FAIRHOPPER_WS_PORT", 8011)),
|
||||||
|
),
|
||||||
|
debug=DebugSettings(
|
||||||
|
PRINT_BOARD=True,
|
||||||
|
PLAYERS=[],
|
||||||
|
),
|
||||||
|
)
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,3 +4,5 @@ __pycache__
|
|||||||
/env
|
/env
|
||||||
/.venv
|
/.venv
|
||||||
/settings.py
|
/settings.py
|
||||||
|
/requirements.txt
|
||||||
|
/frontend/js/config.js
|
||||||
|
|||||||
37
Dockerfile
Normal file
37
Dockerfile
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
FROM python:3.10.11-alpine3.17
|
||||||
|
|
||||||
|
# take arguments
|
||||||
|
ARG INTERNAL_API_PORT
|
||||||
|
ARG INTERNAL_WS_PORT
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
pip install pip -U && \
|
||||||
|
pip install poetry --no-cache-dir
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY pyproject.toml .
|
||||||
|
COPY poetry.lock .
|
||||||
|
|
||||||
|
# create virtual environment
|
||||||
|
RUN python -m venv /venv
|
||||||
|
# set python thingies, set environment variables and activate virtual environment
|
||||||
|
ENV \
|
||||||
|
PYTHONDONTWRITEBYTECODE=1 \
|
||||||
|
PYTHONUNBUFFERED=1 \
|
||||||
|
FAIRHOPPER_API_PORT=${INTERNAL_API_PORT} \
|
||||||
|
FAIRHOPPER_WS_PORT=${INTERNAL_WS_PORT} \
|
||||||
|
PATH="/venv/bin:$PATH"
|
||||||
|
|
||||||
|
RUN \
|
||||||
|
# dump python dependencies into requirements file
|
||||||
|
poetry export --without-hashes --format=requirements.txt > requirements.txt && \
|
||||||
|
# install python libs
|
||||||
|
pip install -r requirements.txt --no-cache-dir --prefer-binary
|
||||||
|
|
||||||
|
# copy all relevant files
|
||||||
|
COPY ./.docker/* ./
|
||||||
|
COPY ./hopper ./hopper
|
||||||
|
COPY ./main.py .
|
||||||
|
|
||||||
|
ENTRYPOINT [ "/app/run.sh" ]
|
||||||
41
Makefile
41
Makefile
@ -1,3 +1,11 @@
|
|||||||
|
IMAGE_NAME=fairhopper-service
|
||||||
|
CONTAINER_NAME=fairhopper-service
|
||||||
|
INTERNAL_API_PORT=8010
|
||||||
|
INTERNAL_WS_PORT=8011
|
||||||
|
EXTERNAL_API_PORT=8010
|
||||||
|
EXTERNAL_WS_PORT=8011
|
||||||
|
|
||||||
|
|
||||||
run:
|
run:
|
||||||
@poetry run \
|
@poetry run \
|
||||||
uvicorn \
|
uvicorn \
|
||||||
@ -14,3 +22,36 @@ run-dev:
|
|||||||
--port 8010 \
|
--port 8010 \
|
||||||
--workers=1 \
|
--workers=1 \
|
||||||
--reload
|
--reload
|
||||||
|
|
||||||
|
create-requirements:
|
||||||
|
@poetry export \
|
||||||
|
--without-hashes \
|
||||||
|
--format=requirements.txt \
|
||||||
|
> requirements.txt
|
||||||
|
|
||||||
|
docker-clean:
|
||||||
|
@echo "> Removing container $(CONTAINER_NAME)"
|
||||||
|
- @docker rm $(CONTAINER_NAME)
|
||||||
|
@echo "> Removing image $(CONTAINER_NAME)"
|
||||||
|
- @docker image rm $(CONTAINER_NAME)
|
||||||
|
|
||||||
|
|
||||||
|
docker-build:
|
||||||
|
@docker \
|
||||||
|
build . \
|
||||||
|
--build-arg INTERNAL_API_PORT=$(INTERNAL_API_PORT) \
|
||||||
|
--build-arg INTERNAL_WS_PORT=$(INTERNAL_WS_PORT) \
|
||||||
|
-t $(CONTAINER_NAME)
|
||||||
|
|
||||||
|
docker-run:
|
||||||
|
@docker \
|
||||||
|
run \
|
||||||
|
--publish $(EXTERNAL_API_PORT):$(INTERNAL_API_PORT) \
|
||||||
|
--publish $(EXTERNAL_WS_PORT):$(INTERNAL_WS_PORT) \
|
||||||
|
--name=$(CONTAINER_NAME) \
|
||||||
|
$(IMAGE_NAME) \
|
||||||
|
--detach
|
||||||
|
|
||||||
|
docker-clean-build:
|
||||||
|
make clean
|
||||||
|
make build
|
||||||
|
|||||||
210
README.md
210
README.md
@ -1,5 +1,14 @@
|
|||||||
# FairHopper
|
# FairHopper
|
||||||
|
|
||||||
|
## Useful links
|
||||||
|
|
||||||
|
- [Frontend](https://fairhopper.mjerenja.com)
|
||||||
|
- [API](https://api.fairhopper.mjerenja.com)
|
||||||
|
- [API Docs](https://api.fairhopper.mjerenja.com/docs)
|
||||||
|
- [FairHopper](https://gitea.ekirin.com/Intis/fairhopper)
|
||||||
|
- [FairHopper SDK](https://gitea.ekirin.com/Intis/fairhopper-sdk)
|
||||||
|
- Websockets: wss://fairhopper.mjerenja.com/ws
|
||||||
|
|
||||||
## Game
|
## Game
|
||||||
|
|
||||||
### Overview
|
### Overview
|
||||||
@ -24,6 +33,7 @@
|
|||||||
## Game States
|
## Game States
|
||||||
|
|
||||||
```plantuml
|
```plantuml
|
||||||
|
scale 1024 width
|
||||||
hide empty description
|
hide empty description
|
||||||
|
|
||||||
state "Start Game" as StartGame
|
state "Start Game" as StartGame
|
||||||
@ -220,7 +230,7 @@ Response body:
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"player": {
|
"player": {
|
||||||
"uuid": "75bba7cd-a4c1-4b50-b0b5-6382c2822a25",
|
"id": "75bba7cd-a4c1-4b50-b0b5-6382c2822a25",
|
||||||
"name": "Pero",
|
"name": "Pero",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 0,
|
"x": 0,
|
||||||
@ -234,17 +244,17 @@ Response body:
|
|||||||
|
|
||||||
### Player Move
|
### Player Move
|
||||||
|
|
||||||
- POST `/player/{uuid}/move/left`
|
- POST `/player/{id}/move/left`
|
||||||
- POST `/player/{uuid}/move/right`
|
- POST `/player/{id}/move/right`
|
||||||
- POST `/player/{uuid}/move/up`
|
- POST `/player/{id}/move/up`
|
||||||
- POST `/player/{uuid}/move/down`
|
- POST `/player/{id}/move/down`
|
||||||
|
|
||||||
Request body: None
|
Request body: None
|
||||||
|
|
||||||
Response code:
|
Response code:
|
||||||
- 200 OK: Destination reached
|
- 200 OK: Destination reached
|
||||||
- 201 Created: Player moved successfully
|
- 201 Created: Player moved successfully
|
||||||
- 403 Forbidden: Player uuid not valid, probably timeout
|
- 403 Forbidden: Player id not valid, probably timeout
|
||||||
- 409 Conflict: Invalid move, obstacle or position out of board
|
- 409 Conflict: Invalid move, obstacle or position out of board
|
||||||
- 422 Unprocessable Content: Validation error
|
- 422 Unprocessable Content: Validation error
|
||||||
|
|
||||||
@ -252,7 +262,7 @@ Response body:
|
|||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"player": {
|
"player": {
|
||||||
"uuid": "string",
|
"id": "string",
|
||||||
"name": "Pero",
|
"name": "Pero",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 50,
|
"x": 50,
|
||||||
@ -266,7 +276,7 @@ Response body:
|
|||||||
|
|
||||||
### Get Player Info
|
### Get Player Info
|
||||||
|
|
||||||
GET `/player/{{uuid}}`
|
GET `/player/{{id}}`
|
||||||
|
|
||||||
Request body: None
|
Request body: None
|
||||||
|
|
||||||
@ -274,7 +284,7 @@ Response body:
|
|||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"player": {
|
"player": {
|
||||||
"uuid": "string",
|
"id": "string",
|
||||||
"name": "Pero",
|
"name": "Pero",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 50,
|
"x": 50,
|
||||||
@ -314,46 +324,55 @@ Response body:
|
|||||||
### WS Data format
|
### WS Data format
|
||||||
- json
|
- json
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"message": message_type,
|
||||||
|
"data": ...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
|
||||||
### Game state structure
|
### Game state structure
|
||||||
|
|
||||||
URI: `/game-state`
|
Message: `game_dump`
|
||||||
|
|
||||||
Data:
|
Data:
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"board": {
|
"board": {
|
||||||
"width": 21,
|
"width": 10,
|
||||||
"height": 21
|
"height": 10
|
||||||
},
|
},
|
||||||
"destination": {
|
"destination": {
|
||||||
"position": {
|
"position": {
|
||||||
"x": 10,
|
"x": 5,
|
||||||
"y": 10
|
"y": 5
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"players": [
|
"players": [
|
||||||
{
|
{
|
||||||
"uuid": "test-player-id",
|
"id": "test-player-pero",
|
||||||
"name": "Pero",
|
"name": "Pero",
|
||||||
"active": true,
|
"active": true,
|
||||||
"position": {
|
"position": {
|
||||||
"x": 2,
|
"x": 3,
|
||||||
"y": 2
|
"y": 3
|
||||||
},
|
},
|
||||||
"move_count": 3,
|
"move_count": 0,
|
||||||
"move_attempt_count": 3
|
"move_attempt_count": 0,
|
||||||
|
"state": "CREATED"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"uuid": "95962b49-0003-4bf2-b205-71f2590f2318",
|
"id": "test-player-mirko",
|
||||||
"name": "Mirko",
|
"name": "Mirko",
|
||||||
"active": true,
|
"active": true,
|
||||||
"position": {
|
"position": {
|
||||||
"x": 0,
|
"x": 4,
|
||||||
"y": 0
|
"y": 4
|
||||||
},
|
},
|
||||||
"move_count": 15,
|
"move_count": 0,
|
||||||
"move_attempt_count": 20
|
"move_attempt_count": 0,
|
||||||
|
"state": "CREATED"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"layers": [
|
"layers": [
|
||||||
@ -363,36 +382,22 @@ Data:
|
|||||||
{
|
{
|
||||||
"type": "OBSTACLE",
|
"type": "OBSTACLE",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 4,
|
"x": 0,
|
||||||
"y": 2
|
"y": 6
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "OBSTACLE",
|
|
||||||
"position": {
|
|
||||||
"x": 4,
|
|
||||||
"y": 13
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "OBSTACLE",
|
|
||||||
"position": {
|
|
||||||
"x": 18,
|
|
||||||
"y": 18
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "OBSTACLE",
|
"type": "OBSTACLE",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 5,
|
"x": 5,
|
||||||
"y": 4
|
"y": 1
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "OBSTACLE",
|
"type": "OBSTACLE",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 7,
|
"x": 1,
|
||||||
"y": 10
|
"y": 6
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -403,8 +408,8 @@ Data:
|
|||||||
{
|
{
|
||||||
"type": "DESTINATION",
|
"type": "DESTINATION",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 10,
|
"x": 5,
|
||||||
"y": 10
|
"y": 5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -415,15 +420,15 @@ Data:
|
|||||||
{
|
{
|
||||||
"type": "PLAYER",
|
"type": "PLAYER",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 2,
|
"x": 3,
|
||||||
"y": 2
|
"y": 3
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "PLAYER",
|
"type": "PLAYER",
|
||||||
"position": {
|
"position": {
|
||||||
"x": 0,
|
"x": 4,
|
||||||
"y": 0
|
"y": 4
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -431,3 +436,110 @@ Data:
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Product purchase start
|
||||||
|
|
||||||
|
Message: `product_purchase_start`
|
||||||
|
|
||||||
|
Data:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"player": {
|
||||||
|
"id": "test-player-pero",
|
||||||
|
"name": "Pero",
|
||||||
|
"active": true,
|
||||||
|
"position": {
|
||||||
|
"x": 10,
|
||||||
|
"y": 10
|
||||||
|
},
|
||||||
|
"move_count": 1,
|
||||||
|
"move_attempt_count": 1,
|
||||||
|
"state": "ON_DESTINATION"
|
||||||
|
},
|
||||||
|
"products": [
|
||||||
|
{
|
||||||
|
"name": "CocaCola",
|
||||||
|
"id": "cocacola-id",
|
||||||
|
"description": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Pepsi",
|
||||||
|
"id": "pepsi-id",
|
||||||
|
"description": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Fanta",
|
||||||
|
"id": "fanta-id",
|
||||||
|
"description": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Snickers",
|
||||||
|
"id": "snickers-id",
|
||||||
|
"description": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Mars",
|
||||||
|
"id": "mars-id",
|
||||||
|
"description": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Burek",
|
||||||
|
"id": "burek-id",
|
||||||
|
"description": null
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"timeout": 5
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Product purchase timer tick
|
||||||
|
|
||||||
|
Message: `product_purchase_timer_tick`
|
||||||
|
|
||||||
|
Data:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"time_left": 4,
|
||||||
|
"player": {
|
||||||
|
"id": "test-player-pero",
|
||||||
|
"name": "Pero",
|
||||||
|
"active": true,
|
||||||
|
"position": {
|
||||||
|
"x": 10,
|
||||||
|
"y": 10
|
||||||
|
},
|
||||||
|
"move_count": 1,
|
||||||
|
"move_attempt_count": 1,
|
||||||
|
"state": "ON_DESTINATION"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Product purchase timer done
|
||||||
|
|
||||||
|
Message: `product_purchase_done`
|
||||||
|
|
||||||
|
Data:
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"player": {
|
||||||
|
"id": "test-player-pero",
|
||||||
|
"name": "Pero",
|
||||||
|
"active": true,
|
||||||
|
"position": {
|
||||||
|
"x": 10,
|
||||||
|
"y": 10
|
||||||
|
},
|
||||||
|
"move_count": 1,
|
||||||
|
"move_attempt_count": 1,
|
||||||
|
"state": "ON_DESTINATION"
|
||||||
|
},
|
||||||
|
"product": {
|
||||||
|
"name": "CocaCola",
|
||||||
|
"id": "cocacola-id",
|
||||||
|
"description": null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
If product selection timeout occured, product will be null.
|
||||||
|
|||||||
@ -39,7 +39,7 @@ POST http://localhost:8010/player/test-player-pero/product/purchase
|
|||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
"product_uuid": "cocacola-id"
|
"product_id": "cocacola-id"
|
||||||
}
|
}
|
||||||
###
|
###
|
||||||
|
|
||||||
|
|||||||
Submodule fairhopper-sdk updated: 10290dba54...fd71fa276c
@ -8,13 +8,14 @@
|
|||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
|
||||||
integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
|
integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
|
||||||
<link rel="stylesheet" href="styles.css">
|
<link rel="stylesheet" href="styles.css">
|
||||||
|
<script src="js/config.js"></script>
|
||||||
<script src="js/frontend.js"></script>
|
<script src="js/frontend.js"></script>
|
||||||
|
|
||||||
<title>FairHopper Visualisation Client</title>
|
<title>FairHopper Visualisation Client</title>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<main class="container-fluid container">
|
<main class="container-fluid main-container">
|
||||||
<h1 class="mt-1 mb-2">
|
<h1 class="mt-1 mb-2">
|
||||||
FairHopper Visualisation Client
|
FairHopper Visualisation Client
|
||||||
</h1>
|
</h1>
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
|
if (typeof FAIRHOPPER_WS_SERVER === "undefined") {
|
||||||
|
var FAIRHOPPER_WS_SERVER = "ws://127.0.0.1:8011";
|
||||||
|
}
|
||||||
|
|
||||||
const BOARD_ICONS = {
|
const BOARD_ICONS = {
|
||||||
PLAYER: "😀",
|
PLAYER: "😀",
|
||||||
PLAYER_ON_DESTINATION: "😎",
|
PLAYER_ON_DESTINATION: "😎",
|
||||||
@ -33,10 +37,10 @@ function renderCellContent(position, content) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function renderPlayerList(players) {
|
function renderPlayerList(players) {
|
||||||
const html = players
|
document.getElementById("players-content").innerHTML = players
|
||||||
.filter((player) => player.active)
|
.filter((player) => player.active)
|
||||||
.map((player) => {
|
.map((player) => {
|
||||||
const onDestination = player.state == "ON_DESTINATION";
|
const onDestination = player.state === "ON_DESTINATION";
|
||||||
return `
|
return `
|
||||||
<li class="${onDestination ? "text-success" : ""}">
|
<li class="${onDestination ? "text-success" : ""}">
|
||||||
${player.name} (${player.move_count})
|
${player.name} (${player.move_count})
|
||||||
@ -45,7 +49,6 @@ function renderPlayerList(players) {
|
|||||||
`;
|
`;
|
||||||
})
|
})
|
||||||
.join("");
|
.join("");
|
||||||
document.getElementById("players-content").innerHTML = html;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderPlayers(players) {
|
function renderPlayers(players) {
|
||||||
@ -53,14 +56,13 @@ function renderPlayers(players) {
|
|||||||
.filter((player) => player.active)
|
.filter((player) => player.active)
|
||||||
.forEach((player) => {
|
.forEach((player) => {
|
||||||
const cell = findCell(player.position);
|
const cell = findCell(player.position);
|
||||||
const onDestination = player.state == "ON_DESTINATION";
|
const onDestination = player.state === "ON_DESTINATION";
|
||||||
const playerIcon = onDestination ? BOARD_ICONS.PLAYER_ON_DESTINATION : BOARD_ICONS.PLAYER;
|
const playerIcon = onDestination ? BOARD_ICONS.PLAYER_ON_DESTINATION : BOARD_ICONS.PLAYER;
|
||||||
if (cell) {
|
if (cell) {
|
||||||
const html = `
|
cell.innerHTML = `
|
||||||
<div class="player-tooltip">${player.name}</div>
|
<div class="player-tooltip">${player.name}</div>
|
||||||
${playerIcon}
|
${playerIcon}
|
||||||
`;
|
`;
|
||||||
cell.innerHTML = html;
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -85,6 +87,8 @@ function renderDestination(position) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function renderGameDump(data) {
|
function renderGameDump(data) {
|
||||||
|
closePurchaseWindow();
|
||||||
|
|
||||||
createBoard(data.board);
|
createBoard(data.board);
|
||||||
renderObstacles(data.layers);
|
renderObstacles(data.layers);
|
||||||
renderDestination(data.destination.position);
|
renderDestination(data.destination.position);
|
||||||
@ -98,10 +102,10 @@ function productPurchaseStart(products, purchaseTimeout) {
|
|||||||
const contentElement = document.getElementById("products-content");
|
const contentElement = document.getElementById("products-content");
|
||||||
const purchaseTimeoutElement = document.getElementById("purchase-countdown");
|
const purchaseTimeoutElement = document.getElementById("purchase-countdown");
|
||||||
|
|
||||||
const html = products
|
contentElement.innerHTML = products
|
||||||
.map((product) => {
|
.map((product) => {
|
||||||
return `
|
return `
|
||||||
<div class="card product">
|
<div class="card product" id="product-${product.id}">
|
||||||
<img src="img/products/${product.name}.jpeg" class="card-img-topx" alt="${product.name}">
|
<img src="img/products/${product.name}.jpeg" class="card-img-topx" alt="${product.name}">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<h5 class="card-title">${product.name}</h5>
|
<h5 class="card-title">${product.name}</h5>
|
||||||
@ -110,8 +114,6 @@ function productPurchaseStart(products, purchaseTimeout) {
|
|||||||
`;
|
`;
|
||||||
})
|
})
|
||||||
.join("");
|
.join("");
|
||||||
|
|
||||||
contentElement.innerHTML = html;
|
|
||||||
containerElement.classList.remove("d-none");
|
containerElement.classList.remove("d-none");
|
||||||
purchaseTimeoutElement.innerText = purchaseTimeout;
|
purchaseTimeoutElement.innerText = purchaseTimeout;
|
||||||
}
|
}
|
||||||
@ -121,18 +123,20 @@ function productPurchaseTimerTick(timeLeft) {
|
|||||||
purchaseTimeoutElement.innerText = timeLeft;
|
purchaseTimeoutElement.innerText = timeLeft;
|
||||||
}
|
}
|
||||||
|
|
||||||
function productPurchased(product) {
|
function closePurchaseWindow() {
|
||||||
console.log("productPurchased:", product);
|
|
||||||
}
|
|
||||||
|
|
||||||
function productPurchaseDone() {
|
|
||||||
console.log("productPurchaseDone");
|
|
||||||
const container = document.getElementById("purchase-container");
|
const container = document.getElementById("purchase-container");
|
||||||
container.classList.add("d-none");
|
container.classList.add("d-none");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function productPurchaseDone(product) {
|
||||||
|
const cardContainer = document.getElementById(`product-${product.id}`);
|
||||||
|
cardContainer.classList.add("selected");
|
||||||
|
}
|
||||||
|
|
||||||
function wsConnect() {
|
function wsConnect() {
|
||||||
let ws = new WebSocket("ws://localhost:8011");
|
console.log("Attempting to connect to", FAIRHOPPER_WS_SERVER);
|
||||||
|
let ws = new WebSocket(FAIRHOPPER_WS_SERVER);
|
||||||
|
|
||||||
ws.onopen = () => {
|
ws.onopen = () => {
|
||||||
console.log("WS connected");
|
console.log("WS connected");
|
||||||
};
|
};
|
||||||
@ -151,11 +155,8 @@ function wsConnect() {
|
|||||||
case "product_purchase_timer_tick":
|
case "product_purchase_timer_tick":
|
||||||
productPurchaseTimerTick(wsMessage.data.time_left);
|
productPurchaseTimerTick(wsMessage.data.time_left);
|
||||||
break;
|
break;
|
||||||
case "product_purchased":
|
|
||||||
productPurchased(wsMessage.data);
|
|
||||||
break;
|
|
||||||
case "product_purchase_done":
|
case "product_purchase_done":
|
||||||
productPurchaseDone();
|
productPurchaseDone(wsMessage.data.product);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
console.error("Unknown message:", wsMessage);
|
console.error("Unknown message:", wsMessage);
|
||||||
@ -163,7 +164,7 @@ function wsConnect() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
ws.onclose = (e) => {
|
ws.onclose = (e) => {
|
||||||
setTimeout(function () {
|
setTimeout(() => {
|
||||||
wsConnect();
|
wsConnect();
|
||||||
}, 1000);
|
}, 1000);
|
||||||
};
|
};
|
||||||
|
|||||||
@ -2,7 +2,7 @@ body {
|
|||||||
background-color: whitesmoke;
|
background-color: whitesmoke;
|
||||||
}
|
}
|
||||||
|
|
||||||
main.container {
|
main.main-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -84,8 +84,13 @@ ul.players {
|
|||||||
grid-template-columns: 1fr 1fr 1fr;
|
grid-template-columns: 1fr 1fr 1fr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.purchase-container .products-content .product.selected {
|
||||||
|
background-color: pink;
|
||||||
|
}
|
||||||
|
|
||||||
.purchase-container .products-content .product .card-title {
|
.purchase-container .products-content .product .card-title {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
font-size: 12pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
.purchase-container .products-content .product img {
|
.purchase-container .products-content .product img {
|
||||||
|
|||||||
@ -27,7 +27,7 @@ class PositionDto(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class PlayerDto(BaseModel):
|
class PlayerDto(BaseModel):
|
||||||
uuid: str
|
id: str
|
||||||
name: str
|
name: str
|
||||||
active: bool
|
active: bool
|
||||||
position: PositionDto
|
position: PositionDto
|
||||||
@ -42,7 +42,7 @@ class DestinationDto(BaseModel):
|
|||||||
|
|
||||||
class ProductDto(BaseModel):
|
class ProductDto(BaseModel):
|
||||||
name: str
|
name: str
|
||||||
uuid: str
|
id: str
|
||||||
description: Optional[str] = None
|
description: Optional[str] = None
|
||||||
|
|
||||||
class StartGameRequestDto(BaseModel):
|
class StartGameRequestDto(BaseModel):
|
||||||
@ -75,4 +75,4 @@ class GetProductsResponse(BaseModel):
|
|||||||
|
|
||||||
|
|
||||||
class PurchaseProductDto(BaseModel):
|
class PurchaseProductDto(BaseModel):
|
||||||
product_uuid: str
|
product_id: str
|
||||||
|
|||||||
@ -24,8 +24,8 @@ from settings import settings
|
|||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
def get_player(uuid: str, engine: GameEngine = Depends(get_game_engine)) -> Player:
|
def get_player(id: str, engine: GameEngine = Depends(get_game_engine)) -> Player:
|
||||||
player = engine.players.find(uuid)
|
player = engine.players.find(id)
|
||||||
if player is None:
|
if player is None:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_404_NOT_FOUND, detail="Player not found"
|
status_code=status.HTTP_404_NOT_FOUND, detail="Player not found"
|
||||||
@ -76,7 +76,7 @@ async def start_game(
|
|||||||
|
|
||||||
|
|
||||||
@router.get(
|
@router.get(
|
||||||
"/player/{uuid}",
|
"/player/{id}",
|
||||||
response_model=PlayerInfoResponseDto,
|
response_model=PlayerInfoResponseDto,
|
||||||
responses={
|
responses={
|
||||||
status.HTTP_403_FORBIDDEN: {
|
status.HTTP_403_FORBIDDEN: {
|
||||||
@ -85,7 +85,7 @@ async def start_game(
|
|||||||
},
|
},
|
||||||
status.HTTP_404_NOT_FOUND: {
|
status.HTTP_404_NOT_FOUND: {
|
||||||
"model": ErrorResponseDto,
|
"model": ErrorResponseDto,
|
||||||
"description": " Player with uuid not found, probably kicked out",
|
"description": " Player with id not found, probably kicked out",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
@ -96,7 +96,7 @@ async def get_player_info(
|
|||||||
|
|
||||||
|
|
||||||
@router.post(
|
@router.post(
|
||||||
"/player/{uuid}/move/{direction}",
|
"/player/{id}/move/{direction}",
|
||||||
response_model=MovePlayerResponseDto,
|
response_model=MovePlayerResponseDto,
|
||||||
status_code=status.HTTP_201_CREATED,
|
status_code=status.HTTP_201_CREATED,
|
||||||
responses={
|
responses={
|
||||||
@ -110,7 +110,7 @@ async def get_player_info(
|
|||||||
},
|
},
|
||||||
status.HTTP_404_NOT_FOUND: {
|
status.HTTP_404_NOT_FOUND: {
|
||||||
"model": ErrorResponseDto,
|
"model": ErrorResponseDto,
|
||||||
"description": " Player with uuid not found, probably kicked out",
|
"description": " Player with id not found, probably kicked out",
|
||||||
},
|
},
|
||||||
status.HTTP_409_CONFLICT: {
|
status.HTTP_409_CONFLICT: {
|
||||||
"model": ErrorResponseDto,
|
"model": ErrorResponseDto,
|
||||||
@ -157,33 +157,32 @@ async def get_products() -> GetProductsResponse:
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.get("/products/{uuid}", response_model=ProductDto)
|
@router.get("/products/{id}", response_model=ProductDto)
|
||||||
async def get_product(uuid: str) -> ProductDto:
|
async def get_product(id: str) -> ProductDto:
|
||||||
for product in settings.products:
|
for product in settings.products:
|
||||||
if product.uuid == uuid:
|
if product.id == id:
|
||||||
return ProductDto.from_orm(product)
|
return ProductDto.from_orm(product)
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_404_NOT_FOUND, detail="Product not found"
|
status_code=status.HTTP_404_NOT_FOUND, detail="Product not found"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.post("/player/{uuid}/product/purchase")
|
@router.post("/player/{id}/product/purchase", response_model=ProductDto)
|
||||||
async def purchase_product(
|
async def purchase_product(
|
||||||
body: PurchaseProductDto,
|
body: PurchaseProductDto,
|
||||||
engine: GameEngine = Depends(get_game_engine),
|
engine: GameEngine = Depends(get_game_engine),
|
||||||
player: Player = Depends(get_player),
|
player: Player = Depends(get_player),
|
||||||
):
|
) -> ProductDto:
|
||||||
for product in settings.products:
|
for product in settings.products:
|
||||||
if product.uuid == body.product_uuid:
|
if product.id == body.product_id:
|
||||||
try:
|
try:
|
||||||
await engine.purchase_product(player=player, product=product)
|
await engine.purchase_product(player=player, product=product)
|
||||||
|
return ProductDto.from_orm(product)
|
||||||
except PurchaseForbiddenForPlayer:
|
except PurchaseForbiddenForPlayer:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_403_FORBIDDEN,
|
status_code=status.HTTP_403_FORBIDDEN,
|
||||||
detail="Purchase forbidden for this player",
|
detail="Purchase forbidden for this player",
|
||||||
)
|
)
|
||||||
break
|
|
||||||
else:
|
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_404_NOT_FOUND, detail="Product not found"
|
status_code=status.HTTP_404_NOT_FOUND, detail="Product not found"
|
||||||
)
|
)
|
||||||
|
|||||||
@ -212,6 +212,8 @@ class GameEngine:
|
|||||||
)
|
)
|
||||||
self._purchase_countdown_timer.start()
|
self._purchase_countdown_timer.start()
|
||||||
|
|
||||||
|
await asyncio.sleep(settings.game.PURCHASE_START_DELAY)
|
||||||
|
|
||||||
async def purchase_product(self, player: Player, product: Product) -> None:
|
async def purchase_product(self, player: Player, product: Product) -> None:
|
||||||
if not player.state == PlayerState.ON_DESTINATION:
|
if not player.state == PlayerState.ON_DESTINATION:
|
||||||
raise PurchaseForbiddenForPlayer()
|
raise PurchaseForbiddenForPlayer()
|
||||||
@ -220,6 +222,7 @@ class GameEngine:
|
|||||||
await self.ws_server.send_product_purchase_done_message(
|
await self.ws_server.send_product_purchase_done_message(
|
||||||
player=player, product=product
|
player=player, product=product
|
||||||
)
|
)
|
||||||
|
await asyncio.sleep(settings.game.PURCHASE_FINISHED_DELAY)
|
||||||
await self.reset_game()
|
await self.reset_game()
|
||||||
|
|
||||||
def _reset_player(self, player) -> None:
|
def _reset_player(self, player) -> None:
|
||||||
|
|||||||
@ -9,6 +9,8 @@ from hopper.models.product import Product
|
|||||||
@dataclass
|
@dataclass
|
||||||
class GameSettings:
|
class GameSettings:
|
||||||
MOVE_DELAY: float = 0.5 # seconds
|
MOVE_DELAY: float = 0.5 # seconds
|
||||||
|
PURCHASE_START_DELAY: float = 2 # seconds
|
||||||
|
PURCHASE_FINISHED_DELAY: float = 2 # seconds
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
@ -27,7 +29,7 @@ class InactivityWatchdogSettings:
|
|||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class WSServerSettings:
|
class WSServerSettings:
|
||||||
HOST: str = "localhost"
|
HOST: str = "127.0.0.1"
|
||||||
PORT: int = 8011
|
PORT: int = 8011
|
||||||
|
|
||||||
|
|
||||||
@ -45,5 +47,5 @@ class Settings:
|
|||||||
ws_server: WSServerSettings
|
ws_server: WSServerSettings
|
||||||
purchase_timeout: int = 10 # seconds
|
purchase_timeout: int = 10 # seconds
|
||||||
log_level: int = logging.INFO
|
log_level: int = logging.INFO
|
||||||
products: Optional[List[Product]] = None
|
products: List[Product] = None
|
||||||
debug: Optional[DebugSettings] = None
|
debug: Optional[DebugSettings] = None
|
||||||
|
|||||||
@ -15,7 +15,7 @@ class Position:
|
|||||||
@dataclass
|
@dataclass
|
||||||
class Player:
|
class Player:
|
||||||
name: str
|
name: str
|
||||||
uuid: str = field(default_factory=lambda: str(uuid.uuid4()))
|
id: str = field(default_factory=lambda: str(uuid.uuid4()))
|
||||||
position: Position = field(default_factory=lambda: Position(0, 0))
|
position: Position = field(default_factory=lambda: Position(0, 0))
|
||||||
move_count: int = 0
|
move_count: int = 0
|
||||||
move_attempt_count: int = 0
|
move_attempt_count: int = 0
|
||||||
@ -31,8 +31,8 @@ class Player:
|
|||||||
|
|
||||||
|
|
||||||
class PlayerList(list[Player]):
|
class PlayerList(list[Player]):
|
||||||
def find(self, uuid: str) -> Optional[Player]:
|
def find(self, id: str) -> Optional[Player]:
|
||||||
for player in self:
|
for player in self:
|
||||||
if player.uuid == uuid:
|
if player.id == id:
|
||||||
return player
|
return player
|
||||||
return None
|
return None
|
||||||
|
|||||||
@ -6,5 +6,5 @@ from typing import Optional
|
|||||||
@dataclass
|
@dataclass
|
||||||
class Product:
|
class Product:
|
||||||
name: str
|
name: str
|
||||||
uuid: str = field(default_factory=lambda: str(uuid.uuid4()))
|
id: str = field(default_factory=lambda: str(uuid.uuid4()))
|
||||||
description: Optional[str] = None
|
description: Optional[str] = None
|
||||||
|
|||||||
51
sdk/demo.py
Normal file
51
sdk/demo.py
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
import random
|
||||||
|
from fh_sdk import Direction, FairHopper, Position
|
||||||
|
import math
|
||||||
|
|
||||||
|
HOST = "http://localhost"
|
||||||
|
PORT = 8010
|
||||||
|
|
||||||
|
|
||||||
|
def calc_angle(position1: Position, position2: Position) -> float:
|
||||||
|
x1, y1 = position1.x, position1.y
|
||||||
|
x2, y2 = position2.x, position2.y
|
||||||
|
return math.atan2(y2 - y1, x2 - x1) * (180 / math.pi)
|
||||||
|
|
||||||
|
|
||||||
|
fh = FairHopper(host=HOST, port=PORT)
|
||||||
|
res = fh.ping()
|
||||||
|
|
||||||
|
game = fh.start_game(player_name=f"Mirko {random.randint(0, 9999)}")
|
||||||
|
print(game.player.position)
|
||||||
|
quit()
|
||||||
|
|
||||||
|
res = fh.get_game_info()
|
||||||
|
print(">>>>>", res)
|
||||||
|
|
||||||
|
res = fh.get_player_info("XX")
|
||||||
|
print(">>>>>", res)
|
||||||
|
|
||||||
|
position = game.player.position
|
||||||
|
dest_position = game.destination.position
|
||||||
|
|
||||||
|
# p1 = PositionDto(x=0, y=20)
|
||||||
|
# p2 = PositionDto(x=10, y=10)
|
||||||
|
# angle = calc_angle(p1, p2)
|
||||||
|
# print(angle)
|
||||||
|
# quit()
|
||||||
|
|
||||||
|
for _ in range(10):
|
||||||
|
angle = calc_angle(position, dest_position) + 180
|
||||||
|
if 0 <= angle < 90:
|
||||||
|
direction = Direction.RIGHT
|
||||||
|
elif 90 <= angle <= 180:
|
||||||
|
direction = Direction.DOWN
|
||||||
|
elif 180 <= angle <= 270:
|
||||||
|
direction = Direction.RIGHT
|
||||||
|
else:
|
||||||
|
direction = Direction.UP
|
||||||
|
|
||||||
|
print(position, dest_position, int(angle), direction)
|
||||||
|
|
||||||
|
move_response = fh.move(game.player.id, direction)
|
||||||
|
position = move_response.player.position
|
||||||
@ -2,18 +2,49 @@ import logging
|
|||||||
|
|
||||||
from hopper.models.config import (
|
from hopper.models.config import (
|
||||||
BoardSettings,
|
BoardSettings,
|
||||||
|
DebugSettings,
|
||||||
GameSettings,
|
GameSettings,
|
||||||
InactivityWatchdogSettings,
|
InactivityWatchdogSettings,
|
||||||
Settings,
|
Settings,
|
||||||
WSServerSettings,
|
WSServerSettings,
|
||||||
)
|
)
|
||||||
|
from hopper.models.player import Player, Position
|
||||||
|
from hopper.models.product import Product
|
||||||
|
|
||||||
settings = Settings(
|
settings = Settings(
|
||||||
game=GameSettings(),
|
game=GameSettings(),
|
||||||
board=BoardSettings(),
|
board=BoardSettings(
|
||||||
|
WIDTH=20,
|
||||||
|
HEIGHT=20,
|
||||||
|
OBSTACLE_COUNT=10,
|
||||||
|
),
|
||||||
inacivity_watchdog=InactivityWatchdogSettings(),
|
inacivity_watchdog=InactivityWatchdogSettings(),
|
||||||
|
purchase_timeout=5,
|
||||||
log_level=logging.INFO,
|
log_level=logging.INFO,
|
||||||
|
products=[
|
||||||
|
Product(name="CocaCola", id="cocacola-id"),
|
||||||
|
Product(name="Pepsi", id="pepsi-id"),
|
||||||
|
Product(name="Fanta", id="fanta-id"),
|
||||||
|
Product(name="Snickers", id="snickers-id"),
|
||||||
|
Product(name="Mars", id="mars-id"),
|
||||||
|
Product(name="Burek", id="burek-id"),
|
||||||
|
],
|
||||||
ws_server=WSServerSettings(),
|
ws_server=WSServerSettings(),
|
||||||
purchase_timeout=10,
|
debug=DebugSettings(
|
||||||
debug=None,
|
PRINT_BOARD=True,
|
||||||
|
PLAYERS=[
|
||||||
|
Player(
|
||||||
|
name="Pero",
|
||||||
|
id="test-player-pero",
|
||||||
|
position=Position(x=9, y=10),
|
||||||
|
can_be_deactivated=False,
|
||||||
|
),
|
||||||
|
Player(
|
||||||
|
name="Mirko",
|
||||||
|
id="test-player-mirko",
|
||||||
|
position=Position(x=10, y=5),
|
||||||
|
can_be_deactivated=False,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user