Perlbot/perlbuut-pastebin
1
0
Fork 0
mirror of https://github.com/perlbot/perlbuut-pastebin synced 2025-06-07 14:17:26 -04:00
Code Issues Releases Wiki Activity

Make web parts use new async code for pastebin. API is broken.

Browse source
This commit is contained in:
Ryan Voots 2017-07-27 21:57:15 -07:00
parent 41514de209
commit c9a995ef18
3 changed files with 133 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/App/Controller/Eval.pm
View file

@ -23,9 +23,18 @@ sub run_eval {
my $code = $data->param('code') // '';
my $language = $data->param('language') // 'perl';
my $output = $self->eval->get_eval(undef, $code, $language);
$self->delay(sub {
my $delay = shift;
$self->eval->get_eval(undef, $code, [$language], $delay->begin(0,1));
$self->render(json => {evalout => $output});
};
return 1;
},
sub {
my $delay = shift;
my ($output) = @_;
$self->render(json => {evalout => $output});
})
}
1;

19
lib/App/Controller/Paste.pm
View file

@ -80,13 +80,20 @@ sub get_paste {
my $row = $c->paste->get_paste($pasteid);
if ($row) {
$c->stash($row);
$c->stash({language => $c->languages->get_language_hash->{$row->{language}}});
$c->stash({page_tmpl => 'viewer.html'});
$c->stash({eval => $c->eval->get_eval($pasteid, $row->{paste}, $row->{language})});
$c->stash({paste_id => $pasteid});
$c->delay(sub {
my $delay = shift;
$c->render('page');
$c->eval->get_eval($pasteid, $row->{paste}, [$row->{language}], $delay->begin(0,1));
}, sub {
my ($delay, $evalout) = @_;
$c->stash($row);
$c->stash({language => $c->languages->get_language_hash->{$row->{language}}});
$c->stash({page_tmpl => 'viewer.html'});
$c->stash({paste_id => $pasteid});
$c->stash({eval => $evalout});
$c->render('page');
});
} else {
return $c->reply->not_found;
}

156
lib/App/Model/Eval.pm
View file

@ -10,75 +10,135 @@ use App::EvalServerAdvanced::Protocol;
use App::Config;
use App::Memcached;
use Future::Mojo;
use Mojo::IOLoop;
has cfg => sub {App::Config::get_config('evalserver')};
our $id = 0; # global id count for evals
sub get_eval {
my ($self, $paste_id, $code, $lang) = @_;
if ($paste_id && (my $cached = $memd->get($paste_id))) {
my ($self, $paste_id, $code, $langs, $callback) = @_;
if ($paste_id && (my $cached = $memd->get($paste_id))) { # TODO make this use sereal to store objects
return $cached;
} else {
# connect to server
my %futures;
$lang //= "perl";
return undef if ($lang eq 'text');
my $server = $self->eval_connect(sub {
my ($loop, $err, $stream) = @_;
my $str = eval {$self->do_singleeval($lang, $code)};
my $reader = $self->get_eval_reader($stream);
my %output;
return "ERROR: evalserver broken: $@" if $@;
for my $lang (@$langs) {
if ($lang eq 'text') {
next;
} else {
my $future = $self->async_eval($stream, $reader, $lang, $code);
$futures{$lang} = $future;
$memd->set($paste_id, $str) if ($paste_id);
$future->on_done(sub {
my ($out) = @_;
return $str;
print "Future is done\n";
$output{$lang} = $out;
delete $futures{$lang};
if (!keys %futures) { # I'm the last one
print "Calling memset\n";
$memd->set($paste_id, \%output) if ($paste_id);
print "Returning output to delay\n";
use Data::Dumper;
print Dumper(\%output);
$callback->(\%output);
}
});
}
}
});
}
}
sub do_singleeval {
my ($self, $type, $code) = @_;
sub eval_connect {
my ($self, $cb) = @_;
my $socket = IO::Socket::INET->new(PeerAddr => $self->cfg->{server} //'localhost', PeerPort => $self->cfg->{port} //14401)
or die "error: cannot connect to eval server";
my $loop = Mojo::IOLoop->singleton;
my $eval_obj = {language => $type, files => [{filename => '__code', contents => $code, encoding => "utf8"}], prio => {pr_realtime=>{}}, sequence => 1, encoding => "utf8"};
my $socket = $loop->client({address => $self->cfg->{server} // 'localhost', port => $self->cfg->{port} // 14401}, $cb);
$socket->autoflush(1);
print $socket encode_message(eval => $eval_obj);
return $socket;
}
my $buf = '';
my $data = '';
my $resultstr = "Failed to read a message";
sub async_eval {
my ($self, $stream, $reader, $lang, $code) = @_;
my $message = $self->read_message($socket);
my $loop = Mojo::IOLoop->singleton;
my $future = Future::Mojo->new($loop);
if (ref($message) =~ /Warning$/) {
return $message->message;
} else {
return $message->get_contents;
my $seq = $id++;
my $eval_obj = {language => $lang,
files => [
{filename => '__code', contents => $code, encoding => "utf8"}
],
prio => {pr_deadline => {}},
sequence => $seq,
encoding => "utf8"};
my $message = encode_message(eval => $eval_obj);
$reader->($seq, $future);
$stream->write($message);
return ($seq => $future);
}
sub get_eval_reader {
my ($self, $stream) = @_;
my %futures;
my %warnings;
my $buf;
my $out;
$stream->on(read => sub {
my ($stream, $bytes) = @_;
print "Reading bytes\n";
$buf = $buf . $bytes;
my ($res, $message, $nbuf) = decode_message($buf);
$buf = $nbuf;
if ($message) {
my $type = ref ($message);
$type =~ s/^App::EvalServerAdvanced::Protocol:://;
my $seq = $message->sequence;
if ($type eq 'Warning') {
push @{$warnings{$seq}}, $message->message;
} elsif ($type eq 'EvalResponse') {
print "Got eval response for $seq\n";
my $output = $message->get_contents;
my $warnings = join ' ', @{$warnings{$seq} || []};
$futures{$seq}->done($output);
print "Future is done: $output\n";
}
}
});
return sub {
print "WTF\n";
my ($seq, $future) = @_;
$futures{$seq} = $future;
}
}
sub read_message {
my ($self, $socket) = @_;
my $header;
$socket->read($header, 8) or die "Couldn't read from socket";
my ($reserved, $length) = unpack "NN", $header;
die "Invalid packet" unless $reserved == 1;
my $buffer;
$socket->read($buffer, $length) or die "Couldn't read from socket2";
my ($res, $message, $nbuf) = decode_message($header . $buffer);
die "Data left over in buffer" unless $nbuf eq '';
die "Couldn't decode packet" unless $res;
return $message;
}
1;