--- AnyEvent-FCP/FCP.pm 2015/08/04 00:35:16 1.9 +++ AnyEvent-FCP/FCP.pm 2016/06/07 18:53:23 1.19 @@ -37,12 +37,13 @@ my $fcp = new AnyEvent::FCP; - $fcp->watch_global_sync (1, 0); - my $req = $fcp->list_persistent_requests_sync; + $fcp->watch_global (1, 0); + my $req = $fcp->list_persistent_requests; +TODO for my $req (values %$req) { if ($req->{filename} =~ /a/) { - $fcp->modify_persistent_request_sync (1, $req->{identifier}, undef, 0); + $fcp->modify_persistent_request (1, $req->{identifier}, undef, 0); } } @@ -50,7 +51,7 @@ Nothing much can be "imported" from this module right now. -=head2 THE AnyEvent::FCP CLASS +=head1 THE AnyEvent::FCP CLASS =over 4 @@ -62,7 +63,7 @@ use Carp; -our $VERSION = '0.3'; +our $VERSION = 0.4; use Scalar::Util (); @@ -70,6 +71,8 @@ use AnyEvent::Handle; use AnyEvent::Util (); +our %TOLC; # tolc cache + sub touc($) { local $_ = shift; 1 while s/((?:^|_)(?:svk|chk|uri|fcp|ds|mime|dda)(?:_|$))/\U$1/; @@ -79,13 +82,13 @@ sub tolc($) { local $_ = shift; - 1 while s/(SVK|CHK|URI|FCP|DS|MIME|DDA)([^_])/$1\_$2/i; - 1 while s/([^_])(SVK|CHK|URI|FCP|DS|MIME|DDA)/$1\_$2/i; + 1 while s/(SVK|CHK|URI|FCP|DS|MIME|DDA)([^_])/$1\_$2/; + 1 while s/([^_])(SVK|CHK|URI|FCP|DS|MIME|DDA)/$1\_$2/; s/(?<=[a-z])(?=[A-Z])/_/g; lc } -=item $fcp = new AnyEvent::FCP [host => $host][, port => $port][, progress => \&cb][, name => $name] +=item $fcp = new AnyEvent::FCP [host => $host][, port => $port][, name => $name] Create a new FCP connection to the given host and port (default 127.0.0.1:9481, or the environment variables C and C). @@ -93,66 +96,143 @@ If no C was specified, then AnyEvent::FCP will generate a (hopefully) unique client name for you. -You can install a progress callback that is being called with the AnyEvent::FCP -object, the type, a hashref with key-value pairs and a reference to any received data, -for all unsolicited messages. - -Example: - - sub progress_cb { - my ($self, $type, $kv, $rdata) = @_; - - if ($type eq "simple_progress") { - warn "$kv->{identifier} $kv->{succeeded}/$kv->{required}\n"; - } - } - =cut sub new { my $class = shift; - my $self = bless { @_ }, $class; - $self->{host} ||= $ENV{FREDHOST} || "127.0.0.1"; - $self->{port} ||= $ENV{FREDPORT} || 9481; - $self->{name} ||= time.rand.rand.rand; # lame - $self->{timeout} ||= 3600*2; - $self->{progress} ||= sub { }; + my $rand = join "", map chr 0x21 + rand 94, 1..40; # ~ 262 bits entropy - $self->{id} = "a0"; + my $self = bless { + host => $ENV{FREDHOST} || "127.0.0.1", + port => $ENV{FREDPORT} || 9481, + timeout => 3600 * 2, + keepalive => 9 * 60, + name => time.rand.rand.rand, # lame + @_, + queue => [], + req => {}, + prefix => "..:aefcpid:$rand:", + idseq => "a0", + }, $class; { Scalar::Util::weaken (my $self = $self); + $self->{kw} = AE::timer $self->{keepalive}, $self->{keepalive}, sub { + $self->{hdl}->push_write ("\n"); + }; + + our $ENDMESSAGE = qr<\012(EndMessage|Data)\012>; + + # these are declared here for performance reasons + my ($k, $v, $type); + my $rdata; + + my $on_read = sub { + my ($hdl) = @_; + + # we only carve out whole messages here + while ($hdl->{rbuf} =~ /\012(EndMessage|Data)\012/) { + # remember end marker + $rdata = $1 eq "Data" + or $1 eq "EndMessage" + or return $self->fatal ("protocol error, expected message end, got $1\n"); + + my @lines = split /\012/, substr $hdl->{rbuf}, 0, $-[0]; + + substr $hdl->{rbuf}, 0, $+[0], ""; # remove pkg + + $type = shift @lines; + $type = ($TOLC{$type} ||= tolc $type); + + my %kv; + + for (@lines) { + ($k, $v) = split /=/, $_, 2; + $k = ($TOLC{$k} ||= tolc $k); + + if ($k =~ /\./) { + # generic, slow case + my @k = split /\./, $k; + my $ro = \\%kv; + + while (@k) { + $k = shift @k; + if ($k =~ /^\d+$/) { + $ro = \$$ro->[$k]; + } else { + $ro = \$$ro->{$k}; + } + } + + $$ro = $v; + + next; + } + + # special comon case, for performance only + $kv{$k} = $v; + } + + if ($rdata) { + $_[0]->push_read (chunk => delete $kv{data_length}, sub { + $rdata = \$_[1]; + $self->recv ($type, \%kv, $rdata); + }); + + last; # do not tgry to parse more messages + } else { + $self->recv ($type, \%kv); + } + } + }; + $self->{hdl} = new AnyEvent::Handle connect => [$self->{host} => $self->{port}], timeout => $self->{timeout}, + on_read => $on_read, + on_eof => $self->{on_eof}, on_error => sub { - warn "@_\n";#d# - exit 1; + $self->fatal ($_[2]); }, - on_read => sub { $self->on_read (@_) }, - on_eof => $self->{on_eof} || sub { }; + ; Scalar::Util::weaken ($self->{hdl}{fcp} = $self); } - $self->send_msg ( - client_hello => - name => $self->{name}, + $self->send_msg (client_hello => + name => $self->{name}, expected_version => "2.0", ); $self } +sub fatal { + my ($self, $msg) = @_; + + $self->{hdl}->shutdown; + delete $self->{kw}; + + if ($self->{on_error}) { + $self->{on_error}->($msg); + } else { + die $msg; + } +} + +sub identifier { + $_[0]{prefix} . ++$_[0]{idseq} +} + sub send_msg { my ($self, $type, %kv) = @_; my $data = delete $kv{data}; if (exists $kv{id_cb}) { - my $id = $kv{identifier} ||= ++$self->{id}; + my $id = $kv{identifier} ||= $self->identifier; $self->{id}{$id} = delete $kv{id_cb}; } @@ -188,7 +268,6 @@ sub _push_queue { my ($self, $queue) = @_; - warn "oush @$queue\n";#d# shift @$queue; $queue->[0]($self, AnyEvent::Util::guard { $self->_push_queue ($queue) }) if @$queue; @@ -205,66 +284,58 @@ unless $#$queue; } -sub on_read { - my ($self) = @_; - - my $type; - my %kv; - my $rdata; - - my $done_cb = sub { - $kv{pkt_type} = $type; - - my $on = $self->{on}; - for (0 .. $#$on) { - unless (my $res = $on->[$_]($type, \%kv, $rdata)) { - splice @$on, $_, 1 unless defined $res; - return; - } - } - - if (my $cb = $self->{queue}[0]) { - $cb->($self, $type, \%kv, $rdata) - and shift @{ $self->{queue} }; - } else { - $self->default_recv ($type, \%kv, $rdata); - } - }; - - my $hdr_cb; $hdr_cb = sub { - if ($_[1] =~ /^([^=]+)=(.*)$/) { - my ($k, $v) = ($1, $2); - my @k = split /\./, tolc $k; - my $ro = \\%kv; - - while (@k) { - my $k = shift @k; - if ($k =~ /^\d+$/) { - $ro = \$$ro->[$k]; - } else { - $ro = \$$ro->{$k}; - } - } - - $$ro = $v; +# how to merge these types into $self->{persistent} +our %PERSISTENT_TYPE = ( + persistent_get => sub { %{ $_[1] } = (type => "persistent_get" , %{ $_[2] }) }, + persistent_put => sub { %{ $_[1] } = (type => "persistent_put" , %{ $_[2] }) }, + persistent_put_dir => sub { %{ $_[1] } = (type => "persistent_put_dir", %{ $_[2] }) }, + persistent_request_modified => sub { %{ $_[1] } = (%{ $_[1] }, %{ $_[2] }) }, + persistent_request_removed => sub { delete $_[0]{req}{$_[2]{identifier}} }, + + simple_progress => sub { $_[1]{simple_progress} = $_[2] }, # get/put + + uri_generated => sub { $_[1]{uri_generated} = $_[2] }, # put + generated_metadata => sub { $_[1]{generated_metadata} = $_[2] }, # put + started_compression => sub { $_[1]{started_compression} = $_[2] }, # put + finished_compression => sub { $_[1]{finished_compression} = $_[2] }, # put + put_fetchable => sub { $_[1]{put_fetchable} = $_[2] }, # put + put_failed => sub { $_[1]{put_failed} = $_[2] }, # put + put_successful => sub { $_[1]{put_successful} = $_[2] }, # put + + sending_to_network => sub { $_[1]{sending_to_network} = $_[2] }, # get + compatibility_mode => sub { $_[1]{compatibility_mode} = $_[2] }, # get + expected_hashes => sub { $_[1]{expected_hashes} = $_[2] }, # get + expected_mime => sub { $_[1]{expected_mime} = $_[2] }, # get + expected_data_length => sub { $_[1]{expected_data_length} = $_[2] }, # get + get_failed => sub { $_[1]{get_failed} = $_[2] }, # get + data_found => sub { $_[1]{data_found} = $_[2] }, # get + enter_finite_cooldown => sub { $_[1]{enter_finite_cooldown} = $_[2] }, # get +); + +sub recv { + my ($self, $type, $kv, @extra) = @_; + + if (my $cb = $PERSISTENT_TYPE{$type}) { + my $id = $kv->{identifier}; + my $req = $_[0]{req}{$id} ||= {}; + $cb->($self, $req, $kv); + $self->recv (request_changed => $kv, $type, @extra); + } - $_[0]->push_read (line => $hdr_cb); - } elsif ($_[1] eq "Data") { - $_[0]->push_read (chunk => delete $kv{data_length}, sub { - $rdata = \$_[1]; - $done_cb->(); - }); - } elsif ($_[1] eq "EndMessage") { - $done_cb->(); - } else { - die "protocol error, expected message end, got $_[1]\n";#d# + my $on = $self->{on}; + for (0 .. $#$on) { + unless (my $res = $on->[$_]($self, $type, $kv, @extra)) { + splice @$on, $_, 1 unless defined $res; + return; } - }; + } - $self->{hdl}->push_read (line => sub { - $type = tolc $_[1]; - $_[0]->push_read (line => $hdr_cb); - }); + if (my $cb = $self->{queue}[0]) { + $cb->($self, $type, $kv, @extra) + and shift @{ $self->{queue} }; + } else { + $self->default_recv ($type, $kv, @extra); + } } sub default_recv { @@ -275,35 +346,117 @@ } elsif (exists $self->{id}{$kv->{identifier}}) { $self->{id}{$kv->{identifier}}($self, $type, $kv, $rdata) and delete $self->{id}{$kv->{identifier}}; - } else { - &{ $self->{progress} }; } } +=back + +=head2 FCP REQUESTS + +The following methods implement various requests. Most of them map +directory to the FCP message of the same name. The added benefit of +these over sending requests yourself is that they handle the necessary +serialisation, protocol quirks, and replies. + +All of them exist in two versions, the variant shown in this manpage, and +a variant with an extra C<_> at the end, and an extra C<$cb> argument. The +version as shown is I - it will wait for any replies, and +either return the reply, or croak with an error. The underscore variant +returns immediately and invokes one or more callbacks or condvars later. + +For example, the call + + $info = $fcp->get_plugin_info ($name, $detailed); + +Also comes in this underscore variant: + + $fcp->get_plugin_info_ ($name, $detailed, $cb); + +You can thinbk of the underscore as a kind of continuation indicator - the +normal function waits and returns with the data, the C<_> indicates that +you pass the continuation yourself, and the continuation will be invoked +with the results. + +This callback/continuation argument (C<$cb>) can come in three forms itself: + +=over 4 + +=item A code reference (or rather anything not matching some other alternative) + +This code reference will be invoked with the result on success. On an +error, it will die (in the event loop) with a backtrace of the call site. + +This is a popular choice, but it makes handling errors hard - make sure +you never generate protocol errors! + +=item A condvar (as returned by e.g. C<< AnyEvent->condvar >>) + +When a condvar is passed, it is sent (C<< $cv->send ($results) >>) the +results when the request has finished. Should an error occur, the error +will instead result in C<< $cv->croak ($error) >>. + +This is also a popular choice. + +=item An array with two callbacks C<[$success, $failure]> + +The C<$success> callback will be invoked with the results, while the +C<$failure> callback will be invoked on any errors. + +=item C + +This is the same thing as specifying C as callback, i.e. on +success, the results are ignored, while on failure, you the module dies +with a backtrace. + +This is good for quick scripts, or when you really aren't interested in +the results. + +=back + +=cut + +our $NOP_CB = sub { }; + sub _txn { my ($name, $sub) = @_; *{$name} = sub { - splice @_, 1, 0, (my $cv = AnyEvent->condvar); + my $cv = AE::cv; + + splice @_, 1, 0, $cv, sub { $cv->croak ($_[0]{extra_description}) }; &$sub; - $cv + $cv->recv }; - *{"$name\_sync"} = sub { - splice @_, 1, 0, (my $cv = AnyEvent->condvar); + *{"$name\_"} = sub { + my ($ok, $err) = pop; + + if (ARRAY:: eq ref $ok) { + ($ok, $err) = @$ok; + } elsif (UNIVERSAL::isa $ok, AnyEvent::CondVar::) { + $err = sub { $ok->croak ($_[0]{extra_description}) }; + } else { + my $bt = Carp::longmess ""; + $err = sub { + die "$_[0]{code_description} ($_[0]{extra_description})$bt"; + }; + } + + $ok ||= $NOP_CB; + + splice @_, 1, 0, $ok, $err; &$sub; - $cv->recv }; } -=item $cv = $fcp->list_peers ([$with_metdata[, $with_volatile]]) +=over 4 -=item $peers = $fcp->list_peers_sync ([$with_metdata[, $with_volatile]]) +=item $peers = $fcp->list_peers ([$with_metdata[, $with_volatile]]) =cut _txn list_peers => sub { - my ($self, $cv, $with_metadata, $with_volatile) = @_; + my ($self, $ok, undef, $with_metadata, $with_volatile) = @_; my @res; @@ -314,7 +467,7 @@ my ($self, $type, $kv, $rdata) = @_; if ($type eq "end_list_peers") { - $cv->(\@res); + $ok->(\@res); 1 } else { push @res, $kv; @@ -324,150 +477,146 @@ ); }; -=item $cv = $fcp->list_peer_notes ($node_identifier) - -=item $notes = $fcp->list_peer_notes_sync ($node_identifier) +=item $notes = $fcp->list_peer_notes ($node_identifier) =cut _txn list_peer_notes => sub { - my ($self, $cv, $node_identifier) = @_; + my ($self, $ok, undef, $node_identifier) = @_; $self->send_msg (list_peer_notes => node_identifier => $node_identifier, id_cb => sub { my ($self, $type, $kv, $rdata) = @_; - $cv->($kv); + $ok->($kv); 1 }, ); }; -=item $cv = $fcp->watch_global ($enabled[, $verbosity_mask]) - -=item $fcp->watch_global_sync ($enabled[, $verbosity_mask]) +=item $fcp->watch_global ($enabled[, $verbosity_mask]) =cut _txn watch_global => sub { - my ($self, $cv, $enabled, $verbosity_mask) = @_; + my ($self, $ok, $err, $enabled, $verbosity_mask) = @_; $self->send_msg (watch_global => enabled => $enabled ? "true" : "false", defined $verbosity_mask ? (verbosity_mask => $verbosity_mask+0) : (), ); - $cv->(); + $ok->(); }; -=item $cv = $fcp->list_persistent_requests - -=item $reqs = $fcp->list_persistent_requests_sync +=item $reqs = $fcp->list_persistent_requests =cut _txn list_persistent_requests => sub { - my ($self, $cv) = @_; + my ($self, $ok, $err) = @_; - my %res; + $self->serialise (list_persistent_requests => sub { + my ($self, $guard) = @_; - $self->send_msg ("list_persistent_requests"); + my @res; - push @{ $self->{queue} }, sub { - my ($self, $type, $kv, $rdata) = @_; + $self->send_msg ("list_persistent_requests"); - if ($type eq "end_list_persistent_requests") { - $cv->(\%res); - 1 - } else { - my $id = $kv->{identifier}; + $self->on (sub { + my ($self, $type, $kv, $rdata) = @_; + + $guard if 0; - if ($type =~ /^persistent_(get|put|put_dir)$/) { - $res{$id} = { - type => $1, - %{ $res{$id} }, - %$kv, - }; - } elsif ($type eq "simple_progress") { - delete $kv->{pkt_type}; # save memory - push @{ $res{delete $kv->{identifier}}{simple_progress} }, $kv; + if ($type eq "end_list_persistent_requests") { + $ok->(\@res); + return; } else { - $res{delete $kv->{identifier}}{delete $kv->{pkt_type}} = $kv; + my $id = $kv->{identifier}; + + if ($type =~ /^persistent_(get|put|put_dir)$/) { + push @res, [$type, $kv]; + } } - 0 - } - }; + + 1 + }); + }); }; -=item $cv = $fcp->remove_request ($global, $identifier) +=item $sync = $fcp->modify_persistent_request ($global, $identifier[, $client_token[, $priority_class]]) -=item $status = $fcp->remove_request_sync ($global, $identifier) +Update either the C or C of a request +identified by C<$global> and C<$identifier>, depending on which of +C<$client_token> and C<$priority_class> are not C. =cut -_txn remove_request => sub { - my ($self, $cv, $global, $identifier) = @_; - - $self->send_msg (remove_request => - global => $global ? "true" : "false", - identifier => $identifier, - id_cb => sub { - my ($self, $type, $kv, $rdata) = @_; - - $cv->($kv); - 1 - }, - ); -}; +_txn modify_persistent_request => sub { + my ($self, $ok, $err, $global, $identifier, $client_token, $priority_class) = @_; -=item $cv = $fcp->modify_persistent_request ($global, $identifier[, $client_token[, $priority_class]]) + $self->serialise ($identifier => sub { + my ($self, $guard) = @_; -=item $sync = $fcp->modify_persistent_request_sync ($global, $identifier[, $client_token[, $priority_class]]) + $self->send_msg (modify_persistent_request => + global => $global ? "true" : "false", + identifier => $identifier, + defined $client_token ? (client_token => $client_token ) : (), + defined $priority_class ? (priority_class => $priority_class) : (), + ); -=cut + $self->on (sub { + my ($self, $type, $kv, @extra) = @_; -_txn modify_persistent_request => sub { - my ($self, $cv, $global, $identifier, $client_token, $priority_class) = @_; + $guard if 0; - $self->send_msg (modify_persistent_request => - global => $global ? "true" : "false", - defined $client_token ? (client_token => $client_token ) : (), - defined $priority_class ? (priority_class => $priority_class) : (), - identifier => $identifier, - id_cb => sub { - my ($self, $type, $kv, $rdata) = @_; + if ($kv->{identifier} eq $identifier) { + if ($type eq "persistent_request_modified") { + $ok->($kv); + return; + } elsif ($type eq "protocol_error") { + $err->($kv); + return; + } + } - $cv->($kv); 1 - }, - ); + }); + }); }; -=item $cv = $fcp->get_plugin_info ($name, $detailed) - -=item $info = $fcp->get_plugin_info_sync ($name, $detailed) +=item $info = $fcp->get_plugin_info ($name, $detailed) =cut _txn get_plugin_info => sub { - my ($self, $cv, $name, $detailed) = @_; + my ($self, $ok, $err, $name, $detailed) = @_; + + my $id = $self->identifier; $self->send_msg (get_plugin_info => + identifier => $id, plugin_name => $name, detailed => $detailed ? "true" : "false", - id_cb => sub { - my ($self, $type, $kv, $rdata) = @_; - - $cv->($kv); - 1 - }, ); -}; + $self->on (sub { + my ($self, $type, $kv) = @_; -=item $cv = $fcp->client_get ($uri, $identifier, %kv) + if ($kv->{identifier} eq $id) { + if ($type eq "get_plugin_info") { + $ok->($kv); + } else { + $err->($kv, $type); + } + return; + } + + 1 + }); +}; -=item $status = $fcp->client_get_sync ($uri, $identifier, %kv) +=item $status = $fcp->client_get ($uri, $identifier, %kv) %kv can contain (L). @@ -478,36 +627,101 @@ =cut _txn client_get => sub { - my ($self, $cv, $uri, $identifier, %kv) = @_; + my ($self, $ok, $err, $uri, $identifier, %kv) = @_; - $self->send_msg (client_get => - %kv, - uri => $uri, - identifier => $identifier, - id_cb => sub { - my ($self, $type, $kv, $rdata) = @_; + $self->serialise ($identifier => sub { + my ($self, $guard) = @_; + + $self->send_msg (client_get => + %kv, + uri => $uri, + identifier => $identifier, + ); + + $self->on (sub { + my ($self, $type, $kv, @extra) = @_; + + $guard if 0; + + if ($kv->{identifier} eq $identifier) { + if ($type eq "persistent_get") { + $ok->($kv); + return; + } elsif ($type eq "protocol_error") { + $err->($kv); + return; + } + } - $cv->($kv); 1 - }, - ); + }); + }); }; -=item $cv = $fcp->test_dda_sync ($local_directory, $remote_directory, $want_read, $want_write) +=item $status = $fcp->remove_request ($identifier[, $global]) + +Remove the request with the given isdentifier. Returns true if successful, +false on error. + +=cut -=item ($can_read, $can_write) = $fcp->test_dda_sync ($local_directory, $remote_directory, $want_read, $want_write)) +_txn remove_request => sub { + my ($self, $ok, $err, $identifier, $global) = @_; + + $self->serialise ($identifier => sub { + my ($self, $guard) = @_; + + $self->send_msg (remove_request => + identifier => $identifier, + global => $global ? "true" : "false", + ); + $self->on (sub { + my ($self, $type, $kv, @extra) = @_; + + $guard if 0; + + if ($kv->{identifier} eq $identifier) { + if ($type eq "persistent_request_removed") { + $ok->(1); + return; + } elsif ($type eq "protocol_error") { + $err->($kv); + return; + } + } + + 1 + }); + }); +}; + +=item ($can_read, $can_write) = $fcp->test_dda ($local_directory, $remote_directory, $want_read, $want_write)) The DDA test in FCP is probably the single most broken protocol - only one directory test can be outstanding at any time, and some guessing and heuristics are involved in mangling the paths. This function combines C and C in one -request, handling file reading and writing as well. +request, handling file reading and writing as well, and tries very hard to +do the right thing. + +Both C<$local_directory> and C<$remote_directory> must specify the same +directory - C<$local_directory> is the directory path on the client (where +L runs) and C<$remote_directory> is the directory path on +the server (where the freenet node runs). When both are running on the +same node, the paths are generally identical. + +C<$want_read> and C<$want_write> should be set to a true value when you +want to read (get) files or write (put) files, respectively. + +On error, an exception is thrown. Otherwise, C<$can_read> and +C<$can_write> indicate whether you can reaqd or write to freenet via the +directory. =cut _txn test_dda => sub { - my ($self, $cv, $local, $remote, $want_read, $want_write) = @_; + my ($self, $ok, $err, $local, $remote, $want_read, $want_write) = @_; $self->serialise (test_dda => sub { my ($self, $guard) = @_; @@ -518,7 +732,7 @@ want_write_directory => $want_write ? "true" : "false", ); $self->on (sub { - my ($type, $kv) = @_; + my ($self, $type, $kv) = @_; if ($type eq "test_dda_reply") { # the filenames are all relative to the server-side directory, @@ -538,7 +752,6 @@ my %response = (directory => $remote); if (length $kv->{read_filename}) { - warn "$local/$kv->{read_filename}";#d# if (open my $fh, "<:raw", "$local/$kv->{read_filename}") { sysread $fh, my $buf, -s $fh; $response{read_content} = $buf; @@ -554,17 +767,17 @@ $self->send_msg (test_dda_response => %response); $self->on (sub { - my ($type, $kv) = @_; + my ($self, $type, $kv) = @_; $guard if 0; # reference if ($type eq "test_dda_complete") { - $cv->( + $ok->( $kv->{read_directory_allowed} eq "true", $kv->{write_directory_allowed} eq "true", ); } elsif ($type eq "protocol_error" && $kv->{identifier} eq $remote) { - $cv->croak ($kv->{extra_description}); + $err->($kv->{extra_description}); return; } @@ -573,7 +786,7 @@ return; } elsif ($type eq "protocol_error" && $kv->{identifier} eq $remote) { - $cv->croak ($kv->{extra_description}); + $err->($kv); return; } @@ -584,6 +797,132 @@ =back +=head2 REQUEST CACHE + +The C class keeps a request cache, where it caches all +information from requests. + +For these messages, it will store a copy of the key-value pairs, together with a C slot, +in C<< $fcp->{req}{$identifier} >>: + + persistent_get + persistent_put + persistent_put_dir + +This message updates the stored data: + + persistent_request_modified + +This message will remove this entry: + + persistent_request_removed + +These messages get merged into the cache entry, under their +type, i.e. a C message will be stored in C<< +$fcp->{req}{$identifier}{simple_progress} >>: + + simple_progress # get/put + + uri_generated # put + generated_metadata # put + started_compression # put + finished_compression # put + put_failed # put + put_fetchable # put + put_successful # put + + sending_to_network # get + compatibility_mode # get + expected_hashes # get + expected_mime # get + expected_data_length # get + get_failed # get + data_found # get + enter_finite_cooldown # get + +In addition, an event (basically a fake message) of type C is generated +on every change, which will be called as C<< $cb->($fcp, $kv, $type) >>, where C<$type> +is the type of the original message triggering the change, + +To fill this cache with the global queue and keep it updated, +call C to subscribe to updates, followed by +C. + + $fcp->watch_global_sync_; # do not wait + $fcp->list_persistent_requests; # wait + +To get a better idea of what is stored in the cache, here is an example of +what might be stored in C<< $fcp->{req}{"Frost-gpl.txt"} >>: + + { + identifier => "Frost-gpl.txt", + uri => 'CHK@Fnx5kzdrfE,EImdzaVyEWl,AAIC--8/gpl.txt', + binary_blob => "false", + global => "true", + max_retries => -1, + max_size => 9223372036854775807, + persistence => "forever", + priority_class => 3, + real_time => "false", + return_type => "direct", + started => "true", + type => "persistent_get", + verbosity => 2147483647, + sending_to_network => { + identifier => "Frost-gpl.txt", + global => "true", + }, + compatibility_mode => { + identifier => "Frost-gpl.txt", + definitive => "true", + dont_compress => "false", + global => "true", + max => "COMPAT_1255", + min => "COMPAT_1255", + }, + expected_hashes => { + identifier => "Frost-gpl.txt", + global => "true", + hashes => { + ed2k => "d83596f5ee3b7...", + md5 => "e0894e4a2a6...", + sha1 => "...", + sha256 => "...", + sha512 => "...", + tth => "...", + }, + }, + expected_mime => { + identifier => "Frost-gpl.txt", + global => "true", + metadata => { content_type => "application/rar" }, + }, + expected_data_length => { + identifier => "Frost-gpl.txt", + data_length => 37576, + global => "true", + }, + simple_progress => { + identifier => "Frost-gpl.txt", + failed => 0, + fatally_failed => 0, + finalized_total => "true", + global => "true", + last_progress => 1438639282628, + required => 372, + succeeded => 102, + total => 747, + }, + data_found => { + identifier => "Frost-gpl.txt", + completion_time => 1438663354026, + data_length => 37576, + global => "true", + metadata => { content_type => "image/jpeg" }, + startup_time => 1438657196167, + }, + } + =head1 EXAMPLE PROGRAM use AnyEvent::FCP; @@ -591,12 +930,13 @@ my $fcp = new AnyEvent::FCP; # let us look at the global request list - $fcp->watch_global (1, 0); + $fcp->watch_global_ (1); # list them, synchronously - my $req = $fcp->list_persistent_requests_sync; + my $req = $fcp->list_persistent_requests; # go through all requests +TODO for my $req (values %$req) { # skip jobs not directly-to-disk next unless $req->{return_type} eq "disk";