X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=565b61dd686ce2b57668183aff70e30b8760e366;hb=c26cad3df9d1b65031c26b65f4cfbe89aef18de7;hp=ecb902f721d5fce28723e1045d5ce1016e1e53b2;hpb=6974ff924b30e4b6e88ac4e30b59cda5dea555fa;p=remoteglot

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index ecb902f..565b61d 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -1,32 +1,85 @@
+(function() {
+
+/** @type {window.ChessBoard} @private */
 var board = null;
+
+/** @type {window.ChessBoard} @private */
 var hiddenboard = null;
+
+/** @type {Array.<{
+ *      from_col: number,
+ *      from_row: number,
+ *      to_col: number,
+ *      to_row: number,
+ *      line_width: number,
+ *      arrow_size: number,
+ *      fg_color: string
+ * }>}
+ * @private
+ */
 var arrows = [];
+
+/** @type {Array.<Array.<boolean>>} */
 var occupied_by_arrows = [];
+
 var refutation_lines = [];
+
+/** @type {!number} @private */
 var move_num = 1;
+
+/** @type {!string} @private */
 var toplay = 'W';
+
+/** @type {number} @private */
 var ims = 0;
-var sort_refutation_lines_by_score = 0;
+
+/** @type {boolean} @private */
+var sort_refutation_lines_by_score = false;
+
+/** @type {!string|undefined} @private */
 var highlight_from = undefined;
+
+/** @type {!string|undefined} @private */
 var highlight_to = undefined;
+
+/** @type {!number} @private */
 var unique = Math.random();
 
+/** The current position on the board, represented as a FEN string.
+ * @type {?string}
+ * @private
+ */
 var fen = null;
+
+/** @typedef {{
+ *    start_fen: string,
+ *    uci_pv: Array.<string>,
+ *    pretty_pv: Array.<string>
+ * }} DisplayLine
+ */
+
+/** @type {Array.<DisplayLine>}
+ * @private
+ */
 var display_lines = [];
+
+/** @type {?DisplayLine} @private */
 var current_display_line = null;
+
+/** @type {?number} @private */
 var current_display_move = null;
 
-var request_update = function(board) {
+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
 	}).done(function(data, textstatus, xhr) {
 		ims = xhr.getResponseHeader('X-Remoteglot-Last-Modified');
 		var num_viewers = xhr.getResponseHeader('X-Remoteglot-Num-Viewers');
-		update_board(board, data, num_viewers);
+		update_board(data, num_viewers);
 	}).fail(function() {
 		// Wait ten seconds, then try again.
-		setTimeout(function() { request_update(board); }, 10000);
+		setTimeout(function() { request_update(); }, 10000);
 	});
 }
 
@@ -51,6 +104,9 @@ var redraw_arrows = function() {
 	}
 }
 
