X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=server%2Fhash-lookup.js;h=7d7daeb9099c6c36f2781cb4889f4fd573f86618;hp=b9d5f008250a3a0fe479bd01552aeed3006e3395;hb=93c084f827a5783b20a3b3349463187c6d342810;hpb=328af66f9b4a34c51c61d19d3d988ee1453bec44

diff --git a/server/hash-lookup.js b/server/hash-lookup.js
index b9d5f00..7d7daeb 100644
--- a/server/hash-lookup.js
+++ b/server/hash-lookup.js
@@ -1,5 +1,5 @@
 var grpc = require('grpc');
-var Chess = require('../www/js/chess.min.js').Chess;
+var Chess = require('../www/js/chess.js').Chess;
 
 var PROTO_PATH = __dirname + '/hashprobe.proto';
 var hashprobe_proto = grpc.load(PROTO_PATH).hashprobe;
@@ -7,11 +7,27 @@ var hashprobe_proto = grpc.load(PROTO_PATH).hashprobe;
 var board = new Chess();
 
 var clients = [];
+var current_servers = [];
+
+var need_reinit = function(servers) {
+	if (servers.length != current_servers.length) {
+		return true;
+	}
+	for (var i = 0; i < servers.length; ++i) {
+		if (servers[i] != current_servers[i]) {
+			return true;
+		}
+	}
+	return false;
+}
+exports.need_reinit = need_reinit;
 
 var init = function(servers) {
+	clients = [];
 	for (var i = 0; i < servers.length; ++i) {
 		clients.push(new hashprobe_proto.HashProbe(servers[i], grpc.credentials.createInsecure()));
 	}
+	current_servers = servers;
 }
 exports.init = init;
 
@@ -55,8 +71,8 @@ var handle_response = function(fen, response, probe_responses) {
 	var root = translate_line(board, fen, probe_response['root']);
 	for (var i = 0; i < probe_response['line'].length; ++i) {
 		var line = probe_response['line'][i];
-		var uci_move = line['move']['from_sq'] + line['move']['to_sq'] + line['move']['promotion'];
-		lines[uci_move] = translate_line(board, fen, line);
+		var pretty_move = line['move']['pretty'];
+		lines[pretty_move] = translate_line(board, fen, line);
 	}
 
 	var text = JSON.stringify({
@@ -89,12 +105,12 @@ var reconcile_responses = function(probe_responses) {
 	for (var i = 0; i < probe_responses.length; ++i) {
 		for (var j = 0; j < probe_responses[i]['line'].length; ++j) {
 			var line = probe_responses[i]['line'][j];
-			var uci_move = line['move']['from_sq'] + line['move']['to_sq'] + line['move']['promotion'];
+			var pretty_move = line['move']['pretty'];
 
-			if (!moves[uci_move]) {
-				moves[uci_move] = line;
+			if (!moves[pretty_move]) {
+				moves[pretty_move] = line;
 			} else {
-				moves[uci_move] = reconcile_moves(line, moves[uci_move]);
+				moves[pretty_move] = reconcile_moves(line, moves[pretty_move]);
 			}
 		}
 	}
@@ -127,16 +143,9 @@ var reconcile_moves = function(a, b) {
 
 var translate_line = function(board, fen, line) {
 	var r = {};
-	board.load(fen);
-	var toplay = board.turn();
-
-	if (line['move'] && line['move']['from_sq']) {
-		var promo = line['move']['promotion'];
-		if (promo) {
-			r['move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'], promotion: promo.toLowerCase() }).san;
-		} else {
-			r['move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'] }).san;
-		}
+
+	if (line['move'] && line['move']['pretty']) {
+		r['move'] = line['move']['pretty']
 	} else {
 		r['move'] = '';
 	}
@@ -153,11 +162,7 @@ var translate_line = function(board, fen, line) {
 	}
 	for (var j = 0; j < line['pv'].length; ++j) {
 		var move = line['pv'][j];
-		var decoded = board.move({ from: move['from_sq'], to: move['to_sq'], promotion: move['promotion'] });
-		if (decoded === null) {
-			break;
-		}
-		pv.push(decoded.san);
+		pv.push(move['pretty']);
 	}
 	r['pv'] = pv;