login, logout via status map

todo: OpenGames via status map

Author: h908714124

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

@@ -38,6 +38,6 @@ function Panel() {
     return undefined
   }, [auth])
   return (
-    <Chat chatId="Lobby" />
+    <Chat chatId="lobby" />
   )
 }

src/main/java/com/bernd/CleanupController.java

@@ -21,7 +21,7 @@ public class CleanupController {
 
   @Scheduled(fixedDelay = 40 * 1000)
   public void runScheduled() {
-    Map<String, List<String>> updatedRooms = statusMap.prune();
+    Map<String, List<String>> updatedRooms = statusMap.removeInactiveUsers();
     for (Map.Entry<String, List<String>> e : updatedRooms.entrySet()) {
       String room = e.getKey();
       List<String> users = e.getValue();

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

@@ -9,8 +9,11 @@
 import com.bernd.model.Game;
 import com.bernd.model.Move;
 import com.bernd.model.OpenGame;
+import com.bernd.model.StatusMap;
 import com.bernd.model.ViewGame;
+import com.bernd.util.Auth;
 import com.bernd.util.RandomString;
+import com.bernd.util.RoomManager;
 import com.bernd.util.SgfCreator;
 import java.security.Principal;
 import java.time.LocalDate;
@@ -36,20 +39,24 @@
 public class GameController {
 
   private final MessageSendingOperations<String> operations;
-  private final Users users;
+  private final RoomManager roomManager;
+  private final StatusMap statusMap;
   private final Games games;
   private final OpenGames openGames;
   private final ActiveGames activeGames;
   private final Chats chats;
 
   GameController(
       MessageSendingOperations<String> operations,
-      Users users,
+      RoomManager roomManager,
+      StatusMap statusMap,
       Games games,
       OpenGames openGames,
-      ActiveGames activeGames, Chats chats) {
+      ActiveGames activeGames,
+      Chats chats) {
     this.operations = operations;
-    this.users = users;
+    this.roomManager = roomManager;
+    this.statusMap = statusMap;
     this.games = games;
     this.openGames = openGames;
     this.activeGames = activeGames;
@@ -59,7 +66,7 @@ public class GameController {
   @ResponseBody
   @GetMapping(value = "/api/game/{id}")
   public ViewGame getGame(@PathVariable String id, Principal p) {
-    users.get(p).setCurrentGame(id);
+    roomManager.updateStatus(Auth.getPrincipal(p), id);
     Game game = games.get(id);
     if (game == null) {
       throw new ResponseStatusException(HttpStatus.NOT_FOUND, "no such game");
@@ -69,7 +76,11 @@ public ViewGame getGame(@PathVariable String id, Principal p) {
 
   @MessageMapping("/game/move")
   public void action(Move move, Principal p) {
-    Game game = games.get(users.get(p).currentGame());
+    String id = statusMap.get(getPrincipal(p));
+    if (id == null) {
+      return;
+    }
+    Game game = games.get(id);
     if (p == null || game == null) {
       return;
     }

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

@@ -5,6 +5,8 @@
 import com.bernd.model.Error;
 import com.bernd.model.LoginRequest;
 import com.bernd.model.LoginResponse;
+import com.bernd.model.StatusMap;
+import com.bernd.util.RoomManager;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,13 +19,16 @@
 @RequestMapping("/api")
 public class LoginController {
 
-  private final Users users;
+  private final StatusMap statusMap;
+  private final RoomManager roomManager;
   private final Environment environment;
 
   LoginController(
-      Users users,
+      StatusMap statusMap,
+      RoomManager roomManager,
       Environment environment) {
-    this.users = users;
+    this.statusMap = statusMap;
+    this.roomManager = roomManager;
     this.environment = environment;
   }
 
@@ -34,7 +39,7 @@ public ResponseEntity<?> loginAction(
       return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
           .body(new Error("The name must not be empty"));
     }
-    if (users.contains(request.name())) {
+    if (statusMap.contains(request.name())) {
       return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
           .body(new Error("Please choose another name"));
     }
@@ -48,7 +53,7 @@ public ResponseEntity<?> loginAction(
         .withIssuer("auth0")
         .withClaim("name", request.name())
         .sign(algorithm);
-    users.login(request.name());
+    roomManager.login(request.name());
     return ResponseEntity.ok(new LoginResponse(request.name(), token));
   }
 }

src/main/java/com/bernd/SessionDisconnectEventListener.java

@@ -1,25 +1,25 @@
 package com.bernd;
 
+import com.bernd.util.RoomManager;
+import java.security.Principal;
 import org.springframework.context.ApplicationListener;
 import org.springframework.messaging.core.MessageSendingOperations;
 import org.springframework.stereotype.Component;
 import org.springframework.web.socket.messaging.SessionDisconnectEvent;
 
-import java.security.Principal;
-
 @Component
 public class SessionDisconnectEventListener implements ApplicationListener<SessionDisconnectEvent> {
 
   private final MessageSendingOperations<String> operations;
-  private final Users users;
+  private final RoomManager roomManager;
   private final OpenGames openGames;
 
   SessionDisconnectEventListener(
       MessageSendingOperations<String> operations,
-      Users users,
+      RoomManager roomManager,
       OpenGames openGames) {
     this.operations = operations;
-    this.users = users;
+    this.roomManager = roomManager;
     this.openGames = openGames;
   }
 
@@ -30,7 +30,7 @@ public void onApplicationEvent(SessionDisconnectEvent event) {
       return;
     }
     String name = user.getName();
-    users.logout(name);
+    roomManager.logout(name);
     openGames.remove(name);
     operations.convertAndSend("/topic/lobby/open_games", openGames.games());
   }

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

@@ -1,22 +1,37 @@
 package com.bernd.model;
 
-import org.springframework.stereotype.Component;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.springframework.stereotype.Component;
 
 @Component
 public final class StatusMap {
 
   private final Map<String, UserStatus> map = new LinkedHashMap<>();
 
-  public UserStatus put(String user, UserStatus status) {
-    return map.put(user, status);
+  public UserStatus put(String user, String room) {
+    return map.put(user, UserStatus.create(room));
+  }
+
+  public String get(String user) {
+    UserStatus status = map.get(user);
+    if (status == null) {
+      return null;
+    }
+    return put(user, status.room()).room();
+  }
+
+  public String remove(String user) {
+    UserStatus status = map.remove(user);
+    if (status == null) {
+      return null;
+    }
+    return status.room();
   }
 
   public List<String> usersInRoom(String room) {
@@ -29,24 +44,27 @@ public List<String> usersInRoom(String room) {
     return result;
   }
 
-  public Map<String, List<String>> prune() {
+  /**
+   * @return all changed rooms, where inactive users have been removed
+   */
+  public Map<String, List<String>> removeInactiveUsers() {
     long current = System.currentTimeMillis();
     Map<String, List<String>> tmp = new HashMap<>();
-    List<RemoveItem> remove = new ArrayList<>();
+    List<RemoveTask> removeTasks = new ArrayList<>();
     for (Map.Entry<String, UserStatus> e : map.entrySet()) {
       UserStatus status = e.getValue();
       String room = status.room();
       String user = e.getKey();
       if (status.isActive(current)) {
         tmp.computeIfAbsent(room, key -> new ArrayList<>()).add(user);
       } else {
-        remove.add(new RemoveItem(user, room));
+        removeTasks.add(new RemoveTask(user, room));
       }
     }
     Map<String, List<String>> result = new LinkedHashMap<>(Math.max(8, (int) (tmp.size() * 1.5)));
-    for (RemoveItem item : remove) {
-      result.put(item.room, tmp.getOrDefault(item.room, List.of()));
-      map.remove(item.user);
+    for (RemoveTask task : removeTasks) {
+      result.put(task.room, tmp.getOrDefault(task.room, List.of()));
+      map.remove(task.user);
     }
     return result;
   }
@@ -62,6 +80,10 @@ public Set<String> activeGames() {
     return result;
   }
 
-  private record RemoveItem(String user, String room) {
+  public boolean contains(String user) {
+    return map.containsKey(user);
+  }
+
+  private record RemoveTask(String user, String room) {
   }
 }

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

@@ -2,9 +2,8 @@
 
 import com.bernd.model.StatusMap;
 import com.bernd.model.UserStatus;
-import org.springframework.stereotype.Component;
-
 import java.util.List;
+import org.springframework.stereotype.Component;
 
 @Component
 public class RoomManager {
@@ -22,7 +21,7 @@ public void updateRooms(String user, String room) {
   }
 
   public void updateStatus(String user, String room) {
-    UserStatus old = statusMap.put(user, UserStatus.create(room));
+    UserStatus old = statusMap.put(user, room);
     List<String> users = statusMap.usersInRoom(room);
     if (old == null) {
       sender.sendUsers(room, users);
@@ -31,4 +30,17 @@ public void updateStatus(String user, String room) {
       sender.sendUsers(old.room(), statusMap.usersInRoom(old.room()));
     }
   }
+
+  public void login(String user) {
+    updateStatus(user, "lobby");
+  }
+
+  public void logout(String user) {
+    String room = statusMap.remove(user);
+    if (room == null) {
+      return;
+    }
+    List<String> users = statusMap.usersInRoom(room);
+    sender.sendUsers(room, users);
+  }
 }