prevent agree to count twice

Author: h908714124

src/main/client/src/Game.jsx

@@ -47,12 +47,12 @@ export const Game = () => {
   let lastMove = useGameStore(state => state.lastMove)
   let setGameState = useGameStore(state => state.setGameState)
   let queueStatus = useGameStore(state => state.queueStatus)
+  let movesLength = useGameStore(state => state.moves.length)
   let addMove = useGameStore(state => state.addMove)
   let currentPlayer = useGameStore(state => state.currentPlayer)
   let counting = useGameStore(state => state.counting)
   let currentColor = useGameStore(state => state.currentColor)
   let {board, forbidden: [forbidden_x, forbidden_y], gameHasEnded} = useGameStore(state => state.gameState)
-  let initialized = useRef()
   let canvasRef = useRef()
   let countingGroup = !gameHasEnded && counting ? getCountingGroup(board, cursor_x, cursor_y) : undefined
 
@@ -161,7 +161,7 @@ export const Game = () => {
     stompClient.publish({
       destination: "/app/game/move",
       body: JSON.stringify({
-        id: gameId,
+        n: movesLength,
         x: cursor_x,
         y: cursor_y,
       }),
@@ -215,16 +215,12 @@ export const Game = () => {
   }, [setGameState, queueStatus, auth, gameId, navigate])
 
   useEffect(() => {
-    if (initialized.current) {
-      return
-    }
-    initialized.current = true
     let sub = stompClient.subscribe("/topic/move/" + gameId, (message) => {
       let move = JSON.parse(message.body)
       addMove(move)
     })
     return sub.unsubscribe
-  }, [setGameState, addMove, initialized, stompClient, gameId, auth])
+  }, [setGameState, addMove, stompClient, gameId, auth])
 
   if (!board.length) {
     return <div>Loading...</div>

src/main/client/src/feature/GamePanel.jsx

@@ -52,7 +52,10 @@ function Panel({zoom, setZoom}) {
   let black = useGameStore(state => state.black)
   let white = useGameStore(state => state.white)
   let queueLength = useGameStore(state => state.queueLength)
+  let movesLength = useGameStore(state => state.moves.length)
   let counting = useGameStore(state => state.counting)
+  let agreeCounting = useGameStore(state => state.agreeCounting)
+  let setAgreeCounting = useGameStore(state => state.setAgreeCounting)
   let countingComplete = useGameStore(state => state.countingComplete)
   let currentPlayer = useGameStore(state => state.currentPlayer)
   let { board, gameHasEnded } = useGameStore(state => state.gameState)
@@ -64,29 +67,30 @@ function Panel({zoom, setZoom}) {
     stompClient.publish({
       destination: "/app/game/move",
       body: JSON.stringify({
-        id: gameId,
-        pass: true,
+        n: movesLength,
+        action: "pass",
       }),
     })
-  }, [stompClient, gameId])
+  }, [stompClient, gameId, movesLength])
   let onResetCounting = useCallback(() => {
     stompClient.publish({
       destination: "/app/game/move",
       body: JSON.stringify({
-        id: gameId,
-        resetCounting: true,
+        n: movesLength,
+        action: "resetCounting",
       }),
     })
-  }, [stompClient, gameId])
+  }, [stompClient, gameId, movesLength])
   let onCountingAgree = useCallback(() => {
+    setAgreeCounting(true)
     stompClient.publish({
       destination: "/app/game/move",
       body: JSON.stringify({
-        id: gameId,
-        agreeCounting: true,
+        n: movesLength,
+        action: "agreeCounting",
       }),
     })
-  }, [stompClient, gameId])
+  }, [stompClient, gameId, movesLength])
   if (!board.length) {
     return <span>Loading...</span>
   }
