X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=fb74e6eab5c0d04c454b532ae047ed509fe2141c;hp=7f1a6687e72aa597827212a95a673b429e1b2bd2;hb=a8b50dfb8117c5495784ae330ccefa8db2355e83;hpb=7314c1611dbab18a6ebdd5934697dd5cf94ed437

diff --git a/remoteglot.pl b/remoteglot.pl
index 7f1a668..fb74e6e 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -19,30 +19,22 @@ 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";  # 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 $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;
 
 $| = 1;
 
@@ -57,28 +49,33 @@ 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', sub { handle_uci(@_, 1); });
-my $engine2 = open_engine($engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
+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");
 }
@@ -88,8 +85,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("");
 
@@ -97,8 +94,6 @@ $t->cmd("");
 $t->cmd("set shout 0");
 $t->cmd("set seek 0");
 $t->cmd("set style 12");
-$t->cmd("observe $target");
-print "FICS ready.\n";
 
 my $ev1 = AnyEvent->io(
 	fh => fileno($t),
@@ -114,12 +109,23 @@ my $ev1 = AnyEvent->io(
 		}
 	}
 );
+if (defined($remoteglotconf::target)) {
+	if ($remoteglotconf::target =~ /^http:/) {
+		fetch_pgn($remoteglotconf::target);
+	} else {
+		$t->cmd("observe $remoteglotconf::target");
+	}
+}
+print "FICS ready.\n";
+
 # Engine events have already been set up by Engine.pm.
 EV::run;
 
 sub handle_uci {
 	my ($engine, $line, $primary) = @_;
 
+	return if $line =~ /(upper|lower)bound/;
+
 	$line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
 	print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
 	if ($line =~ /^info/) {
@@ -136,7 +142,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");
@@ -155,15 +161,64 @@ sub handle_uci {
 	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->{'history'} = \@uci_movelist;
+				$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 } (@masters) == 0);
+		next if (grep { $_ eq $who } (@remoteglotconf::masters) == 0);
 
 		if ($msg =~ /^fics (.*?)$/) {
 			$t->cmd("tell $who Executing '$1' on FICS.");
@@ -174,11 +229,10 @@ sub handle_fics {
 		} elsif ($msg =~ /^pgn (.*?)$/) {
 			my $url = $1;
 			$t->cmd("tell $who Starting to poll '$url'.");
-			AnyEvent::HTTP::http_get($url, sub {
-				handle_pgn(@_, $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.");
@@ -190,26 +244,72 @@ sub handle_fics {
 	#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()) {
 		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;
-		for my $move (@$moves) {
-			my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
-			$pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+		eval {
+			$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 $uci_move;
+				($pos, $uci_move) = $pos->make_pretty_move($move);
+				push @uci_moves, $uci_move;
+			}
+			$pos->{'history'} = \@uci_moves;
+			$pos->{'pretty_history'} = $moves;
+
+			# 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";
 		}
-		handle_position($pos);
 	}
 	
 	$http_timer = AnyEvent->timer(after => 1.0, cb => sub {
-		AnyEvent::HTTP::http_get($url, sub {
-			handle_pgn(@_, $url);
-		});
+		fetch_pgn($url);
 	});
 }
 
@@ -230,7 +330,7 @@ sub handle_position {
 		if (!defined($pos_waiting)) {
 			uciprint($engine, "stop");
 		}
-		if ($uci_assume_full_compliance) {
+		if ($remoteglotconf::uci_assume_full_compliance) {
 			$pos_waiting = $pos;
 		} else {
 			uciprint($engine, "position fen " . $pos->fen());
@@ -260,6 +360,8 @@ sub handle_position {
 	$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,
@@ -311,7 +413,7 @@ sub parse_infos {
 			delete $info->{'score_cp' . $mpv};
 			delete $info->{'score_mate' . $mpv};
 
-			while ($x[0] eq 'cp' || $x[0] eq 'mate' || $x[0] eq 'lowerbound' || $x[0] eq 'upperbound') {
+			while ($x[0] eq 'cp' || $x[0] eq 'mate') {
 				if ($x[0] eq 'cp') {
 					shift @x;
 					$info->{'score_cp' . $mpv} = shift @x;
@@ -388,12 +490,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.
@@ -529,7 +672,7 @@ sub output_screen {
 				my $key = $pretty_move;
 				my $line = sprintf("  %-6s %6s %3s  %s",
 					$pretty_move,
-					short_score($info, $pos_calculating_second_engine, $mpv, 0),
+					short_score($info, $pos_calculating_second_engine, $mpv),
 					"d" . $info->{'depth' . $mpv},
 					join(', ', @pretty_pv));
 				push @refutation_lines, [ $key, $line ];
@@ -559,12 +702,14 @@ sub output_json {
 	$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'};
@@ -587,7 +732,7 @@ sub output_json {
 					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_score => short_score($info, $pos_calculating, $mpv),
 					pretty_move => $pretty_move,
 					pv_pretty => \@pretty_pv,
 				};
@@ -597,11 +742,18 @@ sub output_json {
 	}
 	$json->{'refutation_lines'} = \%refutation_lines;
 
-	open my $fh, ">/srv/analysis.sesse.net/www/analysis.json.tmp"
+	my $encoded = JSON::XS::encode_json($json);
+	atomic_set_contents($remoteglotconf::json_output, $encoded);
+}
+
+sub atomic_set_contents {
+	my ($filename, $contents) = @_;
+
+	open my $fh, ">", $filename . ".tmp"
 		or return;
-	print $fh JSON::XS::encode_json($json);
+	print $fh $contents;
 	close $fh;
-	rename("/srv/analysis.sesse.net/www/analysis.json.tmp", "/srv/analysis.sesse.net/www/analysis.json");
+	rename($filename . ".tmp", $filename);
 }
 
 sub uciprint {
@@ -611,13 +763,9 @@ sub uciprint {
 }
 
 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};
@@ -628,7 +776,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;
@@ -644,11 +796,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};
@@ -679,7 +839,11 @@ sub long_score {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv} * 0.01;
 			if ($score == 0) {
-				return "Score:  0.00";
+				if ($info->{'tablebase'}) {
+					return "Theoretical draw";
+				} else {
+					return "Score:  0.00";
+				}
 			}
 			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
@@ -743,6 +907,84 @@ sub book_info {
 	return $text;
 }
 
+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;
+		}
+
+		# 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;
+	}
+}
+
 sub open_engine {
 	my ($cmdline, $tag, $cb) = @_;
 	return undef if (!defined($cmdline));