Merge commit '83d2eb4'

[remoteglot] / server / hash-lookup.js

diff --git a/server/hash-lookup.js b/server/hash-lookup.js
index b6ed75e33477f5acdc8ca62c10b3f7eb298a22b8..7d7daeb9099c6c36f2781cb4889f4fd573f86618 100644 (file)
--- 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,16 +7,32 @@ 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;
 
 var handle_request = function(fen, response) {
-       if (!board.validate_fen(fen).valid) {
+       if (fen === undefined || fen === null || fen === '' || !board.validate_fen(fen).valid) {
                response.writeHead(400, {});
                response.end();
                return;
@@ -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,40 +143,28 @@ 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['pretty_move'] = board.move({ from: line['move']['from_sq'], to: line['move']['to_sq'], promotion: promo.toLowerCase() }).san;
-               } else {
-                       r['pretty_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['pretty_move'] = '';
+               r['move'] = '';
        }
-       r['sort_key'] = r['pretty_move'];
        if (!line['found']) {
-               r['pv_pretty'] = [];
+               r['pv'] = [];
                return r;
        }
        r['depth'] = line['depth'];
 
        // Convert the PV.
        var pv = [];
-       if (r['pretty_move']) {
-               pv.push(r['pretty_move']);
+       if (r['move']) {
+               pv.push(r['move']);
        }
        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_pretty'] = pv;
+       r['pv'] = pv;
 
        // Convert the score. Use the static eval if no search.
        var value = line['value'] || line['eval'];