Send the game results to the server on game end. (ShieldBattery#539)

This sets things up so we can make this request from the Rust code, as the game finishes. We make 3 attempts, if all 3 fail, the expectation is that the app will retry at some point in the future (but this is NOT implemented yet as of this PR). The app can know to do this by the fact that the game exits without calling /game/resultSent (and my plan is to always submit some sort of results if that occurs, to try to give us fewer result timeouts in the case of weird issues).

APM calculation is also not included in this PR, for now everybody is registered as having 0 APM.

Note that there's a number of random Rust reformatting changes in here, as VSCode really wanted to do them. I adjusted our .editorconfig to preserve most of the existing formatting.

Author: tec27

.editorconfig

@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
 
 [*.bat]
 end_of_line = crlf
+
+[*.rs]
+indent_size = 4

client/active-game/active-game-manager.js

@@ -13,6 +13,8 @@ import {
   GAME_STATUS_FINISHED,
   GAME_STATUS_ERROR,
   statusToString,
+  GAME_STATUS_HAS_RESULT,
+  GAME_STATUS_RESULT_SENT,
 } from '../../common/game-status'
 import { SCR_SETTINGS_OVERWRITE } from '../../common/ipc-constants'
 
@@ -182,14 +184,30 @@ export default class ActiveGameManager extends EventEmitter {
     this._setStatus(GAME_STATUS_PLAYING)
   }
 
-  handleGameEnd(gameId, results, time) {
+  handleGameResult(gameId, results, time) {
     if (!this.activeGame || this.activeGame.id !== gameId) {
       return
     }
-    // TODO(tec27): this needs to be handled differently (game should really be reporting these
-    // directly to the server)
-    log.verbose(`Game finished: ${JSON.stringify({ results, time })}`)
+
+    // TODO(tec27): Store these results and attempt to send them ourselves if the game fails to
+    log.verbose(`Game results: ${JSON.stringify({ results, time })}`)
+    this._setStatus(GAME_STATUS_HAS_RESULT)
     this.emit('gameResults', { results, time })
+  }
+
+  handleGameResultSent(gameId) {
+    if (!this.activeGame || this.activeGame.id !== gameId) {
+      return
+    }
+
+    this._setStatus(GAME_STATUS_RESULT_SENT)
+  }
+
+  handleGameFinished(gameId) {
+    if (!this.activeGame || this.activeGame.id !== gameId) {
+      return
+    }
+
     this._setStatus(GAME_STATUS_FINISHED)
     this.emit('gameCommand', gameId, 'cleanup_and_quit')
   }

client/active-game/game-server.js

@@ -80,8 +80,14 @@ class GameServer {
       case '/game/start':
         activeGameManager.handleGameStart(gameId)
         break
-      case '/game/end':
-        activeGameManager.handleGameEnd(gameId, payload.results, payload.time)
+      case '/game/result':
+        activeGameManager.handleGameResult(gameId, payload.results, payload.time)
+        break
+      case '/game/resultSent':
+        activeGameManager.handleGameResultSent(gameId)
+        break
+      case '/game/finished':
+        activeGameManager.handleGameFinished(gameId)
         break
       case '/game/replaySave':
         activeGameManager.handleReplaySave(gameId, payload.path)

client/lobbies/socket-handlers.js

@@ -33,6 +33,7 @@ import activeGameManager from '../active-game/active-game-manager-instance'
 import audioManager, { SOUNDS } from '../audio/audio-manager-instance'
 import { getIngameLobbySlotsWithIndexes } from '../../common/lobbies'
 import { openSnackbar } from '../snackbars/action-creators'
+import { makeServerUrl } from '../network/server-url'
 
 const ipcRenderer = IS_ELECTRON ? require('electron').ipcRenderer : null
 
@@ -242,6 +243,7 @@ const eventToAction = {
         host,
         seed: event.setup.seed,
         resultCode: event.resultCode,
+        serverUrl: makeServerUrl(''),
       },
     }
 

client/matchmaking/socket-handlers.js

@@ -23,6 +23,7 @@ import { openDialog, closeDialog } from '../dialogs/action-creators'
 import { openSnackbar } from '../snackbars/action-creators'
 import { MATCHMAKING_ACCEPT_MATCH_TIME } from '../../common/constants'
 import { USER_ATTENTION_REQUIRED } from '../../common/ipc-constants'
+import { makeServerUrl } from '../network/server-url'
 
 const ipcRenderer = IS_ELECTRON ? require('electron').ipcRenderer : null
 
@@ -177,6 +178,7 @@ const eventToAction = {
         host: event.slots[0], // Arbitrarily set first player as host
         seed: event.setup.seed,
         resultCode: event.resultCode,
+        serverUrl: makeServerUrl(''),
       },
     }
 

common/game-status.js

@@ -9,8 +9,10 @@ export const GAME_STATUS_CONFIGURING = 2
 export const GAME_STATUS_AWAITING_PLAYERS = 3
 export const GAME_STATUS_STARTING = 4
 export const GAME_STATUS_PLAYING = 5
-export const GAME_STATUS_FINISHED = 6
-export const GAME_STATUS_ERROR = 7
+export const GAME_STATUS_HAS_RESULT = 6
+export const GAME_STATUS_RESULT_SENT = 7
+export const GAME_STATUS_FINISHED = 8
+export const GAME_STATUS_ERROR = 666
 
 export function statusToString(status) {
   switch (status) {
@@ -26,6 +28,10 @@ export function statusToString(status) {
       return 'starting'
     case GAME_STATUS_PLAYING:
       return 'playing'
+    case GAME_STATUS_HAS_RESULT:
+      return 'hasResult'
+    case GAME_STATUS_RESULT_SENT:
+      return 'resultSent'
     case GAME_STATUS_FINISHED:
       return 'finished'
     case GAME_STATUS_ERROR:
@@ -49,6 +55,10 @@ export function stringToStatus(string) {
       return GAME_STATUS_STARTING
     case 'playing':
       return GAME_STATUS_PLAYING
+    case 'hasResults':
+      return GAME_STATUS_HAS_RESULT
+    case 'resultSent':
+      return GAME_STATUS_RESULT_SENT
     case 'finished':
       return GAME_STATUS_FINISHED
     case 'error':