$| = 1;
select(STDOUT);
-umask 0022;
+umask 0022; # analysis.json should not be served to users.
# open the chess engine
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);
+my ($pos_calculating, $pos_calculating_second_engine);
uciprint($engine, "setoption name UCI_AnalyseMode value true");
while (my ($key, $value) = each %remoteglotconf::engine_config) {
print "Chess engine ready.\n";
# now talk to FICS
-my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
-$t->input_log(\*FICSLOG);
-$t->open($remoteglotconf::server);
-$t->print($remoteglotconf::nick);
-$t->waitfor('/Press return to enter the server/');
-$t->cmd("");
-
-# set some options
-$t->cmd("set shout 0");
-$t->cmd("set seek 0");
-$t->cmd("set style 12");
-
-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);
+my ($t, $ev1);
+if (defined($remoteglotconf::server)) {
+ $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
+ $t->input_log(\*FICSLOG);
+ $t->open($remoteglotconf::server);
+ $t->print($remoteglotconf::nick);
+ $t->waitfor('/Press return to enter the server/');
+ $t->cmd("");
+
+ # set some options
+ $t->cmd("set shout 0");
+ $t->cmd("set seek 0");
+ $t->cmd("set style 12");
+
+ $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 (defined($remoteglotconf::target)) {
- if ($remoteglotconf::target =~ /^http:/) {
+ if ($remoteglotconf::target =~ /^https?:/) {
fetch_pgn($remoteglotconf::target);
- } else {
+ } elsif (defined($t)) {
$t->cmd("observe $remoteglotconf::target");
}
}
-print "FICS ready.\n";
+if (defined($t)) {
+ print "FICS ready.\n";
+}
# Engine events have already been set up by Engine.pm.
EV::run;
$line =~ s/ / /g; # Sometimes needed for Zappa Mexico
print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
+
+ # If we've sent a stop command, gobble up lines until we see bestmove.
+ return if ($engine->{'stopping'} && $line !~ /^bestmove/);
+ $engine->{'stopping'} = 0;
+
if ($line =~ /^info/) {
my (@infos) = split / /, $line;
shift @infos;
parse_ids($engine, @ids);
}
- if ($line =~ /^bestmove/) {
- if ($primary) {
- return if (!$remoteglotconf::uci_assume_full_compliance);
- if (defined($pos_waiting)) {
- 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, "go infinite");
- $pos_calculating_second_engine = $pos;
- }
- }
output();
}
$t->cmd("moves");
}
if ($line =~ /^Movelist for game /) {
- my $pos = $pos_waiting // $pos_calculating;
+ my $pos = $pos_calculating;
if (defined($pos)) {
@uci_movelist = ();
@pretty_movelist = ();
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;
+ if (defined($pos_calculating)) {
+ if ($pos_calculating->fen() eq $pos_for_movelist->fen()) {
+ $pos_calculating->{'history'} = \@pretty_movelist;
}
}
$getting_movelist = 0;
my $black = $pgn->black;
$white =~ s/,.*//; # Remove first name.
$black =~ s/,.*//; # Remove first name.
- my $pos = Position->start_pos($white, $black);
+ my $tags = $pgn->tags();
+ my $pos;
+ if (exists($tags->{'FEN'})) {
+ $pos = Position->from_fen($tags->{'FEN'});
+ $pos->{'player_w'} = $white;
+ $pos->{'player_b'} = $black;
+ $pos->{'start_fen'} = $tags->{'FEN'};
+ } else {
+ $pos = Position->start_pos($white, $black);
+ }
my $moves = $pgn->moves;
my @uci_moves = ();
my @repretty_moves = ();
push @repretty_moves, $pretty;
$pos = $npos;
}
- $pos->{'result'} = $pgn->result;
- $pos->{'pretty_history'} = \@repretty_moves;
+ if ($pgn->result eq '1-0' || $pgn->result eq '1/2-1/2' || $pgn->result eq '0-1') {
+ $pos->{'result'} = $pgn->result;
+ }
+ $pos->{'history'} = \@repretty_moves;
extract_clock($pgn, $pos);
my ($pos) = @_;
find_clock_start($pos, $pos_calculating);
- # if this is already in the queue, ignore it (just update the result)
- if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen()) {
- $pos_waiting->{'result'} = $pos->{'result'};
- return;
- }
-
- # if we're already chewing on this and there's nothing else in the queue,
- # also ignore it
- if (!defined($pos_waiting) && defined($pos_calculating) &&
- $pos->fen() eq $pos_calculating->fen()) {
+ # If we're already chewing on this and there's nothing else in the queue,
+ # ignore it.
+ if (defined($pos_calculating) && $pos->fen() eq $pos_calculating->fen()) {
$pos_calculating->{'result'} = $pos->{'result'};
+ for my $key ('white_clock', 'black_clock', 'white_clock_target', 'black_clock_target') {
+ $pos_calculating->{$key} //= $pos->{$key};
+ }
return;
}
- # if we're already thinking on something, stop and wait for the engine
- # to approve
+ # 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
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;
+ # Ask the engine to stop; we will throw away its data until it
+ # sends us "bestmove", signaling the end of it.
+ $engine->{'stopping'} = 1;
+ uciprint($engine, "stop");
}
+ # It's wrong to just give the FEN (the move history is useful,
+ # and per the UCI spec, we should really have sent "ucinewgame"),
+ # but it's easier, and it works around a Stockfish repetition issue.
+ uciprint($engine, "position fen " . $pos->fen());
+ uciprint($engine, "go infinite");
+ $pos_calculating = $pos;
+
if (defined($engine2)) {
if (defined($pos_calculating_second_engine)) {
+ $engine2->{'stopping'} = 1;
uciprint($engine2, "stop");
- } else {
- uciprint($engine2, "position fen " . $pos->fen());
- uciprint($engine2, "go infinite");
- $pos_calculating_second_engine = $pos;
}
+ uciprint($engine2, "position fen " . $pos->fen());
+ uciprint($engine2, "go infinite");
+ $pos_calculating_second_engine = $pos;
$engine2->{'info'} = {};
}
# hour, the analysis/relay has most likely stopped
# and we should stop hogging server resources.
#
- $t->cmd("date");
+ if (defined($t)) {
+ $t->cmd("date");
+ }
}
sub parse_infos {
}
}
+my %tbprobe_cache = ();
+
sub complete_using_tbprobe {
my ($pos, $info, $mpv) = @_;
# Run through the PV until we are at a 6-man position.
# TODO: We could in theory only have 5-man data.
my @pv = @{$info->{'pv' . $mpv}};
- my $key = join('', @pv);
+ my $key = $pos->fen() . " " . join('', @pv);
my @moves = ();
- if (exists($pos->{'tbprobe_cache'}{$key})) {
- @moves = $pos->{'tbprobe_cache'}{$key};
+ if (exists($tbprobe_cache{$key})) {
+ @moves = @{$tbprobe_cache{$key}};
} else {
+ if ($mpv ne '') {
+ # Force doing at least one move of the PV.
+ my $move = shift @pv;
+ push @moves, $move;
+ $pos = $pos->make_move(parse_uci_move($move));
+ }
+
while ($pos->num_pieces() > 6 && $#pv > -1) {
my $move = shift @pv;
push @moves, $move;
# Splice the PV from the tablebase onto what we have so far.
for my $move (@{$pgn->moves}) {
+ last if $move eq '#';
my $uci_move;
($pos, $uci_move) = $pos->make_pretty_move($move);
push @moves, $uci_move;
}
+
+ $tbprobe_cache{$key} = \@moves;
}
$info->{'pv' . $mpv} = \@moves;
if (defined($remoteglotconf::engine_details)) {
$json->{'engine'}{'details'} = $remoteglotconf::engine_details;
}
+ my @grpc_backends = ();
+ if (defined($remoteglotconf::engine_grpc_backend)) {
+ push @grpc_backends, $remoteglotconf::engine_grpc_backend;
+ }
+ if (defined($remoteglotconf::engine2_grpc_backend)) {
+ push @grpc_backends, $remoteglotconf::engine2_grpc_backend;
+ }
+ $json->{'internal'}{'grpc_backends'} = \@grpc_backends;
if (defined($remoteglotconf::move_source)) {
$json->{'move_source'} = $remoteglotconf::move_source;
}
$json->{'tbhits'} = $info->{'tbhits'};
$json->{'seldepth'} = $info->{'seldepth'};
$json->{'tablebase'} = $info->{'tablebase'};
-
- $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'}}) ];
+ $json->{'pv'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
my %refutation_lines = ();
my @refutation_lines = ();
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,
+ $refutation_lines{$pretty_move} = {
depth => $info->{'depth' . $mpv},
score => score_digest($info, $pos_calculating, $mpv),
- pretty_move => $pretty_move,
- pv_pretty => \@pretty_pv,
+ move => $pretty_move,
+ pv => \@pretty_pv,
};
};
}
$json->{'refutation_lines'} = \%refutation_lines;
# Piece together historic score information, to the degree we have it.
- if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
+ if (!$historic_json_only && exists($pos_calculating->{'history'})) {
my %score_history = ();
+ local $dbh->{AutoCommit} = 0;
my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
- my $pos = Position->start_pos('white', 'black');
+ my $pos;
+ if (exists($pos_calculating->{'start_fen'})) {
+ $pos = Position->from_fen($pos_calculating->{'start_fen'});
+ } else {
+ $pos = Position->start_pos('white', 'black');
+ }
my $halfmove_num = 0;
- for my $move (@{$pos_calculating->{'pretty_history'}}) {
+ for my $move (@{$pos_calculating->{'history'}}) {
my $id = id_for_pos($pos, $halfmove_num);
my $ref = $dbh->selectrow_hashref($q, undef, $id);
if (defined($ref)) {
($pos) = $pos->make_pretty_move($move);
}
$q->finish;
+ $dbh->commit;
# If at any point we are missing 10 consecutive moves,
# truncate the history there. This is so we don't get into
}
# Give out a list of other games going on. (Empty is fine.)
+ # TODO: Don't bother reading our own file, the data will be stale anyway.
if (!$historic_json_only) {
my @games = ();
my $white = $other_game_json->{'position'}{'player_w'} // die 'Missing white';
my $black = $other_game_json->{'position'}{'player_b'} // die 'Missing black';
- push @games, {
+ my $game = {
id => $ref->{'id'},
name => "$white–$black",
url => $ref->{'url'},
hashurl => $ref->{'hash_url'},
};
+ if (defined($other_game_json->{'position'}{'result'})) {
+ $game->{'result'} = $other_game_json->{'position'}{'result'};
+ } else {
+ $game->{'score'} = $other_game_json->{'score'};
+ }
+ push @games, $game;
};
if ($@) {
warn "Could not add external game " . $ref->{'json_path'} . ": $@";
$last_written_json = $encoded;
}
- if (exists($pos_calculating->{'pretty_history'}) &&
+ if (exists($pos_calculating->{'history'}) &&
defined($remoteglotconf::json_history_dir)) {
my $id = id_for_pos($pos_calculating);
my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";
sub id_for_pos {
my ($pos, $halfmove_num) = @_;
- $halfmove_num //= scalar @{$pos->{'pretty_history'}};
+ $halfmove_num //= scalar @{$pos->{'history'}};
(my $fen = $pos->fen()) =~ tr,/ ,-_,;
return "move$halfmove_num-$fen";
}
if ($score == 0 && $info->{'tablebase'}) {
return ['d', undef];
} else {
- return ['cp', $score];
+ return ['cp', int($score)];
}
}
}
# TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
# The history is needed for id_for_pos.
- if (!exists($pos->{'pretty_history'})) {
+ if (!exists($pos->{'history'})) {
return;
}
my $id = id_for_pos($pos);
- my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=?', undef, $id);
+ my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=? AND COALESCE(white_clock_target, black_clock_target) >= EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - INTERVAL \'1 day\'));', undef, $id);
if (defined($clock_info)) {
$pos->{'white_clock'} //= $clock_info->{'white_clock'};
$pos->{'black_clock'} //= $clock_info->{'black_clock'};
sub schedule_tb_lookup {
return if (!defined($remoteglotconf::tb_serial_key));
- my $pos = $pos_waiting // $pos_calculating;
+ my $pos = $pos_calculating;
return if (exists($tb_cache{$pos->fen()}));
# If there's more than seven pieces, there's not going to be an answer,
return if ($tb_lookup_running);
$tb_lookup_running = 1;
- my $url = 'http://158.250.18.203:6904/tasks/addtask?auth.login=' .
+ my $url = 'http://tb7-api.chessok.com:6904/tasks/addtask?auth.login=' .
$remoteglotconf::tb_serial_key .
'&auth.password=aquarium&type=0&fen=' .
URI::Escape::uri_escape($pos->fen());
projects / remoteglot / blobdiff