]> git.sesse.net Git - remoteglot/blobdiff - remoteglot.pl
Unbreak promotion again.
[remoteglot] / remoteglot.pl
index 371c837e3b760192a76c555bc4bed278c8cfe6a0..4459015e7c8510de4bf79044480c5e4b88ad4214 100755 (executable)
@@ -9,33 +9,27 @@
 # 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;
 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";  # undef for none
-my $uci_assume_full_compliance = 0;                    # dangerous :-)
-my $update_max_interval = 1.0;
-my @masters = (
-       'Sesse',
-       'Sessse',
-       'Sesssse',
-       'greatestguns',
-       'beuki'
-);
+no warnings qw(once);
 
 # Program starts here
 $SIG{ALRM} = sub { output(); };
 my $latest_update = undef;
+my $http_timer = undef;
 
 $| = 1;
 
@@ -53,25 +47,23 @@ $| = 1;
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline, 'E1');
-my $engine2 = open_engine($engine2_cmdline, 'E2');
+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 ($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");
 
 if (defined($engine2)) {
        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");
+       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");
 }
@@ -81,8 +73,8 @@ 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("");
 
@@ -90,133 +82,29 @@ $t->cmd("");
 $t->cmd("set shout 0");
 $t->cmd("set seek 0");
 $t->cmd("set style 12");
-$t->cmd("observe $target");
-
-# main loop
+$t->cmd("observe $remoteglotconf::target");
 print "FICS ready.\n";
-while (1) {
-       my $rin = '';
-       my $rout;
-       vec($rin, fileno($engine->{'read'}), 1) = 1;
-       if (defined($engine2)) {
-               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 = Position->new($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($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;
-
-                       # 
-                       # 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");
-               }
-               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;
+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));
 
-               output();
-       }
-       if (defined($engine2) && $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);
+                       chomp $line;
+                       $line =~ tr/\r//d;
+                       handle_fics($line);
                }
-               $sleep = 0;
-
-               output();
        }
-
-       sleep $sleep;
-}
+);
+# 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;
        $line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
        print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
        if ($line =~ /^info/) {
@@ -233,7 +121,7 @@ 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, "go infinite");
@@ -249,6 +137,126 @@ sub handle_uci {
                        $pos_calculating_second_engine = $pos;
                }
        }
