Add a Makefile for the book builder stuff.
[remoteglot] / remoteglot.pl
index 39fa629..6a5778a 100755 (executable)
@@ -9,35 +9,36 @@
 # Licensed under the GNU General Public License, version 2.
 #
 
+use AnyEvent;
+use AnyEvent::Handle;
+use AnyEvent::HTTP;
+use Chess::PGN::Parse;
+use EV;
 use Net::Telnet;
 use FileHandle;
 use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
+use URI::Escape;
+require 'Position.pm';
+require 'Engine.pm';
+require 'config.pm';
 use strict;
 use warnings;
-
-# Configuration
-my $server = "freechess.org";
-my $target = "GMCarlsen";
-my $engine_cmdline = "'./Deep Rybka 4 SSE42 x64'";
-my $engine2_cmdline = "./stockfish_13111119_x64_modern_sse42";
-my $telltarget = undef;   # undef to be silent
-my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
-my $uci_assume_full_compliance = 0;                    # dangerous :-)
-my $update_max_interval = 2.0;
-my $second_engine_start_depth = 8;
-my @masters = (
-       'Sesse',
-       'Sessse',
-       'Sesssse',
-       'greatestguns',
-       'beuki'
-);
+no warnings qw(once);
 
 # Program starts here
-$SIG{ALRM} = sub { output(); };
 my $latest_update = undef;
+my $output_timer = undef;
+my $http_timer = undef;
+my $stop_pgn_fetch = 0;
+my $tb_retry_timer = undef;
+my %tb_cache = ();
+my $tb_lookup_running = 0;
+my $last_written_json = undef;
+
+# TODO: Persist (parts of) this so that we can restart.
+my %clock_target_for_pos = ();
 
 $| = 1;
 
@@ -52,38 +53,44 @@ open(UCILOG, ">ucilog.txt")
 print UCILOG "Log starting.\n";
 select(UCILOG);
 $| = 1;
