X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=594759157e5d1fa664fe146c824a56f6c5222c37;hb=190f64548b562d0086e98445153e6ec96a47a275;hp=5d19116ee1927ebc82a989e0aab19a0dc646cf5b;hpb=e283dfb559a8f3504c1499c5ba2f34c717ada683;p=remoteglot diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 5d19116..5947591 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -5,10 +5,10 @@ * Version of this script. If the server returns a version larger than * this, it is a sign we should reload to upgrade ourselves. * - * @type {Number} + * @type {number} * @const * @private */ -let SCRIPT_VERSION = 2021021300; +let SCRIPT_VERSION = 2023122700; /** * The current backend URL. @@ -76,6 +76,18 @@ let occupied_by_arrows = []; /** Currently displayed refutation lines (on-screen). * Can either come from the current_analysis_data, displayed_analysis_data, * or hash_refutation_lines. + * + * TODO: This is a mess, and we should probably just let update_refutation_lines() + * decide anew every time instead of storing the state here in multiple global + * variables. + * + * @type {Array.<{ + * score: Array, + * depth: string, + * pv: Array., + * move: string + * }>} + * @private */ let refutation_lines = []; @@ -86,11 +98,11 @@ let refutation_lines = []; */ let hash_refutation_lines = null; -/** @type {!number} @private */ -let move_num = 1; - -/** @type {!string} @private */ -let toplay = 'W'; +/** + * What FEN refutation_lines is relative to. Will usually be base_fen, + * but if another move gets loaded while we are looking, they can diverge. + */ +let refutation_lines_base_fen = null; /** @type {number} @private */ let ims = 0; @@ -125,6 +137,9 @@ let reverse_dragging_from = null; /** @type {?number} @private */ let unique = null; +/** @type {?string} @private */ +let admin_password = null; + /** @type {boolean} @private */ let enable_sound = false; @@ -164,11 +179,12 @@ let display_fen = null; * toplay: string, * scores: Array<{first_move: number, score: Object}>, * start_display_move_num: number - * }} DisplayLine + * }} * * "start_display_move_num" is the (half-)move number to start displaying the PV at. * "score" is also evaluated at this point. */ +var DisplayLine; /** All PVs that we currently know of. * @@ -203,7 +219,7 @@ let current_analysis_xhr = null; * The current timer to fire off a request to get main analysis (not history), * if any, so that we can abort it. * - * @type {?Number} + * @type {?number} * @private */ let current_analysis_request_timer = null; @@ -228,7 +244,7 @@ let current_hash_xhr = null; * The current timer to display hash probe information (it could be waiting on the * board to stop animating), if any, so that we can abort it. * - * @type {?Number} + * @type {?number} * @private */ let current_hash_display_timer = null; @@ -353,8 +369,7 @@ function possibly_play_sound(old_data, new_data) { if (ding && ding.play) { if (old_data['position'] && old_data['position']['fen'] && new_data['position'] && new_data['position']['fen'] && - (old_data['position']['fen'] !== new_data['position']['fen'] || - old_data['position']['move_num'] !== new_data['position']['move_num'])) { + old_data['position']['fen'] !== new_data['position']['fen']) { ding.play(); } } @@ -398,6 +413,24 @@ function redraw_arrows() { } } +/** @param {!string} fen + * @return {!string} + * + * Return whose side it is to play (w or b), given a FEN. + */ +function find_toplay(fen) { + return fen.split(' ')[1]; +} + +/** @param {!string} fen + * @return {!number} + * + * Return the move clock, starting from 1. See also find_toplay(). + */ +function find_move_num(fen) { + return parseInt(fen.split(' ')[5]); +} + /** @param {!number} x * @return {!number} */ @@ -504,12 +537,11 @@ function position_arrow(arrow) { return; } - let board_width = parseInt(document.querySelector(".board-b72b1").style.width, 10); - let zoom_factor = board_width / 400.0; - let line_width = arrow.line_width * zoom_factor; - let arrow_size = arrow.arrow_size * zoom_factor; + // We always draw as if the board is 400x400, the viewBox will adjust that for us + let line_width = arrow.line_width; + let arrow_size = arrow.arrow_size; - let square_width = board_width / 8; + let square_width = 400 / 8; let from_y, to_y, from_x, to_x; if (board.orientation() === 'black') { from_y = (arrow.from_row + 0.5)*square_width; @@ -526,10 +558,9 @@ function position_arrow(arrow) { let SVG_NS = "http://www.w3.org/2000/svg"; let XHTML_NS = "http://www.w3.org/1999/xhtml"; let svg = document.createElementNS(SVG_NS, "svg"); - svg.setAttribute("width", board_width); - svg.setAttribute("height", board_width); - svg.setAttribute("style", "position: absolute"); - svg.setAttribute("position", "absolute"); + svg.setAttribute("width", "100%"); + svg.setAttribute("height", "100%"); + svg.setAttribute("viewBox", "0 0 400 400"); svg.setAttribute("version", "1.1"); svg.setAttribute("class", "c1"); svg.setAttribute("xmlns", XHTML_NS); @@ -570,8 +601,9 @@ function position_arrow(arrow) { head.setAttribute("fill", arrow.fg_color); svg.appendChild(head); - svg.style.top = '2px'; /* Border for .board-b72b1. */ - svg.style.left = '2px'; + svg.style.position = 'absolute'; + svg.style.top = '0px'; /* Border for .board-b72b1. */ + svg.style.left = '0px'; svg.style.pointerEvents = 'none'; document.getElementById('board').appendChild(svg); arrow.svg = svg; @@ -656,7 +688,8 @@ function find_nonstupid_moves(data, margin, invert) { moves.push(move); } } - moves = moves.sort(function(a, b) { return compare_by_score(data['refutation_lines'], data['position']['toplay'] === 'B', a, b) }); + let toplay = find_toplay(data['position']['fen']); + moves = moves.sort(function(a, b) { return compare_by_score(data['refutation_lines'], toplay, a, b) }); moves.unshift(data['pv'][0]); return moves; @@ -673,19 +706,17 @@ function thousands(x) { /** * @param {!string} start_fen * @param {Array.} pv - * @param {number} move_num - * @param {!string} toplay - * @param {Array<{ first_move: integer, score: Object }>} scores + * @param {Array<{ first_move: number, score: Object }>} scores * @param {number} start_display_move_num * @param {number=} opt_limit * @param {boolean=} opt_showlast */ -function add_pv(start_fen, pv, move_num, toplay, scores, start_display_move_num, opt_limit, opt_showlast) { +function add_pv(start_fen, pv, scores, start_display_move_num, opt_limit, opt_showlast) { display_lines.push({ start_fen: start_fen, pv: pv, - move_num: parseInt(move_num), - toplay: toplay, + move_num: find_move_num(start_fen), + toplay: find_toplay(start_fen), scores: scores, start_display_move_num: start_display_move_num }); @@ -717,13 +748,13 @@ function print_pv(line_num, splicepos, opt_limit, opt_showlast) { if (start_display_move_num > 0) { pv = pv.slice(start_display_move_num); let to_add = start_display_move_num; - if (toplay === 'B') { + if (toplay === 'b') { ++move_num; - toplay = 'W'; + toplay = 'w'; --to_add; } if (to_add % 2 == 1) { - toplay = 'B'; + toplay = 'b'; --to_add; } move_num += to_add / 2; @@ -733,16 +764,16 @@ function print_pv(line_num, splicepos, opt_limit, opt_showlast) { } let ret = document.createDocumentFragment(); - let i = 0; let in_tb = false; - let link = document.createElement('a'); - link.className = 'move'; + let i = 0; if (opt_limit && opt_showlast && 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 + // 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. ret.appendChild(document.createTextNode('(')); + let link = document.createElement('a'); + link.className = 'move'; link.href = 'javascript:collapse_history(false)'; link.textContent = '…'; ret.appendChild(link); @@ -752,50 +783,41 @@ function print_pv(line_num, splicepos, opt_limit, opt_showlast) { ++i; } move_num += i / 2; - } else if (toplay == 'B' && pv.length > 0) { + } else if (toplay == 'b' && pv.length > 0) { ret.appendChild(document.createTextNode(move_num + '. … ')); - let move = ""; - if (splicepos === 0) { - ret.appendChild(document.createTextNode('(TB: ')); - in_tb = true; - } - link.setAttribute('id', 'automove' + line_num + '-0'); - link.href = 'javascript:show_line(' + line_num + ', ' + 0 + ');'; - link.textContent = pv[0]; - ret.appendChild(link); - toplay = 'W'; - ++i; - ++move_num; } - for ( ; i < pv.length; ++i) { - link = document.createElement('a'); - link.className = 'move'; - link.setAttribute('id', 'automove' + line_num + '-' + i); - link.textContent = pv[i]; - link.href = 'javascript:show_line(' + line_num + ', ' + i + ');'; + for (; i < pv.length; ++i) { + let prefix = ''; if (splicepos === i) { - ret.appendChild(document.createTextNode('(TB: ')); + prefix = '(TB: '; in_tb = true; } - if (toplay == 'W') { + if (toplay == 'b' && i == 0) { + ++move_num; + toplay = 'w'; + } else if (toplay == 'w') { if (i > opt_limit && !opt_showlast) { if (in_tb) { - ret.appendChild(document.createTextNode(')')); + prefix += ')'; } - ret.appendChild(document.createTextNode(' (…)')); + ret.appendChild(document.createTextNode(prefix + ' (…)')); return ret; } - if (ret != '') { - ret.appendChild(document.createTextNode(' ')); - } - ret.appendChild(document.createTextNode(move_num + '. ')); + prefix += ' ' + move_num + '. '; ++move_num; - toplay = 'B'; + toplay = 'b'; } else { - ret.appendChild(document.createTextNode(' ')); - toplay = 'W'; + prefix += ' '; + toplay = 'w'; } + ret.appendChild(document.createTextNode(prefix)); + + let link = document.createElement('a'); + link.className = 'move'; + link.setAttribute('id', 'automove' + line_num + '-' + i); + link.textContent = pv[i]; + link.href = 'javascript:show_line(' + line_num + ', ' + i + ');'; ret.appendChild(link); } if (in_tb) { @@ -848,7 +870,7 @@ window['collapse_history'] = collapse_history; * Also recreates the global "display_lines". */ function update_refutation_lines() { - if (base_fen === null) { + if (refutation_lines_base_fen === null) { return; } if (display_lines.length > 2) { @@ -879,7 +901,7 @@ function update_refutation_lines() { moves.push(move); } - let invert = (toplay === 'B'); + let invert = (find_toplay(refutation_lines_base_fen) === 'b'); if (current_display_line && current_display_move % 2 == 0 && !current_display_line_is_history) { invert = !invert; } @@ -916,7 +938,7 @@ function update_refutation_lines() { let pv_td = document.createElement("td"); tr.appendChild(pv_td); pv_td.classList.add("pv"); - pv_td.append(add_pv(base_fen, base_line.concat([ line['move'] ]), move_num, toplay, scores, start_display_move_num)); + pv_td.append(add_pv(refutation_lines_base_fen, base_line.concat([ line['move'] ]), scores, start_display_move_num)); tbl.append(tr); continue; @@ -945,7 +967,7 @@ function update_refutation_lines() { let pv_td = document.createElement("td"); tr.appendChild(pv_td); pv_td.classList.add("pv"); - pv_td.append(add_pv(base_fen, base_line.concat(line['pv']), move_num, toplay, scores, start_display_move_num, 10)); + pv_td.append(add_pv(refutation_lines_base_fen, base_line.concat(line['pv']), scores, start_display_move_num, 10)); tbl.append(tr); } @@ -1097,8 +1119,8 @@ function update_board() { // unconditionally taken from current_data (we're not interested in // historic history). if (current_data['position']['history']) { - let start = (current_data['position'] && current_data['position']['start_fen']) ? current_data['position']['start_fen'] : 'start'; - add_pv(start, current_data['position']['history'], 1, 'W', null, 0, 8, true); + let start = (current_data['position'] && current_data['position']['start_fen']) ? current_data['position']['start_fen'] : 'rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1'; + add_pv(start, current_data['position']['history'], null, 0, 8, true); } else { display_lines.push(null); } @@ -1124,15 +1146,6 @@ function update_board() { headline = 'Analysis'; } - // Credits, where applicable. Note that we don't want the footer to change a lot - // when e.g. viewing history, so if any of these changed during the game, - // use the current one still. - if (current_data['using_lomonosov']) { - document.getElementById("lomonosov").style.display = null; - } else { - document.getElementById("lomonosov").style.display = 'none'; - } - // Credits: The engine name/version. if (current_data['engine'] && current_data['engine']['name'] !== null) { document.getElementById("engineid").textContent = current_data['engine']['name']; @@ -1181,18 +1194,19 @@ function update_board() { } else if (data['position']['last_move'] !== 'none') { // Find the previous move. let previous_move_num, previous_toplay; - if (data['position']['toplay'] == 'B') { - previous_move_num = data['position']['move_num']; - previous_toplay = 'W'; + let fen = data['position']['fen']; + if (find_toplay(fen) === 'b') { + previous_move_num = find_move_num(fen); + previous_toplay = 'w'; } else { - previous_move_num = data['position']['move_num'] - 1; - previous_toplay = 'B'; + previous_move_num = find_move_num(fen) - 1; + previous_toplay = 'b'; } last_move = format_move_with_number( data['position']['last_move'], previous_move_num, - previous_toplay == 'W'); + previous_toplay == 'w'); headline += ' after ' + last_move; } else { last_move = null; @@ -1239,11 +1253,12 @@ function update_board() { document.getElementById("score").textContent = "No analysis for this move"; document.getElementById("pvtitle").textContent = "PV:"; document.getElementById("pv").replaceChildren(); - document.getElementById("searchstats").textContent = " "; + document.getElementById("searchstats").innerHTML = " "; document.getElementById("refutationlines").replaceChildren(); document.getElementById("whiteclock").replaceChildren(); document.getElementById("blackclock").replaceChildren(); refutation_lines = []; + refutation_lines_base_fen = null; update_refutation_lines(); clear_arrows(); update_displayed_line(); @@ -1279,8 +1294,6 @@ function update_board() { // The search stats. if (data['searchstats']) { document.getElementById("searchstats").textContent = data['searchstats']; - } else if (data['tablebase'] == 1) { - document.getElementById("searchstats").textContent = "Tablebase result"; } else if (data['nodes'] && data['nps'] && data['depth']) { let stats = thousands(data['nodes']) + ' nodes, ' + thousands(data['nps']) + ' nodes/sec, depth ' + data['depth'] + ' ply'; if (data['seldepth']) { @@ -1298,6 +1311,9 @@ function update_board() { } else { document.getElementById("searchstats").textContent = ""; } + if (admin_password !== null) { + document.getElementById("searchstats").innerHTML += " | ADMIN MODE (if password is right)"; + } // Update the board itself. base_fen = data['position']['fen']; @@ -1307,10 +1323,11 @@ function update_board() { document.getElementById("pvtitle").textContent = "PV:"; let scores = [{ first_move: -1, score: data['score'] }]; - document.getElementById("pv").replaceChildren(add_pv(data['position']['fen'], data['pv'], data['position']['move_num'], data['position']['toplay'], scores, 0)); + document.getElementById("pv").replaceChildren(add_pv(data['position']['fen'], data['pv'], scores, 0)); // Update the PV arrow. clear_arrows(); + let toplay = find_toplay(data['position']['fen']); if (data['pv'].length >= 1) { let hiddenboard = new Chess(base_fen); @@ -1328,7 +1345,7 @@ function update_board() { hiddenboard.move(data['pv'][i + 1]); // To keep continuity. } - let alt_moves = find_nonstupid_moves(data, 30, data['position']['toplay'] === 'B'); + let alt_moves = find_nonstupid_moves(data, 30, toplay === 'b'); for (let i = 1; i < alt_moves.length && i < 3; ++i) { hiddenboard = new Chess(base_fen); let move = patch_move(hiddenboard.move(alt_moves[i])); @@ -1340,7 +1357,7 @@ function update_board() { // See if all semi-reasonable moves have only one possible response. if (data['pv'].length >= 2) { - let nonstupid_moves = find_nonstupid_moves(data, 300, data['position']['toplay'] === 'B'); + let nonstupid_moves = find_nonstupid_moves(data, 300, toplay === 'b'); let hiddenboard = new Chess(base_fen); hiddenboard.move(data['pv'][0]); let response = hiddenboard.move(data['pv'][1]); @@ -1380,9 +1397,10 @@ function update_board() { // Update the refutation lines. base_fen = data['position']['fen']; - move_num = parseInt(data['position']['move_num']); - toplay = data['position']['toplay']; - refutation_lines = hash_refutation_lines || data['refutation_lines']; + if (hash_refutation_lines === null) { + refutation_lines = data['refutation_lines']; + refutation_lines_base_fen = base_fen; + } update_refutation_lines(); // Update the sparkline last, since its size depends on how everything else reflowed. @@ -1401,8 +1419,9 @@ function update_sparkline(data) { } } if (first_move_num !== undefined) { - let last_move_num = data['position']['move_num'] * 2 - 3; - if (data['position']['toplay'] === 'B') { + let fen = data['position']['fen']; + let last_move_num = find_move_num(fen) * 2 - 3; + if (find_toplay(fen) === 'b') { ++last_move_num; } @@ -1608,7 +1627,7 @@ function update_clock() { // This matches what DGT clocks do. let show_seconds = (white_clock_ms < 60 * 20 * 1000 || black_clock_ms < 60 * 20 * 1000); - if (color) { + if (color && remaining_ms > 0) { // See when the clock will change next, and update right after that. let next_update_ms; if (show_seconds) { @@ -1624,7 +1643,7 @@ function update_clock() { } /** - * @param {Number} remaining_ms + * @param {number} remaining_ms * @param {boolean} show_seconds */ function format_clock(remaining_ms, show_seconds) { @@ -1650,7 +1669,7 @@ function format_clock(remaining_ms, show_seconds) { } /** - * @param {Number} x + * @param {number} x */ function format_2d(x) { if (x >= 10) { @@ -1662,7 +1681,7 @@ function format_2d(x) { /** * @param {string} move - * @param {Number} move_num Move number of this move. + * @param {number} move_num Move number of this move. * @param {boolean} white_to_play Whether white is to play this move. */ function format_move_with_number(move, move_num, white_to_play) { @@ -1678,7 +1697,7 @@ function format_move_with_number(move, move_num, white_to_play) { /** * @param {string} move - * @param {Number} halfmove_num Half-move number that is to be played, + * @param {number} halfmove_num Half-move number that is to be played, * starting from 0. */ function format_halfmove_with_number(move, halfmove_num) { @@ -1690,7 +1709,7 @@ function format_halfmove_with_number(move, halfmove_num) { /** * @param {Object} data - * @param {Number} halfmove_num + * @param {number} halfmove_num */ function format_tooltip(data, halfmove_num) { if (data['score_history'][halfmove_num + 1] || @@ -1744,6 +1763,7 @@ function show_line(line_num, move_num) { current_display_line = null; current_display_move = null; hash_refutation_lines = null; + refutation_lines_base_fen = base_fen; if (displayed_analysis_data) { // TODO: Support exiting to history position if we are in an // analysis line of a history position. @@ -1913,7 +1933,7 @@ function update_move_highlight() { document.getElementById("pvtitle").textContent = "Exploring:"; current_display_line.start_display_move_num = 0; display_lines.push(current_display_line); - document.getElementById("pv").append(print_pv(display_lines.length - 1, null)); // FIXME + document.getElementById("pv").replaceChildren(print_pv(display_lines.length - 1, null)); // FIXME display_line_num = display_lines.length - 1; // Clear out the PV, so it's not selected by anything later. @@ -1997,7 +2017,8 @@ function update_displayed_line() { function set_board_position(new_fen) { board_is_animating = true; let old_fen = board.fen(); - board.position(new_fen); + let animate = old_fen !== '8/8/8/8/8/8/8/'; + board.position(new_fen, animate); if (board.fen() === old_fen) { board_is_animating = false; } @@ -2068,6 +2089,7 @@ function show_explore_hash_results(data, fen) { } current_hash_display_timer = null; hash_refutation_lines = data['lines']; + refutation_lines_base_fen = fen; update_board(); } @@ -2089,12 +2111,12 @@ function onDragStart(source, piece, position, orientation) { } function mousedownSquare(e) { - if (!e.target || !e.target.closest('.square-55d63')) { + if (!e.target || !e.target.getAttribute('data-square')) { return; } reverse_dragging_from = null; - let square = e.target.closest('.square-55d63').getAttribute('data-square'); + let square = e.target.getAttribute('data-square'); let pseudogame = new Chess(display_fen); if (pseudogame.game_over() === true) { @@ -2119,13 +2141,13 @@ function mousedownSquare(e) { } function mouseupSquare(e) { - if (!e.target || !e.target.closest('.square-55d63')) { + if (!e.target || !e.target.getAttribute('data-square')) { return; } if (reverse_dragging_from === null) { return; } - let source = e.target.closest('.square-55d63').getAttribute('data-square'); + let source = e.target.getAttribute('data-square'); let target = reverse_dragging_from; reverse_dragging_from = null; if (onDrop(source, target) !== 'snapback') { @@ -2221,6 +2243,28 @@ function onDrop(source, target) { if (move === null) return 'snapback'; } +/** + * If we are in admin mode, send this move to the backend. + * + * @param {string} fen + * @param {string} move + */ +function send_chosen_move(fen, move) { + if (admin_password !== null) { + let history = current_analysis_data['position']['history']; + let url = '/manual-override.pl'; + url += '?fen=' + encodeURIComponent(fen); + url += '&history=' + encodeURIComponent(JSON.stringify(history)); + url += '&move=' + encodeURIComponent(move); + url += '&player_w=' + encodeURIComponent(current_analysis_data['position']['player_w']); + url += '&player_b=' + encodeURIComponent(current_analysis_data['position']['player_b']); + url += '&password=' + encodeURIComponent(admin_password); + + console.log(fen, history); + fetch(url); // Ignore the result. + } +} + function onSnapEnd(source, target) { if (source === target && recommended_move !== null) { source = recommended_move.from; @@ -2234,6 +2278,11 @@ function onSnapEnd(source, target) { promotion: 'q' // NOTE: always promote to a queen for example simplicity }); + if (admin_password !== null) { + send_chosen_move(display_fen, move.san); + return; + } + // Move ahead on the line we're on -- this includes history if we've // gone backwards. if (current_display_line && @@ -2479,6 +2528,11 @@ function init() { set_sound(false); } + let admin_match = window.location.href.match(/\?password=([a-zA-Z0-9_-]+)/); + if (admin_match !== null) { + admin_password = admin_match[1]; + } + // Create board. board = new window.ChessBoard('board', { onMoveEnd: function() { board_is_animating = false; }, @@ -2492,6 +2546,11 @@ function init() { document.getElementById("board").addEventListener('mousedown', mousedownSquare); document.getElementById("board").addEventListener('mouseup', mouseupSquare); + if (window['inline_json']) { + let j = window['inline_json']; + process_update_response(j['data'], { 'get': (h) => j['headers'][h] }); + delete window['inline_json']; + } request_update(); window.addEventListener('resize', function() { board.resize(); @@ -2499,6 +2558,7 @@ function init() { update_board_highlight(); redraw_arrows(); }); + new ResizeObserver(() => update_sparkline(displayed_analysis_data || current_analysis_data)).observe(document.getElementById('scoresparkcontainer')); window.addEventListener('keyup', function(event) { if (event.which == 39) { // Left arrow. next_move();