+       output();
+}
+
+sub handle_fics {
+       my $line = shift;
+       if ($line =~ /^<12> /) {
+               handle_position(Position->new($line));
+       }
+       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'.");
+                       AnyEvent::HTTP::http_get($url, sub {
+                               handle_pgn(@_, $url);
+                       });
+               } elsif ($msg =~ /^stoppgn$/) {
+                       $t->cmd("tell $who Stopping poll.");
+                       $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";
+}
+
+sub handle_pgn {
+       my ($body, $header, $url) = @_;
+       my $pgn = Chess::PGN::Parse->new(undef, $body);
+       if (!defined($pgn) || !$pgn->read_game()) {
+               warn "Error in parsing PGN from $url\n";
+       } else {
+               $pgn->quick_parse_game;
+               my $pos = Position->start_pos($pgn->white, $pgn->black);
+               my $moves = $pgn->moves;
+               my @uci_moves = ();
+               for my $move (@$moves) {
+                       my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+                       push @uci_moves, Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+                       $pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+               }
+               $pos->{'history'} = \@uci_moves;
+               $pos->{'pretty_history'} = $moves;
+               handle_position($pos);
+       }
+       
+       $http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+               AnyEvent::HTTP::http_get($url, sub {
+                       handle_pgn(@_, $url);
+               });
+       });
+}
+
+sub handle_position {
+       my ($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)) {
+               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;
+
+       # 
+       # 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 {
@@ -259,26 +267,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;
@@ -290,7 +300,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' || $x[0] eq 'lowerbound' || $x[0] eq 'upperbound') {
                                if ($x[0] eq 'cp') {
                                        shift @x;
                                        $info->{'score_cp' . $mpv} = shift @x;
@@ -334,7 +344,7 @@ sub parse_ids {
        }
 }
 
-sub prettyprint_pv {
+sub prettyprint_pv_no_cache {
        my ($board, @pvs) = @_;
 
        if (scalar @pvs == 0 || !defined($pvs[0])) {
@@ -342,112 +352,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 = $board->make_move($from_row, $from_col, $to_row, $to_col, $promo);
-       my $piece = $board->[$from_row][$from_col];
-
-       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 ($board->[$row][$col] eq $piece);
-                               ++$num_total if ($board->can_reach($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 ($board->[$from_row][$col] eq $piece);
-                       ++$num_row if ($board->can_reach($piece, $from_row, $col, $to_row, $to_col));
-               }
-               
-               # and same for columns
-               my $num_col = 0;
-               for my $row (0..7) {
-                       next unless ($board->[$row][$from_col] eq $piece);
-                       ++$num_col if ($board->can_reach($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 ($board->[$to_row][$to_col] 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 ($nb->in_mate()) {
-               $pretty .= '#';
-       } elsif ($nb->in_check() ne 'none') {
-               $pretty .= '+';
-       }
-       return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
 sub output {
@@ -457,8 +377,8 @@ 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) {
+               Time::HiRes::alarm($remoteglotconf::update_max_interval + 0.01 - $age);
                return;
        }
        
@@ -485,12 +405,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;
                }
        };
@@ -551,7 +471,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;
                }
@@ -559,7 +479,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'})) {
@@ -589,8 +509,8 @@ sub output_screen {
                        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);
+                               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, "...";
@@ -637,7 +557,7 @@ sub output_json {
 
        # single-PV only for now
        $json->{'pv_uci'} = $info->{'pv'};
-       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}) ];
+       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
        my %refutation_lines = ();
        my @refutation_lines = ();
@@ -650,8 +570,8 @@ sub output_json {
 
                        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);
+                               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},
@@ -675,7 +595,7 @@ sub output_json {
 
 sub uciprint {
        my ($engine, $msg) = @_;
-       print { $engine->{'write'} } "$msg\n";
+       $engine->print($msg);
        print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
@@ -780,7 +700,7 @@ sub book_info {
                if ($move eq '')  {
                        $pmove = '(current)';
                } else {
-                       ($pmove) = prettyprint_pv($board, $move);
+                       ($pmove) = prettyprint_pv_no_cache($board, $move);
                        $pmove .= $annotation;
                }
 
@@ -813,64 +733,9 @@ sub book_info {
 }
 
 sub open_engine {
-       my ($cmdline, $tag) = @_;
-
+       my ($cmdline, $tag, $cb) = @_;
        return undef if (!defined($cmdline));
-
-       my ($uciread, $uciwrite);
-       my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
-
-       my $engine = {
-               pid => $pid,
-               read => $uciread,
-               readbuf => '',
-               write => $uciwrite,
-               info => {},
-               ids => {},
-               tag => $tag,
-       };
-
-       uciprint($engine, "uci");
-
-       # gobble the options
-       while (<$uciread>) {
-               /uciok/ && last;
-               handle_uci($engine, $_);
-       }
-       
-       return $engine;
-}
-
-sub read_lines {
-       my $engine = 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";
-               }
-
-               $engine->{'readbuf'} .= $tmp;
-       }
-
-       # Blah.
-       my @lines = ();
-       while ($engine->{'readbuf'} =~ s/^([^\n]*)\n//) {
-               my $line = $1;
-               $line =~ tr/\r\n//d;
-               push @lines, $line;
-       }
-       return @lines;
+       return Engine->open($cmdline, $tag, $cb);
 }
 
 sub col_letter_to_num {
@@ -881,3 +746,12 @@ sub row_letter_to_num {
        return 7 - (ord(shift) - ord('1'));
 }
 
+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);
+}