+/** @param {!number} x
+ * @return {!number}
+ */
 var sign = function(x) {
 	if (x > 0) {
 		return 1;
@@ -61,7 +117,11 @@ var sign = function(x) {
 	}
 }
 
-// See if drawing this arrow on the board would cause unduly amount of confusion.
+/** See if drawing this arrow on the board would cause unduly amount of confusion.
+ * @param {!string} from The square the arrow is from (e.g. e4).
+ * @param {!string} to The square the arrow is to (e.g. e4).
+ * @return {boolean}
+ */
 var interfering_arrow = function(from, to) {
 	var from_col = from.charCodeAt(0) - "a1".charCodeAt(0);
 	var from_row = from.charCodeAt(1) - "a1".charCodeAt(1);
@@ -93,6 +153,16 @@ var interfering_arrow = function(from, to) {
 	return false;
 }
 
+/** Find a point along the coordinate system given by the given line,
+ * <t> units forward from the start of the line, <u> units to the right of it.
+ * @param {!number} x1
+ * @param {!number} x2
+ * @param {!number} y1
+ * @param {!number} y2
+ * @param {!number} t
+ * @param {!number} u
+ * @return {!string} The point in "x y" form, suitable for SVG paths.
+ */
 var point_from_start = function(x1, y1, x2, y2, t, u) {
 	var dx = x2 - x1;
 	var dy = y2 - y1;
@@ -106,6 +176,16 @@ var point_from_start = function(x1, y1, x2, y2, t, u) {
 	return x + " " + y;
 }
 
+/** Find a point along the coordinate system given by the given line,
+ * <t> units forward from the end of the line, <u> units to the right of it.
+ * @param {!number} x1
+ * @param {!number} x2
+ * @param {!number} y1
+ * @param {!number} y2
+ * @param {!number} t
+ * @param {!number} u
+ * @return {!string} The point in "x y" form, suitable for SVG paths.
+ */
 var point_from_end = function(x1, y1, x2, y2, t, u) {
 	var dx = x2 - x1;
 	var dy = y2 - y1;
@@ -143,8 +223,8 @@ var position_arrow = function(arrow) {
 	var SVG_NS = "http://www.w3.org/2000/svg";
 	var XHTML_NS = "http://www.w3.org/1999/xhtml";
 	var svg = document.createElementNS(SVG_NS, "svg");
-	svg.setAttribute("width", $("#board").width());
-	svg.setAttribute("height", $("#board").height());
+	svg.setAttribute("width", /** @type{number} */ ($("#board").width()));
+	svg.setAttribute("height", /** @type{number} */ ($("#board").height()));
 	svg.setAttribute("style", "position: absolute");
 	svg.setAttribute("position", "absolute");
 	svg.setAttribute("version", "1.1");
@@ -184,7 +264,7 @@ var position_arrow = function(arrow) {
 	head.setAttribute("xmlns", XHTML_NS);
 	head.setAttribute("stroke", "#000");
 	head.setAttribute("stroke-width", "1");
-	head.setAttribute("fill", "#f66");
+	head.setAttribute("fill", arrow.fg_color);
 	svg.appendChild(head);
 
 	$(svg).css({ top: pos.top, left: pos.left });
@@ -192,6 +272,13 @@ var position_arrow = function(arrow) {
 	arrow.svg = svg;
 }
 
+/**
+ * @param {!string} from_square
+ * @param {!string} to_square
+ * @param {!string} fg_color
+ * @param {number} line_width
+ * @param {number} arrow_size
+ */
 var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_size) {
 	var from_col = from_square.charCodeAt(0) - "a1".charCodeAt(0);
 	var from_row = from_square.charCodeAt(1) - "a1".charCodeAt(1);
@@ -214,36 +301,44 @@ var create_arrow = function(from_square, to_square, fg_color, line_width, arrow_
 }
 
 var compare_by_sort_key = function(refutation_lines, a, b) {
-	var ska = refutation_lines[a].sort_key;
-	var skb = refutation_lines[b].sort_key;
+	var ska = refutation_lines[a]['sort_key'];
+	var skb = refutation_lines[b]['sort_key'];
 	if (ska < skb) return -1;
 	if (ska > skb) return 1;
 	return 0;
 };
 
 var compare_by_score = function(refutation_lines, a, b) {
-	var sa = parseInt(refutation_lines[b].score_sort_key);
-	var sb = parseInt(refutation_lines[a].score_sort_key);
+	var sa = parseInt(refutation_lines[b]['score_sort_key'], 10);
+	var sb = parseInt(refutation_lines[a]['score_sort_key'], 10);
 	return sa - sb;
 }
 
-// Fake multi-PV using the refutation lines. Find all “relevant” moves,
-// sorted by quality, descending.
+/**
+ * Fake multi-PV using the refutation lines. Find all “relevant” moves,
+ * sorted by quality, descending.
+ *
+ * @param {!Object} data
+ * @param {number} margin The maximum number of centipawns worse than the
+ *     best move can be and still be included.
+ * @return {Array.<string>} The UCI representation (e.g. e1g1) of all
+ *     moves, in score order.
+ */
 var find_nonstupid_moves = function(data, margin) {
 	// First of all, if there are any moves that are more than 0.5 ahead of
 	// the primary move, the refutation lines are probably bunk, so just
 	// kill them all. 
 	var best_score = undefined;
 	var pv_score = undefined;
-	for (var move in data.refutation_lines) {
-		var score = parseInt(data.refutation_lines[move].score_sort_key);
-		if (move == data.pv_uci[0]) {
+	for (var move in data['refutation_lines']) {
+		var score = parseInt(data['refutation_lines'][move]['score_sort_key'], 10);
+		if (move == data['pv_uci'][0]) {
 			pv_score = score;
 		}
 		if (best_score === undefined || score > best_score) {
 			best_score = score;
 		}
-		if (!(data.refutation_lines[move].depth >= 8)) {
+		if (!(data['refutation_lines'][move]['depth'] >= 8)) {
 			return [];
 		}
 	}
@@ -255,23 +350,35 @@ var find_nonstupid_moves = function(data, margin) {
 	// Now find all moves that are within “margin” of the best score.
 	// The PV move will always be first.
 	var moves = [];
-	for (var move in data.refutation_lines) {
-		var score = parseInt(data.refutation_lines[move].score_sort_key);
-		if (move != data.pv_uci[0] && best_score - score <= margin) {
+	for (var move in data['refutation_lines']) {
+		var score = parseInt(data['refutation_lines'][move]['score_sort_key'], 10);
+		if (move != data['pv_uci'][0] && best_score - score <= margin) {
 			moves.push(move);
 		}
 	}
-	moves = moves.sort(function(a, b) { return compare_by_score(data.refutation_lines, a, b) });
-	moves.unshift(data.pv_uci[0]);
+	moves = moves.sort(function(a, b) { return compare_by_score(data['refutation_lines'], a, b) });
+	moves.unshift(data['pv_uci'][0]);
 
 	return moves;
 }
 
+/**
+ * @param {number} x
+ * @return {!string}
+ */
 var thousands = function(x) {
 	return String(x).split('').reverse().join('').replace(/(\d{3}\B)/g, '$1,').split('').reverse().join('');
 }
 
-var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) {
+/**
+ * @param {!string} fen
+ * @param {Array.<string>} uci_pv
+ * @param {Array.<string>} pretty_pv
+ * @param {number} move_num
+ * @param {!string} toplay
+ * @param {number=} opt_limit
+ */
+var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, opt_limit) {
 	display_lines.push({
 		start_fen: fen,
 		uci_pv: uci_pv,
@@ -291,7 +398,7 @@ var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) {
 		var move = "<a class=\"move\" href=\"javascript:show_line(" + (display_lines.length - 1) + ", " + i + ");\">" + pretty_pv[i] + "</a>";
 
 		if (toplay == 'W') {
-			if (i > limit) {
+			if (i > opt_limit) {
 				return pv + ' (…)';
 			}
 			if (pv != '') {
@@ -308,7 +415,7 @@ var print_pv = function(fen, uci_pv, pretty_pv, move_num, toplay, limit) {
 	return pv;
 }
 
-var update_highlight = function()  {
+var update_highlight = function() {
 	$("#board").find('.square-55d63').removeClass('nonuglyhighlight');
 	if (current_display_line === null && highlight_from !== undefined && highlight_to !== undefined) {
 		$("#board").find('.square-' + highlight_from).addClass('nonuglyhighlight');
@@ -316,7 +423,10 @@ var update_highlight = function()  {
 	}
 }
 
-var update_refutation_lines = function(board) {
+var update_refutation_lines = function() {
+	if (fen === null) {
+		return;
+	}
 	if (display_lines.length > 1) {
 		display_lines = [ display_lines[0] ];
 	}
@@ -338,54 +448,64 @@ var update_refutation_lines = function(board) {
 		var move_td = document.createElement("td");
 		tr.appendChild(move_td);
 		$(move_td).addClass("move");
-		if (line.pv_uci.length == 0) {
-			$(move_td).text(line.pretty_move);
+		if (line['pv_uci'].length == 0) {
+			$(move_td).text(line['pretty_move']);
 		} else {
-			var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line.pretty_move + "</a>";
+			var move = "<a class=\"move\" href=\"javascript:show_line(" + display_lines.length + ", " + 0 + ");\">" + line['pretty_move'] + "</a>";
 			$(move_td).html(move);
 		}
 
 		var score_td = document.createElement("td");
 		tr.appendChild(score_td);
 		$(score_td).addClass("score");
-		$(score_td).text(line.pretty_score);
+		$(score_td).text(line['pretty_score']);
 
 		var depth_td = document.createElement("td");
 		tr.appendChild(depth_td);
 		$(depth_td).addClass("depth");
-		$(depth_td).text("d" + line.depth);
+		$(depth_td).text("d" + line['depth']);
 
 		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(print_pv(fen, line['pv_uci'], line['pv_pretty'], move_num, toplay, 10));
 
 		tbl.append(tr);
 	}
 
 	// Make one of the links clickable and the other nonclickable.
 	if (sort_refutation_lines_by_score) {
-		$("#sortbyscore0").html("<a href=\"javascript:resort_refutation_lines(0)\">Move</a>");
+		$("#sortbyscore0").html("<a href=\"javascript:resort_refutation_lines(false)\">Move</a>");
 		$("#sortbyscore1").html("<strong>Score</strong>");
 	} else {
 		$("#sortbyscore0").html("<strong>Move</strong>");
-		$("#sortbyscore1").html("<a href=\"javascript:resort_refutation_lines(1)\">Score</a>");
+		$("#sortbyscore1").html("<a href=\"javascript:resort_refutation_lines(true)\">Score</a>");
 	}
 }
 
-var update_board = function(board, data, num_viewers) {
+/**
+ * @param {Object} data
+ * @param {number} num_viewers
+ */
+var update_board = function(data, num_viewers) {
 	display_lines = [];
 
 	// The headline.
-	var headline = 'Analysis';
-	if (data.position.last_move !== 'none') {
+	var headline;
+	if (data['position']['player_w'] && data['position']['player_b']) {
+		headline = data['position']['player_w'] + '–' +
+			data['position']['player_b'] + ', analysis';
+	} else {
+		headline = 'Analysis';
+	}
+	if (data['position']['last_move'] !== 'none') {
 		headline += ' after '
-		if (data.position.toplay == 'W') {
-			headline += (data.position.move_num-1) + '… ';
+		if (data['position']['toplay'] == 'W') {
+			headline += (data['position']['move_num']-1) + '… ';
 		} else {
-			headline += data.position.move_num + '. ';
+			headline += data['position']['move_num'] + '. ';
 		}
-		headline += data.position.last_move;
+		headline += data['position']['last_move'];
 	}
 
 	$("#headline").text(headline);
@@ -399,21 +519,21 @@ var update_board = function(board, data, num_viewers) {
 	}
 
 	// The score.
-	if (data.score !== null) {
-		$("#score").text(data.score);
+	if (data['score'] !== null) {
+		$("#score").text(data['score']);
 	}
 
 	// The search stats.
-	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['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';
+		if (data['tbhits'] && data['tbhits'] > 0) {
+			if (data['tbhits'] == 1) {
+				stats += ', one Syzygy hit';
 			} else {
-				stats += ', ' + data.tbhits + ' Nalimov hits';
+				stats += ', ' + thousands(data['tbhits']) + ' Syzygy hits';
 			}
 		}
 
@@ -421,28 +541,28 @@ var update_board = function(board, data, num_viewers) {
 	}
 
 	// Update the board itself.
-	fen = data.position.fen;
+	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, 4);
+	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);
 	} else {
 		highlight_from = highlight_to = undefined;
 	}
 	update_highlight();
 
 	// 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(print_pv(data['position']['fen'], data['pv_uci'], data['pv_pretty'], data['position']['move_num'], data['position']['toplay']));
 
 	// Update the PV arrow.
 	clear_arrows();
-	if (data.pv_uci.length >= 1) {
+	if (data['pv_uci'].length >= 1) {
 		// draw a continuation arrow as long as it's the same piece
-		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)) ||
+		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)) ||
 			     interfering_arrow(from, to)) {
 				break;
 			}
@@ -457,23 +577,23 @@ var update_board = function(board, data, num_viewers) {
 	}
 
 	// See if all semi-reasonable moves have only one possible response.
-	if (data.pv_uci.length >= 2) {
+	if (data['pv_uci'].length >= 2) {
 		var nonstupid_moves = find_nonstupid_moves(data, 300);
-		var response = data.pv_uci[1];
+		var response = data['pv_uci'][1];
 		for (var i = 0; i < nonstupid_moves.length; ++i) {
-			if (nonstupid_moves[i] == data.pv_uci[0]) {
+			if (nonstupid_moves[i] == data['pv_uci'][0]) {
 				// ignore the PV move for refutation lines.
 				continue;
 			}
-			if (!data.refutation_lines ||
-			    !data.refutation_lines[nonstupid_moves[i]] ||
-			    !data.refutation_lines[nonstupid_moves[i]].pv_uci ||
-			    data.refutation_lines[nonstupid_moves[i]].pv_uci.length < 1) {
+			if (!data['refutation_lines'] ||
+			    !data['refutation_lines'][nonstupid_moves[i]] ||
+			    !data['refutation_lines'][nonstupid_moves[i]]['pv_uci'] ||
+			    data['refutation_lines'][nonstupid_moves[i]]['pv_uci'].length < 1) {
 				// Incomplete PV, abort.
 				response = undefined;
 				break;
 			}
-			var this_response = data.refutation_lines[nonstupid_moves[i]].pv_uci[1];
+			var this_response = data['refutation_lines'][nonstupid_moves[i]]['pv_uci'][1];
 			if (response !== this_response) {
 				// Different response depending on lines, abort.
 				response = undefined;
@@ -488,21 +608,29 @@ var update_board = function(board, data, num_viewers) {
 	}
 
 	// Update the refutation lines.
-	fen = data.position.fen;
-	move_num = data.position.move_num;
-	toplay = data.position.toplay;
-	refutation_lines = data.refutation_lines;
-	update_refutation_lines(board);
+	fen = data['position']['fen'];
+	move_num = data['position']['move_num'];
+	toplay = data['position']['toplay'];
+	refutation_lines = data['refutation_lines'];
+	update_refutation_lines();
 
 	// Next update.
-	setTimeout(function() { request_update(board); }, 100);
+	setTimeout(function() { request_update(); }, 100);
 }
 
+/**
+ * @param {boolean} sort_by_score
+ */
 var resort_refutation_lines = function(sort_by_score) {
 	sort_refutation_lines_by_score = sort_by_score;
-	update_refutation_lines(board);
+	update_refutation_lines();
 }
+window['resort_refutation_lines'] = resort_refutation_lines;
 
+/**
+ * @param {number} line_num
+ * @param {number} move_num
+ */
 var show_line = function(line_num, move_num) {
 	if (line_num == -1) {
 		current_display_line = null;
@@ -515,16 +643,19 @@ var show_line = function(line_num, move_num) {
 	update_highlight();
 	redraw_arrows();
 }
+window['show_line'] = show_line;
 
 var prev_move = function() {
 	--current_display_move;
 	update_displayed_line();
 }
+window['prev_move'] = prev_move;
 
 var next_move = function() {
 	++current_display_move;
 	update_displayed_line();
 }
+window['next_move'] = next_move;
 
 var update_displayed_line = function() {
 	if (current_display_line === null) {
@@ -553,16 +684,28 @@ var update_displayed_line = function() {
 		var move = current_display_line.uci_pv[i];
 		move = move.substr(0, 2) + "-" + move.substr(2, 4);
 		hiddenboard.move(move, false);
+
+		// chessboard.js does not automatically move the rook on castling
+		// (issue #51; marked as won't fix), so update it ourselves.
+		if (move == "e1-g1" && hiddenboard.position().g1 == "wK") {  // white O-O
+			hiddenboard.move("h1-f1", false);
+		} else if (move == "e1-c1" && hiddenboard.position().c1 == "wK") {  // white O-O-O
+			hiddenboard.move("a1-d1", false);
+		} else if (move == "e8-g8" && hiddenboard.position().g8 == "bK") {  // black O-O
+			hiddenboard.move("h8-f8", false);
+		} else if (move == "e8-c8" && hiddenboard.position().c8 == "bK") {  // black O-O-O
+			hiddenboard.move("a8-d8", false);
+		}
 	}
 	board.position(hiddenboard.position());
 }
 
 var init = function() {
 	// Create board.
-	board = new ChessBoard('board', 'start');
-	hiddenboard = new ChessBoard('hiddenboard', 'start');
+	board = new window.ChessBoard('board', 'start');
+	hiddenboard = new window.ChessBoard('hiddenboard', 'start');
 
-	request_update(board);
+	request_update();
 	$(window).resize(function() {
 		board.resize();
 		update_highlight();
@@ -570,3 +713,5 @@ var init = function() {
 	});
 };
 $(document).ready(init);
+
+})();