@@ -158,7 +162,7 @@ function Panel({zoom, setZoom}) {
         </div>
         <div className="flex-none">
           <Button
-            disabled={gameHasEnded || !countingComplete()}
+            disabled={agreeCounting || gameHasEnded || !countingComplete()}
             className="py-1 px-4"
             onClick={onCountingAgree}>
             OK

src/main/client/src/model/base.js

@@ -13,10 +13,10 @@ import {
 } from "../util.js"
 
 export function updateBoard(board, move) {
-  let {pass, x, y, color} = move
-  if (pass) {
+  if (move.action === "pass") {
     return [PointList.empty(), board]
   }
+  let {x, y, color} = move
   board = applyMove(board, move)
   let oppositeColor = color ^ (WHITE | BLACK)
   let dead = new PointList(board.length)

src/main/client/src/store.js

@@ -101,18 +101,28 @@ export const useGameStore = create((set, get) => ({
     return moves[moves.length - 1].color ^ COLORS
   },
   counting: false,
+  agreeCounting: false,
+  setAgreeCounting: (agree) => {
+    set(produce(state => {
+      state.agreeCounting = agree
+    }))
+  },
   gameState: {
     board: [],
     forbidden: [-1, -1],
     gameHasEnded: false,
   },
   addMove: (move) => {
     set(produce(state => {
-      if (move.end) {
+      if (move.action === "end") {
         state.moves.push(move)
         state.gameState.gameHasEnded = true
         return
       }
+      if (move.action === "agreeCounting") {
+        return
+      }
+      state.agreeCounting = false
       let moves = get().moves
       let baseBoard = get().baseBoard
       if (move.n < moves.length) {
@@ -129,11 +139,11 @@ export const useGameStore = create((set, get) => ({
       }
       let [storedMove, updated, forbidden] = createMoveData(baseBoard, moves, move, counting, get().handicap)
       state.moves.push(storedMove)
-      state.lastMove = move.pass ? undefined : move
+      state.lastMove = move.action === "pass" ? undefined : move
       state.baseBoard = updated
       state.gameState.board = rehydrate(updated)
       state.gameState.forbidden = forbidden
-      if (move.pass && moves.length && moves[moves.length - 1].pass) {
+      if (move.action === "pass" && moves.length && moves[moves.length - 1].action === "pass") {
         state.counting = true
       }
     }))
@@ -152,7 +162,7 @@ export const useGameStore = create((set, get) => ({
       let counting = false
       let queueLength = 0
       for (let move of game.moves) {
-        if (move.end) {
+        if (move.action === "end") {
           moves.push(move)
           state.gameState.gameHasEnded = true
           break
@@ -174,7 +184,7 @@ export const useGameStore = create((set, get) => ({
       }
       if (game.moves.length) {
         let move = game.moves[game.moves.length - 1]
-        state.lastMove = move.pass ? undefined : move
+        state.lastMove = move.action === "pass" ? undefined : move
       }
       state.counting = counting
       state.dim = game.dim
@@ -191,11 +201,11 @@ export const useGameStore = create((set, get) => ({
 
 function createMoveData(baseBoard, moves, colorlessMove, counting, handicap) {
   let move = {...colorlessMove, color: nextMoveColor(moves, handicap)}
-  if (move.pass && moves.length && moves[moves.length - 1].pass) {
+  if (move.action === "pass" && moves.length && moves[moves.length - 1].action === "pass") {
     return [move, count(baseBoard), [-1, -1]]
   }
   if (counting) {
-    let updated = move.resetCounting ?
+    let updated = move.action === "resetCounting" ?
       resetCounting(baseBoard) :
       toggleStonesAt(baseBoard, move.x, move.y)
     return [move, count(updated), [-1, -1]]

src/main/java/com/bernd/GameController.java

@@ -5,7 +5,6 @@
 import com.bernd.model.AcceptRequest;
 import com.bernd.model.ActiveGame;
 import com.bernd.model.Game;
-import com.bernd.model.GameMove;
 import com.bernd.model.Move;
 import com.bernd.model.OpenGame;
 import com.bernd.model.ViewGame;
@@ -76,11 +75,10 @@ public void action(Move move, Principal p) {
       return;
     }
     Move updatedMove = move
-        .withColor(game.isSelfPlay() ? color : principalColor)
-        .withMoveNumber(game.moves().size());
+        .withColor(game.isSelfPlay() ? color : principalColor);
     Game updated = game.update(updatedMove);
     games.put(updated);
-    GameMove lastMove = game.getLastMove();
+    Move lastMove = game.getLastMove();
     operations.convertAndSend("/topic/move/" + game.id(), lastMove.removeColor());
   }
 

src/main/java/com/bernd/LobbyController.java

@@ -72,7 +72,6 @@ public ViewGame startEdit(@RequestBody MatchRequest request) {
         principal,
         principal,
         false,
-        0,
         createEmptyBoard(request.dim()),
         request.dim(),
         request.handicap(),

src/main/java/com/bernd/game/MoveList.java

@@ -1,16 +1,15 @@
 package com.bernd.game;
 
-import com.bernd.model.GameMove;
 import com.bernd.model.Move;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Stream;
 
 public final class MoveList {
 
-  private final List<GameMove> moves;
+  private final List<Move> moves;
 
-  private MoveList(List<GameMove> moves) {
+  private MoveList(List<Move> moves) {
     this.moves = moves;
   }
 
@@ -19,14 +18,14 @@ public static MoveList create(int size) {
   }
 
   public void addGameEndMarker() {
-    moves.add(new GameMove(moves.size(), 0, true, -1, -1, false, false, true));
+    moves.add(new Move(0, moves.size(), "end", -1, -1));
   }
 
   public void add(Move move) {
     moves.add(move.toGameMove());
   }
 
-  public GameMove get(int i) {
+  public Move get(int i) {
     return moves.get(i);
   }
 
@@ -38,11 +37,7 @@ public int size() {
     return moves.size();
   }
 
-  public List<GameMove> asList() {
-    return List.copyOf(moves);
-  }
-
-  public Stream<GameMove> asStream() {
+  public Stream<Move> asStream() {
     return moves.stream();
   }
 

src/main/java/com/bernd/model/ColorlessMove.java

@@ -2,10 +2,7 @@
 
 public record ColorlessMove(
     int n,
-    boolean pass,
+    String action,
     int x,
-    int y,
-    boolean resetCounting,
-    boolean agreeCounting,
-    boolean end) {
+    int y) {
 }

src/main/java/com/bernd/model/Game.java

@@ -17,7 +17,6 @@ public record Game(
     String black,
     String white,
     boolean counting,
-    int countingAgreed,
     int[][] board,
     int dim,
     int handicap,
@@ -38,14 +37,13 @@ public Game update(Move move) {
   }
 
   private Game updateInternal(Move move) {
-    if (move.agreeCounting() && (countingAgreed | move.color()) == COLORS) {
+    if (move.agreeCounting() && (countingAgreed() | move.color()) == COLORS) {
       moves.addGameEndMarker();
     } else {
       moves.add(move);
     }
     if (move.agreeCounting()) {
       return toBuilder()
-          .withCountingAgreed(countingAgreed | move.color())
           .build();
     }
     if (counting) {
@@ -144,7 +142,10 @@ public ViewGame toView() {
   }
 
   public boolean gameHasEnded() {
-    return countingAgreed == COLORS;
+    if (moves.isEmpty()) {
+      return false;
+    }
+    return getLastMove().end();
   }
 
   public GameBuilder toBuilder() {
@@ -163,7 +164,7 @@ public boolean isBlack(String name) {
     return black.equals(name);
   }
 
-  public GameMove getLastMove() {
+  public Move getLastMove() {
     return moves.get(moves.size() - 1);
   }
 
@@ -174,6 +175,14 @@ boolean opponentPassed() {
     return getLastMove().pass();
   }
 
+  public int countingAgreed() {
+    if (moves.isEmpty()) {
+      return 0;
+    }
+    Move lastMove = getLastMove();
+    return lastMove.agreeCounting() ? lastMove.color() : 0;
+  }
+
   public int remainingHandicap() {
     return Math.max(0, handicap - moves.size());
   }

src/main/java/com/bernd/model/GameBuilder.java

@@ -4,7 +4,6 @@ public final class GameBuilder {
   private final Game game;
 
   private boolean counting;
-  private int countingAgreed;
   private int[][] board;
   private int[] forbidden;
 
@@ -17,11 +16,6 @@ public GameBuilder withCounting(boolean counting) {
     return this;
   }
 
-  public GameBuilder withCountingAgreed(int countingAgreed) {
-    this.countingAgreed = countingAgreed;
-    return this;
-  }
-
   public GameBuilder withBoard(int[][] board) {
     this.board = board;
     return this;
@@ -39,7 +33,6 @@ public GameBuilder withForbidden(int x, int y) {
   static GameBuilder builder(Game game) {
     GameBuilder builder = new GameBuilder(game);
     builder.counting = game.counting();
-    builder.countingAgreed = game.countingAgreed();
     builder.board = game.board();
     builder.forbidden = game.forbidden();
     return builder;
@@ -51,7 +44,6 @@ public Game build() {
         game.black(),
         game.white(),
         counting,
-        countingAgreed,
         board,
         game.dim(),
         game.handicap(),