feat(server): use more specific RescuableClientExceptions

Author: xeruf

sdk/src/framework/sc/shared/InvalidMoveException.kt

@@ -9,7 +9,7 @@ import kotlin.RuntimeException
  * @param mistake ist die Art der Regelverletzung.
  * @param move ist der Zug, der den Fehler verursacht hat.
  */
-class InvalidMoveException @JvmOverloads constructor(
-        @JvmField val mistake: IMoveMistake,
-        @JvmField val move: IMove? = null):
+data class InvalidMoveException @JvmOverloads constructor(
+        val mistake: IMoveMistake,
+        val move: IMove? = null):
         RuntimeException("${mistake.message}${move?.let { " bei Zug '$it'"}.orEmpty()}")

sdk/src/server-api/sc/networking/clients/XStreamClient.java

@@ -80,7 +80,7 @@ public void run() {
     this.receiveThread.start();
   }
 
-  protected abstract void onObject(ProtocolMessage o) throws UnprocessedPacketException, InvalidGameStateException;
+  protected abstract void onObject(ProtocolMessage o) throws UnprocessedPacketException;
 
   /** Used by the receiving thread. All exceptions should be handled. */
   public void receiveThread() {

server/src/sc/server/Lobby.kt

@@ -55,7 +55,8 @@ open class Lobby: GameRoomManager(), IClientListener, Closeable {
         val packet = callback.packet
         if (packet is ILobbyRequest) {
             when (packet) {
-                is JoinPreparedRoomRequest -> ReservationManager.redeemReservationCode(source, packet.reservationCode)
+                is JoinPreparedRoomRequest ->
+                    ReservationManager.redeemReservationCode(source, packet.reservationCode)
                 is JoinRoomRequest -> {
                     val gameRoomMessage = this.joinOrCreateGame(source, packet.gameType)
                     // null is returned if join was unsuccessful

server/src/sc/server/gaming/GameRoom.java

@@ -436,7 +436,7 @@ public synchronized void onEvent(Client source, ProtocolMessage data) throws Gam
       final String error = String.format("Ungueltiger Zug von '%s'.\n%s", player.getDisplayName(), e);
       logger.error(error);
       player.setViolationReason(e.getMessage());
-      ProtocolErrorMessage errorMessage = new ProtocolErrorMessage(e.move, error);
+      ProtocolErrorMessage errorMessage = new ProtocolErrorMessage(e.getMove(), error);
       player.notifyListeners(errorMessage);
       observerBroadcast(new RoomPacket(id, errorMessage));
       game.onPlayerLeft(player, ScoreCause.RULE_VIOLATION);

server/src/sc/server/gaming/GameRoomManager.java

@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sc.api.plugins.exceptions.GameRoomException;
 import sc.api.plugins.exceptions.RescuableClientException;
 import sc.networking.InvalidScoreDefinitionException;
 import sc.protocol.requests.PrepareGameRequest;
@@ -207,7 +208,7 @@ public synchronized GameRoom findRoom(String roomId) throws RescuableClientExcep
     GameRoom room = this.rooms.get(roomId);
 
     if (room == null) {
-      throw new RescuableClientException("Couldn't find a room with id " + roomId);
+      throw new GameRoomException("Couldn't find a room with id " + roomId);
     }
 
     return room;

server/src/sc/server/gaming/ReservationManager.java

@@ -29,8 +29,8 @@ private ReservationManager() {
    *
    * @throws RescuableClientException will be thrown if slot cannot be filled or reservation is unknown
    */
-  public static synchronized PlayerSlot redeemReservationCode(Client client,
-                                                              String reservation) throws RescuableClientException {
+  public static synchronized PlayerSlot redeemReservationCode(Client client, String reservation)
+      throws RescuableClientException {
     PlayerSlot result = reservations.remove(reservation);
 
     if (result == null) {

server/src/sc/server/network/Client.java

@@ -2,6 +2,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sc.api.plugins.exceptions.GameLogicException;
+import sc.api.plugins.exceptions.NotYourTurnException;
 import sc.api.plugins.exceptions.RescuableClientException;
 import sc.networking.INetworkInterface;
 import sc.networking.UnprocessedPacketException;
@@ -75,19 +77,17 @@ private void notifyOnPacket(Object packet) throws UnprocessedPacketException {
 
     for (RescuableClientException error : errors) {
       logger.warn("An error occured: ", error);
-      if (!error.getMessage().equals("It's not your turn yet.")) {
+      if (error instanceof GameLogicException && !(error instanceof NotYourTurnException)) {
         logger.warn("Game closed because of GameLogicException: " + error.getMessage());
       }
     }
     if (!errors.isEmpty()) {
-      logger.debug("Stopping client because of error. Thread: {}",
-              Thread.currentThread().getName());
+      logger.debug("Stopping {} because of error", this);
       stop();
     }
 
     if (packet instanceof LeftGameEvent) {
-      logger.debug("Stopping client because of LeftGameEvent received. Thread: {}",
-              Thread.currentThread().getName());
+      logger.debug("Stopping {} because of received LeftGameEvent", this);
       stop();
     }
   }