Merge pull request 'MAPG-226 change remaining time calculation' (#21) from feature/MAPG-226-change-timeout-algorithm into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/21

multi/index.js

@@ -5,7 +5,7 @@ process.title = 'mapguesser-multi';
 class MultiGame {
     static ROUND_TIMEOUT_DEFAULT = 120000;
     static ROUND_TIMEOUT_MINIMUM = 15000;
-    static ROUND_TIMEOUT_DIVIDER = 2;
+    static ROUND_TIMEOUT_DIVIDER = 1.5;
     static ROUND_TIMEOUT_OFFSET = 500;
 
     constructor() {
@@ -36,19 +36,20 @@ class MultiGame {
 
     createRoom(roomId) {
         this.rooms.set(roomId, { members: new Map(), rounds: [], currentRound: -1, updated: new Date() });
+
+        return { ok: true };
     }
 
     joinRoom(roomId, token, userName) {
         if (!this.rooms.has(roomId)) {
-            console.error('Room does not exist!')
+            return { error: 'room_not_found' };
-            return;
         }
 
         var room = this.rooms.get(roomId);
         room.updated = new Date();
 
         if (room.members.has(token)) {
-            return;
+            return { error: 'member_already_joined' };
         }
 
         var data = { userName: userName };
@@ -58,13 +59,13 @@ class MultiGame {
         });
 
         room.members.set(token, { userName: userName, connection: null });
+
+        return { ok: true };
     }
 
     startGame(roomId, places) {
         if (!this.rooms.has(roomId)) {
-            //TODO: send something back
+            return { error: 'room_not_found' };
-            console.log('Room does not exist!')
-            return;
         }
 
         var room = this.rooms.get(roomId);
@@ -84,19 +85,23 @@ class MultiGame {
         room.rounds = rounds;
 
         this.nextRound(roomId, 0);
+
+        return { ok: true };
     }
 
     guess(roomId, token, guessPosition, distance, score) {
         if (!this.rooms.has(roomId)) {
-            //TODO: send something back
+            return { error: 'room_not_found' };
-            console.log('Room does not exist!')
-            return;
         }
 
         var room = this.rooms.get(roomId);
         room.updated = new Date();
 
         var round = room.rounds[room.currentRound];
+        if (round.results.has(token)) {
+            return { error: 'already_guessed' };
+        }
+
         var member = room.members.get(token);
         var allResults = this._collectResultsInRound(room, round);
 
@@ -106,14 +111,12 @@ class MultiGame {
 
         this._setNewTimeout(room, round);
 
-        return allResults;
+        return { allResults: allResults };
     }
 
     nextRound(roomId, currentRound) {
         if (!this.rooms.has(roomId)) {
-            //TODO: send something back
+            return { error: 'room_not_found' };
-            console.log('Room does not exist!')
-            return;
         }
 
         var room = this.rooms.get(roomId);
@@ -137,6 +140,8 @@ class MultiGame {
         room.members.forEach(function (member) {
             self._sendToMember(member, 'new_round', data);
         });
+
+        return { ok: true };
     }
 
     _setNewTimeout(room, round) {
@@ -150,7 +155,7 @@ class MultiGame {
         } else {
             round.timeout = round.timeout - (new Date() - round.timeoutStarted);
             if (round.timeout > MultiGame.ROUND_TIMEOUT_DIVIDER * MultiGame.ROUND_TIMEOUT_MINIMUM) {
-                round.timeout = round.timeout / MultiGame.ROUND_TIMEOUT_DIVIDER;
+                round.timeout = Math.round(round.timeout / MultiGame.ROUND_TIMEOUT_DIVIDER);
             } else if (round.timeout > MultiGame.ROUND_TIMEOUT_MINIMUM) {
                 round.timeout = MultiGame.ROUND_TIMEOUT_MINIMUM;
             }
@@ -295,30 +300,30 @@ var tcpServer = net.createServer(function (socket) {
             return;
         }
 
-        var response = { data: null };
+        var response;
         switch (data.func) {
             case 'create_room':
-                response.data = multiGame.createRoom(data.args.roomId);
+                response = multiGame.createRoom(data.args.roomId);
 
                 break;
 
             case 'join_room':
-                response.data = multiGame.joinRoom(data.args.roomId, data.args.token, data.args.userName);
+                response = multiGame.joinRoom(data.args.roomId, data.args.token, data.args.userName);
 
                 break;
 
             case 'start_game':
-                response.data = multiGame.startGame(data.args.roomId, data.args.places);
+                response = multiGame.startGame(data.args.roomId, data.args.places);
 
                 break
 
             case 'guess':
-                response.data = multiGame.guess(data.args.roomId, data.args.token, data.args.guessPosition, data.args.distance, data.args.score);
+                response = multiGame.guess(data.args.roomId, data.args.token, data.args.guessPosition, data.args.distance, data.args.score);
 
                 break;
 
             case 'next_round':
-                response.data = multiGame.nextRound(data.args.roomId, data.args.currentRound);
+                response = multiGame.nextRound(data.args.roomId, data.args.currentRound);
 
                 break;
         }

public/static/js/game.js

@@ -120,9 +120,11 @@
 
                     for (var j = 0; j < round.allResults.length; ++j) {
                         var result = round.allResults[j];
+                        if (result.guessPosition) {
                             Game.addGuessPositionToResultMap(result.guessPosition, result, true);
                         }
                     }
+                }
 
                 document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
                 document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
@@ -200,11 +202,6 @@
                     return;
                 }
 
-                // TODO: refactor - it is necessary for mobile
-                if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
-                    document.getElementById('showGuessButton').click();
-                }
-
                 document.getElementById('guessButton').disabled = true;
                 document.getElementById('panoCover').style.visibility = 'visible';
 
@@ -330,6 +327,7 @@
             scoreInfo.children[0].style.display = null;
             scoreInfo.children[1].style.display = null;
             document.getElementById('continueButton').style.display = null;
+            document.getElementById('showSummaryButton').style.display = null;
             document.getElementById('startNewGameButton').style.display = null;
 
             document.getElementById('showGuessButton').style.visibility = null;
@@ -434,10 +432,12 @@
             if (allResults) {
                 for (var i = 0; i < allResults.length; ++i) {
                     var currentResult = allResults[i];
+                    if (currentResult.guessPosition) {
                         Game.addGuessPositionToResultMap(currentResult.guessPosition, currentResult);
                         resultBounds.extend(currentResult.guessPosition);
                     }
                 }
+            }
 
             Game.showResultMap(result, resultBounds);
         },
@@ -461,6 +461,11 @@
         },
 
         showResultMap: function (result, resultBounds) {
+            // TODO: refactor - it is necessary for mobile
+            if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
+                document.getElementById('showGuessButton').click();
+            }
+
             if (Game.adaptGuess) {
                 document.getElementById('guess').classList.remove('adapt');
             }
@@ -735,15 +740,16 @@
                 clearInterval(Game.countdownHandler);
             }
 
+            Game.countdownElement = document.getElementById('countdown');
+            Game.countdownTimeElement = document.getElementById('countdownTime');
+
+            Game.setCountdownTime(Math.round(timeout / 1000));
+
             if (timeout <= 0) {
                 return;
             }
 
             Game.timeoutEnd = new Date(new Date().getTime() + timeout);
-            Game.countdownElement = document.getElementById('countdown');
-            Game.countdownTimeElement = document.getElementById('countdownTime');
-
-            Game.setCountdownTime(Math.round(timeout / 1000));
 
             Game.countdownHandler = setInterval(function () {
                 var timeLeft = Math.round((Game.timeoutEnd - new Date()) / 1000);

src/Controller/GameFlowController.php

@@ -164,7 +164,7 @@ class GameFlowController
         $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
         $result = $this->evalueteGuess($last['position'], $guessPosition, $state['area']);
 
-        $allResults = $this->multiConnector->sendMessage('guess', [
+        $responseFromMulti = $this->multiConnector->sendMessage('guess', [
             'roomId' => $roomId,
             'token' => $multiState['token'],
             'guessPosition' => $guessPosition->toArray(),
@@ -172,10 +172,14 @@ class GameFlowController
             'score' => $result['score']
         ]);
 
+        if (isset($responseFromMulti['error'])) {
+            return new JsonContent(['error' => $responseFromMulti['error']]);
+        }
+
         $response = [
             'position' => $last['position']->toArray(),
             'result' => $result,
-            'allResults' => $allResults
+            'allResults' => $responseFromMulti['allResults']
         ];
 
         return new JsonContent($response);

src/Multi/MultiConnector.php

@@ -17,10 +17,6 @@ class MultiConnector
         }
         fclose($connection);
 
-        $response = json_decode($response, true);
+        return json_decode($response, true);
-
-        if (isset($response['data'])) {
-            return $response['data'];
-        }
     }
 }