Merge branch 'fix-runtime-errors' into 'master'

fix(SDK): fails properly reported in test.html, even when caught by user

See merge request codingame/game-engine!199

Author: Julien Poulton

.gitignore

@@ -5,4 +5,4 @@ target/
 .project
 .vscode
 /bin
-*.iml
+*.iml

engine/core/src/main/java/com/codingame/gameengine/core/GameManager.java

@@ -172,42 +172,48 @@ void start(InputStream is, PrintStream out) {
      *            The amount of expected output lines from the player.
      */
     protected void execute(T player, int nbrOutputLines) {
-        if (!this.initDone) {
-            throw new RuntimeException("Impossible to execute a player during init phase.");
-        }
+        try {
+            if (!this.initDone) {
+                throw new RuntimeException("Impossible to execute a player during init phase.");
+            }
 
-        player.setTimeout(false);
+            player.setTimeout(false);
 
-        InputCommand iCmd = InputCommand.parse(s.nextLine());
+            InputCommand iCmd = InputCommand.parse(s.nextLine());
 
-        if (iCmd.cmd != InputCommand.Command.GET_GAME_INFO) {
-            throw new RuntimeException("Invalid command: " + iCmd.cmd);
-        }
+            if (iCmd.cmd != InputCommand.Command.GET_GAME_INFO) {
+                throw new RuntimeException("Invalid command: " + iCmd.cmd);
+            }
 
-        dumpView();
-        dumpInfos();
-        dumpNextPlayerInput(player.getInputs().toArray(new String[0]));
-        if (nbrOutputLines > 0) {
-            addTurnTime();
-        }
-        dumpNextPlayerInfos(player.getIndex(), nbrOutputLines, player.hasNeverBeenExecuted() ? firstTurnMaxTime : turnMaxTime);
-
-        // READ PLAYER OUTPUTS
-        iCmd = InputCommand.parse(s.nextLine());
-        if (iCmd.cmd == InputCommand.Command.SET_PLAYER_OUTPUT) {
-            List<String> output = new ArrayList<>(iCmd.lineCount);
-            for (int i = 0; i < iCmd.lineCount; i++) {
-                output.add(s.nextLine());
+            dumpView();
+            dumpInfos();
+            dumpNextPlayerInput(player.getInputs().toArray(new String[0]));
+            if (nbrOutputLines > 0) {
+                addTurnTime();
+            }
+            dumpNextPlayerInfos(player.getIndex(), nbrOutputLines, player.hasNeverBeenExecuted() ? firstTurnMaxTime : turnMaxTime);
+
+            // READ PLAYER OUTPUTS
+            iCmd = InputCommand.parse(s.nextLine());
+            if (iCmd.cmd == InputCommand.Command.SET_PLAYER_OUTPUT) {
+                List<String> output = new ArrayList<>(iCmd.lineCount);
+                for (int i = 0; i < iCmd.lineCount; i++) {
+                    output.add(s.nextLine());
+                }
+                player.setOutputs(output);
+            } else if (iCmd.cmd == InputCommand.Command.SET_PLAYER_TIMEOUT) {
+                player.setTimeout(true);
+            } else {
+                throw new RuntimeException("Invalid command: " + iCmd.cmd);
             }
-            player.setOutputs(output);
-        } else if (iCmd.cmd == InputCommand.Command.SET_PLAYER_TIMEOUT) {
-            player.setTimeout(true);
-        } else {
-            throw new RuntimeException("Invalid command: " + iCmd.cmd);
-        }
 
-        player.resetInputs();
-        newTurn = false;
+            player.resetInputs();
+            newTurn = false;
+        } catch (RuntimeException e) {
+            //Don't let the user catch game fail exceptions
+            dumpFail(e);
+            throw e;
+        }
     }
 
     /**

runner/src/main/resources/view/app.js

@@ -72,7 +72,9 @@ function PlayerCtrl ($scope, $timeout, $interval, $filter, drawerFactory, gameMa
       return
     }
     if (ctrl.data.failCause) {
-      addError(ctrl.data.failCause)
+      addError({
+        message: ctrl.data.failCause
+      })
       return
     }