Merge pull request 'MAPG-223 send error if member already guessed' (#19) from feature/MAPG-223-user-should-not-be-able-to-guess-after-round-is-over into develop

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

multi/index.js

@@ -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;
+            return { error: 'room_not_found' };
         }
 
         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
-            console.log('Room does not exist!')
-            return;
+            return { error: 'room_not_found' };
         }
 
         var room = this.rooms.get(roomId);
@@ -84,49 +85,38 @@ 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
-            console.log('Room does not exist!')
-            return;
+            return { error: 'room_not_found' };
         }
 
         var room = this.rooms.get(roomId);
         room.updated = new Date();
 
         var round = room.rounds[room.currentRound];
-
-        clearTimeout(round.timeoutHandler);
-        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;
-        } else if (round.timeout > MultiGame.ROUND_TIMEOUT_MINIMUM) {
-            round.timeout = MultiGame.ROUND_TIMEOUT_MINIMUM;
+        if (round.results.has(token)) {
+            return { error: 'already_guessed' };
         }
-        round.timeoutStarted = new Date();
-        var self = this;
-        round.timeoutHandler = setTimeout(function () {
-            self._endRoundTimeout(room, round);
-        }, round.timeout + MultiGame.ROUND_TIMEOUT_OFFSET);
 
         var member = room.members.get(token);
         var allResults = this._collectResultsInRound(room, round);
 
-        this._broadcastTimeout(room, round);
         this._broadcastGuess(room, member.userName, guessPosition, distance, score);
 
         round.results.set(token, { guessPosition: guessPosition, distance: distance, score: score });
 
-        return allResults;
+        this._setNewTimeout(room, round);
+
+        return { allResults: allResults };
     }
 
     nextRound(roomId, currentRound) {
         if (!this.rooms.has(roomId)) {
-            //TODO: send something back
-            console.log('Room does not exist!')
-            return;
+            return { error: 'room_not_found' };
         }
 
         var room = this.rooms.get(roomId);
@@ -139,7 +129,7 @@ class MultiGame {
         round.timeoutStarted = new Date();
         var self = this;
         round.timeoutHandler = setTimeout(function () {
-            self._endRoundTimeout(room, round);
+            self._endRound(room, round);
         }, round.timeout + MultiGame.ROUND_TIMEOUT_OFFSET);
 
         var data = {};
@@ -150,18 +140,48 @@ class MultiGame {
         room.members.forEach(function (member) {
             self._sendToMember(member, 'new_round', data);
         });
+
+        return { ok: true };
     }
 
-    _endRoundTimeout(room, round) {
+    _setNewTimeout(room, round) {
         clearTimeout(round.timeoutHandler);
 
-        var data = { position: round.place.position, allResults: this._collectResultsInRound(room, round) };
+        if (room.members.size === round.results.size) {
+            round.timeout = 0;
+            round.timeoutStarted = new Date();
+
+            this._endRound(room, round);
+        } 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;
+            } else if (round.timeout > MultiGame.ROUND_TIMEOUT_MINIMUM) {
+                round.timeout = MultiGame.ROUND_TIMEOUT_MINIMUM;
+            }
+            round.timeoutStarted = new Date();
+            var self = this;
+            round.timeoutHandler = setTimeout(function () {
+                self._endRound(room, round);
+            }, round.timeout + MultiGame.ROUND_TIMEOUT_OFFSET);
+
+            this._broadcastTimeout(room, round);
+        }
+    }
+
+    _endRound(room, round) {
+        var allResults = this._collectResultsInRound(room, round);
         var self = this;
         room.members.forEach(function (member, token) {
+            var result = { guessPosition: null, distance: null, score: 0 };
+
             if (round.results.has(token)) {
-                return;
+                result = round.results.get(token);
+            } else {
+                round.results.set(token, result);
             }
 
+            var data = { position: round.place.position, result: result, allResults: allResults };
             self._sendToMember(member, 'end_round', data);
         });
     }
@@ -177,9 +197,13 @@ class MultiGame {
         }
 
         data.history = [];
-        for (var i = 0; i < room.currentRound; ++i) {
+        for (var i = 0; i <= room.currentRound; ++i) {
             var round = room.rounds[i];
 
+            if (i === room.currentRound && !round.results.has(token)) {
+                continue;
+            }
+
             var result = { guessPosition: null, distance: null, score: 0 };
             var allResults = [];
 
@@ -204,6 +228,8 @@ class MultiGame {
             data.members.push({ userName: currentMember.userName, me: member === currentMember });
         });
 
+        data.readyToContinue = room.currentRound >= 0 && room.members.size === room.rounds[room.currentRound].results.size
+
         this._sendToMember(member, 'initialize', data);
     }
 
@@ -274,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

@@ -17,6 +17,7 @@
         adaptGuess: false,
         googleLink: null,
 
+        readyToContinue: false,
         timeoutEnd: null,
         countdownHandler: null,
 
@@ -96,51 +97,59 @@
             },
 
             initialize: function (data) {
-                if (data.history) {
-                    for (var i = 0; i < data.history.length; ++i) {
-                        var round = data.history[i];
-                        Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] });
-                        Game.addPositionToResultMap(true);
-                        if (round.result.guessPosition) {
-                            Game.addGuessPositionToResultMap(round.result.guessPosition, null, true);
-                        }
-                        Game.scoreSum += round.result.score;
+                if (data.history.length === 0 && !data.place) {
+                    var div = document.getElementById('players');
 
-                        for (var j = 0; j < round.allResults.length; ++j) {
-                            var result = round.allResults[j];
+                    for (var i = 0; i < data.members.length; ++i) {
+                        var member = data.members[i];
+
+                        var p = document.createElement('p');
+                        p.innerHTML = member.userName + (member.me ? ' (me)' : '');
+                        div.appendChild(p);
+                    }
+                }
+
+                for (var i = 0; i < data.history.length; ++i) {
+                    var round = data.history[i];
+                    Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] });
+                    Game.addPositionToResultMap(true);
+                    if (round.result.guessPosition) {
+                        Game.addGuessPositionToResultMap(round.result.guessPosition, null, true);
+                    }
+                    Game.scoreSum += round.result.score;
+
+                    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);
                 }
 
