X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=34e1863624ffdc7afd34a7913e54acd35bbc6028;hp=114f3a4e7435aaf26f2700757dbd981f3ffa8084;hb=83d2eb4;hpb=e29e4043c66b7b187d48e73e73895a2ce62949d4 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 114f3a4..34e1863 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 = 2016113002; /** * 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, @@ -552,8 +571,8 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_ // Note: invert is ignored. var compare_by_name = function(refutation_lines, invert, a, b) { - var ska = refutation_lines[a]['pretty_move']; - var skb = refutation_lines[b]['pretty_move']; + var ska = refutation_lines[a]['move']; + var skb = refutation_lines[b]['move']; if (ska < skb) return -1; if (ska > skb) return 1; return 0; @@ -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.} 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; } @@ -797,7 +816,7 @@ var update_refutation_lines = function() { if (line['pv'].length == 0) { // Not found, so just make a one-move PV. - var move = "" + line['pretty_move'] + ""; + var move = "" + line['move'] + ""; $(move_td).html(move); var score_td = document.createElement("td"); @@ -813,13 +832,13 @@ var update_refutation_lines = function() { var pv_td = document.createElement("td"); tr.appendChild(pv_td); $(pv_td).addClass("pv"); - $(pv_td).html(add_pv(base_fen, base_line.concat([ line['pretty_move'] ]), move_num, toplay, scores, start_display_move_num)); + $(pv_td).html(add_pv(base_fen, base_line.concat([ line['move'] ]), move_num, toplay, scores, start_display_move_num)); tbl.append(tr); continue; } - var move = "" + line['pretty_move'] + ""; + var move = "" + line['move'] + ""; $(move_td).html(move); var score_td = document.createElement("td"); @@ -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; } @@ -959,8 +978,8 @@ var update_board = function() { // Print the history. This is pretty much the only thing that's // unconditionally taken from current_data (we're not interested in // historic history). - if (current_data['position']['pretty_history']) { - add_pv('start', current_data['position']['pretty_history'], 1, 'W', null, 0, 8, true); + if (current_data['position']['history']) { + add_pv('start', current_data['position']['history'], 1, 'W', null, 0, 8, true); } else { display_lines.push(null); } @@ -1034,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; @@ -1070,13 +1101,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 { @@ -1177,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); + } } } @@ -1204,7 +1237,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) { @@ -1279,7 +1312,16 @@ 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); + } + }); + $('#scorespark').bind('sparklineClick', function(event) { + var sparkline = event.sparklines[0]; + var region = sparkline.getCurrentRegionFields(); + if (region[0].offset !== undefined) { + show_line(0, first_move_num + region[0].offset - 1); } }); } else { @@ -1336,7 +1378,6 @@ var update_clock = function() { var white_clock_ms = null; var black_clock_ms = null; - var show_seconds = false; // Static clocks. if (data['position'] && @@ -1377,8 +1418,9 @@ var update_clock = function() { return; } - // If either player has ten minutes or less left, add the second counters. - var show_seconds = (white_clock_ms < 60 * 10 * 1000 || black_clock_ms < 60 * 10 * 1000); + // If either player has twenty minutes or less left, add the second counters. + // This matches what DGT clocks do. + var show_seconds = (white_clock_ms < 60 * 20 * 1000 || black_clock_ms < 60 * 20 * 1000); if (color) { // See when the clock will change next, and update right after that. @@ -1434,15 +1476,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 +1492,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 +1507,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']['pretty_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']['pretty_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']['pretty_history'][halfmove_num]; - short_score = format_short_score(data['score_history'][halfmove_num]); + move = data['position']['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']['pretty_history'][i]; - return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]"; + var move = data['position']['history'][i]; + if (i === -1) { + return "[Analysis kept from start position]"; + } else { + return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]"; + } } } } @@ -1571,7 +1623,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 +2026,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 +2118,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 +2141,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 +2183,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 +2234,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();