add /api/create

Author: h908714124

src/main/client/src/Lobby.jsx

@@ -15,14 +15,16 @@ import {
   base,
   StompContext,
 } from "./util.js"
+import {
+  LobbyPanel,
+} from "./feature/LobbyPanel.jsx"
 import {
   useAuthStore,
   useGameStore,
 } from "./store.js"
 
 export function Lobby() {
   let [matchRequested, setMatchRequested] = useState(false)
-  let [users, setUsers] = useState([])
   let stompClient = useContext(StompContext)
   let navigate = useNavigate()
   let auth = useAuthStore(state => state.auth)
@@ -37,11 +39,7 @@ export function Lobby() {
       let game = JSON.parse(message.body)
       navigate(base + "/game/" + game.id)
     })
-    let sub2 = stompClient.subscribe("/topic/lobby/users", (message) => {
-      let r = JSON.parse(message.body)
-      setUsers(r.users)
-    })
-    let sub3 = stompClient.subscribe("/topic/lobby/gamerequest", (message) => {
+    let sub2 = stompClient.subscribe("/topic/lobby/gamerequest", (message) => {
       let r = JSON.parse(message.body)
       if (r.name === auth.name) {
         setMatchRequested(true)
@@ -50,51 +48,44 @@ export function Lobby() {
     stompClient.publish({
       destination: "/app/lobby/hello",
       body: JSON.stringify({
-        name: auth.name,
       }),
     })
     return () => {
       sub1.unsubscribe()
       sub2.unsubscribe()
-      sub3.unsubscribe()
     }
-  }, [setInit, setUsers, setMatchRequested, auth, initialized, stompClient, navigate])
+  }, [setInit, setMatchRequested, auth, initialized, stompClient, navigate])
   let matchRequest = useCallback((editMode) => {
     stompClient.publish({
       destination: "/app/lobby/match",
       body: JSON.stringify({
-        name: auth.name,
         dim: 9,
         editMode: editMode,
       }),
     })
-  }, [auth, stompClient])
-  if (!matchRequested) {
+  }, [stompClient])
+  if (matchRequested) {
     return (
       <div className="m-4">
-        <div>
-          <Button
-            onClick={() => matchRequest(true)}>
-            Create
-          </Button>
-        </div>
-        <div className="mt-2">
-          <Button
-            onClick={() => matchRequest(false)}>
-            Find match
-          </Button>
-        </div>
-        <div className="mt-2">
-          {users.map(user => (
-            <div key={user.name}>{user.name}</div>
-          ))}
-        </div>
+        Waiting for match...
       </div>
     )
   }
   return (
     <div className="m-4">
-     Waiting for match...
+      <div>
+        <Button
+          onClick={() => matchRequest(true)}>
+          Create
+        </Button>
+      </div>
+      <div className="mt-2">
+        <Button
+          onClick={() => matchRequest(false)}>
+          Find match
+        </Button>
+      </div>
+      <LobbyPanel />
     </div>
   )
 }

src/main/client/src/Login.jsx

@@ -1,6 +1,6 @@
 import {
   Form,
-} from "./Form.jsx"
+} from "./component/Form.jsx"
 import {
   Input,
 } from "./component/Input.jsx"

src/main/client/src/Form.jsx renamed to src/main/client/src/component/Form.jsx