+                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);
+
                 if (data.timeout) {
                     Game.startCountdown(data.timeout);
                 }
 
                 if (data.place) {
+                    Game.readyToContinue = data.readyToContinue;
                     Game.panoId = data.place.panoId;
                     Game.pov = data.place.pov;
 
                     document.getElementById('multi').style.visibility = 'hidden';
-                    document.getElementById('panoCover').style.visibility = 'hidden';
 
-                    Game.startNewRound();
+                    if (Game.rounds.length === 0 || !Game.rounds[Game.rounds.length - 1].position) {
+                        document.getElementById('panoCover').style.visibility = 'hidden';
+                        Game.startNewRound();
+                    } else {
+                        Game.loadPano(Game.panoId, Game.pov);
+                        Game.showResultFromHistory(data.history[data.history.length - 1].result);
+                    }
                 }
 
                 document.getElementById('loading').style.visibility = 'hidden';
-
-                var div = document.getElementById('players');
-
-                for (var i = 0; i < data.members.length; ++i) {
-                    var member = data.members[i];
-
-                    var p = document.createElement('p');
-                    p.innerHTML = member.userName + (member.me ? ' (me)' : '');
-                    div.appendChild(p);
-                }
             },
 
             memberJoined: function (data) {
@@ -156,6 +165,7 @@
                     Game.reset();
                 }
 
+                Game.readyToContinue = false;
                 Game.panoId = data.place.panoId;
                 Game.pov = data.place.pov;
 
