Update readme

javascript/README.md

@@ -1,7 +1,7 @@
 # FairHopper JavaScript SDK
 
 Requirements:
-- Node 1.16+
+- Node 18+
 
 ## Running demo
 
@@ -10,8 +10,7 @@ Check `demo.js` for usage example.
 Edit `demo.js` and configure FairHopper Game host settings:
 
 ```javascript
-const FAIRHOPPER_HOST = "http://127.0.0.1";
-const FAIRHOPPER_PORT = 8010;
+const FAIRHOPPER_HOST = "http://127.0.0.1:8010";
 ```
 
 Run example using node:

javascript/demo.js

@@ -1,12 +1,11 @@
 const sdk = require("./fh_sdk");
 
-const FAIRHOPPER_HOST = "http://127.0.0.1";
-const FAIRHOPPER_PORT = 8010;
+const FAIRHOPPER_HOST = "https://api.fairhopper.mjerenja.com";
 
 async function main() {
-    const fh = new sdk.FairHopper(FAIRHOPPER_HOST, FAIRHOPPER_PORT);
+    const fh = new sdk.FairHopper(FAIRHOPPER_HOST);
 
-    console.log(`Pinging FairHopper server on ${FAIRHOPPER_HOST}:${FAIRHOPPER_PORT}`);
+    console.log(`Pinging FairHopper server on ${FAIRHOPPER_HOST}`);
     const pingResult = await fh.ping();
     console.log("Ping result:", pingResult);
     console.log();
@@ -18,23 +17,23 @@ async function main() {
     console.log("Initial player position is", game.player.position);
 
     let moveResult;
-    const playerUuid = game.player.uuid;
+    const playerId = game.player.id;
 
     try {
         console.log("Trying to move right");
-        moveResult = await fh.move(playerUuid, sdk.Direction.RIGHT);
+        moveResult = await fh.move(playerId, sdk.Direction.RIGHT);
         console.log("Successfully moved to", moveResult.player.position);
 
         console.log("Trying to move right");
-        moveResult = await fh.move(playerUuid, sdk.Direction.RIGHT);
+        moveResult = await fh.move(playerId, sdk.Direction.RIGHT);
         console.log("Successfully moved to", moveResult.player.position);
 
         console.log("Trying to move right");
-        moveResult = await fh.move(playerUuid, sdk.Direction.RIGHT);
+        moveResult = await fh.move(playerId, sdk.Direction.RIGHT);
         console.log("Successfully moved to", moveResult.player.position);
 
         console.log("Trying to move down");
-        moveResult = await fh.move(playerUuid, sdk.Direction.DOWN);
+        moveResult = await fh.move(playerId, sdk.Direction.DOWN);
         console.log("Successfully moved to", moveResult.player.position);
     } catch (err) {
         if (err instanceof sdk.PositionError) {

javascript/fh_sdk.js

@@ -1,3 +1,13 @@
+class ValidationError extends Error {
+    constructor(message) {
+        if (!message) {
+            message = "ValidationError";
+        }
+        super(message);
+        this.name = "ValidationError";
+    }
+}
+
 class PlayerNotFoundError extends Error {
     constructor(message) {
         if (!message) {
@@ -36,9 +46,8 @@ const Direction = {
 };
 
 class FairHopper {
-    constructor(host, port) {
+    constructor(host) {
         this.host = host;
-        this.port = port;
 
         this.defaultHeaders = {
             Accept: "application/json",
@@ -47,7 +56,7 @@ class FairHopper {
     }
 
     formatUrl(path) {
-        return `${this.host}:${this.port}${path}`;
+        return `${this.host}${path}`;
     }
 
     async ping() {
@@ -66,6 +75,10 @@ class FairHopper {
             headers: this.defaultHeaders,
             body: JSON.stringify(payload),
         });
+        switch (r.status) {
+            case 422:
+                throw new ValidationError();
+        }
         return await r.json();
     }
 
@@ -76,8 +89,8 @@ class FairHopper {
         return await r.json();
     }
 
-    async getPlayerInfo(playerUuid) {
-        const r = await fetch(this.formatUrl(`/player/${playerUuid}`), {
+    async getPlayerInfo(playerId) {
+        const r = await fetch(this.formatUrl(`/player/${playerId}`), {
             headers: this.defaultHeaders,
         });
         switch (r.status) {
@@ -85,28 +98,30 @@ class FairHopper {
                 throw new PlayerInactiveError();
             case 404:
                 throw new PlayerNotFoundError();
+            case 422:
+                throw new ValidationError();
         }
         return await r.json();
     }
 
-    async moveLeft(playerUuid) {
-        return await this.move(playerUuid, "left");
+    async moveLeft(playerId) {
+        return await this.move(playerId, "left");
     }
 
-    async moveRight(playerUuid) {
-        return await this.move(playerUuid, "right");
+    async moveRight(playerId) {
+        return await this.move(playerId, "right");
     }
 
-    async moveUp(playerUuid) {
-        return await this.move(playerUuid, "up");
+    async moveUp(playerId) {
+        return await this.move(playerId, "up");
     }
 
-    async moveDown(playerUuid) {
-        return await this.move(playerUuid, "down");
+    async moveDown(playerId) {
+        return await this.move(playerId, "down");
     }
 
-    async move(playerUuid, direction) {
-        const url = this.formatUrl(`/player/${playerUuid}/move/${direction}`);
+    async move(playerId, direction) {
+        const url = this.formatUrl(`/player/${playerId}/move/${direction}`);
         const r = await fetch(url, {
             method: "post",
             headers: this.defaultHeaders,
@@ -118,6 +133,8 @@ class FairHopper {
                 throw new PlayerNotFoundError();
             case 409:
                 throw new PositionError();
+            case 422:
+                throw new ValidationError();
         }
         return await r.json();
     }

python/README.md

@@ -1,10 +1,12 @@
 # FairHopper Python SDK
 
 Requirements:
-- Python 3.10+
+- Python 3.7+
 
 ## Setting up environment
 
+### Recommended: Using Poetry
+
 Project uses [Poetry](https://python-poetry.org), ultimate dependency management software for Python.
 
 Install Poetry:
@@ -17,6 +19,23 @@ Install virtual environment:
 poetry install
 ```
 
+### Simple: Using virtualenv
+
+Create virtual environment:
+```sh
+virtualenv .env
+```
+
+Activate virtual environment:
+```sh
+source .env/bin/activate
+```
+
+Install required dependencies:
+```sh
+pip install -r requirements.txt
+```
+
 ## Running demo
 
 Check `demo.py` for usage example.
@@ -24,13 +43,20 @@ Check `demo.py` for usage example.
 Edit `demo.py` and configure FairHopper Game host settings:
 
 ```python
-FAIRHOPPER_HOST = "http://127.0.0.1"
-FAIRHOPPER_PORT = 8010
+FAIRHOPPER_HOST = "http://127.0.0.1:8010"
 ```
 
 Activate environment and run example:
 
+### Poetry
+
 ```sh
 poetry shell
 python demo.py
 ```
+
+### Virtualenv
+```sh
+source .env/bin/activate
+python demo.py
+```

python/demo.py

@@ -1,13 +1,12 @@
 from fh_sdk import Direction, FairHopper, PositionError
 
-FAIRHOPPER_HOST = "http://127.0.0.1"
-FAIRHOPPER_PORT = 8010
+FAIRHOPPER_HOST = "https://api.fairhopper.mjerenja.com"
 
 
 def main() -> None:
-    fh = FairHopper(FAIRHOPPER_HOST, FAIRHOPPER_PORT)
+    fh = FairHopper(FAIRHOPPER_HOST)
 
-    print(f"Pinging FairHopper server on {FAIRHOPPER_HOST}:{FAIRHOPPER_PORT}")
+    print(f"Pinging FairHopper server on {FAIRHOPPER_HOST}")
     res = fh.ping()
     print("Ping result:", res)
     print()
@@ -18,23 +17,23 @@ def main() -> None:
     print()
     print("Initial player position is", game.player.position)
 
-    player_uuid = game.player.uuid
+    player_id = game.player.id
 
     try:
         print("Trying to move right")
-        moveResult = fh.move(player_uuid, Direction.RIGHT)
+        moveResult = fh.move(player_id, Direction.RIGHT)
         print("Successfully moved to", moveResult.player.position)
 
         print("Trying to move right")
-        moveResult = fh.move(player_uuid, Direction.RIGHT)
+        moveResult = fh.move(player_id, Direction.RIGHT)
         print("Successfully moved to", moveResult.player.position)
 
         print("Trying to move right")
-        moveResult = fh.move(player_uuid, Direction.RIGHT)
+        moveResult = fh.move(player_id, Direction.RIGHT)
         print("Successfully moved to", moveResult.player.position)
 
         print("Trying to move down")
-        moveResult = fh.move(player_uuid, Direction.DOWN)
+        moveResult = fh.move(player_id, Direction.DOWN)
         print("Successfully moved to", moveResult.player.position)
     except PositionError:
         print("Cant't move in this direction")

python/fh_sdk.py

@@ -1,23 +1,35 @@
-from pydantic import BaseModel
 from enum import Enum
+from typing import List, Optional
 
 import requests
+from pydantic import BaseModel
 
 
 class BaseError(Exception):
-    ...
+    detail: str = "BaseError"
+
+    def __str__(self) -> str:
+        return self.detail
 
 
 class PositionError(BaseError):
-    ...
+    detail = "Invalid position"
 
 
 class PlayerInactiveError(BaseError):
-    ...
+    detail = "Player inactive"
 
 
 class PlayerNotFoundError(BaseError):
-    ...
+    detail = "Player not found"
+
+
+class GameLockedError(BaseError):
+    detail = "Game locked. Product selection in progress."
+
+
+class ValidationError(BaseError):
+    detail = "Validation error"
 
 
 class Direction(str, Enum):
@@ -27,6 +39,13 @@ class Direction(str, Enum):
     DOWN = "down"
 
 
+class PlayerState(str, Enum):
+    CREATED = "CREATED"
+    MOVING = "MOVING"
+    ON_DESTINATION = "ON_DESTINATION"
+    INACTIVE = "INACTIVE"
+
+
 class Board(BaseModel):
     width: int
     height: int
@@ -42,12 +61,13 @@ class Destination(BaseModel):
 
 
 class Player(BaseModel):
-    uuid: str
+    id: str
     name: str
     active: bool
     position: Position
     move_count: int
     move_attempt_count: int
+    state: PlayerState
 
 
 class PingResponse(BaseModel):
@@ -70,12 +90,11 @@ class GameInfoResponse(BaseModel):
 
 
 class FairHopper:
-    def __init__(self, host, port) -> None:
+    def __init__(self, host: str) -> None:
         self.host = host
-        self.port = port
 
     def format_url(self, path: str) -> str:
-        return f"{self.host}:{self.port}{path}"
+        return f"{self.host}{path}"
 
     def ping(self) -> PingResponse:
         r = requests.get(self.format_url("/ping"))
@@ -87,7 +106,12 @@ class FairHopper:
             "player_name": player_name,
         }
         r = requests.post(self.format_url("/game"), json=payload)
-        r.raise_for_status()
+
+        if r.status_code == 422:
+            raise ValidationError()
+        else:
+            r.raise_for_status()
+
         return StartGameResponse(**r.json())
 
     def get_game_info(self) -> GameInfoResponse:
@@ -95,32 +119,34 @@ class FairHopper:
         r.raise_for_status()
         return GameInfoResponse(**r.json())
 
-    def get_player_info(self, uuid: str) -> PlayerInfoResponse:
-        r = requests.get(self.format_url(f"/player/{uuid}"))
+    def get_player_info(self, player_id: str) -> PlayerInfoResponse:
+        r = requests.get(self.format_url(f"/player/{player_id}"))
 
         if r.status_code == 403:
             raise PlayerInactiveError()
         elif r.status_code == 404:
             raise PlayerNotFoundError()
+        elif r.status_code == 422:
+            raise ValidationError()
         else:
             r.raise_for_status()
 
         return PlayerInfoResponse(**r.json())
 
-    def move_left(self, uuid: str) -> PlayerInfoResponse:
-        return self.move(uuid, Direction.LEFT)
+    def move_left(self, player_id: str) -> PlayerInfoResponse:
+        return self.move(player_id, Direction.LEFT)
 
-    def move_right(self, uuid: str) -> PlayerInfoResponse:
-        return self.move(uuid, Direction.RIGHT)
+    def move_right(self, player_id: str) -> PlayerInfoResponse:
+        return self.move(player_id, Direction.RIGHT)
 
-    def move_up(self, uuid: str) -> PlayerInfoResponse:
-        return self.move(uuid, Direction.UP)
+    def move_up(self, player_id: str) -> PlayerInfoResponse:
+        return self.move(player_id, Direction.UP)
 
-    def move_down(self, uuid: str) -> PlayerInfoResponse:
-        return self.move(uuid, Direction.DOWN)
+    def move_down(self, player_id: str) -> PlayerInfoResponse:
+        return self.move(player_id, Direction.DOWN)
 
-    def move(self, uuid: str, direction: Direction) -> PlayerInfoResponse:
-        path = f"/player/{uuid}/move/{direction}"
+    def move(self, player_id: str, direction: Direction) -> PlayerInfoResponse:
+        path = f"/player/{player_id}/move/{direction}"
         r = requests.post(self.format_url(path))
 
         if r.status_code == 403:
@@ -129,6 +155,10 @@ class FairHopper:
             raise PlayerNotFoundError()
         elif r.status_code == 409:
             raise PositionError()
+        elif r.status_code == 422:
+            raise ValidationError()
+        elif r.status_code == 423:
+            raise GameLockedError()
         else:
             r.raise_for_status()
 

python/poetry.lock

@@ -215,5 +215,5 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [metadata]
 lock-version = "2.0"
-python-versions = "^3.10"
-content-hash = "a8d95adf4819c22b47d4cac44f18a3bc5040d1c0487ead04cb2f09692de0d411"
+python-versions = "^3.7"
+content-hash = "6d7fc4c2ae40fa75f772d15817348dd97078b9aa25ecd3ad52e71bec25732be8"

python/pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "fh_sdk"}]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.7"
 requests = "^2.28.2"
 pydantic = "^1.10.7"
 

python/requirements.txt

@@ -0,0 +1,2 @@
+pydantic
+requests