Merge branch 'fix-sdk' into 'master'

fix(SDK): Use player-parsed frames to diplay STDOUT and STDERR streams

See merge request codingame/game-engine!237

Author: CodinGameCommunity

playground/misc/misc-3-release-notes.md

@@ -10,7 +10,9 @@ The CodinGame SDK is regularly updated and improved. This document lets you know
 
 ### 🐞 Bug fix
 
-- Fix display of error messages
+- Referee output now properly displayed
+- Player output now properly displayed
+- Game Errors now displayed once more
 
 ## 3.6.1
 
@@ -19,12 +21,22 @@ The CodinGame SDK is regularly updated and improved. This document lets you know
 - Fix the `stepByStepAnimateSpeed` getting interrupted by clicking in the IDE
 - Fix YAML testcases export
 
+### ⚠️ Known issues
+
+- Referee and player output improperly displayed
+- Game Errors not displayed
+
 ## 3.6.0
 
 ### 🎁 New features
 
 - Add `TilingSprite`
 
+### ⚠️ Known issues
+
+- Referee and player output improperly displayed
+- Game Errors not displayed
+
 ## 3.5.2
 
 ### 🐞 Bug fix

runner/src/main/java/com/codingame/gameengine/runner/GameRunner.java

@@ -223,7 +223,6 @@ private void readInitFrameErrors() {
             String id = String.valueOf(i);
             gameResult.errors.get(id).add(player.readError());
         }
-        readError(referee);
     }
 
     /**

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

@@ -83,12 +83,16 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
     loadGame()
   }
 
-  function onParsedGameInfo (gameInfo) {
+  function onParsedGameInfo (parsedGameInfo) {
     $scope.playerColors = {}
-    gameInfo.agents.forEach(function (agent) {
+    ctrl.parsedGameInfo = parsedGameInfo
+    parsedGameInfo.agents.forEach(function (agent) {
       $scope.playerColors[agent.index] = agent.color
     })
     cgPlayer.off('parsedGameInfo', onParsedGameInfo)
+    const frameData = parsedGameInfo.frames[0]
+    $scope.referee = { ...frameData.referee }
+    $scope.summary = frameData.gameSummary
   }
 
   async function loadGame () {
@@ -113,7 +117,7 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
   }
 
   function onUpdate (frame, progress, playing, isSubFrame, isTurnBased, atEnd) {
-    if (ctrl.gameInfo.frames[frame].keyframe && frame !== currentFrame) {
+    if (frame !== currentFrame) {
       $timeout(() => {
         currentFrame = frame
         onFrameChange(frame)
@@ -122,33 +126,28 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
   }
 
   function onFrameChange (frame) {
-    let startFrame = frame
-    while (startFrame > 0 && !ctrl.gameInfo.frames[startFrame - 1].keyframe) {
-      startFrame--
-    }
-
     for (let i in ctrl.data.ids) {
       $scope.agents[i].stdout = null
       $scope.agents[i].stderr = null
-      $scope.referee = {}
     }
 
-    while (startFrame <= frame) {
-      for (let i in ctrl.data.ids) {
-        const stdout = ctrl.data.outputs[i][startFrame]
-        if (stdout) {
-          $scope.agents[i].stdout = stdout
+    $scope.referee = {}
+    const frameData = ctrl.parsedGameInfo.frames[frame]
+    for (let i in ctrl.data.ids) {
+      const subframe = frameData.subframes[i]
+      if (subframe) {
+        if (subframe.stdout) {
+          $scope.agents[i].stdout = subframe.stdout
         }
-        const stderr = ctrl.data.errors[i][startFrame]
-        if (stderr) {
-          $scope.agents[i].stderr = stderr
+
+        if (subframe.stderr) {
+          $scope.agents[i].stderr = subframe.stderr
         }
       }
-      $scope.referee.stdout = $scope.referee.stdout || ctrl.data.outputs.referee[startFrame]
-      $scope.referee.stderr = $scope.referee.stderr || ctrl.data.errors.referee[startFrame]
-      $scope.summary = ctrl.data.summaries[startFrame]
-      startFrame++
     }
+    $scope.referee.stdout = frameData.referee.stdout
+    $scope.referee.stderr = frameData.referee.stderr
+    $scope.summary = frameData.gameSummary
   }
 
   function convertFrameFormat (data) {
@@ -158,8 +157,18 @@ function PlayerCtrl ($scope, $timeout, $interval, $element) {
 
       return { view: v.replace(/^(KEY_FRAME)|(INTERMEDIATE_FRAME)/, ''), keyframe: header[0] === 'KEY_FRAME' }
     })
+    const refereeKeysMap = { 'errors': 'stderr', 'outputs': 'stdout' }
     for (let i = 0; i < frames.length; i++) {
       frames[i].gameSummary = data.summaries[i]
+      frames[i].referee = {}
+
+      for (const key in refereeKeysMap) {
+        const newKey = refereeKeysMap[key]
+        if (data[key].referee[i] && data[key].referee[i].length) {
+          frames[i].referee[newKey] = data[key].referee[i]
+        }
+      }
+
       for (let pi in data.ids) {
         frames[i].stderr = frames[i].stderr || data.errors[pi][i]
         frames[i].stdout = frames[i].stdout || data.outputs[pi][i]