Use the prettyprinted files from the protobuf. Leave the old code in place in case...

[remoteglot] / server / hash-lookup.js

diff --git a/server/hash-lookup.js b/server/hash-lookup.js
index 0e7ee52b0fc38d7d5798548fecf6e993dd46e1ea..3ee6bd3ad1643a1ef4ea711e34ad80604c3587ad 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;
@@ -52,11 +68,11 @@ var handle_response = function(fen, response, probe_responses) {
        var probe_response = reconcile_responses(probe_responses);
        var lines = {};
 
-       var root = translate_line(board, fen, probe_response['root']);
+       var root = translate_line_use_pretty(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);
+               lines[uci_move] = translate_line_use_pretty(board, fen, line);
        }
 
        var text = JSON.stringify({
@@ -181,3 +197,49 @@ var translate_line = function(board, fen, line) {
 
        return r;
 }
+
+var translate_line_use_pretty = function(board, fen, line) {
+       var r = {};
+
+       if (line['move'] && line['move']['pretty']) {
+               r['move'] = line['move']['pretty']
+       } else {
+               r['move'] = '';
+       }
+       if (!line['found']) {
+               r['pv'] = [];
+               return r;
+       }
+       r['depth'] = line['depth'];
+
+       // Convert the PV.
+       var pv = [];
+       if (r['move']) {
+               pv.push(r['move']);
+       }
+       for (var j = 0; j < line['pv'].length; ++j) {
+               var move = line['pv'][j];
+               pv.push(move['pretty']);
+       }
+       r['pv'] = pv;
+
+       // Convert the score. Use the static eval if no search.
+       var value = line['value'] || line['eval'];
+       var score = null;
+       if (value['score_type'] === 'SCORE_CP') {
+               score = ['cp', value['score_cp']];
+       } else if (value['score_type'] === 'SCORE_MATE') {
+               score = ['m', value['score_mate']];
+       }
+       if (score) {
+               if (line['bound'] === 'BOUND_UPPER') {
+                       score.push('≤');
+               } else if (line['bound'] === 'BOUND_LOWER') {
+                       score.push('≥');
+               }
+       }
+
+       r['score'] = score;
+
+       return r;
+}