X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=be53c978f777a9b5df37c54e908548d92361a2fe;hp=9635c9198f20cb05268ce38229b3dd097d46df3c;hb=3797e272b3764680e81afaa1744fabca3314d9c9;hpb=7672cd409aaf8cdf4ae2caf8a1f403c7d86c7fcd diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index 9635c91..be53c97 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -1,5 +1,14 @@ (function() { +/** + * 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} + * @const + * @private */ +var SCRIPT_VERSION = 2015062104; + /** @type {window.ChessBoard} @private */ var board = null; @@ -135,10 +144,24 @@ var request_update = function() { url: "/analysis.pl?ims=" + ims + "&unique=" + unique }).done(function(data, textstatus, xhr) { sync_server_clock(xhr.getResponseHeader('Date')); - ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified'); - var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers'); - possibly_play_sound(current_analysis_data, data); - current_analysis_data = data; + ims = xhr.getResponseHeader('X-RGLM'); + var num_viewers = xhr.getResponseHeader('X-RGNV'); + var new_data; + if (Array.isArray(data)) { + new_data = JSON.parse(JSON.stringify(current_analysis_data)); + JSON_delta.patch(new_data, data); + } else { + new_data = data; + } + + var minimum_version = xhr.getResponseHeader('X-RGMV'); + if (minimum_version && minimum_version > SCRIPT_VERSION) { + // Upgrade to latest version with a force-reload. + location.reload(true); + } + + possibly_play_sound(current_analysis_data, new_data); + current_analysis_data = new_data; update_board(current_analysis_data, displayed_analysis_data); update_num_viewers(num_viewers); @@ -629,6 +652,28 @@ var update_refutation_lines = function() { } } +/** + * @param {?string} fen + * @param {Array.} moves + * @param {number} last_move + */ +var chess_from = function(fen, moves, last_move) { + var hiddenboard = new Chess(); + if (fen !== null) { + hiddenboard.load(fen); + } + for (var i = 0; i <= last_move; ++i) { + if (moves[i] === '0-0') { + hiddenboard.move('O-O'); + } else if (moves[i] === '0-0-0') { + hiddenboard.move('O-O-O'); + } else { + hiddenboard.move(moves[i]); + } + } + return hiddenboard; +} + /** * @param {Object} data * @param {?Object} display_data @@ -663,10 +708,9 @@ var update_board = function(current_data, display_data) { 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( + last_move = format_halfmove_with_number( current_display_line.pretty_pv[current_display_move], - Math.floor((current_display_move + 1) / 2) + 1, - (current_display_move % 2 == 1)); + current_display_move + 1); headline += ' after ' + last_move; } else if (data['position']['last_move'] !== 'none') { last_move = format_move_with_number( @@ -702,10 +746,7 @@ var update_board = function(current_data, display_data) { // 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 hiddenboard = chess_from(null, current_display_line.pretty_pv, current_display_move); var moves = hiddenboard.history({ verbose: true }); var last_move = moves.pop(); highlight_from = last_move.from; @@ -827,6 +868,69 @@ var update_board = function(current_data, display_data) { toplay = data['position']['toplay']; refutation_lines = data['refutation_lines']; update_refutation_lines(); + + // Update the sparkline last, since its size depends on how everything else reflowed. + update_sparkline(data); +} + +var update_sparkline = function(data) { + if (data && data['score_history']) { + var first_move_num = undefined; + for (var halfmove_num in data['score_history']) { + halfmove_num = parseInt(halfmove_num); + if (first_move_num === undefined || halfmove_num < first_move_num) { + first_move_num = halfmove_num; + } + } + if (first_move_num !== undefined) { + var last_move_num = data['position']['move_num'] * 2 - 3; + if (data['position']['toplay'] === 'B') { + ++last_move_num; + } + + // Possibly truncate some moves if we don't have enough width. + // FIXME: Sometimes width() for #scorecontainer (and by extent, + // #scoresparkcontainer) on Chrome for mobile seems to start off + // at something very small, and then suddenly snap back into place. + // Figure out why. + var max_moves = Math.floor($("#scoresparkcontainer").width() / 5) - 5; + if (last_move_num - first_move_num > max_moves) { + first_move_num = last_move_num - max_moves; + } + + var min_score = -100; + var max_score = 100; + var last_score = null; + var scores = []; + for (var halfmove_num = first_move_num; halfmove_num <= last_move_num; ++halfmove_num) { + if (data['score_history'][halfmove_num]) { + var score = data['score_history'][halfmove_num][0]; + if (score < min_score) min_score = score; + if (score > max_score) max_score = score; + last_score = data['score_history'][halfmove_num][0]; + } + scores.push(last_score); + } + if (data['plot_score']) { + scores.push(data['plot_score']); + } + // FIXME: at some widths, calling sparkline() seems to push + // #scorecontainer under the board. + $("#scorespark").sparkline(scores, { + type: 'bar', + zeroColor: 'gray', + chartRangeMin: min_score, + chartRangeMax: max_score, + tooltipFormatter: function(sparkline, options, fields) { + return format_tooltip(data, fields[0].offset + first_move_num); + } + }); + } else { + $("#scorespark").text(""); + } + } else { + $("#scorespark").text(""); + } } /** @@ -851,62 +955,98 @@ var update_clock = function() { if (result === '1-0') { $("#whiteclock").text("1"); $("#blackclock").text("0"); + $("#whiteclock").removeClass("running-clock"); + $("#blackclock").removeClass("running-clock"); return; } if (result === '1/2-1/2') { $("#whiteclock").text("1/2"); $("#blackclock").text("1/2"); + $("#whiteclock").removeClass("running-clock"); + $("#blackclock").removeClass("running-clock"); return; } if (result === '0-1') { $("#whiteclock").text("0"); $("#blackclock").text("1"); + $("#whiteclock").removeClass("running-clock"); + $("#blackclock").removeClass("running-clock"); return; } } - var white_clock = ""; - var black_clock = ""; + var white_clock_ms = null; + var black_clock_ms = null; + var show_seconds = false; // Static clocks. if (data['position'] && data['position']['white_clock'] && data['position']['black_clock']) { - white_clock = data['position']['white_clock'].replace(/:[0-5][0-9]$/, ""); - black_clock = data['position']['black_clock'].replace(/:[0-5][0-9]$/, ""); + white_clock_ms = data['position']['white_clock'] * 1000; + black_clock_ms = data['position']['black_clock'] * 1000; } // Dynamic clock (only one, obviously). var color; if (data['position']['white_clock_target']) { color = "white"; + $("#whiteclock").addClass("running-clock"); + $("#blackclock").removeClass("running-clock"); } else if (data['position']['black_clock_target']) { color = "black"; + $("#whiteclock").removeClass("running-clock"); + $("#blackclock").addClass("running-clock"); + } else { + $("#whiteclock").removeClass("running-clock"); + $("#blackclock").removeClass("running-clock"); } + var remaining_ms; if (color) { var now = new Date().getTime() + client_clock_offset_ms; - var remaining_ms = data['position'][color + '_clock_target'] * 1000 - now; + remaining_ms = data['position'][color + '_clock_target'] * 1000 - now; if (color === "white") { - white_clock = format_clock(remaining_ms); + white_clock_ms = remaining_ms; } else { - black_clock = format_clock(remaining_ms); + black_clock_ms = remaining_ms; } + } + + if (white_clock_ms === null || black_clock_ms === null) { + $("#whiteclock").empty(); + $("#blackclock").empty(); + 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 (color) { // See when the clock will change next, and update right after that. - var next_update_ms = remaining_ms % 60000 + 100; + var next_update_ms; + if (show_seconds) { + next_update_ms = remaining_ms % 1000 + 100; + } else { + next_update_ms = remaining_ms % 60000 + 100; + } clock_timer = setTimeout(update_clock, next_update_ms); } - $("#whiteclock").text(white_clock); - $("#blackclock").text(black_clock); + $("#whiteclock").text(format_clock(white_clock_ms, show_seconds)); + $("#blackclock").text(format_clock(black_clock_ms, show_seconds)); } /** * @param {Number} remaining_ms + * @param {boolean} show_seconds */ -var format_clock = function(remaining_ms) { +var format_clock = function(remaining_ms, show_seconds) { if (remaining_ms <= 0) { - return "00:00"; + if (show_seconds) { + return "00:00:00"; + } else { + return "00:00"; + } } var remaining = Math.floor(remaining_ms / 1000); @@ -915,7 +1055,11 @@ var format_clock = function(remaining_ms) { var minutes = remaining % 60; remaining = (remaining - minutes) / 60; var hours = remaining; - return format_2d(hours) + ":" + format_2d(minutes); + if (show_seconds) { + return format_2d(hours) + ":" + format_2d(minutes) + ":" + format_2d(seconds); + } else { + return format_2d(hours) + ":" + format_2d(minutes); + } } /** @@ -945,6 +1089,46 @@ var format_move_with_number = function(move, move_num, white_to_play) { return ret; } +/** + * @param {string} move + * @param {Number} halfmove_num + */ +var format_halfmove_with_number = function(move, halfmove_num) { + return format_move_with_number( + move, + Math.floor(halfmove_num / 2) + 1, + halfmove_num % 2 == 0); +} + +/** + * @param {Object} data + * @param {Number} halfmove_num + */ +var format_tooltip = function(data, halfmove_num) { + if (data['score_history'][halfmove_num] || + halfmove_num === data['position']['pretty_history'].length) { + var move; + var short_score; + if (halfmove_num === data['position']['pretty_history'].length) { + move = data['position']['last_move']; + short_score = data['short_score']; + } else { + move = data['position']['pretty_history'][halfmove_num]; + short_score = data['score_history'][halfmove_num][1]; + } + 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; ) { + if (data['score_history'][i]) { + var move = data['position']['pretty_history'][i]; + return "[Analysis kept from " + format_halfmove_with_number(move, i) + "]"; + } + } + } +} + /** * @param {boolean} sort_by_score */ @@ -1021,10 +1205,7 @@ var update_historic_analysis = function() { } // 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 hiddenboard = chess_from(null, current_display_line.pretty_pv, current_display_move); var filename = "/history/move" + (current_display_move + 1) + "-" + hiddenboard.fen().replace(/ /g, '_').replace(/\//g, '-') + ".json"; @@ -1039,6 +1220,41 @@ var update_historic_analysis = function() { }); } +/** + * @param {string} fen + */ +var update_imbalance = function(fen) { + var hiddenboard = new Chess(fen); + var imbalance = {'k': 0, 'q': 0, 'r': 0, 'b': 0, 'n': 0, 'p': 0}; + for (var row = 0; row < 8; ++row) { + for (var col = 0; col < 8; ++col) { + var col_text = String.fromCharCode('a1'.charCodeAt(0) + col); + var row_text = String.fromCharCode('a1'.charCodeAt(1) + row); + var square = col_text + row_text; + var contents = hiddenboard.get(square); + if (contents !== null) { + if (contents.color === 'w') { + ++imbalance[contents.type]; + } else { + --imbalance[contents.type]; + } + } + } + } + var white_imbalance = ''; + var black_imbalance = ''; + for (var piece in imbalance) { + for (var i = 0; i < imbalance[piece]; ++i) { + white_imbalance += ''; + } + for (var i = 0; i < -imbalance[piece]; ++i) { + black_imbalance += ''; + } + } + $('#whiteimbalance').html(white_imbalance); + $('#blackimbalance').html(black_imbalance); +} + var update_displayed_line = function() { if (highlighted_move !== null) { highlighted_move.removeClass('highlight'); @@ -1047,6 +1263,7 @@ var update_displayed_line = function() { $("#linenav").hide(); $("#linemsg").show(); board.position(fen); + update_imbalance(fen); return; } @@ -1064,16 +1281,12 @@ var update_displayed_line = function() { $("#nextmove").html("Next"); } - var hiddenboard = new Chess(); - hiddenboard.load(current_display_line.start_fen); - for (var i = 0; i <= current_display_move; ++i) { - hiddenboard.move(current_display_line.pretty_pv[i]); - } - highlighted_move = $("#automove" + current_display_line.line_number + "-" + current_display_move); highlighted_move.addClass('highlight'); + var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pretty_pv, current_display_move); board.position(hiddenboard.fen()); + update_imbalance(hiddenboard.fen()); } /** @@ -1123,6 +1336,7 @@ var init = function() { request_update(); $(window).resize(function() { board.resize(); + update_sparkline(displayed_analysis_data || current_analysis_data); update_highlight(); redraw_arrows(); });