X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=server%2Fhash-lookup.js;h=21e722a8644d2065448d1f575b77260ad52f8167;hb=f71f5c94d093acda1b39d23cf7a71a21c6a3122b;hp=dd0b0c3160633d643271606cd397916584a907b0;hpb=19afd6bdb8c2d498dd9dd5887ea33c33185443a5;p=remoteglot

diff --git a/server/hash-lookup.js b/server/hash-lookup.js
index dd0b0c3..21e722a 100644
--- a/server/hash-lookup.js
+++ b/server/hash-lookup.js
@@ -1,8 +1,17 @@
-var grpc = require('grpc');
+var grpc = require('@grpc/grpc-js');
 var Chess = require('../www/js/chess.js').Chess;
 
 var PROTO_PATH = __dirname + '/hashprobe.proto';
-var hashprobe_proto = grpc.load(PROTO_PATH).hashprobe;
+var protoLoader = require('@grpc/proto-loader');
+var packageDefinition = protoLoader.loadSync(
+    PROTO_PATH,
+    {keepCase: true,
+     longs: String,
+     enums: String,
+     defaults: true,
+     oneofs: true
+    });
+var hashprobe_proto = grpc.loadPackageDefinition(packageDefinition).hashprobe;
 
 var board = new Chess();
 
@@ -71,8 +80,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({
@@ -105,12 +114,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]);
 			}
 		}
 	}
@@ -143,16 +152,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'] = '';
 	}
@@ -169,11 +171,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;