X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=1b6952db9bb58a75f14b0bccb8ac084ae14b8120;hp=81612361feeefadfa122053c427972fbe133989b;hb=bc097140eb8ba34f6911ac0ef4f55988b0443ee1;hpb=181097241ea4fe24cbea99a0a92736e39704e4a6 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 8161236..1b6952d 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -3,6 +3,23 @@ /** @type {window.ChessBoard} @private */ var board = null; +/** + * The most recent analysis data we have from the server + * (about the most recent position). + * + * @type {?Object} + * @private */ +var current_analysis_data = null; + +/** + * If we are displaying previous analysis, this is non-null, + * and will override most of current_analysis_data. + * + * @type {?Object} + * @private + */ +var displayed_analysis_data = null; + /** @type {Array.<{ * from_col: number, * from_row: number, @@ -70,6 +87,9 @@ var display_lines = []; /** @type {?DisplayLine} @private */ var current_display_line = null; +/** @type {boolean} @private */ +var current_display_line_is_history = false; + /** @type {?number} @private */ var current_display_move = null; @@ -101,7 +121,12 @@ var request_update = function() { }).done(function(data, textstatus, xhr) { ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified'); var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers'); - update_board(data, num_viewers); + current_analysis_data = data; + update_board(current_analysis_data, displayed_analysis_data); + update_num_viewers(num_viewers); + + // Next update. + setTimeout(function() { request_update(); }, 100); }).fail(function() { // Wait ten seconds, then try again. setTimeout(function() { request_update(); }, 10000); @@ -229,7 +254,7 @@ var position_arrow = function(arrow) { arrow.svg.parentElement.removeChild(arrow.svg); delete arrow.svg; } - if (current_display_line !== null) { + if (current_display_line !== null && !current_display_line_is_history) { return; } @@ -397,23 +422,15 @@ var thousands = function(x) { /** * @param {!string} fen - * @param {Array.} uci_pv + * @param {Array.} pretty_pv * @param {number} move_num * @param {!string} toplay * @param {number=} opt_limit * @param {boolean=} opt_showlast */ -var add_pv = function(fen, uci_pv, move_num, toplay, opt_limit, opt_showlast) { - var hiddenboard = new Chess(); - hiddenboard.load(fen); - for (var i = 0; i < uci_pv.length; ++i) { - hiddenboard.move(ucimove_to_chessjs_move(uci_pv[i])); - } - var pretty_pv = hiddenboard.history(); - +var add_pv = function(fen, pretty_pv, move_num, toplay, opt_limit, opt_showlast) { display_lines.push({ start_fen: fen, - uci_pv: uci_pv, pretty_pv: pretty_pv, line_number: display_lines.length }); @@ -472,7 +489,8 @@ var print_pv = function(line_num, pretty_pv, move_num, toplay, opt_limit, opt_sh var update_highlight = function() { $("#board").find('.square-55d63').removeClass('nonuglyhighlight'); - if (current_display_line === null && highlight_from !== undefined && highlight_to !== undefined) { + if ((current_display_line === null || current_display_line_is_history) && + highlight_from !== undefined && highlight_to !== undefined) { $("#board").find('.square-' + highlight_from).addClass('nonuglyhighlight'); $("#board").find('.square-' + highlight_to).addClass('nonuglyhighlight'); } @@ -524,7 +542,7 @@ var update_refutation_lines = function() { var move_td = document.createElement("td"); tr.appendChild(move_td); $(move_td).addClass("move"); - if (line['pv_uci'].length == 0) { + if (line['pv_pretty'].length == 0) { $(move_td).text(line['pretty_move']); } else { var move = "" + line['pretty_move'] + ""; @@ -544,7 +562,7 @@ var update_refutation_lines = function() { var pv_td = document.createElement("td"); tr.appendChild(pv_td); $(pv_td).addClass("pv"); - $(pv_td).html(add_pv(fen, line['pv_uci'], move_num, toplay, 10)); + $(pv_td).html(add_pv(fen, line['pv_pretty'], move_num, toplay, 10)); tbl.append(tr); } @@ -561,53 +579,55 @@ var update_refutation_lines = function() { /** * @param {Object} data - * @param {number} num_viewers + * @param {?Object} display_data */ -var update_board = function(data, num_viewers) { +var update_board = function(current_data, display_data) { + var data = display_data || current_data; + display_lines = []; - // The headline. + // 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', 8, true); + } else { + display_lines.push(null); + } + update_history(); + + // The headline. Names are always fetched from current_data; + // the rest can depend a bit. var headline; - if (data['position']['player_w'] && data['position']['player_b']) { - headline = data['position']['player_w'] + '–' + - data['position']['player_b'] + ', analysis'; + if (current_data && + current_data['position']['player_w'] && current_data['position']['player_b']) { + headline = current_data['position']['player_w'] + '–' + + current_data['position']['player_b'] + ', analysis'; } else { headline = 'Analysis'; } - var last_move; - if (data['position']['last_move'] !== 'none') { - if (data['position']['toplay'] == 'W') { - last_move = (data['position']['move_num']-1) + '… '; - } else { - last_move = data['position']['move_num'] + '. '; - } - last_move += data['position']['last_move']; + var last_move; + if (display_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_move_with_number( + current_display_line.pretty_pv[current_display_move], + Math.floor((current_display_move + 1) / 2) + 1, + (current_display_move % 2 == 1)); + headline += ' after ' + last_move; + } else if (data['position']['last_move'] !== 'none') { + last_move = format_move_with_number( + data['position']['last_move'], + data['position']['move_num'], + data['position']['toplay'] == 'W'); headline += ' after ' + last_move; } else { last_move = null; } - $("#headline").text(headline); - if (num_viewers === null) { - $("#numviewers").text(""); - } else if (num_viewers == 1) { - $("#numviewers").text("You are the only current viewer"); - } else { - $("#numviewers").text(num_viewers + " current viewers"); - } - - // The engine id. - if (data['id'] && data['id']['name'] !== null) { - $("#engineid").text(data['id']['name']); - } - - // The score. - if (data['score'] !== null) { - $("#score").text(data['score']); - } - + // The contains a very brief headline. var title_elems = []; if (data['short_score'] !== undefined && data['short_score'] !== null) { title_elems.push(data['short_score']); @@ -622,6 +642,49 @@ var update_board = function(data, num_viewers) { document.title = 'analysis.sesse.net'; } + // The last move (shown by highlighting the from and to squares). + 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) { + // 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 = new Chess(); + for (var i = 0; i <= current_display_move; ++i) { + hiddenboard.move(current_display_line.pretty_pv[i]); + } + var moves = hiddenboard.history({ verbose: true }); + var last_move = moves.pop(); + highlight_from = last_move.from; + highlight_to = last_move.to; + } else { + highlight_from = highlight_to = undefined; + } + update_highlight(); + + if (data['failed']) { + $("#score").text("No analysis for this move"); + $("#pv").empty(); + $("#searchstats").html(" "); + $("#refutationlines").empty(); + refutation_lines = []; + update_refutation_lines(); + clear_arrows(); + update_displayed_line(); + return; + } + + // The engine id. + if (data['id'] && data['id']['name'] !== null) { + $("#engineid").text(data['id']['name']); + } + + // The score. + if (data['score'] !== null) { + $("#score").text(data['score']); + } + // The search stats. if (data['tablebase'] == 1) { $("#searchstats").text("Tablebase result"); @@ -647,24 +710,8 @@ var update_board = function(data, num_viewers) { fen = data['position']['fen']; update_displayed_line(); - if (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 { - highlight_from = highlight_to = undefined; - } - update_highlight(); - - // Print the history. - if (data['position']['history']) { - add_pv('start', data['position']['history'], 1, 'W', 8, true); - } else { - display_lines.push(null); - } - update_history(); - // Print the PV. - $("#pv").html(add_pv(data['position']['fen'], data['pv_uci'], data['position']['move_num'], data['position']['toplay'])); + $("#pv").html(add_pv(data['position']['fen'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'])); // Update the PV arrow. clear_arrows(); @@ -724,9 +771,35 @@ var update_board = function(data, num_viewers) { toplay = data['position']['toplay']; refutation_lines = data['refutation_lines']; update_refutation_lines(); +} + +/** + * @param {number} num_viewers + */ +var update_num_viewers = function(num_viewers) { + if (num_viewers === null) { + $("#numviewers").text(""); + } else if (num_viewers == 1) { + $("#numviewers").text("You are the only current viewer"); + } else { + $("#numviewers").text(num_viewers + " current viewers"); + } +} - // Next update. - setTimeout(function() { request_update(); }, 100); +/** + * @param {string} move + * @param {Number} move_num + * @param {boolean} white_to_play + */ +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 + '. '; + } + ret += move; + return ret; } /** @@ -755,10 +828,19 @@ var show_line = function(line_num, move_num) { if (line_num == -1) { current_display_line = null; current_display_move = null; + if (displayed_analysis_data) { + // TODO: Support exiting to history position if we are in an + // analysis line of a history position. + displayed_analysis_data = null; + update_board(current_analysis_data, displayed_analysis_data); + } } else { current_display_line = display_lines[line_num]; current_display_move = move_num; } + current_display_line_is_history = (line_num == 0); + + update_historic_analysis(); update_displayed_line(); update_highlight(); redraw_arrows(); @@ -769,6 +851,7 @@ var prev_move = function() { if (current_display_move > -1) { --current_display_move; } + update_historic_analysis(); update_displayed_line(); } window['prev_move'] = prev_move; @@ -777,10 +860,39 @@ var next_move = function() { if (current_display_line && current_display_move < current_display_line.pretty_pv.length - 1) { ++current_display_move; } + update_historic_analysis(); update_displayed_line(); } window['next_move'] = next_move; +var update_historic_analysis = function() { + if (!current_display_line_is_history) { + return; + } + if (current_display_move == current_display_line.pretty_pv.length - 1) { + displayed_analysis_data = null; + update_board(current_analysis_data, displayed_analysis_data); + } + + // Fetch old analysis for this line if it exists. + var hiddenboard = new Chess(); + for (var i = 0; i <= current_display_move; ++i) { + hiddenboard.move(current_display_line.pretty_pv[i]); + } + var filename = "/history/move" + (current_display_move + 1) + "-" + + hiddenboard.fen().replace(/ /g, '_').replace(/\//g, '-') + ".json"; + + $.ajax({ + url: filename + }).done(function(data, textstatus, xhr) { + displayed_analysis_data = data; + update_board(current_analysis_data, displayed_analysis_data); + }).fail(function() { + displayed_analysis_data = {'failed': true}; + update_board(current_analysis_data, displayed_analysis_data); + }); +} + var update_displayed_line = function() { if (highlighted_move !== null) { highlighted_move.removeClass('highlight'); @@ -800,7 +912,7 @@ var update_displayed_line = function() { } else { $("#prevmove").html("<a href=\"javascript:prev_move();\">Previous</a></span>"); } - if (current_display_move == current_display_line.uci_pv.length - 1) { + if (current_display_move == current_display_line.pretty_pv.length - 1) { $("#nextmove").html("Next"); } else { $("#nextmove").html("<a href=\"javascript:next_move();\">Next</a></span>"); @@ -809,7 +921,7 @@ var update_displayed_line = function() { var hiddenboard = new Chess(); hiddenboard.load(current_display_line.start_fen); for (var i = 0; i <= current_display_move; ++i) { - hiddenboard.move(ucimove_to_chessjs_move(current_display_line.uci_pv[i])); + hiddenboard.move(current_display_line.pretty_pv[i]); } highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move); @@ -818,18 +930,6 @@ var update_displayed_line = function() { board.position(hiddenboard.fen()); } -var ucimove_to_chessjs_move = function(move) { - var source = move.substr(0, 2); - var target = move.substr(2, 2); - var promo = move.substr(4, 1); - - if (promo === '') { - return { from: source, to: target }; - } else { - return { from: source, to: target, promotion: promo }; - } -} - var init = function() { unique = get_unique();