X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=81612361feeefadfa122053c427972fbe133989b;hp=8cffebdeda197c78022ad443fdc2ea73c7fc56e7;hb=181097241ea4fe24cbea99a0a92736e39704e4a6;hpb=071760a7bd1a175ebe9c77b460b8d0f654eeee48 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 8cffebd..8161236 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -3,9 +3,6 @@ /** @type {window.ChessBoard} @private */ var board = null; -/** @type {window.ChessBoard} @private */ -var hiddenboard = null; - /** @type {Array.<{ * from_col: number, * from_row: number, @@ -34,7 +31,10 @@ var toplay = 'W'; var ims = 0; /** @type {boolean} @private */ -var sort_refutation_lines_by_score = false; +var sort_refutation_lines_by_score = true; + +/** @type {boolean} @private */ +var truncate_display_history = true; /** @type {!string|undefined} @private */ var highlight_from = undefined; @@ -42,8 +42,11 @@ var highlight_from = undefined; /** @type {!string|undefined} @private */ var highlight_to = undefined; -/** @type {!number} @private */ -var unique = Math.random(); +/** @type {?jQuery} @private */ +var highlighted_move = null; + +/** @type {?number} @private */ +var unique = null; /** The current position on the board, represented as a FEN string. * @type {?string} @@ -54,7 +57,8 @@ var fen = null; /** @typedef {{ * start_fen: string, * uci_pv: Array., - * pretty_pv: Array. + * pretty_pv: Array., + * line_num: number * }} DisplayLine */ @@ -69,10 +73,31 @@ var current_display_line = null; /** @type {?number} @private */ var current_display_move = null; +var supports_html5_storage = function() { + try { + return 'localStorage' in window && window['localStorage'] !== null; + } catch (e) { + return false; + } +} + +// Make the unique token persistent so people refreshing the page won't count twice. +// Of course, you can never fully protect against people deliberately wanting to spam. +var get_unique = function() { + var use_local_storage = supports_html5_storage(); + if (use_local_storage && localStorage['unique']) { + return localStorage['unique']; + } + var unique = Math.random(); + if (use_local_storage) { + localStorage['unique'] = unique; + } + return unique; +} + var request_update = function() { $.ajax({ - url: "http://analysis.sesse.net/analysis.pl?ims=" + ims + "&unique=" + unique - //url: "http://analysis.sesse.net:5000/analysis.pl?ims=" + ims + "&unique=" + unique + url: "/analysis.pl?ims=" + ims + "&unique=" + unique }).done(function(data, textstatus, xhr) { ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified'); var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers'); @@ -373,32 +398,62 @@ 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 print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit) { +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(); + display_lines.push({ start_fen: fen, uci_pv: uci_pv, - pretty_pv: pretty_pv + pretty_pv: pretty_pv, + line_number: display_lines.length }); + return print_pv(display_lines.length - 1, pretty_pv, move_num, toplay, opt_limit, opt_showlast); +} +/** + * @param {number} line_num + * @param {Array.} pretty_pv + * @param {number} move_num + * @param {!string} toplay + * @param {number=} opt_limit + * @param {boolean=} opt_showlast + */ +var print_pv = function(line_num, pretty_pv, move_num, toplay, opt_limit, opt_showlast) { var pv = ''; var i = 0; - if (toplay == 'B') { - var move = "" + pretty_pv[0] + ""; + if (opt_limit && opt_showlast && pretty_pv.length > opt_limit) { + // Truncate the PV at the beginning (instead of at the end). + // We assume here that toplay is 'W'. We also assume that if + // opt_showlast is set, then it is the history, and thus, + // the UI should be to expand the history. + pv = '(…) '; + i = pretty_pv.length - opt_limit; + if (i % 2 == 1) { + ++i; + } + move_num += i / 2; + } else if (toplay == 'B' && pretty_pv.length > 0) { + var move = "" + pretty_pv[0] + ""; pv = move_num + '. … ' + move; toplay = 'W'; ++i; ++move_num; } for ( ; i < pretty_pv.length; ++i) { - var move = "" + pretty_pv[i] + ""; + var move = "" + pretty_pv[i] + ""; if (toplay == 'W') { - if (i > opt_limit) { + if (i > opt_limit && !opt_showlast) { return pv + ' (…)'; } if (pv != '') { @@ -423,12 +478,33 @@ var update_highlight = function() { } } +var update_history = function() { + if (display_lines[0] === null || display_lines[0].pretty_pv.length == 0) { + $("#history").html("No history"); + } else if (truncate_display_history) { + $("#history").html(print_pv(0, display_lines[0].pretty_pv, 1, 'W', 8, true)); + } else { + $("#history").html( + '(collapse) ' + + print_pv(0, display_lines[0].pretty_pv, 1, 'W')); + } +} + +/** + * @param {!boolean} truncate_history + */ +var collapse_history = function(truncate_history) { + truncate_display_history = truncate_history; + update_history(); +} +window['collapse_history'] = collapse_history; + var update_refutation_lines = function() { if (fen === null) { return; } - if (display_lines.length > 1) { - display_lines = [ display_lines[0] ]; + if (display_lines.length > 2) { + display_lines = [ display_lines[0], display_lines[1] ]; } var tbl = $("#refutationlines"); @@ -468,7 +544,7 @@ var update_refutation_lines = function() { var pv_td = document.createElement("td"); tr.appendChild(pv_td); $(pv_td).addClass("pv"); - $(pv_td).html(print_pv(fen, line['pv_uci'], line['pv_pretty'], move_num, toplay, 10)); + $(pv_td).html(add_pv(fen, line['pv_uci'], move_num, toplay, 10)); tbl.append(tr); } @@ -491,15 +567,25 @@ var update_board = function(data, num_viewers) { display_lines = []; // The headline. - var headline = 'Analysis'; + var headline; + if (data['position']['player_w'] && data['position']['player_b']) { + headline = data['position']['player_w'] + '–' + + data['position']['player_b'] + ', analysis'; + } else { + headline = 'Analysis'; + } + var last_move; if (data['position']['last_move'] !== 'none') { - headline += ' after ' if (data['position']['toplay'] == 'W') { - headline += (data['position']['move_num']-1) + '… '; + last_move = (data['position']['move_num']-1) + '… '; } else { - headline += data['position']['move_num'] + '. '; + last_move = data['position']['move_num'] + '. '; } - headline += data['position']['last_move']; + last_move += data['position']['last_move']; + + headline += ' after ' + last_move; + } else { + last_move = null; } $("#headline").text(headline); @@ -512,26 +598,49 @@ var update_board = function(data, num_viewers) { $("#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']); } + var title_elems = []; + if (data['short_score'] !== undefined && data['short_score'] !== null) { + title_elems.push(data['short_score']); + } + if (last_move !== null) { + title_elems.push(last_move); + } + + if (title_elems.length != 0) { + document.title = '(' + title_elems.join(', ') + ') analysis.sesse.net'; + } else { + document.title = 'analysis.sesse.net'; + } + // The search stats. - if (data['nodes'] && data['nps'] && data['depth']) { + if (data['tablebase'] == 1) { + $("#searchstats").text("Tablebase result"); + } else if (data['nodes'] && data['nps'] && data['depth']) { var stats = thousands(data['nodes']) + ' nodes, ' + thousands(data['nps']) + ' nodes/sec, depth ' + data['depth'] + ' ply'; if (data['seldepth']) { stats += ' (' + data['seldepth'] + ' selective)'; } if (data['tbhits'] && data['tbhits'] > 0) { if (data['tbhits'] == 1) { - stats += ', one Nalimov hit'; + stats += ', one Syzygy hit'; } else { - stats += ', ' + data['tbhits'] + ' Nalimov hits'; + stats += ', ' + thousands(data['tbhits']) + ' Syzygy hits'; } } $("#searchstats").text(stats); + } else { + $("#searchstats").text(""); } // Update the board itself. @@ -540,14 +649,22 @@ var update_board = function(data, num_viewers) { 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, 4); + 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(print_pv(data['position']['fen'], data['pv_uci'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay'])); + $("#pv").html(add_pv(data['position']['fen'], data['pv_uci'], data['position']['move_num'], data['position']['toplay'])); // Update the PV arrow. clear_arrows(); @@ -556,7 +673,7 @@ var update_board = function(data, num_viewers) { for (var i = 0; i < data['pv_uci'].length; i += 2) { var from = data['pv_uci'][i].substr(0, 2); var to = data['pv_uci'][i].substr(2,4); - if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 4)) || + if ((i >= 2 && from != data['pv_uci'][i - 2].substr(2, 2)) || interfering_arrow(from, to)) { break; } @@ -566,7 +683,7 @@ var update_board = function(data, num_viewers) { var alt_moves = find_nonstupid_moves(data, 30); for (var i = 1; i < alt_moves.length && i < 3; ++i) { create_arrow(alt_moves[i].substr(0, 2), - alt_moves[i].substr(2, 4), '#f66', 1, 10); + alt_moves[i].substr(2, 2), '#f66', 1, 10); } } @@ -597,7 +714,7 @@ var update_board = function(data, num_viewers) { if (nonstupid_moves.length > 0 && response !== undefined) { create_arrow(response.substr(0, 2), - response.substr(2, 4), '#66f', 6, 20); + response.substr(2, 2), '#66f', 6, 20); } } @@ -621,6 +738,15 @@ var resort_refutation_lines = function(sort_by_score) { } window['resort_refutation_lines'] = resort_refutation_lines; +/** + * @param {boolean} truncate_history + */ +var set_truncate_history = function(truncate_history) { + truncate_display_history = truncate_history; + update_refutation_lines(); +} +window['set_truncate_history'] = set_truncate_history; + /** * @param {number} line_num * @param {number} move_num @@ -640,18 +766,25 @@ var show_line = function(line_num, move_num) { window['show_line'] = show_line; var prev_move = function() { - --current_display_move; + if (current_display_move > -1) { + --current_display_move; + } update_displayed_line(); } window['prev_move'] = prev_move; var next_move = function() { - ++current_display_move; + if (current_display_line && current_display_move < current_display_line.pretty_pv.length - 1) { + ++current_display_move; + } update_displayed_line(); } window['next_move'] = next_move; var update_displayed_line = function() { + if (highlighted_move !== null) { + highlighted_move.removeClass('highlight'); + } if (current_display_line === null) { $("#linenav").hide(); $("#linemsg").show(); @@ -662,7 +795,7 @@ var update_displayed_line = function() { $("#linenav").show(); $("#linemsg").hide(); - if (current_display_move == 0) { + if (current_display_move <= 0) { $("#prevmove").html("Previous"); } else { $("#prevmove").html("Previous"); @@ -673,19 +806,35 @@ var update_displayed_line = function() { $("#nextmove").html("Next"); } - hiddenboard.position(current_display_line.start_fen, false); + var hiddenboard = new Chess(); + hiddenboard.load(current_display_line.start_fen); for (var i = 0; i <= current_display_move; ++i) { - var move = current_display_line.uci_pv[i]; - move = move.substr(0, 2) + "-" + move.substr(2, 4); - hiddenboard.move(move, false); + hiddenboard.move(ucimove_to_chessjs_move(current_display_line.uci_pv[i])); + } + + highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move); + highlighted_move.addClass('highlight'); + + 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 }; } - board.position(hiddenboard.position()); } var init = function() { + unique = get_unique(); + // Create board. board = new window.ChessBoard('board', 'start'); - hiddenboard = new window.ChessBoard('hiddenboard', 'start'); request_update(); $(window).resize(function() { @@ -693,6 +842,13 @@ var init = function() { update_highlight(); redraw_arrows(); }); + $(window).keyup(function(event) { + if (event.which == 39) { + next_move(); + } else if (event.which == 37) { + prev_move(); + } + }); }; $(document).ready(init);