@@ -24,7 +24,7 @@ export const GamePanel = () => {
   return (
     <div className="fixed top-0 right-0 h-full bg-slate-800 border-l-2 border-slate-700">
       <div className="pr-12 pt-8 pl-8">
-      <Panel />
+        <Panel />
       </div>
     </div>
   )
@@ -56,7 +56,7 @@ function Panel() {
   if (!board.length) {
     return <span>Loading...</span>
   }
-  let result = counting ? getResult(board) : undefined
+  let result = counting ? getScore(board) : undefined
   return (
     <>
       <div>
@@ -96,7 +96,7 @@ function Panel() {
   )
 }
 
-function getResult(board) {
+function getScore(board) {
   let w = 0, b = 0
   for (let y = 0; y < board.length; y++) {
     for (let x = 0; x < board[y].length; x++) {

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

@@ -0,0 +1,50 @@
+import {
+  useContext,
+  useRef,
+  useEffect,
+  useState,
+} from "react"
+import {
+  StompContext,
+} from "../util.js"
+
+export const LobbyPanel = () => {
+  return (
+    <div className="fixed top-0 right-0 w-64 h-full bg-slate-800 border-l-2 border-slate-700">
+      <div className="pt-2 pl-4">
+        <Panel />
+      </div>
+    </div>
+  )
+}
+
+function Panel() {
+  let stompClient = useContext(StompContext)
+  let [users, setUsers] = useState([])
+  let initialized = useRef()
+  useEffect(() => {
+    if (initialized.current) {
+      return
+    }
+    initialized.current = true
+    let sub1 = stompClient.subscribe("/topic/lobby/users", (message) => {
+      let r = JSON.parse(message.body)
+      setUsers(r.users)
+    })
+    stompClient.publish({
+      destination: "/app/lobby/hello",
+      body: JSON.stringify({
+      }),
+    })
+    return () => {
+      sub1.unsubscribe()
+    }
+  }, [setUsers, initialized, stompClient])
+  return (
+    <div className="mt-2">
+      {users.map(user => (
+        <div key={user.name}>{user.name}</div>
+      ))}
+    </div>
+  )
+}

src/main/client/src/feature/LobbyPanel.jsx

@@ -89,7 +89,7 @@ export function getGroup(board, xx, yy) {
   }
 }
 
-export function createBoardWithGroups(board) {
+export function rehydrate(board) {
   let dim = board.length
   let result = []
   for (let i = 0; i < board.length; i++) {

src/main/client/src/model/board.js

@@ -4,7 +4,7 @@ import {
 } from "vitest"
 import {
   getGroup,
-  createBoardWithGroups,
+  rehydrate,
 } from "./board.js"
 import {
   BLACK,
@@ -20,7 +20,7 @@ test("liberties", () => {
     [w, w, w, 0], 
     [0, 0, 0, 0], 
   ]
-  let result = createBoardWithGroups(board)
+  let result = rehydrate(board)
   expect(result[0][1].liberties).toBe(1)
 })
 

src/main/client/src/model/board.test.js

@@ -8,7 +8,7 @@ import {
   BLACK,
 } from "./util.js"
 import {
-  createBoardWithGroups,
+  rehydrate,
 } from "./model/board.js"
 
 export const useAuthStore = create((set) => ({
@@ -56,7 +56,7 @@ export const useGameStore = create((set) => ({
       state.black = game.black
       state.white = game.white
       state.editMode = game.editMode
-      state.gameState.board = createBoardWithGroups(game.board)
+      state.gameState.board = rehydrate(game.board)
       state.gameState.currentPlayer = game.currentPlayer
       state.gameState.currentColor = game.currentColor
       state.gameState.counting = game.counting

src/main/client/src/store.js

@@ -3,21 +3,31 @@
 import com.bernd.model.Game;
 import com.bernd.model.JoinGameRequest;
 import com.bernd.model.Move;
+import com.bernd.model.OpenGame;
+import com.bernd.model.OpenGameList;
+import com.bernd.util.RandomString;
+import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.core.MessageSendingOperations;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class GameController {
 
   private final MessageSendingOperations<String> operations;
   private final Games games;
+  private final OpenGames openGames;
 
   GameController(
       MessageSendingOperations<String> operations,
-      Games games) {
+      Games games,
+      OpenGames openGames) {
     this.operations = operations;
     this.games = games;
+    this.openGames = openGames;
   }
 
   @MessageMapping("/game/hello")
@@ -33,4 +43,13 @@ public void action(Move move) {
     games.put(updated);
     operations.convertAndSend("/topic/game/" + game.id(), updated);
   }
+
+  @PostMapping(value = "/api/create", consumes = "application/json")
+  @ResponseBody
+  public ResponseEntity<?> newGame(@RequestBody OpenGame openGame) {
+    openGames.put(RandomString.get(), openGame);
+    operations.convertAndSend("/topic/lobby/open",
+        new OpenGameList(openGames.games()));
+    return ResponseEntity.ok().build();
+  }
 }

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

@@ -61,7 +61,7 @@ public void matchAction(MatchRequest request, Principal principal) {
     if (lookingForMatch == null) {
       lookingForMatch = user;
       operations.convertAndSend("/topic/lobby/gamerequest",
-          new Status(request.name(), "ready"));
+          new Status(principal.getName(), "ready"));
       return;
     }
     User black = lookingForMatch;
@@ -84,7 +84,7 @@ public void matchAction(MatchRequest request, Principal principal) {
     operations.convertAndSend("/topic/lobby/gamestart", game);
   }
 
-  private static int[][] createEmptyBoard(MatchRequest request) {
+  static int[][] createEmptyBoard(MatchRequest request) {
     int dim = Math.max(request.dim(), 2);
     int[][] board = new int[dim][];
     for (int y = 0; y < dim; y++) {

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

@@ -32,14 +32,19 @@ public ResponseEntity<?> loginAction(
       @RequestBody LoginRequest request) {
     if (users.contains(request.name())) {
       return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-          .body(new Error("Name bereits vergeben"));
+          .body(new Error("Please choose another name"));
     }
-    Algorithm algorithm = Algorithm.HMAC512(environment.getProperty("jwt.secret.key"));
+    String key = environment.getProperty("jwt.secret.key");
+    if (key == null) {
+      return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+          .body(new Error("Server configuration error"));
+    }
+    Algorithm algorithm = Algorithm.HMAC512(key);
     String token = JWT.create()
         .withIssuer("auth0")
         .withClaim("name", request.name())
         .sign(algorithm);
     users.login(request.name());
     return ResponseEntity.ok(new LoginResponse(request.name(), token));
   }
-}
+}

src/main/java/com/bernd/LoginController.java

@@ -0,0 +1,25 @@
+package com.bernd;
+
+import com.bernd.model.OpenGame;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OpenGames {
+  private final Map<String, OpenGame> map = new LinkedHashMap<>();
+
+  OpenGame get(String id) {
+    return map.get(id);
+  }
+
+  OpenGame put(String id, OpenGame game) {
+    map.put(game.id(), game);
+    return game;
+  }
+
+  List<OpenGame> games() {
+    return List.copyOf(map.values());
+  }
+}

src/main/java/com/bernd/OpenGames.java

@@ -1,4 +1,7 @@
 package com.bernd.model;
 
-public record MatchRequest(String name, int dim, boolean editMode) {
+public record MatchRequest(
+    int dim,
+    boolean editMode,
+    int handicap) {
 }

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

@@ -0,0 +1,12 @@
+package com.bernd.model;
+
+public record OpenGame(
+    String id,
+    User user,
+    int dim,
+    int handicap) {
+
+  public OpenGame withId(String id) {
+    return new OpenGame(id, user, dim, handicap);
+  }
+}

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

@@ -0,0 +1,6 @@
+package com.bernd.model;
+
+import java.util.List;
+
+public record OpenGameList(List<OpenGame> games) {
+}