X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=43b2e1ddbb7c304b2450349fbaef79e23e355d92;hp=b7a4fea4e1f765fc125c365e2f9bbe8b21a9305d;hb=ab94a7c05a495c1d8f9ea30e2268bbc72f17b303;hpb=a4f594893e37a18dfc85ff92061f1bd664dc4887 diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js index b7a4fea..43b2e1d 100644 --- a/www/js/remoteglot.js +++ b/www/js/remoteglot.js @@ -135,10 +135,17 @@ 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; + } + 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 +636,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 @@ -702,10 +731,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; @@ -871,15 +897,16 @@ var update_clock = function() { } } - 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). @@ -896,30 +923,52 @@ var update_clock = function() { $("#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); @@ -928,7 +977,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); + } } /** @@ -1034,10 +1087,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"; @@ -1052,6 +1102,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'); @@ -1060,6 +1145,7 @@ var update_displayed_line = function() { $("#linenav").hide(); $("#linemsg").show(); board.position(fen); + update_imbalance(fen); return; } @@ -1077,16 +1163,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()); } /**