Sends an ActionMessage between client and server

pac-man-board-game/ClientApp/src/classes/WebSocketService.ts

@@ -33,14 +33,14 @@ export default class WebSocketService {
     if (this._onError) this.ws.onerror = this._onError;
   }
 
-  public send(data: ActionRequest | string): void {
+  public send(data: ActionMessage | string): void {
     if (typeof data !== "string") {
       data = JSON.stringify(data);
     }
     this.ws?.send(data);
   }
   
-  public async sendAndReceive<R>(data: ActionRequest): Promise<R> {
+  public async sendAndReceive<R>(data: ActionMessage): Promise<R> {
     if (!this.isOpen()) return Promise.reject("WebSocket is not open");
 
     let result: R | undefined;

pac-man-board-game/ClientApp/src/components/gameComponent.tsx

@@ -2,6 +2,7 @@ import React from "react";
 import GameCanvas from "../components/gameCanvas";
 import Game from "../game/game";
 import {AllDice} from "./dice";
+import {Action} from "../classes/actions";
 
 let game: Game;
 export const GameComponent: Component = () => {
@@ -18,9 +19,12 @@ export const GameComponent: Component = () => {
 
   function updateState() {
     game.wsService.onReceive = (message) => {
-      const parsed = JSON.parse(message.data);
+      const parsed: ActionMessage = JSON.parse(message.data);
-      if (parsed instanceof Array) {
+      console.log(parsed);
-        setDice(parsed);
+      switch (parsed.Action) {
+        case Action.rollDice:
+          setDice(parsed.Data as number[]);
+          break;
       }
     };
   }

pac-man-board-game/ClientApp/src/game/game.ts

@@ -19,7 +19,7 @@ export default class Game {
   public async gameLoop(setDice: Setter<number[] | undefined>): Promise<void> {
     // Throw the dices
     const result = await this.rollDice();
-    setDice(result);
+    setDice(result.Data);
 
     // Choose a dice and move pac-man or a ghost
 
@@ -55,9 +55,9 @@ export default class Game {
     throw new Error("Not implemented");
   }
 
-  private async rollDice(): Promise<number[]> {
+  private async rollDice(): Promise<ActionMessage<number[]>> {
-    let result: number[];
+    let result: ActionMessage<number[]>;
-    result = await this._wsService.sendAndReceive<number[]>({action: Action.rollDice});
+    result = await this._wsService.sendAndReceive<ActionMessage<number[]>>({Action: Action.rollDice});
     return result;
   }
 

pac-man-board-game/ClientApp/src/types/types.d.ts

@@ -4,7 +4,7 @@ type Setter<T> = React.Dispatch<React.SetStateAction<T>>;
 
 type WebSocketData = string | ArrayBufferLike | Blob | ArrayBufferView;
 
-type ActionRequest = {
+type ActionMessage<T = object> = {
-  action: import("../classes/actions").Action,
+  Action: import("../classes/actions").Action,
-  data?: object
+  Data?: T
 }

pac-man-board-game/Controllers/GameController.cs

@@ -31,7 +31,7 @@ public class GameController : GenericController
         stringResult = Regex.Replace(stringResult, @"\p{C}+", "");
 
         Logger.Log(LogLevel.Information, "Received: {}", stringResult);
-        var action = JsonSerializer.Deserialize<ActionRequest>(stringResult);
+        var action = JsonSerializer.Deserialize<ActionMessage>(stringResult);
 
         switch (action?.Action)
         {
@@ -39,7 +39,8 @@ public class GameController : GenericController
                 var rolls = _diceCup.Roll();
                 Logger.Log(LogLevel.Information, "Rolled {}", string.Join(", ", rolls));
 
-                return rolls.ToArraySegment();
+                action.Data = rolls;
+                return action.ToArraySegment();
             default:
                 return new ArraySegment<byte>("Invalid action"u8.ToArray());
         }

pac-man-board-game/Game/Action.cs

@@ -1,6 +0,0 @@
-namespace pacMan.Game;
-
-public enum GameAction
-{
-    RollDice
-}

pac-man-board-game/Game/ActionRequest.cs

@@ -1,7 +0,0 @@
-namespace pacMan.Game;
-
-public class ActionRequest
-{
-    public GameAction Action { get; set; }
-    public object? Data { get; set; }
-}

pac-man-board-game/Game/Actions.cs

@@ -0,0 +1,16 @@
+namespace pacMan.Game;
+
+public enum GameAction
+{
+    RollDice
+}
+
+public class ActionMessage<T>
+{
+    public GameAction Action { get; set; }
+    public T? Data { get; set; }
+}
+
+public class ActionMessage : ActionMessage<dynamic>
+{
+}