keep chat status up to date

Author: h908714124

src/main/client/src/component/Chat.jsx

@@ -41,6 +41,14 @@ export const Chat = ({chatId, className}) => {
         return [...previous, message]
       })
     })
+    let intervalId = setInterval(() => {
+      stompClient.publish({
+        destination: "/app/chat/status",
+        body: JSON.stringify({
+          room: chatId,
+        }),
+      })
+    }, 30 * 1000)
 
     doTry(async () => {
       let chat = await tfetch("/api/chat/" + chatId, {
@@ -56,6 +64,7 @@ export const Chat = ({chatId, className}) => {
     return () => {
       sub1.unsubscribe()
       sub2.unsubscribe()
+      clearInterval(intervalId)
     }
   }, [stompClient, auth, chatId])
 
@@ -163,7 +172,7 @@ function SplitPane({className, messageRef, topElement, bottomElement}) {
         }
         if (!containerRef.current) {
           let rect = ref.getBoundingClientRect()
-          setSplitPos(getSplitPos(rect.top + 2.5 * getRemInPixel(), ref))
+          setSplitPos(getSplitPos(rect.top + 4.5 * getRemInPixel(), ref))
         }
         containerRef.current = ref
       }}

src/main/client/src/layout.js

@@ -4,9 +4,6 @@ import {
 import {
   produce,
 } from "immer"
-import {
-  persist,
-} from "zustand/middleware"
 import {
   getRemInPixel,
   DELTA,

src/main/java/com/bernd/ChatController.java

@@ -3,46 +3,51 @@
 import com.bernd.model.Chat;
 import com.bernd.model.ChatMessage;
 import com.bernd.model.ChatRequest;
+import com.bernd.model.ChatWithUsers;
 import com.bernd.model.Status;
 import com.bernd.model.StatusMap;
-import com.bernd.model.UserStatus;
-import com.bernd.model.UsersMessage;
 import com.bernd.util.Auth;
+import com.bernd.util.RoomManager;
 import com.bernd.util.Sender;
-import java.security.Principal;
-import java.util.List;
-import java.util.Map;
 import org.springframework.messaging.core.MessageSendingOperations;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.security.Principal;
+
 @Controller
 public class ChatController {
 
-  private static final long SCAN_TIMEOUT = 120 * 1000;
+  private static final long SCAN_TIMEOUT = 15 * 1000;
 
   private final Chats chats;
   private final MessageSendingOperations<String> operations;
   private final Sender sender;
-  private final StatusMap statusMap = new StatusMap();
+  private final StatusMap statusMap;
+  private final RoomManager roomManager;
   private long lastScan;
 
   ChatController(
       Chats chats,
       MessageSendingOperations<String> operations,
-      Sender sender) {
+      Sender sender,
+      StatusMap statusMap, RoomManager roomManager) {
     this.chats = chats;
     this.operations = operations;
     this.sender = sender;
+    this.statusMap = statusMap;
+    this.roomManager = roomManager;
   }
 
   @ResponseBody
   @GetMapping("/api/chat/{id}")
-  public Chat getChat(@PathVariable String id) {
-    return chats.get(id);
+  public ChatWithUsers getChat(@PathVariable String id) {
+    String user = Auth.getPrincipal();
+    roomManager.updateStatus(user, id);
+    return chats.get(id).withUsers(statusMap.usersInRoom(id));
   }
 
   @MessageMapping("/chat/send")
@@ -51,29 +56,13 @@ public void sendChat(ChatRequest chatRequest, Principal principal) {
     Chat chat = chats.get(chatRequest.id());
     ChatMessage message = new ChatMessage(chat.counter().getAndIncrement(), chatRequest.message(), user);
     chat.messages().add(message);
-    if (chat.users().add(user)) {
-      operations.convertAndSend("/topic/users/" + chat.id(), new UsersMessage(chat.users()));
-    }
+    roomManager.updateRooms(user, chat.id());
     operations.convertAndSend("/topic/chat/" + chat.id(), message);
   }
 
   @MessageMapping("/chat/status")
   public void updateStatus(Status status, Principal principal) {
     String user = Auth.getPrincipal(principal);
-    UserStatus old = statusMap.put(user, UserStatus.create(status.room()));
-    if (lastScan + SCAN_TIMEOUT < System.currentTimeMillis()) {
-      Map<String, List<String>> allRooms = statusMap.allRooms();
-      for (Map.Entry<String, List<String>> e : allRooms.entrySet()) {
-        String room = e.getKey();
-        List<String> users = e.getValue();
-        sender.sendUsers(room, users);
-      }
-      lastScan = System.currentTimeMillis();
-    } else if (old == null) {
-      sender.sendUsers(status.room(), statusMap.usersInRoom(status.room()));
-    } else if (!old.room().equals(status.room())) {
-      sender.sendUsers(status.room(), statusMap.usersInRoom(status.room()));
-      sender.sendUsers(status.room(), statusMap.usersInRoom(old.room()));
-    }
+    roomManager.updateRooms(user, status.room());
   }
 }

src/main/java/com/bernd/Chats.java

@@ -1,20 +1,20 @@
 package com.bernd;
 
 import com.bernd.model.Chat;
+import org.springframework.stereotype.Component;
+
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.TreeSet;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.springframework.stereotype.Component;
 
 @Component
 public class Chats {
   private final Map<String, Chat> map = new LinkedHashMap<>();
 
   Chat get(String id) {
     return map.computeIfAbsent(id,
-        _id -> new Chat(id, new AtomicInteger(0), new ArrayList<>(), new TreeSet<>()));
+        _id -> new Chat(id, new AtomicInteger(0), new ArrayList<>()));
   }
 
   Chat put(Chat chat) {

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

@@ -4,16 +4,11 @@
 import com.bernd.game.MoveList;
 import com.bernd.model.AcceptRequest;
 import com.bernd.model.ActiveGame;
-import com.bernd.model.Chat;
-import com.bernd.model.ChatMessage;
 import com.bernd.model.Game;
 import com.bernd.model.Move;
 import com.bernd.model.OpenGame;
-import com.bernd.model.UsersMessage;
 import com.bernd.model.ViewGame;
-import com.bernd.util.Auth;
 import com.bernd.util.RandomString;
-import java.security.Principal;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.core.MessageSendingOperations;
@@ -26,6 +21,8 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.server.ResponseStatusException;
 
+import java.security.Principal;
+
 import static com.bernd.util.Auth.getPrincipal;
 import static com.bernd.util.Util.COLORS;
 
@@ -61,10 +58,6 @@ public ViewGame getGame(@PathVariable String id, Principal p) {
     if (game == null) {
       throw new ResponseStatusException(HttpStatus.NOT_FOUND, "no such game");
     }
-    Chat chat = chats.get(id);
-    if (chat.users().add(Auth.getPrincipal(p))) {
-      operations.convertAndSend("/topic/users/" + chat.id(), new UsersMessage(chat.users()));
-    }
     return game.toView();
   }
 

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

@@ -1,12 +1,13 @@
 package com.bernd.model;
 
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public record Chat(
     String id,
     AtomicInteger counter,
-    List<ChatMessage> messages,
-    Set<String> users) {
+    List<ChatMessage> messages) {
+  public ChatWithUsers withUsers(List<String> users) {
+    return new ChatWithUsers(id, counter, messages, users);
+  }
 }

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

@@ -0,0 +1,11 @@
+package com.bernd.model;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public record ChatWithUsers(
+    String id,
+    AtomicInteger counter,
+    List<ChatMessage> messages,
+    List<String> users) {
+}

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

@@ -1,13 +1,17 @@
 package com.bernd.model;
 
+import org.springframework.stereotype.Component;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+@Component
 public final class StatusMap {
 
-  private static final long USER_TIMEOUT = 90 * 1000;
+  private static final long USER_TIMEOUT = 12 * 1000;
 
   private final Map<String, UserStatus> map = new LinkedHashMap<>();
 
@@ -25,23 +29,28 @@ public List<String> usersInRoom(String room) {
     return result;
   }
 
-  public Map<String, List<String>> allRooms() {
+  public Map<String, List<String>> prune() {
     long current = System.currentTimeMillis();
-    Map<String, List<String>> result = new LinkedHashMap<>();
-    List<String> remove = new ArrayList<>();
+    Map<String, List<String>> tmp = new HashMap<>();
+    List<RemoveItem> remove = new ArrayList<>();
     for (Map.Entry<String, UserStatus> e : map.entrySet()) {
       UserStatus status = e.getValue();
+      String room = status.room();
       String user = e.getKey();
       if (status.lastSeen() + USER_TIMEOUT < current) {
-        remove.add(user);
+        remove.add(new RemoveItem(user, room));
       } else {
-        result.computeIfAbsent(status.room(), key -> new ArrayList<>())
-            .add(user);
+        tmp.computeIfAbsent(room, key -> new ArrayList<>()).add(user);
       }
     }
-    for (String user : remove) {
-      map.remove(user);
+    Map<String, List<String>> result = new LinkedHashMap<>(Math.max(8, (int) (tmp.size() * 1.5)));
+    for (RemoveItem item : remove) {
+      result.put(item.room, tmp.get(item.room));
+      map.remove(item.user);
     }
     return result;
   }
+
+  private record RemoveItem(String user, String room) {
+  }
 }

src/main/java/com/bernd/util/RoomManager.java

@@ -0,0 +1,47 @@
+package com.bernd.util;
+
+import com.bernd.model.StatusMap;
+import com.bernd.model.UserStatus;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class RoomManager {
+
+  private static final long SCAN_TIMEOUT = 15 * 1000;
+
+  private final Sender sender;
+  private final StatusMap statusMap;
+  private long lastScan;
+
+  public RoomManager(Sender sender, StatusMap statusMap) {
+    this.sender = sender;
+    this.statusMap = statusMap;
+  }
+
+  public void updateRooms(String user, String room) {
+    updateStatus(user, room);
+    if (lastScan + SCAN_TIMEOUT < System.currentTimeMillis()) {
+      Map<String, List<String>> updatedRooms = statusMap.prune();
+      for (Map.Entry<String, List<String>> e : updatedRooms.entrySet()) {
+        String r = e.getKey();
+        List<String> users = e.getValue();
+        sender.sendUsers(r, users);
+      }
+      lastScan = System.currentTimeMillis();
+    }
+  }
+
+  public void updateStatus(String user, String room) {
+    UserStatus old = statusMap.put(user, UserStatus.create(room));
+    List<String> users = statusMap.usersInRoom(room);
+    if (old == null) {
+      sender.sendUsers(room, users);
+    } else if (!old.room().equals(room)) {
+      sender.sendUsers(room, users);
+      sender.sendUsers(old.room(), statusMap.usersInRoom(old.room()));
+    }
+  }
+}