fix(server): send error from Lobby if reservation redemption fails

Author: xeruf

sdk/src/server-api/sc/api/plugins/exceptions/RescuableClientException.kt

@@ -1,6 +1,5 @@
 package sc.api.plugins.exceptions
 
-
 /** An Exception in Client-Server communication that should be handled. */
 open class RescuableClientException
 @JvmOverloads constructor(override val message: String, cause: Throwable? = null):

server/src/sc/server/Lobby.kt

@@ -56,7 +56,11 @@ open class Lobby: GameRoomManager(), IClientListener, Closeable {
         if (packet is ILobbyRequest) {
             when (packet) {
                 is JoinPreparedRoomRequest ->
-                    ReservationManager.redeemReservationCode(source, packet.reservationCode)
+                    try {
+                        ReservationManager.redeemReservationCode(source, packet.reservationCode)
+                    } catch(e: RescuableClientException) {
+                        source.send(ProtocolErrorMessage(packet, e.message))
+                    }
                 is JoinRoomRequest -> {
                     val gameRoomMessage = this.joinOrCreateGame(source, packet.gameType)
                     // null is returned if join was unsuccessful

server/test/sc/server/network/LobbyRequestTest.kt

@@ -62,6 +62,12 @@ class LobbyRequestTest: WordSpec({
             val reservations = listener.prepareGameResponse.reservations
             players[1].joinPreparedGame(reservations[0])
             await("First player joined") { room.clients shouldHaveSize 1 }
+            "not accept a reservation twice" {
+                admin.joinPreparedGame(reservations[0])
+                await("Receive error when reusing a reservation") { listener.errorReceived shouldBe true }
+                room.clients shouldHaveSize 1
+                lobby.games shouldHaveSize 1
+            }
             players[2].joinPreparedGame(reservations[1])
             await("Players join, Game start") { room.status shouldBe GameRoom.GameStatus.ACTIVE }
 

server/test/sc/server/network/RequestTest.kt

@@ -55,30 +55,6 @@ class RequestTest: RealServerTest() {
         assertFalse(clients[1].isAdministrator)
     }
 
-    @Test
-    fun joinPreparedRoomRequest() {
-        player1.authenticate(PASSWORD)
-        val listener = TestPreparedGameResponseListener()
-        player1.addListener(listener)
-        
-        player1.prepareGame(TestPlugin.TEST_PLUGIN_UUID)
-        Thread.sleep(200)
-        val response = listener.response
-        
-        val reservation = response.reservations[0]
-        player1.joinPreparedGame(reservation)
-        Thread.sleep(200)
-        assertEquals(1, lobby.games.iterator().next().clients.size.toLong())
-        
-        player2.joinPreparedGame(response.reservations[1])
-        Thread.sleep(200)
-        assertEquals(2, lobby.games.iterator().next().clients.size.toLong())
-        
-        player3.joinPreparedGame(response.reservations[1])
-        Thread.sleep(200)
-        assertEquals(2, lobby.clientManager.clients.size.toLong())
-    }
-    
     @Test
     fun observationRequest() {
         player1.joinRoomRequest(TestPlugin.TEST_PLUGIN_UUID)