+
+open(TBLOG, ">tblog.txt")
+       or die "tblog.txt: $!";
+print TBLOG "Log starting.\n";
+select(TBLOG);
+$| = 1;
+
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline, 'E1');
-my $engine2 = open_engine($engine2_cmdline, 'E2');
-my ($last_move, $last_tell);
+my $engine = open_engine($remoteglotconf::engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
+my $engine2 = open_engine($remoteglotconf::engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
+my $last_move;
 my $last_text = '';
-my $last_told_text = '';
 my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
 
 uciprint($engine, "setoption name UCI_AnalyseMode value true");
-# uciprint($engine, "setoption name NalimovPath value /srv/tablebase");
-uciprint($engine, "setoption name NalimovUsage value Rarely");
-uciprint($engine, "setoption name Hash value 1024");
-# uciprint($engine, "setoption name MultiPV value 2");
+while (my ($key, $value) = each %remoteglotconf::engine_config) {
+       uciprint($engine, "setoption name $key value $value");
+}
 uciprint($engine, "ucinewgame");
 
-uciprint($engine2, "setoption name UCI_AnalyseMode value true");
-# uciprint($engine2, "setoption name NalimovPath value /srv/tablebase");
-uciprint($engine2, "setoption name NalimovUsage value Rarely");
-uciprint($engine2, "setoption name Hash value 1024");
-uciprint($engine2, "setoption name Threads value 8");
-uciprint($engine2, "setoption name MultiPV value 500");
-uciprint($engine2, "ucinewgame");
+if (defined($engine2)) {
+       uciprint($engine2, "setoption name UCI_AnalyseMode value true");
+       while (my ($key, $value) = each %remoteglotconf::engine2_config) {
+               uciprint($engine2, "setoption name $key value $value");
+       }
+       uciprint($engine2, "setoption name MultiPV value 500");
+       uciprint($engine2, "ucinewgame");
+}
 
 print "Chess engine ready.\n";
 
 # now talk to FICS
 my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
 $t->input_log(\*FICSLOG);
-$t->open($server);
-$t->print("SesseBOT");
+$t->open($remoteglotconf::server);
+$t->print($remoteglotconf::nick);
 $t->waitfor('/Press return to enter the server/');
 $t->cmd("");
 
@@ -91,129 +98,38 @@ $t->cmd("");
 $t->cmd("set shout 0");
 $t->cmd("set seek 0");
 $t->cmd("set style 12");
-$t->cmd("observe $target");
 
-# main loop
-print "FICS ready.\n";
-while (1) {
-       my $rin = '';
-       my $rout;
-       vec($rin, fileno($engine->{'read'}), 1) = 1;
-       vec($rin, fileno($engine2->{'read'}), 1) = 1;
-       vec($rin, fileno($t), 1) = 1;
-
-       my ($nfound, $timeleft) = select($rout=$rin, undef, undef, 5.0);
-       my $sleep = 1.0;
-
-       while (1) {
-               my $line = $t->getline(Timeout => 0, errmode => 'return');
-               last if (!defined($line));
-
-               chomp $line;
-               $line =~ tr/\r//d;
-               if ($line =~ /^<12> /) {
-                       my $pos = style12_to_pos($line);
-                       
-                       # if this is already in the queue, ignore it
-                       next if (defined($pos_waiting) && $pos->{'fen'} eq $pos_waiting->{'fen'});
-
-                       # if we're already chewing on this and there's nothing else in the queue,
-                       # also ignore it
-                       next if (!defined($pos_waiting) && defined($pos_calculating) &&
-                                $pos->{'fen'} eq $pos_calculating->{'fen'});
-
-                       # if we're already thinking on something, stop and wait for the engine
-                       # to approve
-                       if (defined($pos_calculating)) {
-                               if (!defined($pos_waiting)) {
-                                       uciprint($engine, "stop");
-                               }
-                               if ($uci_assume_full_compliance) {
-                                       $pos_waiting = $pos;
-                               } else {
-                                       uciprint($engine, "position fen " . $pos->{'fen'});
-                                       uciprint($engine, "go infinite");
-                                       $pos_calculating = $pos;
-                               }
-                       } else {
-                               # it's wrong just to give the FEN (the move history is useful,
-                               # and per the UCI spec, we should really have sent "ucinewgame"),
-                               # but it's easier
-                               uciprint($engine, "position fen " . $pos->{'fen'});
-                               uciprint($engine, "go infinite");
-                               $pos_calculating = $pos;
-                       }
-
-                       if (defined($pos_calculating_second_engine)) {
-                               uciprint($engine2, "stop");
-                       } else {
-                               uciprint($engine2, "position fen " . $pos->{'fen'});
-                               uciprint($engine2, "go infinite");
-                               $pos_calculating_second_engine = $pos;
-                       }
-
-                       $engine->{'info'} = {};
-                       $engine2->{'info'} = {};
-                       $last_move = time;
-
-                       # 
-                       # Output a command every move to note that we're
-                       # still paying attention -- this is a good tradeoff,
-                       # since if no move has happened in the last half
-                       # hour, the analysis/relay has most likely stopped
-                       # and we should stop hogging server resources.
-                       #
-                       $t->cmd("date");
+my $ev1 = AnyEvent->io(
+       fh => fileno($t),
+       poll => 'r',
+       cb => sub {    # what callback to execute
+               while (1) {
+                       my $line = $t->getline(Timeout => 0, errmode => 'return');
+                       return if (!defined($line));
+
+                       chomp $line;
+                       $line =~ tr/\r//d;
+                       handle_fics($line);
                }
-               if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
-                       my ($who, $msg) = ($1, $2);
-
-                       next if (grep { $_ eq $who } (@masters) == 0);
-       
-                       if ($msg =~ /^fics (.*?)$/) {
-                               $t->cmd("tell $who Executing '$1' on FICS.");
-                               $t->cmd($1);
-                       } elsif ($msg =~ /^uci (.*?)$/) {
-                               $t->cmd("tell $who Sending '$1' to the engine.");
-                               print { $engine->{'write'} } "$1\n";
-                       } else {
-                               $t->cmd("tell $who Couldn't understand '$msg', sorry.");
-                       }
-               }
-               #print "FICS: [$line]\n";
-               $sleep = 0;
        }
-       
-       # any fun on the UCI channel?
-       if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-               my @lines = read_lines($engine);
-               for my $line (@lines) {
-                       next if $line =~ /(upper|lower)bound/;
-                       handle_uci($engine, $line, 1);
-               }
-               $sleep = 0;
-
-               output();
-       }
-       if ($nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
-               my @lines = read_lines($engine2);
-               for my $line (@lines) {
-                       next if $line =~ /(upper|lower)bound/;
-                       handle_uci($engine2, $line, 0);
-               }
-               $sleep = 0;
-
-               output();
+);
+if (defined($remoteglotconf::target)) {
+       if ($remoteglotconf::target =~ /^http:/) {
+               fetch_pgn($remoteglotconf::target);
+       } else {
+               $t->cmd("observe $remoteglotconf::target");
        }
-
-       sleep $sleep;
 }
+print "FICS ready.\n";
+
+# Engine events have already been set up by Engine.pm.
+EV::run;
 
 sub handle_uci {
        my ($engine, $line, $primary) = @_;
 
-       chomp $line;
-       $line =~ tr/\r//d;
+       return if $line =~ /(upper|lower)bound/;
+
        $line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
        print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
        if ($line =~ /^info/) {
@@ -230,21 +146,249 @@ sub handle_uci {
        }
        if ($line =~ /^bestmove/) {
                if ($primary) {
-                       return if (!$uci_assume_full_compliance);
+                       return if (!$remoteglotconf::uci_assume_full_compliance);
                        if (defined($pos_waiting)) {
-                               uciprint($engine, "position fen " . $pos_waiting->{'fen'});
+                               uciprint($engine, "position fen " . $pos_waiting->fen());
                                uciprint($engine, "go infinite");
 
                                $pos_calculating = $pos_waiting;
                                $pos_waiting = undef;
                        }
                } else {
+                       $engine2->{'info'} = {};
                        my $pos = $pos_waiting // $pos_calculating;
-                       uciprint($engine2, "position fen " . $pos->{'fen'});
+                       uciprint($engine2, "position fen " . $pos->fen());
                        uciprint($engine2, "go infinite");
                        $pos_calculating_second_engine = $pos;
                }
        }
+       output();
+}
+
+my $getting_movelist = 0;
+my $pos_for_movelist = undef;
+my @uci_movelist = ();
+my @pretty_movelist = ();
+
+sub handle_fics {
+       my $line = shift;
+       if ($line =~ /^<12> /) {
+               handle_position(Position->new($line));
+               $t->cmd("moves");
+       }
+       if ($line =~ /^Movelist for game /) {
+               my $pos = $pos_waiting // $pos_calculating;
+               if (defined($pos)) {
+                       @uci_movelist = ();
+                       @pretty_movelist = ();
+                       $pos_for_movelist = Position->start_pos($pos->{'player_w'}, $pos->{'player_b'});
+                       $getting_movelist = 1;
+               }
+       }
+       if ($getting_movelist &&
+           $line =~ /^\s* \d+\. \s+                     # move number
+                       (\S+) \s+ \( [\d:.]+ \) \s*       # first move, then time
+                      (?: (\S+) \s+ \( [\d:.]+ \) )?    # second move, then time 
+                    /x) {
+               eval {
+                       my $uci_move;
+                       ($pos_for_movelist, $uci_move) = $pos_for_movelist->make_pretty_move($1);
+                       push @uci_movelist, $uci_move;
+                       push @pretty_movelist, $1;
+
+                       if (defined($2)) {
+                               ($pos_for_movelist, $uci_move) = $pos_for_movelist->make_pretty_move($2);
+                               push @uci_movelist, $uci_move;
+                               push @pretty_movelist, $2;
+                       }
+               };
+               if ($@) {
+                       warn "Error when getting FICS move history: $@";
+                       $getting_movelist = 0;
+               }
+       }
+       if ($getting_movelist &&
+           $line =~ /^\s+ \{.*\} \s+ (?: \* | 1\/2-1\/2 | 0-1 | 1-0 )/x) {
+               # End of movelist.
+               for my $pos ($pos_waiting, $pos_calculating) {
+                       next if (!defined($pos));
+                       if ($pos->fen() eq $pos_for_movelist->fen()) {
+                               $pos->{'pretty_history'} = \@pretty_movelist;
+                       }
+               }
+               $getting_movelist = 0;
+       }
+       if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+               my ($who, $msg) = ($1, $2);
+
+               next if (grep { $_ eq $who } (@remoteglotconf::masters) == 0);
+
+               if ($msg =~ /^fics (.*?)$/) {
+                       $t->cmd("tell $who Executing '$1' on FICS.");
+                       $t->cmd($1);
+               } elsif ($msg =~ /^uci (.*?)$/) {
+                       $t->cmd("tell $who Sending '$1' to the engine.");
+                       print { $engine->{'write'} } "$1\n";
+               } elsif ($msg =~ /^pgn (.*?)$/) {
+                       my $url = $1;
+                       $t->cmd("tell $who Starting to poll '$url'.");
+                       fetch_pgn($url);
+               } elsif ($msg =~ /^stoppgn$/) {
+                       $t->cmd("tell $who Stopping poll.");
+                       $stop_pgn_fetch = 1;
+                       $http_timer = undef;
+               } elsif ($msg =~ /^quit$/) {
+                       $t->cmd("tell $who Bye bye.");
+                       exit;
+               } else {
+                       $t->cmd("tell $who Couldn't understand '$msg', sorry.");
+               }
+       }
+       #print "FICS: [$line]\n";
+}
+
+# Starts periodic fetching of PGNs from the given URL.
+sub fetch_pgn {
+       my ($url) = @_;
+       AnyEvent::HTTP::http_get($url, sub {
+               handle_pgn(@_, $url);
+       });
+}
+
+my ($last_pgn_white, $last_pgn_black);
+my @last_pgn_uci_moves = ();
+my $pgn_hysteresis_counter = 0;
+
+sub handle_pgn {
+       my ($body, $header, $url) = @_;
+
+       if ($stop_pgn_fetch) {
+               $stop_pgn_fetch = 0;
+               $http_timer = undef;
+               return;
+       }
+
+       my $pgn = Chess::PGN::Parse->new(undef, $body);
+       if (!defined($pgn) || !$pgn->read_game() || $body !~ /^\[/) {
+               warn "Error in parsing PGN from $url\n";
+       } else {
+               eval {
+                       $pgn->parse_game({ save_comments => 'yes' });
+                       my $pos = Position->start_pos($pgn->white, $pgn->black);
+                       my $moves = $pgn->moves;
+                       my @uci_moves = ();
+                       for my $move (@$moves) {
+                               my $uci_move;
+                               ($pos, $uci_move) = $pos->make_pretty_move($move);
+                               push @uci_moves, $uci_move;
+                       }
+                       $pos->{'result'} = $pgn->result;
+                       $pos->{'pretty_history'} = $moves;
+
+                       extract_clock($pgn, $pos);
+
+                       # Sometimes, PGNs lose a move or two for a short while,
+                       # or people push out new ones non-atomically. 
+                       # Thus, if we PGN doesn't change names but becomes
+                       # shorter, we mistrust it for a few seconds.
+                       my $trust_pgn = 1;
+                       if (defined($last_pgn_white) && defined($last_pgn_black) &&
+                           $last_pgn_white eq $pgn->white &&
+                           $last_pgn_black eq $pgn->black &&
+                           scalar(@uci_moves) < scalar(@last_pgn_uci_moves)) {
+                               if (++$pgn_hysteresis_counter < 3) {
+                                       $trust_pgn = 0; 
+                               }
+                       }
+                       if ($trust_pgn) {
+                               $last_pgn_white = $pgn->white;
+                               $last_pgn_black = $pgn->black;
+                               @last_pgn_uci_moves = @uci_moves;
+                               $pgn_hysteresis_counter = 0;
+                               handle_position($pos);
+                       }
+               };
+               if ($@) {
+                       warn "Error in parsing moves from $url\n";
+               }
+       }
+       
+       $http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+               fetch_pgn($url);
+       });
+}
+
+sub handle_position {
+       my ($pos) = @_;
+       find_clock_start($pos);
+               
+       # if this is already in the queue, ignore it
+       return if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
+
+       # if we're already chewing on this and there's nothing else in the queue,
+       # also ignore it
+       return if (!defined($pos_waiting) && defined($pos_calculating) &&
+                $pos->fen() eq $pos_calculating->fen());
+
+       # if we're already thinking on something, stop and wait for the engine
+       # to approve
+       if (defined($pos_calculating)) {
+               # Store the final data we have for this position in the history,
+               # with the precise clock information we just got from the new
+               # position. (Historic positions store the clock at the end of
+               # the position.)
+               #
+               # Do not output anything new to the main analysis; that's
+               # going to be obsolete really soon.
+               $pos_calculating->{'white_clock'} = $pos->{'white_clock'};
+               $pos_calculating->{'black_clock'} = $pos->{'black_clock'};
+               delete $pos_calculating->{'white_clock_target'};
+               delete $pos_calculating->{'black_clock_target'};
+               output_json(1);
+
+               if (!defined($pos_waiting)) {
+                       uciprint($engine, "stop");
+               }
+               if ($remoteglotconf::uci_assume_full_compliance) {
+                       $pos_waiting = $pos;
+               } else {
+                       uciprint($engine, "position fen " . $pos->fen());
+                       uciprint($engine, "go infinite");
+                       $pos_calculating = $pos;
+               }
+       } else {
+               # it's wrong just to give the FEN (the move history is useful,
+               # and per the UCI spec, we should really have sent "ucinewgame"),
+               # but it's easier
+               uciprint($engine, "position fen " . $pos->fen());
+               uciprint($engine, "go infinite");
+               $pos_calculating = $pos;
+       }
+
+       if (defined($engine2)) {
+               if (defined($pos_calculating_second_engine)) {
+                       uciprint($engine2, "stop");
+               } else {
+                       uciprint($engine2, "position fen " . $pos->fen());
+                       uciprint($engine2, "go infinite");
+                       $pos_calculating_second_engine = $pos;
+               }
+               $engine2->{'info'} = {};
+       }
+
+       $engine->{'info'} = {};
+       $last_move = time;
+
+       schedule_tb_lookup();
+
+       # 
+       # Output a command every move to note that we're
+       # still paying attention -- this is a good tradeoff,
+       # since if no move has happened in the last half
+       # hour, the analysis/relay has most likely stopped
+       # and we should stop hogging server resources.
+       #
+       $t->cmd("date");
 }
 
 sub parse_infos {
@@ -255,26 +399,28 @@ sub parse_infos {
 
        # Search for "multipv" first of all, since e.g. Stockfish doesn't put it first.
        for my $i (0..$#x - 1) {
-               if ($x[$i] =~ 'multipv') {
+               if ($x[$i] eq 'multipv') {
                        $mpv = $x[$i + 1];
                        next;
                }
        }
 
        while (scalar @x > 0) {
-               if ($x[0] =~ 'multipv') {
+               if ($x[0] eq 'multipv') {
                        # Dealt with above
                        shift @x;
                        shift @x;
                        next;
                }
-               if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
+               if ($x[0] eq 'currmove' || $x[0] eq 'currmovenumber' || $x[0] eq 'cpuload') {
                        my $key = shift @x;
                        my $value = shift @x;
                        $info->{$key} = $value;
                        next;
                }
-               if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
+               if ($x[0] eq 'depth' || $x[0] eq 'seldepth' || $x[0] eq 'hashfull' ||
+                   $x[0] eq 'time' || $x[0] eq 'nodes' || $x[0] eq 'nps' ||
+                   $x[0] eq 'tbhits') {
                        my $key = shift @x;
                        my $value = shift @x;
                        $info->{$key . $mpv} = $value;
@@ -286,7 +432,7 @@ sub parse_infos {
                        delete $info->{'score_cp' . $mpv};
                        delete $info->{'score_mate' . $mpv};
 
-                       while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
+                       while ($x[0] eq 'cp' || $x[0] eq 'mate') {
                                if ($x[0] eq 'cp') {
                                        shift @x;
                                        $info->{'score_cp' . $mpv} = shift @x;
@@ -330,185 +476,7 @@ sub parse_ids {
        }
 }
 
-sub style12_to_pos {
-       my $str = shift;
-       my %pos = ();
-       my (@x) = split / /, $str;
-       
-       $pos{'board'} = [ @x[1..8] ];
-       $pos{'toplay'} = $x[9];
-       $pos{'ep_file_num'} = $x[10];
-       $pos{'white_castle_k'} = $x[11];
-       $pos{'white_castle_q'} = $x[12];
-       $pos{'black_castle_k'} = $x[13];
-       $pos{'black_castle_q'} = $x[14];
-       $pos{'time_to_100move_rule'} = $x[15];
-       $pos{'move_num'} = $x[26];
-       $pos{'last_move'} = $x[29];
-       $pos{'fen'} = make_fen(\%pos);
-
-       return \%pos;
-}
-
-sub make_fen {
-       my $pos = shift;
-
-       # the board itself
-       my (@board) = @{$pos->{'board'}};
-       for my $rank (0..7) {
-               $board[$rank] =~ s/(-+)/length($1)/ge;
-       }
-       my $fen = join('/', @board);
-
-       # white/black to move
-       $fen .= " ";
-       $fen .= lc($pos->{'toplay'});
-
-       # castling
-       my $castling = "";
-       $castling .= "K" if ($pos->{'white_castle_k'} == 1);
-       $castling .= "Q" if ($pos->{'white_castle_q'} == 1);
-       $castling .= "k" if ($pos->{'black_castle_k'} == 1);
-       $castling .= "q" if ($pos->{'black_castle_q'} == 1);
-       $castling = "-" if ($castling eq "");
-       # $castling = "-"; # chess960
-       $fen .= " ";
-       $fen .= $castling;
-
-       # en passant
-       my $ep = "-";
-       if ($pos->{'ep_file_num'} != -1) {
-               my $col = $pos->{'ep_file_num'};
-               my $nep = (qw(a b c d e f g h))[$col];
-
-               if ($pos->{'toplay'} eq 'B') {
-                       $nep .= "3";
-               } else {
-                       $nep .= "6";
-               }
-
-               #
-               # Showing the en passant square when actually no capture can be made
-               # seems to confuse at least Rybka. Thus, check if there's actually
-               # a pawn of the opposite side that can do the en passant move, and if
-               # not, just lie -- it doesn't matter anyway. I'm unsure what's the
-               # "right" thing as per the standard, though.
-               #
-               if ($pos->{'toplay'} eq 'B') {
-                       $ep = $nep if ($col > 0 && substr($pos->{'board'}[4], $col-1, 1) eq 'p');
-                       $ep = $nep if ($col < 7 && substr($pos->{'board'}[4], $col+1, 1) eq 'p');
-               } else {
-                       $ep = $nep if ($col > 0 && substr($pos->{'board'}[3], $col-1, 1) eq 'P');
-                       $ep = $nep if ($col < 7 && substr($pos->{'board'}[3], $col+1, 1) eq 'P');
-               }
-       }
-       $fen .= " ";
-       $fen .= $ep;
-
-       # half-move clock
-       $fen .= " ";
-       $fen .= $pos->{'time_to_100move_rule'};
-
-       # full-move clock
-       $fen .= " ";
-       $fen .= $pos->{'move_num'};
-
-       return $fen;
-}
-
-sub make_move {
-       my ($board, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
-       my $move = move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
-       my $piece = substr($board->[$from_row], $from_col, 1);
-       my @nb = @$board;
-
-       if ($piece eq '-') {
-               die "Invalid move $move";
-       }
-
-       # white short castling
-       if ($move eq 'e1g1' && $piece eq 'K') {
-               # king
-               substr($nb[7], 4, 1, '-');
-               substr($nb[7], 6, 1, $piece);
-               
-               # rook
-               substr($nb[7], 7, 1, '-');
-               substr($nb[7], 5, 1, 'R');
-                               
-               return \@nb;
-       }
-
-       # white long castling
-       if ($move eq 'e1c1' && $piece eq 'K') {
-               # king
-               substr($nb[7], 4, 1, '-');
-               substr($nb[7], 2, 1, $piece);
-               
-               # rook
-               substr($nb[7], 0, 1, '-');
-               substr($nb[7], 3, 1, 'R');
-                               
-               return \@nb;
-       }
-
-       # black short castling
-       if ($move eq 'e8g8' && $piece eq 'k') {
-               # king
-               substr($nb[0], 4, 1, '-');
-               substr($nb[0], 6, 1, $piece);
-               
-               # rook
-               substr($nb[0], 7, 1, '-');
-               substr($nb[0], 5, 1, 'r');
-                               
-               return \@nb;
-       }
-
-       # black long castling
-       if ($move eq 'e8c8' && $piece eq 'k') {
-               # king
-               substr($nb[0], 4, 1, '-');
-               substr($nb[0], 2, 1, $piece);
-               
-               # rook
-               substr($nb[0], 0, 1, '-');
-               substr($nb[0], 3, 1, 'r');
-                               
-               return \@nb;
-       }
-
-       # check if the from-piece is a pawn
-       if (lc($piece) eq 'p') {
-               # attack?
-               if ($from_col != $to_col) {
-                       # en passant?
-                       if (substr($board->[$to_row], $to_col, 1) eq '-') {
-                               if ($piece eq 'p') {
-                                       substr($nb[$to_row + 1], $to_col, 1, '-');
-                               } else {
-                                       substr($nb[$to_row - 1], $to_col, 1, '-');
-                               }
-                       }
-               } else {
-                       if ($promo ne '') {
-                               if ($piece eq 'p') {
-                                       $piece = $promo;
-                               } else {
-                                       $piece = uc($promo);
-                               }
-                       }
-               }
-       }
-
-       # update the board
-       substr($nb[$from_row], $from_col, 1, '-');
-       substr($nb[$to_row], $to_col, 1, $piece);
-
-       return \@nb;
-}
-
-sub prettyprint_pv {
+sub prettyprint_pv_no_cache {
        my ($board, @pvs) = @_;
 
        if (scalar @pvs == 0 || !defined($pvs[0])) {
@@ -516,112 +484,22 @@ sub prettyprint_pv {
        }
 
        my $pv = shift @pvs;
-       my $from_col = col_letter_to_num(substr($pv, 0, 1));
-       my $from_row = row_letter_to_num(substr($pv, 1, 1));
-       my $to_col   = col_letter_to_num(substr($pv, 2, 1));
-       my $to_row   = row_letter_to_num(substr($pv, 3, 1));
-       my $promo    = substr($pv, 4, 1);
-
-       my $nb = make_move($board, $from_row, $from_col, $to_row, $to_col, $promo);
-       my $piece = substr($board->[$from_row], $from_col, 1);
-
-       if ($piece eq '-') {
-               die "Invalid move $pv";
-       }
-
-       # white short castling
-       if ($pv eq 'e1g1' && $piece eq 'K') {
-               return ('0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       # white long castling
-       if ($pv eq 'e1c1' && $piece eq 'K') {
-               return ('0-0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       # black short castling
-       if ($pv eq 'e8g8' && $piece eq 'k') {
-               return ('0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       # black long castling
-       if ($pv eq 'e8c8' && $piece eq 'k') {
-               return ('0-0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       my $pretty;
-
-       # check if the from-piece is a pawn
-       if (lc($piece) eq 'p') {
-               # attack?
-               if ($from_col != $to_col) {
-                       $pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
-               } else {
-                       $pretty = substr($pv, 2, 2);
+       my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($pv);
+       my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+       return ( $pretty, prettyprint_pv_no_cache($nb, @pvs) );
+}
 
-                       if (length($pv) == 5) {
-                               # promotion
-                               $pretty .= "=";
-                               $pretty .= uc(substr($pv, 4, 1));
+sub prettyprint_pv {
+       my ($pos, @pvs) = @_;
 
-                               if ($piece eq 'p') {
-                                       $piece = substr($pv, 4, 1);
-                               } else {
-                                       $piece = uc(substr($pv, 4, 1));
-                               }
-                       }
-               }
+       my $cachekey = join('', @pvs);
+       if (exists($pos->{'prettyprint_cache'}{$cachekey})) {
+               return @{$pos->{'prettyprint_cache'}{$cachekey}};
        } else {
-               $pretty = uc($piece);
-
-               # see how many of these pieces could go here, in all
-               my $num_total = 0;
-               for my $col (0..7) {
-                       for my $row (0..7) {
-                               next unless (substr($board->[$row], $col, 1) eq $piece);
-                               ++$num_total if (can_reach($board, $piece, $row, $col, $to_row, $to_col));
-                       }
-               }
-
-               # see how many of these pieces from the given row could go here
-               my $num_row = 0;
-               for my $col (0..7) {
-                       next unless (substr($board->[$from_row], $col, 1) eq $piece);
-                       ++$num_row if (can_reach($board, $piece, $from_row, $col, $to_row, $to_col));
-               }
-               
-               # and same for columns
-               my $num_col = 0;
-               for my $row (0..7) {
-                       next unless (substr($board->[$row], $from_col, 1) eq $piece);
-                       ++$num_col if (can_reach($board, $piece, $row, $from_col, $to_row, $to_col));
-               }
-               
-               # see if we need to disambiguate
-               if ($num_total > 1) {
-                       if ($num_col == 1) {
-                               $pretty .= substr($pv, 0, 1);
-                       } elsif ($num_row == 1) {
-                               $pretty .= substr($pv, 1, 1);
-                       } else {
-                               $pretty .= substr($pv, 0, 2);
-                       }
-               }
-
-               # attack?
-               if (substr($board->[$to_row], $to_col, 1) ne '-') {
-                       $pretty .= 'x';
-               }
-
-               $pretty .= substr($pv, 2, 2);
+               my @res = prettyprint_pv_no_cache($pos->{'board'}, @pvs);
+               $pos->{'prettyprint_cache'}{$cachekey} = \@res;
+               return @res;
        }
-
-       if (in_mate($nb)) {
-               $pretty .= '#';
-       } elsif (in_check($nb) ne 'none') {
-               $pretty .= '+';
-       }
-       return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
 sub output {
@@ -631,12 +509,53 @@ sub output {
 
        # Don't update too often.
        my $age = Time::HiRes::tv_interval($latest_update);
-       if ($age < $update_max_interval) {
-               Time::HiRes::alarm($update_max_interval + 0.01 - $age);
+       if ($age < $remoteglotconf::update_max_interval) {
+               my $wait = $remoteglotconf::update_max_interval + 0.01 - $age;
+               $output_timer = AnyEvent->timer(after => $wait, cb => \&output);
                return;
        }
        
        my $info = $engine->{'info'};
+
+       #
+       # If we have tablebase data from a previous lookup, replace the
+       # engine data with the data from the tablebase.
+       #
+       my $fen = $pos_calculating->fen();
+       if (exists($tb_cache{$fen})) {
+               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+                       delete $info->{$key . '1'};
+                       delete $info->{$key};
+               }
+               $info->{'nodes'} = 0;
+               $info->{'nps'} = 0;
+               $info->{'depth'} = 0;
+               $info->{'seldepth'} = 0;
+               $info->{'tbhits'} = 0;
+
+               my $t = $tb_cache{$fen};
+               my $pv = $t->{'pv'};
+               my $matelen = int((1 + $t->{'score'}) / 2);
+               if ($t->{'result'} eq '1/2-1/2') {
+                       $info->{'score_cp'} = 0;
+               } elsif ($t->{'result'} eq '1-0') {
+                       if ($pos_calculating->{'toplay'} eq 'B') {
+                               $info->{'score_mate'} = -$matelen;
+                       } else {
+                               $info->{'score_mate'} = $matelen;
+                       }
+               } else {
+                       if ($pos_calculating->{'toplay'} eq 'B') {
+                               $info->{'score_mate'} = $matelen;
+                       } else {
+                               $info->{'score_mate'} = -$matelen;
+                       }
+               }
+               $info->{'pv'} = $pv;
+               $info->{'tablebase'} = 1;
+       } else {
+               $info->{'tablebase'} = 0;
+       }
        
        #
        # Some programs _always_ report MultiPV, even with only one PV.
@@ -659,12 +578,12 @@ sub output {
        eval {
                my $dummy;
                if (exists($info->{'pv'})) {
-                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}});
+                       $dummy = prettyprint_pv($pos_calculating, @{$info->{'pv'}});
                }
        
                my $mpv = 1;
                while (exists($info->{'pv' . $mpv})) {
-                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}});
+                       $dummy = prettyprint_pv($pos_calculating, @{$info->{'pv' . $mpv}});
                        ++$mpv;
                }
        };
@@ -674,7 +593,7 @@ sub output {
        }
 
        output_screen();
-       output_json();
+       output_json(0);
        $latest_update = [Time::HiRes::gettimeofday];
 }
 
@@ -725,7 +644,7 @@ sub output_screen {
                        }
 
                        $text .= ":\n";
-                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}})) . "\n";
+                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating, @{$info->{'pv' . $mpv}})) . "\n";
                        $text .= "\n";
                        ++$mpv;
                }
@@ -733,7 +652,7 @@ sub output_screen {
                # single-PV
                my $score = long_score($info, $pos_calculating, '');
                $text .= "  $score\n" if defined($score);
-               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
+               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating, @{$info->{'pv'}}));
                $text .=  "\n";
 
                if (exists($info->{'nodes'}) && exists($info->{'nps'}) && exists($info->{'depth'})) {
@@ -745,37 +664,39 @@ sub output_screen {
                }
                if (exists($info->{'tbhits'}) && $info->{'tbhits'} > 0) {
                        if ($info->{'tbhits'} == 1) {
-                               $text .= ", one Nalimov hit";
+                               $text .= ", one Syzygy hit";
                        } else {
-                               $text .= sprintf ", %u Nalimov hits", $info->{'tbhits'};
+                               $text .= sprintf ", %u Syzygy hits", $info->{'tbhits'};
                        }
                }
                $text .= "\n\n";
        }
 
-       #$text .= book_info($pos_calculating->{'fen'}, $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
+       #$text .= book_info($pos_calculating->fen(), $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
 
        my @refutation_lines = ();
-       for (my $mpv = 1; $mpv < 500; ++$mpv) {
-               my $info = $engine2->{'info'};
-               last if (!exists($info->{'pv' . $mpv}));
-               eval {
-                       my $pv = $info->{'pv' . $mpv};
-
-                       my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine->{'board'}, $pv->[0]));
-                       my @pretty_pv = prettyprint_pv($pos_calculating_second_engine->{'board'}, @$pv);
-                       if (scalar @pretty_pv > 5) {
-                               @pretty_pv = @pretty_pv[0..4];
-                               push @pretty_pv, "...";
-                       }
-                       my $key = $pretty_move;
-                       my $line = sprintf("  %-6s %6s %3s  %s",
-                               $pretty_move,
-                               short_score($info, $pos_calculating_second_engine, $mpv, 1),
-                               "d" . $info->{'depth' . $mpv},
-                               join(', ', @pretty_pv));
-                       push @refutation_lines, [ $key, $line ];
-               };
+       if (defined($engine2)) {
+               for (my $mpv = 1; $mpv < 500; ++$mpv) {
+                       my $info = $engine2->{'info'};
+                       last if (!exists($info->{'pv' . $mpv}));
+                       eval {
+                               my $pv = $info->{'pv' . $mpv};
+
+                               my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine, $pv->[0]));
+                               my @pretty_pv = prettyprint_pv($pos_calculating_second_engine, @$pv);
+                               if (scalar @pretty_pv > 5) {
+                                       @pretty_pv = @pretty_pv[0..4];
+                                       push @pretty_pv, "...";
+                               }
+                               my $key = $pretty_move;
+                               my $line = sprintf("  %-6s %6s %3s  %s",
+                                       $pretty_move,
+                                       short_score($info, $pos_calculating_second_engine, $mpv),
+                                       "d" . $info->{'depth' . $mpv},
+                                       join(', ', @pretty_pv));
+                               push @refutation_lines, [ $key, $line ];
+                       };
+               }
        }
 
        if ($#refutation_lines >= 0) {
@@ -791,327 +712,131 @@ sub output_screen {
                print $text;
                $last_text = $text;
        }
-
-       # Now construct the tell text, if any
-       return if (!defined($telltarget));
-
-       my $tell_text = '';
-
-       if (exists($id->{'name'})) {
-               $tell_text .= "Analysis by $id->{'name'} -- see http://analysis.sesse.net/ for more information\n";
-       } else {
-               $tell_text .= "Computer analysis -- http://analysis.sesse.net/ for more information\n";
-       }
-
-       if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
-               # multi-PV
-               my $mpv = 1;
-               while (exists($info->{'pv' . $mpv})) {
-                       $tell_text .= sprintf "  PV%2u", $mpv;
-                       my $score = short_score($info, $pos_calculating, $mpv);
-                       $tell_text .= "  ($score)" if (defined($score));
-
-                       if (exists($info->{'depth' . $mpv})) {
-                               $tell_text .= sprintf " (%2u ply)", $info->{'depth' . $mpv};
-                       }
-
-                       $tell_text .= ": ";
-                       $tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}}));
-                       $tell_text .= "\n";
-                       ++$mpv;
-               }
-       } else {
-               # single-PV
-               my $score = long_score($info, $pos_calculating, '');
-               $tell_text .= "  $score\n" if defined($score);
-               $tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
-               if (exists($info->{'depth'})) {
-                       $tell_text .= sprintf " (depth %u ply)", $info->{'depth'};
-               }
-               $tell_text .=  "\n";
-       }
-
-       # see if a new tell is called for -- it is if the delay has expired _and_
-       # this is not simply a repetition of the last one
-       if ($last_told_text ne $tell_text) {
-               my $now = time;
-               for my $iv (@tell_intervals) {
-                       last if ($now - $last_move < $iv);
-                       next if ($last_tell - $last_move >= $iv);
-
-                       for my $line (split /\n/, $tell_text) {
-                               $t->print("tell $telltarget [$target] $line");
-                       }
-
-                       $last_told_text = $text;
-                       $last_tell = $now;
-
-                       last;
-               }
-       }
 }
 
 sub output_json {
+       my $historic_json_only = shift;
        my $info = $engine->{'info'};
 
        my $json = {};
-       $json->{'position'} = $pos_calculating;
+       $json->{'position'} = $pos_calculating->to_json_hash();
        $json->{'id'} = $engine->{'id'};
        $json->{'score'} = long_score($info, $pos_calculating, '');
+       $json->{'short_score'} = short_score($info, $pos_calculating, '');
 
        $json->{'nodes'} = $info->{'nodes'};
        $json->{'nps'} = $info->{'nps'};
        $json->{'depth'} = $info->{'depth'};
        $json->{'tbhits'} = $info->{'tbhits'};
        $json->{'seldepth'} = $info->{'seldepth'};
+       $json->{'tablebase'} = $info->{'tablebase'};
 
-       # single-PV only for now
-       $json->{'pv_uci'} = $info->{'pv'};
-       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}) ];
+       $json->{'pv_uci'} = $info->{'pv'};  # Still needs to be there for the JS to calculate arrows; only for the primary PV, though!
+       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
        my %refutation_lines = ();
        my @refutation_lines = ();
-       for (my $mpv = 1; $mpv < 500; ++$mpv) {
-               my $info = $engine2->{'info'};
-               my $pretty_move = "";
-               my @pretty_pv = ();
-               last if (!exists($info->{'pv' . $mpv}));
-
-               eval {
-                       my $pv = $info->{'pv' . $mpv};
-                       my $pretty_move = join('', prettyprint_pv($pos_calculating->{'board'}, $pv->[0]));
-                       my @pretty_pv = prettyprint_pv($pos_calculating->{'board'}, @$pv);
-                       $refutation_lines{$pv->[0]} = {
-                               sort_key => $pretty_move,
-                               depth => $info->{'depth' . $mpv},
-                               score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
-                               pretty_score => short_score($info, $pos_calculating, $mpv, 0),
-                               pretty_move => $pretty_move,
-                               pv_pretty => \@pretty_pv,
+       if (defined($engine2)) {
+               for (my $mpv = 1; $mpv < 500; ++$mpv) {
+                       my $info = $engine2->{'info'};
+                       my $pretty_move = "";
+                       my @pretty_pv = ();
+                       last if (!exists($info->{'pv' . $mpv}));
+
+                       eval {
+                               my $pv = $info->{'pv' . $mpv};
+                               my $pretty_move = join('', prettyprint_pv($pos_calculating, $pv->[0]));
+                               my @pretty_pv = prettyprint_pv($pos_calculating, @$pv);
+                               $refutation_lines{$pv->[0]} = {
+                                       sort_key => $pretty_move,
+                                       depth => $info->{'depth' . $mpv},
+                                       score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
+                                       pretty_score => short_score($info, $pos_calculating, $mpv),
+                                       pretty_move => $pretty_move,
+                                       pv_pretty => \@pretty_pv,
+                               };
                        };
-                       $refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
-               };
+               }
        }
        $json->{'refutation_lines'} = \%refutation_lines;
 
-       open my $fh, ">analysis.json.tmp"
-               or return;
-       print $fh JSON::XS::encode_json($json);
-       close $fh;
-       rename("analysis.json.tmp", "analysis.json");   
-}
-
-sub find_kings {
-       my $board = shift;
-       my ($wkr, $wkc, $bkr, $bkc);
-
-       for my $row (0..7) {
-               for my $col (0..7) {
-                       my $piece = substr($board->[$row], $col, 1);
-                       if ($piece eq 'K') {
-                               ($wkr, $wkc) = ($row, $col);
-                       } elsif ($piece eq 'k') {
-                               ($bkr, $bkc) = ($row, $col);
-                       }
-               }
+       my $encoded = JSON::XS::encode_json($json);
+       unless ($historic_json_only || !defined($remoteglotconf::json_output) ||
+               (defined($last_written_json) && $last_written_json eq $encoded)) {
+               atomic_set_contents($remoteglotconf::json_output, $encoded);
+               $last_written_json = $encoded;
        }
 
-       return ($wkr, $wkc, $bkr, $bkc);
-}
-
-sub in_mate {
-       my $board = shift;
-       my $check = in_check($board);
-       return 0 if ($check eq 'none');
-
-       # try all possible moves for the side in check
-       for my $row (0..7) {
-               for my $col (0..7) {
-                       my $piece = substr($board->[$row], $col, 1);
-                       next if ($piece eq '-');
-
-                       if ($check eq 'white') {
-                               next if ($piece eq lc($piece));
-                       } else {
-                               next if ($piece eq uc($piece));
-                       }
-
-                       for my $dest_row (0..7) {
-                               for my $dest_col (0..7) {
-                                       next if ($row == $dest_row && $col == $dest_col);
-                                       next unless (can_reach($board, $piece, $row, $col, $dest_row, $dest_col));
-
-                                       my @nb = @$board;
-                                       substr($nb[$row], $col, 1, '-');
-                                       substr($nb[$dest_row], $dest_col, 1, $piece);
-
-                                       my $new_check = in_check(\@nb);
-                                       return 0 if ($new_check ne $check && $new_check ne 'both');
-                               }
-                       }
+       if (exists($pos_calculating->{'pretty_history'}) &&
+           defined($remoteglotconf::json_history_dir)) {
+               my $filename = $remoteglotconf::json_history_dir . "/" . id_for_pos($pos_calculating) . ".json";
+
+               # Overwrite old analysis (assuming it exists at all) if we're
+               # using a different engine, or if we've calculated deeper.
+               # nodes is used as a tiebreaker. Don't bother about Multi-PV
+               # data; it's not that important.
+               my ($old_engine, $old_depth, $old_nodes) = get_json_analysis_stats($filename);
+               my $new_depth = $json->{'depth'} // 0;
+               my $new_nodes = $json->{'nodes'} // 0;
+               if (!defined($old_engine) ||
+                   $old_engine ne $json->{'id'}{'name'} ||
+                   $new_depth > $old_depth ||
+                   ($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
+                       atomic_set_contents($filename, $encoded);
                }
        }
-
-       # nothing to do; mate
-       return 1;
 }
 
-sub in_check {
-       my $board = shift;
-       my ($black_check, $white_check) = (0, 0);
-
-       my ($wkr, $wkc, $bkr, $bkc) = find_kings($board);
-
-       # check all pieces for the possibility of threatening the two kings
-       for my $row (0..7) {
-               for my $col (0..7) {
-                       my $piece = substr($board->[$row], $col, 1);
-                       next if ($piece eq '-');
-               
-                       if (uc($piece) eq $piece) {
-                               # white piece
-                               $black_check = 1 if (can_reach($board, $piece, $row, $col, $bkr, $bkc));
-                       } else {
-                               # black piece
-                               $white_check = 1 if (can_reach($board, $piece, $row, $col, $wkr, $wkc));
-                       }
-               }
-       }
+sub atomic_set_contents {
+       my ($filename, $contents) = @_;
 
-       if ($black_check && $white_check) {
-               return 'both';
-       } elsif ($black_check) {
-               return 'black';
-       } elsif ($white_check) {
-               return 'white';
-       } else {
-               return 'none';
-       }
+       open my $fh, ">", $filename . ".tmp"
+               or return;
+       print $fh $contents;
+       close $fh;
+       rename($filename . ".tmp", $filename);
 }
 
-sub can_reach {
-       my ($board, $piece, $from_row, $from_col, $to_row, $to_col) = @_;
-       
-       # can't eat your own piece
-       my $dest_piece = substr($board->[$to_row], $to_col, 1);
-       if ($dest_piece ne '-') {
-               return 0 if (($piece eq lc($piece)) == ($dest_piece eq lc($dest_piece)));
-       }
-
-       if (lc($piece) eq 'k') {
-               return (abs($from_row - $to_row) <= 1 && abs($from_col - $to_col) <= 1);
-       }
-       if (lc($piece) eq 'r') {
-               return 0 unless ($from_row == $to_row || $from_col == $to_col);
-
-               # check that there's a clear passage
-               if ($from_row == $to_row) {
-                       if ($from_col > $to_col) {
-                               ($to_col, $from_col) = ($from_col, $to_col);
-                       }
-
-                       for my $c (($from_col+1)..($to_col-1)) {
-                               my $middle_piece = substr($board->[$to_row], $c, 1);
-                               return 0 if ($middle_piece ne '-');     
-                       }
-
-                       return 1;
-               } else {
-                       if ($from_row > $to_row) {
-                               ($to_row, $from_row) = ($from_row, $to_row);
-                       }
-
-                       for my $r (($from_row+1)..($to_row-1)) {
-                               my $middle_piece = substr($board->[$r], $to_col, 1);
-                               return 0 if ($middle_piece ne '-');     
-                       }
-
-                       return 1;
-               }
-       }
-       if (lc($piece) eq 'b') {
-               return 0 unless (abs($from_row - $to_row) == abs($from_col - $to_col));
-
-               my $dr = ($to_row - $from_row) / abs($to_row - $from_row);
-               my $dc = ($to_col - $from_col) / abs($to_col - $from_col);
+sub id_for_pos {
+       my $pos = shift;
 
-               my $r = $from_row + $dr;
-               my $c = $from_col + $dc;
+       my $halfmove_num = scalar @{$pos->{'pretty_history'}};
+       (my $fen = $pos->fen()) =~ tr,/ ,-_,;
+       return "move$halfmove_num-$fen";
+}
 
-               while ($r != $to_row) {
-                       my $middle_piece = substr($board->[$r], $c, 1);
-                       return 0 if ($middle_piece ne '-');
-                       
-                       $r += $dr;
-                       $c += $dc;
-               }
+sub get_json_analysis_stats {
+       my $filename = shift;
 
-               return 1;
-       }
-       if (lc($piece) eq 'n') {
-               my $diff_r = abs($from_row - $to_row);
-               my $diff_c = abs($from_col - $to_col);
-               return 1 if ($diff_r == 2 && $diff_c == 1);
-               return 1 if ($diff_r == 1 && $diff_c == 2);
-               return 0;
-       }
-       if ($piece eq 'q') {
-               return (can_reach($board, 'r', $from_row, $from_col, $to_row, $to_col) ||
-                       can_reach($board, 'b', $from_row, $from_col, $to_row, $to_col));
-       }
-       if ($piece eq 'Q') {
-               return (can_reach($board, 'R', $from_row, $from_col, $to_row, $to_col) ||
-                       can_reach($board, 'B', $from_row, $from_col, $to_row, $to_col));
-       }
+       my ($engine, $depth, $nodes);
 
-       # TODO: en passant
-       if ($piece eq 'p') {
-               # black pawn
-               if ($to_col == $from_col && $to_row == $from_row + 1) {
-                       return ($dest_piece eq '-');
-               }
-               if ($to_col == $from_col && $from_row == 1 && $to_row == 3) {
-                       my $middle_piece = substr($board->[2], $to_col, 1);
-                       return ($dest_piece eq '-' && $middle_piece eq '-');
-               }
-               if (abs($to_col - $from_col) == 1 && $to_row == $from_row + 1) {
-                       return ($dest_piece ne '-');
-               }
-               return 0;
-       }
-       if ($piece eq 'P') {
-               # white pawn
-               if ($to_col == $from_col && $to_row == $from_row - 1) {
-                       return ($dest_piece eq '-');
-               }
-               if ($to_col == $from_col && $from_row == 6 && $to_row == 4) {
-                       my $middle_piece = substr($board->[5], $to_col, 1);
-                       return ($dest_piece eq '-' && $middle_piece eq '-');
-               }
-               if (abs($to_col - $from_col) == 1 && $to_row == $from_row - 1) {
-                       return ($dest_piece ne '-');
-               }
-               return 0;
+       open my $fh, "<", $filename
+               or return undef;
+       local $/ = undef;
+       eval {
+               my $json = JSON::XS::decode_json(<$fh>);
+               $engine = $json->{'id'}{'name'} // die;
+               $depth = $json->{'depth'} // 0;
+               $nodes = $json->{'nodes'} // 0;
+       };
+       close $fh;
+       if ($@) {
+               warn "Error in decoding $filename: $@";
+               return undef;
        }
-       
-       # unknown piece
-       return 0;
+       return ($engine, $depth, $nodes);
 }
 
 sub uciprint {
        my ($engine, $msg) = @_;
-       print { $engine->{'write'} } "$msg\n";
+       $engine->print($msg);
        print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
 sub short_score {
-       my ($info, $pos, $mpv, $invert) = @_;
-
-       $invert //= 0;
-       if ($pos->{'toplay'} eq 'B') {
-               $invert = !$invert;
-       }
+       my ($info, $pos, $mpv) = @_;
 
+       my $invert = ($pos->{'toplay'} eq 'B');
        if (defined($info->{'score_mate' . $mpv})) {
                if ($invert) {
                        return sprintf "M%3d", -$info->{'score_mate' . $mpv};
@@ -1122,7 +847,11 @@ sub short_score {
                if (exists($info->{'score_cp' . $mpv})) {
                        my $score = $info->{'score_cp' . $mpv} * 0.01;
                        if ($score == 0) {
-                               return " 0.00";
+                               if ($info->{'tablebase'}) {
+                                       return "TB draw";
+                               } else {
+                                       return " 0.00";
+                               }
                        }
                        if ($invert) {
                                $score = -$score;
@@ -1138,11 +867,19 @@ sub score_sort_key {
        my ($info, $pos, $mpv, $invert) = @_;
 
        if (defined($info->{'score_mate' . $mpv})) {
-               if ($invert) {
-                       return -(99999 - $info->{'score_mate' . $mpv});
+               my $mate = $info->{'score_mate' . $mpv};
+               my $score;
+               if ($mate > 0) {
+                       # Side to move mates
+                       $score = 99999 - $mate;
                } else {
-                       return 99999 - $info->{'score_mate' . $mpv};
+                       # Side to move is getting mated (note the double negative for $mate)
+                       $score = -99999 - $mate;
+               }
+               if ($invert) {
+                       $score = -$score;
                }
+               return $score;
        } else {
                if (exists($info->{'score_cp' . $mpv})) {
                        my $score = $info->{'score_cp' . $mpv};
@@ -1172,6 +909,13 @@ sub long_score {
        } else {
                if (exists($info->{'score_cp' . $mpv})) {
                        my $score = $info->{'score_cp' . $mpv} * 0.01;
+                       if ($score == 0) {
+                               if ($info->{'tablebase'}) {
+                                       return "Theoretical draw";
+                               } else {
+                                       return "Score:  0.00";
+                               }
+                       }
                        if ($pos->{'toplay'} eq 'B') {
                                $score = -$score;
                        }
@@ -1202,7 +946,7 @@ sub book_info {
                if ($move eq '')  {
                        $pmove = '(current)';
                } else {
-                       ($pmove) = prettyprint_pv($board, $move);
+                       ($pmove) = prettyprint_pv_no_cache($board, $move);
                        $pmove .= $annotation;
                }
 
@@ -1234,62 +978,171 @@ sub book_info {
        return $text;
 }
 
-sub open_engine {
-       my ($cmdline, $tag) = @_;
-       my ($uciread, $uciwrite);
-       my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
-
-       my $engine = {
-               pid => $pid,
-               read => $uciread,
-               readbuf => '',
-               write => $uciwrite,
-               info => {},
-               ids => {},
-               tag => $tag,
-       };
+sub extract_clock {
+       my ($pgn, $pos) = @_;
 
-       uciprint($engine, "uci");
+       # Look for extended PGN clock tags.
+       my $tags = $pgn->tags;
+       if (exists($tags->{'WhiteClock'}) && exists($tags->{'BlackClock'})) {
+               $pos->{'white_clock'} = $tags->{'WhiteClock'};
+               $pos->{'black_clock'} = $tags->{'BlackClock'};
 
-       # gobble the options
-       while (<$uciread>) {
-               /uciok/ && last;
-               handle_uci($engine, $_);
+               $pos->{'white_clock'} =~ s/\b(\d)\b/0$1/g;
+               $pos->{'black_clock'} =~ s/\b(\d)\b/0$1/g;
+               return;
+       }
+
+       # Look for TCEC-style time comments.
+       my $moves = $pgn->moves;
+       my $comments = $pgn->comments;
+       my $last_black_move = int((scalar @$moves) / 2);
+       my $last_white_move = int((1 + scalar @$moves) / 2);
+
+       my $black_key = $last_black_move . "b";
+       my $white_key = $last_white_move . "w";
+
+       if (exists($comments->{$white_key}) &&
+           exists($comments->{$black_key}) &&
+           $comments->{$white_key} =~ /tl=(\d+:\d+:\d+)/ &&
+           $comments->{$black_key} =~ /tl=(\d+:\d+:\d+)/) {
+               $comments->{$white_key} =~ /tl=(\d+:\d+:\d+)/;
+               $pos->{'white_clock'} = $1;
+               $comments->{$black_key} =~ /tl=(\d+:\d+:\d+)/;
+               $pos->{'black_clock'} = $1;
+               return;
        }
-       
-       return $engine;
 }
 
-sub read_lines {
-       my $engine = shift;
+sub find_clock_start {
+       my $pos = shift;
 
-       # 
-       # Read until we've got a full line -- if the engine sends part of
-       # a line and then stops we're pretty much hosed, but that should
-       # never happen.
-       #
-       while ($engine->{'readbuf'} !~ /\n/) {
-               my $tmp;
-               my $ret = sysread $engine->{'read'}, $tmp, 4096;
-
-               if (!defined($ret)) {
-                       next if ($!{EINTR});
-                       die "error in reading from the UCI engine: $!";
-               } elsif ($ret == 0) {
-                       die "EOF from UCI engine";
+       # If the game is over, the clock is stopped.
+       if (exists($pos->{'result'}) &&
+           ($pos->{'result'} eq '1-0' ||
+            $pos->{'result'} eq '1/2-1/2' ||
+            $pos->{'result'} eq '0-1')) {
+               return;
+       }
+
+       # When we don't have any moves, we assume the clock hasn't started yet.
+       if ($pos->{'move_num'} == 1 && $pos->{'toplay'} eq 'W') {
+               return;
+       }
+
+       # TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
+       if (!exists($pos->{'pretty_history'})) {
+               return;
+       }
+
+       my $id = id_for_pos($pos);
+       if (exists($clock_target_for_pos{$id})) {
+               if ($pos->{'toplay'} eq 'W') {
+                       $pos->{'white_clock_target'} = $clock_target_for_pos{$id};
+               } else {
+                       $pos->{'black_clock_target'} = $clock_target_for_pos{$id};
                }
+               return;
+       }
 
-               $engine->{'readbuf'} .= $tmp;
+       # OK, we haven't seen this position before, so we assume the move
+       # happened right now.
+       my $key = ($pos->{'toplay'} eq 'W') ? 'white_clock' : 'black_clock';
+       if (!exists($pos->{$key})) {
+               # No clock information.
+               return;
        }
+       $pos->{$key} =~ /(\d+):(\d+):(\d+)/;
+       my $time_left = $1 * 3600 + $2 * 60 + $3;
+       $clock_target_for_pos{$id} = time + $time_left;
+       if ($pos->{'toplay'} eq 'W') {
+               $pos->{'white_clock_target'} = $clock_target_for_pos{$id};
+       } else {
+               $pos->{'black_clock_target'} = $clock_target_for_pos{$id};
+       }
+}
+
+sub schedule_tb_lookup {
+       return if (!defined($remoteglotconf::tb_serial_key));
+       my $pos = $pos_waiting // $pos_calculating;
+       return if (exists($tb_cache{$pos->fen()}));
+
+       # If there's more than seven pieces, there's not going to be an answer,
+       # so don't bother.
+       return if ($pos->num_pieces() > 7);
+
+       # Max one at a time. If it's still relevant when it returns,
+       # schedule_tb_lookup() will be called again.
+       return if ($tb_lookup_running);
+
+       $tb_lookup_running = 1;
+       my $url = 'http://158.250.18.203:6904/tasks/addtask?auth.login=' .
+               $remoteglotconf::tb_serial_key .
+               '&auth.password=aquarium&type=0&fen=' . 
+               URI::Escape::uri_escape($pos->fen());
+       print TBLOG "Downloading $url...\n";
+       AnyEvent::HTTP::http_get($url, sub {
+               handle_tb_lookup_return(@_, $pos, $pos->fen());
+       });
+}
+
+sub handle_tb_lookup_return {
+       my ($body, $header, $pos, $fen) = @_;
+       print TBLOG "Response for [$fen]:\n";
+       print TBLOG $header . "\n\n";
+       print TBLOG $body . "\n\n";
+       eval {
+               my $response = JSON::XS::decode_json($body);
+               if ($response->{'ErrorCode'} != 0) {
+                       die "Unknown tablebase server error: " . $response->{'ErrorDesc'};
+               }
+               my $state = $response->{'Response'}{'StateString'};
+               if ($state eq 'COMPLETE') {
+                       my $pgn = Chess::PGN::Parse->new(undef, $response->{'Response'}{'Moves'});
+                       if (!defined($pgn) || !$pgn->read_game()) {
+                               warn "Error in parsing PGN\n";
+                       } else {
+                               $pgn->quick_parse_game;
+                               my $pvpos = $pos;
+                               my $moves = $pgn->moves;
+                               my @uci_moves = ();
+                               for my $move (@$moves) {
+                                       my $uci_move;
+                                       ($pvpos, $uci_move) = $pvpos->make_pretty_move($move);
+                                       push @uci_moves, $uci_move;
+                               }
+                               $tb_cache{$fen} = {
+                                       result => $pgn->result,
+                                       pv => \@uci_moves,
+                                       score => $response->{'Response'}{'Score'},
+                               };
+                               output();
+                       }
+               } elsif ($state =~ /QUEUED/ || $state =~ /PROCESSING/) {
+                       # Try again in a second. Note that if we have changed
+                       # position in the meantime, we might query a completely
+                       # different position! But that's fine.
+               } else {
+                       die "Unknown response state " . $state;
+               }
 
-       # Blah.
-       my @lines = ();
-       while ($engine->{'readbuf'} =~ s/^([^\n]*)\n//) {
-               my $line = $1;
-               $line =~ tr/\r\n//d;
-               push @lines, $line;
+               # Wait a second before we schedule another one.
+               $tb_retry_timer = AnyEvent->timer(after => 1.0, cb => sub {
+                       $tb_lookup_running = 0;
+                       schedule_tb_lookup();
+               });
+       };
+       if ($@) {
+               warn "Error in tablebase lookup: $@";
+
+               # Don't try this one again, but don't block new lookups either.
+               $tb_lookup_running = 0;
        }
-       return @lines;
+}
+
+sub open_engine {
+       my ($cmdline, $tag, $cb) = @_;
+       return undef if (!defined($cmdline));
+       return Engine->open($cmdline, $tag, $cb);
 }
 
 sub col_letter_to_num {
@@ -1300,8 +1153,12 @@ sub row_letter_to_num {
        return 7 - (ord(shift) - ord('1'));
 }
 
-sub move_to_uci_notation {
-       my ($from_row, $from_col, $to_row, $to_col, $promo) = @_;
-       $promo //= "";
-       return sprintf("%c%d%c%d%s", ord('a') + $from_col, 8 - $from_row, ord('a') + $to_col, 8 - $to_row, $promo);
+sub parse_uci_move {
+       my $move = shift;
+       my $from_col = col_letter_to_num(substr($move, 0, 1));
+       my $from_row = row_letter_to_num(substr($move, 1, 1));
+       my $to_col   = col_letter_to_num(substr($move, 2, 1));
+       my $to_row   = row_letter_to_num(substr($move, 3, 1));
+       my $promo    = substr($move, 4, 1);
+       return ($from_col, $from_row, $to_col, $to_row, $promo);
 }