From fdcc1b8f3468e758ea6dd8caebf443063e088808 Mon Sep 17 00:00:00 2001
From: martin <me@martials.no>
Date: Mon, 7 Aug 2023 22:18:28 +0200
Subject: [PATCH] Error action

---
 .../ClientApp/src/components/gameTile.tsx     |  2 +-
 .../ClientApp/src/utils/actions.ts            |  4 ++++
 .../Controllers/GameController.cs             | 19 +++++++++++++++++--
 pac-man-board-game/GameStuff/Actions.cs       |  1 +
 pac-man-board-game/Services/ActionService.cs  |  8 ++++----
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/pac-man-board-game/ClientApp/src/components/gameTile.tsx b/pac-man-board-game/ClientApp/src/components/gameTile.tsx
index 63e9257..5323d6e 100644
--- a/pac-man-board-game/ClientApp/src/components/gameTile.tsx
+++ b/pac-man-board-game/ClientApp/src/components/gameTile.tsx
@@ -84,7 +84,7 @@ const Tile: FC<TileProps> = (
       case TileType.ghostSpawn:
         return "bg-red-500";
       case TileType.pacmanSpawn:
-        return "bg-green-500";
+        return "bg-green-500"; // TODO should be the colour of the player
       default:
         return "bg-black";
     }
diff --git a/pac-man-board-game/ClientApp/src/utils/actions.ts b/pac-man-board-game/ClientApp/src/utils/actions.ts
index e211e97..e444f9a 100644
--- a/pac-man-board-game/ClientApp/src/utils/actions.ts
+++ b/pac-man-board-game/ClientApp/src/utils/actions.ts
@@ -7,6 +7,7 @@ import {currentPlayerNameAtom, diceAtom, ghostsAtom, playersAtom, rollDiceButton
 import {Colour} from "../game/colour";
 
 export enum GameAction {
+  error,
   rollDice,
   moveCharacter,
   joinGame,
@@ -37,6 +38,9 @@ export const doAction: MessageEventFunction<string> = (event): void => {
   console.debug("Received message:", message);
 
   switch (message.action as GameAction) {
+    case GameAction.error:
+      console.error("Error:", message.data); // TODO show error to user
+      break;
     case GameAction.rollDice:
       setDice(message.data);
       break;
diff --git a/pac-man-board-game/Controllers/GameController.cs b/pac-man-board-game/Controllers/GameController.cs
index 9f1b4f4..4ca2ff2 100644
--- a/pac-man-board-game/Controllers/GameController.cs
+++ b/pac-man-board-game/Controllers/GameController.cs
@@ -79,11 +79,26 @@ public class GameController : GenericController
         Logger.Log(LogLevel.Information, "Received: {}", stringResult);
         var action = ActionMessage.FromJson(stringResult);
 
-        _actionService.DoAction(action);
+        try
+        {
+            _actionService.DoAction(action);
+        }
+        catch (Exception e)
+        {
+            Logger.Log(LogLevel.Error, "{}", e.Message);
+            action = new ActionMessage { Action = GameAction.Error, Data = e.Message };
+        }
+
         return action.ToArraySegment();
     }
 
-    protected override void Send(ArraySegment<byte> segment) => _actionService.SendToAll(segment);
+    protected override async void Send(ArraySegment<byte> segment)
+    {
+        if (_actionService.Game is not null)
+            _actionService.SendToAll(segment);
+        else if (WebSocket is not null)
+            await _gameService.Send(WebSocket, segment);
+    }
 
     protected override ArraySegment<byte>? Disconnect() =>
         new ActionMessage { Action = GameAction.Disconnect, Data = _actionService.Disconnect() }
diff --git a/pac-man-board-game/GameStuff/Actions.cs b/pac-man-board-game/GameStuff/Actions.cs
index 8841a48..2464e25 100644
--- a/pac-man-board-game/GameStuff/Actions.cs
+++ b/pac-man-board-game/GameStuff/Actions.cs
@@ -5,6 +5,7 @@ namespace pacMan.GameStuff;
 
 public enum GameAction
 {
+    Error,
     RollDice,
     MoveCharacter,
     JoinGame,
diff --git a/pac-man-board-game/Services/ActionService.cs b/pac-man-board-game/Services/ActionService.cs
index d98c488..225deac 100644
--- a/pac-man-board-game/Services/ActionService.cs
+++ b/pac-man-board-game/Services/ActionService.cs
@@ -10,7 +10,7 @@ namespace pacMan.Services;
 public interface IActionService
 {
     Player Player { set; }
-    Game Game { set; }
+    Game? Game { get; set; }
     WebSocket? WebSocket { set; }
     void DoAction(ActionMessage message);
     List<int> RollDice();
@@ -68,7 +68,7 @@ public class ActionService : IActionService
         if (Game != null && jsonElement.HasValue)
         {
             Game.Ghosts = jsonElement.Value.GetProperty("ghosts").Deserialize<List<Character>>() ??
-                          throw new JsonException("Ghosts is null");
+                          throw new NullReferenceException("Ghosts is null");
             Game.Players = jsonElement.Value.GetProperty("players").Deserialize<List<Player>>() ??
                            throw new NullReferenceException("Players is null");
         }
@@ -82,10 +82,10 @@ public class ActionService : IActionService
         var data = jsonElement?.Deserialize<JoinGameData>() ?? throw new NullReferenceException("Data is null");
 
         var game = _gameService.Games.FirstOrDefault(game => game.Id == data.GameId) ??
-                   throw new GameNotFoundException();
+                   throw new GameNotFoundException($"Game was not found, id \"{data.GameId}\" does not exist");
 
         var player = game.Players.Find(p => p.Username == data.Username)
-                     ?? throw new PlayerNotFoundException("Player was not found in game");
+                     ?? throw new PlayerNotFoundException($"Player \"{data.Username}\" was not found in game");
 
         player.State = game.IsGameStarted ? State.InGame : State.WaitingForPlayers; // TODO doesn't work anymore
         Player = player;