@@ -180,6 +190,18 @@
             },
 
             endRound: function (data) {
+                Game.readyToContinue = true;
+                Game.startCountdown(0);
+
+                if (Game.rounds[Game.rounds.length - 1].guessPosition || Game.rounds[Game.rounds.length - 1].position) {
+                    if (Game.multi.owner) {
+                        document.getElementById('continueButton').disabled = false;
+                        document.getElementById('startNewGameButton').disabled = false;
+                    }
+
+                    return;
+                }
+
                 // TODO: refactor - it is necessary for mobile
                 if (window.getComputedStyle(document.getElementById('guess')).visibility === 'hidden') {
                     document.getElementById('showGuessButton').click();
@@ -188,11 +210,7 @@
                 document.getElementById('guessButton').disabled = true;
                 document.getElementById('panoCover').style.visibility = 'visible';
 
-                Game.showResults(data.position, null, { distance: NaN, score: 0 }, data.allResults);
-
-                if (!Game.multi.owner) {
-                    document.getElementById('continueButton').style.display = 'none';
-                }
+                Game.receiveResult(data.position, data.result.guessPosition, { distance: data.result.distance, score: data.result.score }, data.allResults);
             }
         },
 
@@ -242,8 +260,6 @@
 
         initialize: function () {
             document.getElementById('panoCover').style.visibility = 'visible';
-            document.getElementById('currentRound').innerHTML = '1/' + String(Game.NUMBER_OF_ROUNDS);
-            document.getElementById('currentScoreSum').innerHTML = '0/0';
 
             Game.map.setOptions({
                 draggableCursor: 'crosshair'
@@ -268,19 +284,17 @@
                 Game.panoId = this.response.place.panoId;
                 Game.pov = this.response.place.pov;
 
-                if (this.response.history) {
-                    for (var i = 0; i < this.response.history.length; ++i) {
-                        var round = this.response.history[i];
-                        Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] });
-                        Game.addPositionToResultMap(true);
-                        Game.addGuessPositionToResultMap(round.result.guessPosition, null, true);
-                        Game.scoreSum += round.result.score;
-                    }
-
-                    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);
+                for (var i = 0; i < this.response.history.length; ++i) {
+                    var round = this.response.history[i];
+                    Game.rounds.push({ position: round.position, guessPosition: round.result.guessPosition, realMarker: null, guessMarkers: [] });
+                    Game.addPositionToResultMap(true);
+                    Game.addGuessPositionToResultMap(round.result.guessPosition, null, true);
+                    Game.scoreSum += round.result.score;
                 }
 
+                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);
+
                 Game.startNewRound();
             });
         },
@@ -318,6 +332,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;
@@ -404,18 +419,7 @@
             Game.panorama.setPano(panoId);
         },
 
