reconnect in server and cli

wizard-server/src/main/java/eu/jonahbauer/wizard/server/Session.java

@@ -9,6 +9,7 @@ import eu.jonahbauer.wizard.common.model.Configuration;
 import eu.jonahbauer.wizard.core.machine.Game;
 import eu.jonahbauer.wizard.core.messages.Observer;
 import eu.jonahbauer.wizard.core.model.Configurations;
+import eu.jonahbauer.wizard.core.util.Pair;
 import eu.jonahbauer.wizard.server.machine.Player;
 import lombok.AccessLevel;
 import lombok.Data;
@@ -16,10 +17,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadLocalRandom;
@@ -40,6 +38,7 @@ public class Session implements Observer {
     private final Map<UUID, SessionPlayer> players = new HashMap<>();
 
     private Game game;
+    private final List<Pair<UUID, ServerMessage>> messages = new ArrayList<>();
 
 
     public Session(UUID uuid, String name, long timeout, Configuration configuration) {
@@ -79,6 +78,34 @@ public class Session implements Observer {
         return sessionPlayer.getUuid();
     }
 
+    public synchronized PlayerData rejoin(Player player, UUID uuid, String secret) {
+        if (!players.containsKey(uuid)) {
+            throw new NackException(NackMessage.ILLEGAL_ARGUMENT, "An error occurred.");
+        }
+
+        SessionPlayer sessionPlayer = players.get(uuid);
+        if (sessionPlayer.isConnected()) {
+            throw new NackException(NackMessage.ILLEGAL_ARGUMENT, "An error occurred.");
+        } else if (!sessionPlayer.getSecret().equals(secret)) {
+            throw new NackException(NackMessage.ILLEGAL_ARGUMENT, "An error occurred.");
+        }
+
+        sessionPlayer.setPlayer(player);
+        player.send(new SessionJoinedMessage(
+                this.uuid,
+                uuid,
+                players.values().stream().map(SessionPlayer::toData).toList(),
+                secret
+        ));
+        for (Pair<UUID, ServerMessage> message : messages) {
+            if (message.getKey() == null || message.getKey().equals(uuid)) {
+                player.send(message.getValue());
+            }
+        }
+
+        return sessionPlayer.toData();
+    }
+
     public synchronized void leave(UUID player) {
         if (game == null) {
             if (players.remove(player) != null) {
@@ -149,6 +176,7 @@ public class Session implements Observer {
 
     private void startGame() {
         notifyPlayers(new StartingGameMessage());
+        messages.add(Pair.of(null, new StartingGameMessage()));
         game = new Game(Configurations.get(configuration).withTimeout(timeout), this);
         game.start(List.copyOf(players.keySet()));
         CompletableFuture.runAsync(() -> {
@@ -166,6 +194,7 @@ public class Session implements Observer {
             players.forEach((id, player) -> player.setReady(false));
             synchronized (this) {
                 game = null;
+                messages.clear();
                 for (SessionPlayer player : List.copyOf(players.values())) {
                     if (!player.isConnected()) {
                         leave(player.getUuid());
@@ -202,13 +231,17 @@ public class Session implements Observer {
     }
 
     @Override
-    public void notify(ObserverMessage message) {
-        notifyPlayers(new GameMessage(message));
+    public synchronized void notify(ObserverMessage message) {
+        var gameMessage = new GameMessage(message);
+        notifyPlayers(gameMessage);
+        messages.add(Pair.of(null, gameMessage));
     }
 
     @Override
-    public void notify(UUID player, ObserverMessage message) {
-        players.get(player).send(new GameMessage(message));
+    public synchronized void notify(UUID player, ObserverMessage message) {
+        var gameMessage = new GameMessage(message);
+        players.get(player).send(gameMessage);
+        messages.add(Pair.of(player, gameMessage));
     }
 
     @Data

wizard-server/src/main/java/eu/jonahbauer/wizard/server/machine/states/LobbyState.java

@@ -3,6 +3,7 @@ package eu.jonahbauer.wizard.server.machine.states;
 import eu.jonahbauer.wizard.common.messages.client.ClientMessage;
 import eu.jonahbauer.wizard.common.messages.client.CreateSessionMessage;
 import eu.jonahbauer.wizard.common.messages.client.JoinSessionMessage;
+import eu.jonahbauer.wizard.common.messages.client.RejoinMessage;
 import eu.jonahbauer.wizard.common.messages.server.NackMessage;
 import eu.jonahbauer.wizard.server.Lobby;
 import eu.jonahbauer.wizard.server.NackException;
@@ -51,6 +52,23 @@ public class LobbyState implements ClientState {
                 Lobby.getInstance().join(player);
                 return Optional.empty();
             }
+        } else if (message instanceof RejoinMessage rejoin) {
+            Lobby.getInstance().leave(player);
+            try {
+                player.buffer();
+                var session = Lobby.getInstance().getSession(rejoin.getSession());
+                if (session == null) {
+                    throw new NackException(NackMessage.NOT_FOUND, "Session not found.");
+                } else {
+                    var data = session.rejoin(player, rejoin.getPlayer(), rejoin.getSecret());
+                    return Optional.of(new SessionState(session.getUuid(), data.getUuid(), data.getName()));
+                }
+            } catch (NackException nack) {
+                // nack must be sent before joinlobby
+                player.send(nack.toMessage());
+                Lobby.getInstance().join(player);
+                return Optional.empty();
+            }
         } else {
             return ClientState.super.onMessage(player, message);
         }