pause on reload

Forced clients to be paused even on join or reload.

Author: ymmot239

src/client/game/game.tsx

@@ -104,11 +104,12 @@ export function Game(): JSX.Element {
         "game-state",
         async () => {
             return get("/game-state").then((gameState) => {
-                setChess(new ChessEngine(gameState.position));
-                if (gameState.gameEndReason !== undefined) {
-                    setGameInterruptedReason(gameState.gameEndReason);
+                setChess(new ChessEngine(gameState.state.position));
+                setPause(gameState.pause);
+                if (gameState.state.gameEndReason !== undefined) {
+                    setGameInterruptedReason(gameState.state.gameEndReason);
                 }
-                return gameState;
+                return gameState.state;
             });
         },
         false,
@@ -161,12 +162,7 @@ export function Game(): JSX.Element {
             :   null
         :   null;
 
-    const gamePauseDialog =
-        gameHoldReason !== undefined ?
-            gameHoldReason === GameHoldReason.GAME_PAUSED ?
-                <PauseDialog />
-            :   null
-        :   null;
+    const gamePauseDialog = paused ? <PauseDialog /> : null;
 
     const gameUnpauseDialog =
         gameHoldReason !== undefined ?

src/server/api/api.ts

@@ -221,7 +221,10 @@ apiRouter.get("/game-state", (req, res) => {
         return res.status(400).send({ message: "No game is currently active" });
     }
     const clientType = clientManager.getClientType(req.cookies.id);
-    return res.send(gameManager.getGameState(clientType));
+    return res.send({
+        state: gameManager.getGameState(clientType),
+        pause: gamePaused.flag,
+    });
 });
 
 /**
@@ -575,26 +578,32 @@ apiRouter.get("/pause-game", (_, res) => {
  * Todo: add authentication instead of an exposed unpause call
  */
 apiRouter.get("/unpause-game", async (_, res) => {
-    gamePaused.flag = false;
-    const ids = clientManager.getIds();
-    if (ids) {
-        const oldSave = SaveManager.loadGame(ids[0]);
-        gameManager?.chess.loadFen(oldSave!.oldPos);
-        setAllRobotsToDefaultPositions(
-            new Map(
-                oldSave!.oldRobotPos?.map<[string, GridIndices]>((obj) => [
-                    obj[1],
-                    new GridIndices(
-                        parseInt(obj[0].split(", ")[0]),
-                        parseInt(obj[0].split(", ")[1]),
-                    ),
-                ]),
-            ),
+    if (gamePaused.flag) {
+        gamePaused.flag = false;
+        const ids = clientManager.getIds();
+        if (ids) {
+            const oldSave = SaveManager.loadGame(ids[0]);
+            gameManager?.chess.loadFen(oldSave!.oldPos);
+            setAllRobotsToDefaultPositions(
+                new Map(
+                    oldSave!.oldRobotPos?.map<[string, GridIndices]>((obj) => [
+                        obj[1],
+                        new GridIndices(
+                            parseInt(obj[0].split(", ")[0]),
+                            parseInt(obj[0].split(", ")[1]),
+                        ),
+                    ]),
+                ),
+            );
+            socketManager.sendToAll(new SetChessMessage(oldSave!.oldPos));
+        }
+        socketManager.sendToAll(
+            new GameHoldMessage(GameHoldReason.GAME_UNPAUSED),
         );
-        socketManager.sendToAll(new SetChessMessage(oldSave!.oldPos));
+        return res.send({ message: "success" });
+    } else {
+        return res.send({ message: "game not paused" });
     }
-    socketManager.sendToAll(new GameHoldMessage(GameHoldReason.GAME_UNPAUSED));
-    return res.send({ message: "success" });
 });
 
 /**

src/server/api/save-manager.ts

@@ -62,7 +62,7 @@ export class SaveManager {
         };
         const oldGame = SaveManager.loadGame(hostId + "+" + clientID);
         if (oldGame && oldGame.pos !== null) {
-            saveContents.oldPos = oldGame.game;
+            saveContents.oldPos = oldGame.pos;
             saveContents.oldRobotPos = oldGame.robotPos;
         }
         return FileManager.writeFile(hostId + "+" + clientID, saveContents);