-        showResults: function (position, guessPosition, result, allResults) {
-            if (Game.adaptGuess) {
-                document.getElementById('guess').classList.remove('adapt');
-            }
-
-            if (Game.guessMarker) {
-                Game.guessMarker.setMap(null);
-                Game.guessMarker = null;
-            }
-
-            document.getElementById('guess').classList.add('result');
-
+        receiveResult: function (position, guessPosition, result, allResults) {
             Game.scoreSum += result.score;
             document.getElementById('currentScoreSum').innerHTML = String(Game.scoreSum) + '/' + String(Game.rounds.length * Game.MAX_SCORE);
 
@@ -433,18 +437,53 @@
             if (allResults) {
                 for (var i = 0; i < allResults.length; ++i) {
                     var currentResult = allResults[i];
-                    Game.addGuessPositionToResultMap(currentResult.guessPosition, currentResult);
-                    resultBounds.extend(currentResult.guessPosition);
+                    if (currentResult.guessPosition) {
+                        Game.addGuessPositionToResultMap(currentResult.guessPosition, currentResult);
+                        resultBounds.extend(currentResult.guessPosition);
+                    }
                 }
             }
 
+            Game.showResultMap(result, resultBounds);
+        },
+
+        showResultFromHistory: function (result) {
+            var round = Game.rounds[Game.rounds.length - 1];
+            var resultBounds = new google.maps.LatLngBounds();
+
+            round.realMarker.setVisible(true);
+            resultBounds.extend(round.position);
+
+            for (var j = 0; j < round.guessMarkers.length; ++j) {
+                var guessMarker = round.guessMarkers[j];
+                guessMarker.marker.setVisible(true);
+                guessMarker.line.setVisible(true);
+
+                resultBounds.extend(guessMarker.marker.getPosition());
+            }
+
+            Game.showResultMap(result, resultBounds);
+        },
+
+        showResultMap: function (result, resultBounds) {
+            if (Game.adaptGuess) {
+                document.getElementById('guess').classList.remove('adapt');
+            }
+
+            if (Game.guessMarker) {
+                Game.guessMarker.setMap(null);
+                Game.guessMarker = null;
+            }
+
+            document.getElementById('guess').classList.add('result');
+
             Game.map.setOptions({
                 draggableCursor: 'grab'
             });
             Game.map.fitBounds(resultBounds);
 
             var distanceInfo = document.getElementById('distanceInfo');
-            if (Number.isNaN(result.distance)) {
+            if (result.distance === null) {
                 distanceInfo.children[0].style.display = 'none';
                 distanceInfo.children[1].style.display = 'block';
             } else {
@@ -463,6 +502,14 @@
             if (Game.rounds.length === Game.NUMBER_OF_ROUNDS) {
                 document.getElementById('continueButton').style.display = 'none';
                 document.getElementById('showSummaryButton').style.display = 'block';
+            } else if (roomId) {
+                if (Game.multi.owner) {
+                    if (!Game.readyToContinue) {
+                        document.getElementById('continueButton').disabled = true;
+                    }
+                } else {
+                    document.getElementById('continueButton').style.display = 'none';
+                }
             }
         },
 
@@ -491,15 +538,11 @@
                     return;
                 }
 
-                Game.showResults(this.response.position, guessPosition, this.response.result, this.response.allResults);
+                Game.receiveResult(this.response.position, guessPosition, this.response.result, this.response.allResults);
 
                 if (this.response.place) {
                     Game.panoId = this.response.place.panoId;
                     Game.pov = this.response.place.pov;
-                } else {
-                    if (!Game.multi.owner) {
-                        document.getElementById('continueButton').style.display = 'none';
-                    }
                 }
             }, data);
         },
@@ -625,6 +668,9 @@
 
             if (!roomId || Game.multi.owner) {
                 document.getElementById('startNewGameButton').style.display = 'block';
+                if (!Game.readyToContinue) {
+                    document.getElementById('startNewGameButton').disabled = true;
+                }
             }
 
             var resultBounds = new google.maps.LatLngBounds();
@@ -694,12 +740,17 @@
                 clearInterval(Game.countdownHandler);
             }
 
-            Game.timeoutEnd = new Date(new Date().getTime() + timeout);
             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.countdownHandler = setInterval(function () {
                 var timeLeft = Math.round((Game.timeoutEnd - new Date()) / 1000);
 
@@ -758,7 +809,7 @@
     });
 
     Game.map.addListener('click', function (e) {
-        if (Game.rounds[Game.rounds.length - 1].guessPosition) {
+        if (Game.rounds[Game.rounds.length - 1].guessPosition || Game.rounds[Game.rounds.length - 1].position) {
             return;
         }
 
@@ -826,7 +877,7 @@
 
     document.getElementById('continueButton').onclick = function () {
         if (roomId) {
-            if (!Game.multi.owner) {
+            if (!Game.multi.owner || !Game.readyToContinue) {
                 return;
             }
 

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);
-
-        if (isset($response['data'])) {
-            return $response['data'];
-        }
+        return json_decode($response, true);
     }
 }