X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=b049c32ea81bc52c63b1cbb19172d7c769778b21;hp=c5ab4379f05d14074e314876fc84cc6116a72521;hb=619f444e5eafb0f602d848ec13d70148cd90a16b;hpb=48c786c43fab6dfe37c0fe70aa474431f33d2b27

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index c5ab437..b049c32 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -7,7 +7,7 @@
  * @type {Number}
  * @const
  * @private */
-var SCRIPT_VERSION = 2016032202;
+var SCRIPT_VERSION = 2016091401;
 
 /**
  * The current backend URL.
@@ -47,9 +47,10 @@ var displayed_analysis_data = null;
  * @type {?Array.<{
  *      name: string,
  *      url: string,
+ *      hashurl: string,
  *      id: string,
- *      score: =Object,
- *      result: =string,
+ *      score: Object=,
+ *      result: string=,
  * }>}
  * @private
  */
@@ -276,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,
@@ -572,7 +591,7 @@ var compare_by_score = function(refutation_lines, invert, a, b) {
  * @param {!Object} data
  * @param {number} margin The maximum number of centipawns worse than the
  *     best move can be and still be included.
- * @param {boolean} margin Whether black is to play.
+ * @param {boolean} invert Whether black is to play.
  * @return {Array.<string>} The FEN representation (e.g. Ne4) of all
  *     moves, in score order.
  */
@@ -584,7 +603,7 @@ var find_nonstupid_moves = function(data, margin, invert) {
 	var pv_score = undefined;
 	for (var move in data['refutation_lines']) {
 		var line = data['refutation_lines'][move];
-		var score = compute_score_sort_key(line['score'], line['depth'], invert);
+		var score = compute_score_sort_key(line['score'], line['depth'], invert, false);
 		if (move == data['pv'][0]) {
 			pv_score = score;
 		}
@@ -941,7 +960,7 @@ var possibly_switch_game_from_hash = function() {
 	for (var i = 0; i < current_games.length; ++i) {
 		if (current_games[i]['id'] === hash) {
 			if (backend_url !== current_games[i]['url']) {
-				switch_backend(current_games[i]['url'], current_games[i]['hashurl']);
+				switch_backend(current_games[i]);
 			}
 			return;
 		}
@@ -1070,13 +1089,13 @@ 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.
 		var hiddenboard = chess_from(null, current_display_line.pv, current_display_move);
 		var moves = hiddenboard.history({ verbose: true });
-		var last_move = moves.pop();
+		last_move = moves.pop();
 		highlight_from = last_move.from;
 		highlight_to = last_move.to;
 	} else {
@@ -1204,7 +1223,7 @@ var update_board = function() {
 				break;
 			}
 			var line = data['refutation_lines'][nonstupid_moves[i]];
-			var hiddenboard = new Chess(base_fen);
+			hiddenboard = new Chess(base_fen);
 			hiddenboard.move(line['pv'][0]);
 			var this_response = hiddenboard.move(line['pv'][1]);
 			if (response.from !== this_response.from || response.to !== this_response.to) {
@@ -1336,7 +1355,6 @@ var update_clock = function() {
 
 	var white_clock_ms = null;
 	var black_clock_ms = null;
-	var show_seconds = false;
 
 	// Static clocks.
 	if (data['position'] &&
@@ -1571,7 +1589,7 @@ var next_game = function() {
 		var game = current_games[game_num];
 		if (game['url'] === backend_url) {
 			var next_game_num = (game_num + 1) % current_games.length;
-			switch_backend(current_games[next_game_num]['url'], current_games[next_game_num]['hashurl']);
+			switch_backend(current_games[next_game_num]);
 			return;
 		}
 	}
@@ -1974,6 +1992,10 @@ var onSnapEnd = function(source, target) {
 	// this move, then select that. Note that this gives us a good priority
 	// order (history first, then PV, then multi-PV lines).
 	for (var i = 0; i < display_lines.length; ++i) {
+		if (i == 1 && current_display_line) {
+			// Do not choose PV if not on it.
+			continue;
+		}
 		var line = display_lines[i];
 		if (line.pv[line.start_display_move_num] === move.san) {
 			show_line(i, 0);
@@ -2062,9 +2084,10 @@ var compute_plot_score = function(score) {
  * @param score The score digest tuple.
  * @param {?number} depth Depth the move has been computed to, or null.
  * @param {boolean} invert Whether black is to play.
+ * @param {boolean=} depth_secondary_key
  * @return {number}
  */
-var compute_score_sort_key = function(score, depth, invert) {
+var compute_score_sort_key = function(score, depth, invert, depth_secondary_key) {
 	var s;
 	if (!score) {
 		return -10000000;
@@ -2084,16 +2107,20 @@ var compute_score_sort_key = function(score, depth, invert) {
 	}
 	if (s) {
 		if (invert) s = -s;
-		return s * 200 + (depth || 0);
+		if (depth_secondary_key) {
+			return s * 200 + (depth || 0);
+		} else {
+			return s;
+		}
 	} else {
 		return null;
 	}
 }
 
 /**
- * @param {string} new_backend_url
+ * @param {Object} game
  */
-var switch_backend = function(new_backend_url, new_backend_hash_url) {
+var switch_backend = function(game) {
 	// Stop looking at historic data.
 	current_display_line = null;
 	current_display_move = null;
@@ -2122,8 +2149,9 @@ var switch_backend = function(new_backend_url, new_backend_hash_url) {
 	}
 
 	// Request an immediate fetch with the new backend.
-	backend_url = new_backend_url;
-	backend_hash_url = new_backend_hash_url;
+	backend_url = game['url'];
+	backend_hash_url = game['hashurl'];
+	window.location.hash = '#' + game['id'];
 	current_analysis_data = null;
 	ims = 0;
 	request_update();
@@ -2172,7 +2200,7 @@ var init = function() {
 		} else if (event.which >= 49 && event.which <= 57) {  // 1-9.
 			var num = event.which - 49;
 			if (current_games && current_games.length >= num) {
-				switch_backend(current_games[num]['url'], current_games[num]['hashurl']);
+				switch_backend(current_games[num]);
 			}
 		} else if (event.which == 78) {  // N.
 			next_game();