]> git.sesse.net Git - remoteglot/blobdiff - www/js/remoteglot.js
Fix a client crash when the server was not sending it correct multi-PVs.
[remoteglot] / www / js / remoteglot.js
index d14571792bff114783834c973a4873ea95d2ebc9..35683608f55fb33aac14a0e5d7b5fd16f39497c6 100644 (file)
@@ -7,7 +7,7 @@
  * @type {Number}
  * @const
  * @private */
-var SCRIPT_VERSION = 2016032202;
+var SCRIPT_VERSION = 2016091401;
 
 /**
  * The current backend URL.
@@ -277,13 +277,31 @@ var request_update = function() {
                        location.reload(true);
                }
 
-               possibly_play_sound(current_analysis_data, new_data);
-               current_analysis_data = new_data;
-               update_board();
-               update_num_viewers(num_viewers);
+               // Verify that the PV makes sense.
+               var valid = true;
+               if (new_data['pv']) {
+                       var hiddenboard = new Chess(new_data['position']['fen']);
+                       for (var i = 0; i < new_data['pv'].length; ++i) {
+                               if (hiddenboard.move(new_data['pv'][i]) === null) {
+                                       valid = false;
+                                       break;
+                               }
+                       }
+               }
+
+               var timeout = 100;
+               if (valid) {
+                       possibly_play_sound(current_analysis_data, new_data);
+                       current_analysis_data = new_data;
+                       update_board();
+                       update_num_viewers(num_viewers);
+               } else {
+                       console.log("Received invalid update, waiting five seconds and trying again.");
+                       location.reload(true);
+               }
 
                // Next update.
-               current_analysis_request_timer = setTimeout(function() { request_update(); }, 100);
+               current_analysis_request_timer = setTimeout(function() { request_update(); }, timeout);
        }).fail(function(jqXHR, textStatus, errorThrown) {
                if (textStatus === "abort") {
                        // Aborted because we are switching backends. Abandon and don't retry,
@@ -1035,15 +1053,27 @@ var update_board = function() {
        if (displayed_analysis_data) {
                // Displaying some non-current position, pick out the last move
                // from the history. This will work even if the fetch failed.
-               last_move = format_halfmove_with_number(
-                       current_display_line.pv[current_display_move],
-                       current_display_move + 1);
-               headline += ' after ' + last_move;
+               if (current_display_move !== -1) {
+                       last_move = format_halfmove_with_number(
+                               current_display_line.pv[current_display_move],
+                               current_display_move);
+                       headline += ' after ' + last_move;
+               }
        } else if (data['position']['last_move'] !== 'none') {
+               // Find the previous move.
+               var previous_move_num, previous_toplay;
+               if (data['position']['toplay'] == 'B') {
+                       previous_move_num = data['position']['move_num'];
+                       previous_toplay = 'W';
+               } else {
+                       previous_move_num = data['position']['move_num'] - 1;
+                       previous_toplay = 'B';
+               }
+
                last_move = format_move_with_number(
                        data['position']['last_move'],
-                       data['position']['move_num'],
-                       data['position']['toplay'] == 'W');
+                       previous_move_num,
+                       previous_toplay == 'W');
                headline += ' after ' + last_move;
        } else {
                last_move = null;
@@ -1071,7 +1101,7 @@ var update_board = function() {
        if (data['position'] && data['position']['last_move_uci']) {
                highlight_from = data['position']['last_move_uci'].substr(0, 2);
                highlight_to = data['position']['last_move_uci'].substr(2, 2);
-       } else if (current_display_line_is_history && current_display_move >= 0) {
+       } else if (current_display_line_is_history && current_display_line && current_display_move >= 0) {
                // We don't have historic analysis for this position, but we
                // can reconstruct what the last move was by just replaying
                // from the start.
@@ -1178,7 +1208,9 @@ var update_board = function() {
                for (var i = 1; i < alt_moves.length && i < 3; ++i) {
                        hiddenboard = new Chess(base_fen);
                        var move = hiddenboard.move(alt_moves[i]);
-                       create_arrow(move.from, move.to, '#f66', 1, 10);
+                       if (move !== null) {
+                               create_arrow(move.from, move.to, '#f66', 1, 10);
+                       }
                }
        }
 
@@ -1280,7 +1312,9 @@ var update_sparkline = function(data) {
                                chartRangeMin: min_score,
                                chartRangeMax: max_score,
                                tooltipFormatter: function(sparkline, options, fields) {
-                                       return format_tooltip(data, fields[0].offset + first_move_num);
+                                       // score_history contains the Nth _position_, but format_tooltip
+                                       // wants to format the Nth _move_; thus the -1.
+                                       return format_tooltip(data, fields[0].offset + first_move_num - 1);
                                }
                        });
                } else {
@@ -1434,15 +1468,15 @@ var format_2d = function(x) {
 
 /**
  * @param {string} move
- * @param {Number} move_num
- * @param {boolean} white_to_play
+ * @param {Number} move_num Move number of this move.
+ * @param {boolean} white_to_play Whether white is to play this move.
  */
 var format_move_with_number = function(move, move_num, white_to_play) {
        var ret;
        if (white_to_play) {
-               ret = (move_num - 1) + '… ';
-       } else {
                ret = move_num + '. ';
+       } else {
+               ret = move_num + '… ';
        }
        ret += move;
        return ret;
@@ -1450,7 +1484,8 @@ var format_move_with_number = function(move, move_num, white_to_play) {
 
 /**
  * @param {string} move
- * @param {Number} halfmove_num
+ * @param {Number} halfmove_num Half-move number that is to be played,
+ *   starting from 0.
  */
 var format_halfmove_with_number = function(move, halfmove_num) {
        return format_move_with_number(
@@ -1464,25 +1499,34 @@ var format_halfmove_with_number = function(move, halfmove_num) {
  * @param {Number} halfmove_num
  */
 var format_tooltip = function(data, halfmove_num) {
-       if (data['score_history'][halfmove_num] ||
-           halfmove_num === data['position']['history'].length) {
+       if (data['score_history'][halfmove_num + 1] ||
+           (halfmove_num + 1) === data['position']['history'].length) {
+               // Position is in the history, or it is the current position
+               // (which is implicitly tacked onto the history).
                var move;
                var short_score;
-               if (halfmove_num === data['position']['history'].length) {
+               if ((halfmove_num + 1) === data['position']['history'].length) {
                        move = data['position']['last_move'];
                        short_score = format_short_score(data['score']);
                } else {
                        move = data['position']['history'][halfmove_num];
-                       short_score = format_short_score(data['score_history'][halfmove_num]);
+                       short_score = format_short_score(data['score_history'][halfmove_num + 1]);
+               }
+               if (halfmove_num === -1) {
+                       return "Start position: " + short_score;
+               } else {
+                       var move_with_number = format_halfmove_with_number(move, halfmove_num);
+                       return "After " + move_with_number + ": " + short_score;
                }
-               var move_with_number = format_halfmove_with_number(move, halfmove_num);
-
-               return "After " + move_with_number + ": " + short_score;
        } else {
-               for (var i = halfmove_num; i --> 0; ) {
+               for (var i = halfmove_num; i --> -1; ) {
                        if (data['score_history'][i]) {
                                var move = data['position']['history'][i];
-                               return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
+                               if (i === -1) {
+                                       return "[Analysis kept from start position]";
+                               } else {
+                                       return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]";
+                               }
                        }
                }
        }