ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Net-FCP/FCP.pm
(Generate patch)

Comparing Net-FCP/FCP.pm (file contents):
Revision 1.8 by root, Mon Sep 8 01:47:31 2003 UTC vs.
Revision 1.32 by root, Fri May 14 17:25:17 2004 UTC

17of what the messages do. I am too lazy to document all this here. 17of what the messages do. I am too lazy to document all this here.
18 18
19=head1 WARNING 19=head1 WARNING
20 20
21This module is alpha. While it probably won't destroy (much :) of your 21This module is alpha. While it probably won't destroy (much :) of your
22data, it currently works only with the Event module (alkthough the event 22data, it currently falls short of what it should provide (intelligent uri
23mechanism is fully pluggable). 23following, splitfile downloads, healing...)
24
25=head2 IMPORT TAGS
26
27Nothing much can be "imported" from this module right now. There are,
28however, certain "import tags" that can be used to select the event model
29to be used.
30
31Event models are implemented as modules under the C<Net::FCP::Event::xyz>
32class, where C<xyz> is the event model to use. The default is C<Event> (or
33later C<Auto>).
34
35The import tag to use is named C<event=xyz>, e.g. C<event=Event>,
36C<event=Glib> etc.
37
38You should specify the event module to use only in the main program.
39
40If no event model has been specified, FCP tries to autodetect it on first
41use (e.g. first transaction), in this order: Coro, Event, Glib, Tk.
42
43=head2 FREENET BASICS
44
45Ok, this section will not explain any freenet basics to you, just some
46problems I found that you might want to avoid:
47
48=over 4
49
50=item freenet URIs are _NOT_ URIs
51
52Whenever a "uri" is required by the protocol, freenet expects a kind of
53URI prefixed with the "freenet:" scheme, e.g. "freenet:CHK...". However,
54these are not URIs, as freeent fails to parse them correctly, that is, you
55must unescape an escaped characters ("%2c" => ",") yourself. Maybe in the
56future this library will do it for you, so watch out for this incompatible
57change.
58
59=item Numbers are in HEX
60
61Virtually every number in the FCP protocol is in hex. Be sure to use
62C<hex()> on all such numbers, as the module (currently) does nothing to
63convert these for you.
64
65=back
24 66
25=head2 THE Net::FCP CLASS 67=head2 THE Net::FCP CLASS
26 68
27=over 4 69=over 4
28 70
29=cut 71=cut
30 72
31package Net::FCP; 73package Net::FCP;
32 74
33use Carp; 75use Carp;
34use IO::Socket::INET;
35 76
36$VERSION = 0.04; 77$VERSION = 0.7;
37 78
38sub event_reg_cb { 79no warnings;
39 my ($obj) = @_;
40 require Event;
41 80
42 $obj->{eventdata} = Event->io ( 81use Net::FCP::Metadata;
43 fd => $obj->{fh}, 82use Net::FCP::Util qw(tolc touc xeh);
44 poll => 'r',
45 cb => sub {
46 $obj->fh_ready;
47 },
48 );
49}
50 83
51sub event_unreg_cb { 84our $EVENT = Net::FCP::Event::Auto::;
52 $_[0]{eventdata}
53 and (delete $_[0]{eventdata})->cancel;
54}
55 85
56sub event_wait_cb { 86sub import {
57 Event::one_event(); 87 shift;
58}
59 88
60$regcb = \&event_reg_cb;
61$unregcb = \&event_unreg_cb;
62$waitcb = \&event_wait_cb;
63
64sub touc($) {
65 local $_ = shift;
66 1 while s/((?:^|_)(?:svk|chk|uri)(?:_|$))/\U$1/;
67 s/(?:^|_)(.)/\U$1/g;
68 $_;
69}
70
71sub tolc($) {
72 local $_ = shift;
73 s/(?<=[a-z])(?=[A-Z])/_/g;
74 lc $_;
75}
76
77=item $meta = Net::FCP::parse_metadata $string
78
79Parse a metadata string and return it.
80
81The metadata will be a hashref with key C<version> (containing
82the mandatory version header entries).
83
84All other headers are represented by arrayrefs (they can be repeated).
85
86Since this is confusing, here is a rather verbose example of a parsed
87manifest:
88
89 (
90 version => { revision => 1 },
91 document => [
92 {
93 "info.format" => "image/jpeg",
94 name => "background.jpg",
95 "redirect.target" => "freenet:CHK\@ZcagI,ra726bSw"
96 },
97 {
98 "info.format" => "text/html",
99 name => ".next",
100 "redirect.target" => "freenet:SSK\@ilUPAgM/TFEE/3"
101 },
102 {
103 "info.format" => "text/html",
104 "redirect.target" => "freenet:CHK\@8M8Po8ucwI,8xA"
105 }
106 ]
107 )
108
109=cut
110
111sub parse_metadata {
112 my $meta;
113
114 my $data = shift;
115 if ($data =~ /^Version\015?\012/gc) {
116 my $hdr = $meta->{version} = {};
117
118 for (;;) { 89 for (@_) {
119 while ($data =~ /\G([^=\015\012]+)=([^\015\012]*)\015?\012/gc) { 90 if (/^event=(\w+)$/) {
120 my ($k, $v) = ($1, $2); 91 $EVENT = "Net::FCP::Event::$1";
121 $hdr->{tolc $k} = $v; 92 eval "require $EVENT";
122 }
123
124 if ($data =~ /\GEndPart\015?\012/gc) {
125 } elsif ($data =~ /\GEnd\015?\012/gc) {
126 last;
127 } elsif ($data =~ /\G([A-Za-z0-9.\-]+)\015?\012/gcs) {
128 push @{$meta->{tolc $1}}, $hdr = {};
129 } elsif ($data =~ /\G(.*)/gcs) {
130 die "metadata format error ($1)";
131 }
132 } 93 }
133 } 94 }
134 95 die $@ if $@;
135 #$meta->{tail} = substr $data, pos $data;
136
137 $meta;
138} 96}
139 97
140=item $fcp = new Net::FCP [host => $host][, port => $port] 98=item $fcp = new Net::FCP [host => $host][, port => $port][, progress => \&cb]
141 99
142Create a new virtual FCP connection to the given host and port (default 100Create a new virtual FCP connection to the given host and port (default
143127.0.0.1:8481, or the environment variables C<FREDHOST> and C<FREDPORT>). 101127.0.0.1:8481, or the environment variables C<FREDHOST> and C<FREDPORT>).
144 102
145Connections are virtual because no persistent physical connection is 103Connections are virtual because no persistent physical connection is
146established. However, the existance of the node is checked by executing a 104established.
147C<ClientHello> transaction. 105
106You can install a progress callback that is being called with the Net::FCP
107object, a txn object, the type of the transaction and the attributes. Use
108it like this:
109
110 sub progress_cb {
111 my ($self, $txn, $type, $attr) = @_;
112
113 warn "progress<$txn,$type," . (join ":", %$attr) . ">\n";
114 }
148 115
149=cut 116=cut
150 117
151sub new { 118sub new {
152 my $class = shift; 119 my $class = shift;
153 my $self = bless { @_ }, $class; 120 my $self = bless { @_ }, $class;
154 121
155 $self->{host} ||= $ENV{FREDHOST} || "127.0.0.1"; 122 $self->{host} ||= $ENV{FREDHOST} || "127.0.0.1";
156 $self->{port} ||= $ENV{FREDPORt} || 8481; 123 $self->{port} ||= $ENV{FREDPORT} || 8481;
157
158 $self->{nodehello} = $self->client_hello
159 or croak "unable to get nodehello from node\n";
160 124
161 $self; 125 $self;
162} 126}
163 127
128sub progress {
129 my ($self, $txn, $type, $attr) = @_;
130
131 $self->{progress}->($self, $txn, $type, $attr)
132 if $self->{progress};
133}
134
164=item $txn = $fcp->txn(type => attr => val,...) 135=item $txn = $fcp->txn (type => attr => val,...)
165 136
166The low-level interface to transactions. Don't use it. 137The low-level interface to transactions. Don't use it unless you have
138"special needs". Instead, use predefiend transactions like this:
139
140The blocking case, no (visible) transactions involved:
141
142 my $nodehello = $fcp->client_hello;
143
144A transaction used in a blocking fashion:
145
146 my $txn = $fcp->txn_client_hello;
147 ...
148 my $nodehello = $txn->result;
149
150Or shorter:
151
152 my $nodehello = $fcp->txn_client_hello->result;
153
154Setting callbacks:
155
156 $fcp->txn_client_hello->cb(
157 sub { my $nodehello => $_[0]->result }
158 );
167 159
168=cut 160=cut
169 161
170sub txn { 162sub txn {
171 my ($self, $type, %attr) = @_; 163 my ($self, $type, %attr) = @_;
172 164
173 $type = touc $type; 165 $type = touc $type;
174 166
175 my $txn = "Net::FCP::Txn::$type"->new(fcp => $self, type => tolc $type, attr => \%attr); 167 my $txn = "Net::FCP::Txn::$type"->new (fcp => $self, type => tolc $type, attr => \%attr);
176 168
177 $txn; 169 $txn;
178} 170}
179 171
180sub _txn($&) { 172{ # transactions
173
174my $txn = sub {
181 my ($name, $sub) = @_; 175 my ($name, $sub) = @_;
182 *{"$name\_txn"} = $sub; 176 *{"txn_$name"} = $sub;
183 *{$name} = sub { $sub->(@_)->result }; 177 *{$name} = sub { $sub->(@_)->result };
184} 178};
185 179
186=item $txn = $fcp->txn_client_hello 180=item $txn = $fcp->txn_client_hello
187 181
188=item $nodehello = $fcp->client_hello 182=item $nodehello = $fcp->client_hello
189 183
195 protocol => "1.2", 189 protocol => "1.2",
196 } 190 }
197 191
198=cut 192=cut
199 193
200_txn client_hello => sub { 194$txn->(client_hello => sub {
201 my ($self) = @_; 195 my ($self) = @_;
202 196
203 $self->txn ("client_hello"); 197 $self->txn ("client_hello");
204}; 198});
205 199
206=item $txn = $fcp->txn_client_info 200=item $txn = $fcp->txn_client_info
207 201
208=item $nodeinfo = $fcp->client_info 202=item $nodeinfo = $fcp->client_info
209 203
233 routing_time => "a5", 227 routing_time => "a5",
234 } 228 }
235 229
236=cut 230=cut
237 231
238_txn client_info => sub { 232$txn->(client_info => sub {
239 my ($self) = @_; 233 my ($self) = @_;
240 234
241 $self->txn ("client_info"); 235 $self->txn ("client_info");
242}; 236});
243 237
244=item $txn = $fcp->txn_generate_chk ($metadata, $data) 238=item $txn = $fcp->txn_generate_chk ($metadata, $data[, $cipher])
245 239
246=item $uri = $fcp->generate_chk ($metadata, $data) 240=item $uri = $fcp->generate_chk ($metadata, $data[, $cipher])
247 241
248Creates a new CHK, given the metadata and data. UNTESTED. 242Calculates a CHK, given the metadata and data. C<$cipher> is either
243C<Rijndael> or C<Twofish>, with the latter being the default.
249 244
250=cut 245=cut
251 246
252_txn generate_chk => sub { 247$txn->(generate_chk => sub {
253 my ($self, $metadata, $data) = @_; 248 my ($self, $metadata, $data, $cipher) = @_;
254 249
255 $self->txn (generate_chk => data => "$data$metadata", metadata_length => length $metadata); 250 $metadata = Net::FCP::Metadata::build_metadata $metadata;
251
252 $self->txn (generate_chk =>
253 data => "$metadata$data",
254 metadata_length => xeh length $metadata,
255 cipher => $cipher || "Twofish");
256}; 256});
257 257
258=item $txn = $fcp->txn_generate_svk_pair 258=item $txn = $fcp->txn_generate_svk_pair
259 259
260=item ($public, $private) = @{ $fcp->generate_svk_pair } 260=item ($public, $private, $crypto) = @{ $fcp->generate_svk_pair }
261 261
262Creates a new SVK pair. Returns an arrayref. 262Creates a new SVK pair. Returns an arrayref with the public key, the
263private key and a crypto key, which is just additional entropy.
263 264
264 [ 265 [
265 "hKs0-WDQA4pVZyMPKNFsK1zapWY", 266 "acLx4dux9fvvABH15Gk6~d3I-yw",
266 "ZnmvMITaTXBMFGl4~jrjuyWxOWg" 267 "cPoDkDMXDGSMM32plaPZDhJDxSs",
268 "BH7LXCov0w51-y9i~BoB3g",
267 ] 269 ]
268 270
269=cut 271A private key (for inserting) can be constructed like this:
270 272
273 SSK@<private_key>,<crypto_key>/<name>
274
275It can be used to insert data. The corresponding public key looks like this:
276
277 SSK@<public_key>PAgM,<crypto_key>/<name>
278
279Watch out for the C<PAgM>-part!
280
281=cut
282
271_txn generate_svk_pair => sub { 283$txn->(generate_svk_pair => sub {
272 my ($self) = @_; 284 my ($self) = @_;
273 285
274 $self->txn ("generate_svk_pair"); 286 $self->txn ("generate_svk_pair");
275}; 287});
276 288
277=item $txn = $fcp->txn_insert_private_key ($private) 289=item $txn = $fcp->txn_invert_private_key ($private)
278 290
279=item $uri = $fcp->insert_private_key ($private) 291=item $public = $fcp->invert_private_key ($private)
280 292
281Inserts a private key. $private can be either an insert URI (must start 293Inverts a private key (returns the public key). C<$private> can be either
282with freenet:SSK@) or a raw private key (i.e. the private value you get back 294an insert URI (must start with C<freenet:SSK@>) or a raw private key (i.e.
283from C<generate_svk_pair>). 295the private value you get back from C<generate_svk_pair>).
284 296
285Returns the public key. 297Returns the public key.
286 298
287UNTESTED.
288
289=cut 299=cut
290 300
291_txn insert_private_key => sub { 301$txn->(invert_private_key => sub {
292 my ($self, $privkey) = @_; 302 my ($self, $privkey) = @_;
293 303
294 $self->txn (invert_private_key => private => $privkey); 304 $self->txn (invert_private_key => private => $privkey);
295}; 305});
296 306
297=item $txn = $fcp->txn_get_size ($uri) 307=item $txn = $fcp->txn_get_size ($uri)
298 308
299=item $length = $fcp->get_size ($uri) 309=item $length = $fcp->get_size ($uri)
300 310
301Finds and returns the size (rounded up to the nearest power of two) of the 311Finds and returns the size (rounded up to the nearest power of two) of the
302given document. 312given document.
303 313
304UNTESTED.
305
306=cut 314=cut
307 315
308_txn get_size => sub { 316$txn->(get_size => sub {
309 my ($self, $uri) = @_; 317 my ($self, $uri) = @_;
310 318
311 $self->txn (get_size => URI => $uri); 319 $self->txn (get_size => URI => $uri);
312}; 320});
313 321
314=item $txn = $fcp->txn_client_get ($uri [, $htl = 15 [, $removelocal = 0]]) 322=item $txn = $fcp->txn_client_get ($uri [, $htl = 15 [, $removelocal = 0]])
315 323
316=item ($metadata, $data) = @{ $fcp->client_get ($uri, $htl, $removelocal) 324=item ($metadata, $data) = @{ $fcp->client_get ($uri, $htl, $removelocal)
317 325
318Fetches a (small, as it should fit into memory) file from 326Fetches a (small, as it should fit into memory) key content block from
319freenet. C<$meta> is the metadata (as returned by C<parse_metadata> or 327freenet. C<$meta> is a C<Net::FCP::Metadata> object or C<undef>).
320C<undef>).
321 328
322Due to the overhead, a better method to download big files should be used. 329The C<$uri> should begin with C<freenet:>, but the scheme is currently
330added, if missing.
323 331
324 my ($meta, $data) = @{ 332 my ($meta, $data) = @{
325 $fcp->client_get ( 333 $fcp->client_get (
326 "freenet:CHK@hdXaxkwZ9rA8-SidT0AN-bniQlgPAwI,XdCDmBuGsd-ulqbLnZ8v~w" 334 "freenet:CHK@hdXaxkwZ9rA8-SidT0AN-bniQlgPAwI,XdCDmBuGsd-ulqbLnZ8v~w"
327 ) 335 )
328 }; 336 };
329 337
330=cut 338=cut
331 339
332_txn client_get => sub { 340$txn->(client_get => sub {
333 my ($self, $uri, $htl, $removelocal) = @_; 341 my ($self, $uri, $htl, $removelocal) = @_;
334 342
335 $self->txn (client_get => URI => $uri, hops_to_live => ($htl || 15), remove_local => $removelocal*1); 343 $uri =~ s/^freenet://; $uri = "freenet:$uri";
344
345 $self->txn (client_get => URI => $uri, hops_to_live => xeh (defined $htl ? $htl : 15),
346 remove_local_key => $removelocal ? "true" : "false");
336}; 347});
337 348
338=item MISSING: ClientPut 349=item $txn = $fcp->txn_client_put ($uri, $metadata, $data, $htl, $removelocal)
350
351=item my $uri = $fcp->client_put ($uri, $metadata, $data, $htl, $removelocal);
352
353Insert a new key. If the client is inserting a CHK, the URI may be
354abbreviated as just CHK@. In this case, the node will calculate the
355CHK. If the key is a private SSK key, the node will calculcate the public
356key and the resulting public URI.
357
358C<$meta> can be a hash reference (same format as returned by
359C<Net::FCP::parse_metadata>) or a string.
360
361The result is an arrayref with the keys C<uri>, C<public_key> and C<private_key>.
362
363=cut
364
365$txn->(client_put => sub {
366 my ($self, $uri, $metadata, $data, $htl, $removelocal) = @_;
367
368 $metadata = Net::FCP::Metadata::build_metadata $metadata;
369 $uri =~ s/^freenet://; $uri = "freenet:$uri";
370
371 $self->txn (client_put => URI => $uri,
372 hops_to_live => xeh (defined $htl ? $htl : 15),
373 remove_local_key => $removelocal ? "true" : "false",
374 data => "$metadata$data", metadata_length => xeh length $metadata);
375});
376
377} # transactions
339 378
340=back 379=back
341 380
342=head2 THE Net::FCP::Txn CLASS 381=head2 THE Net::FCP::Txn CLASS
343 382
344All requests (or transactions) are executed in a asynchroneous way (LIE: 383All requests (or transactions) are executed in a asynchronous way. For
345uploads are blocking). For each request, a C<Net::FCP::Txn> object is 384each request, a C<Net::FCP::Txn> object is created (worse: a tcp
346created (worse: a tcp connection is created, too). 385connection is created, too).
347 386
348For each request there is actually a different subclass (and it's possible 387For each request there is actually a different subclass (and it's possible
349to subclass these, although of course not documented). 388to subclass these, although of course not documented).
350 389
351The most interesting method is C<result>. 390The most interesting method is C<result>.
353=over 4 392=over 4
354 393
355=cut 394=cut
356 395
357package Net::FCP::Txn; 396package Net::FCP::Txn;
397
398use Fcntl;
399use Socket;
358 400
359=item new arg => val,... 401=item new arg => val,...
360 402
361Creates a new C<Net::FCP::Txn> object. Not normally used. 403Creates a new C<Net::FCP::Txn> object. Not normally used.
362 404
364 406
365sub new { 407sub new {
366 my $class = shift; 408 my $class = shift;
367 my $self = bless { @_ }, $class; 409 my $self = bless { @_ }, $class;
368 410
411 $self->{signal} = $EVENT->new_signal;
412
413 $self->{fcp}{txn}{$self} = $self;
414
369 my $attr = ""; 415 my $attr = "";
370 my $data = delete $self->{attr}{data}; 416 my $data = delete $self->{attr}{data};
371 417
372 while (my ($k, $v) = each %{$self->{attr}}) { 418 while (my ($k, $v) = each %{$self->{attr}}) {
373 $attr .= (Net::FCP::touc $k) . "=$v\012" 419 $attr .= (Net::FCP::touc $k) . "=$v\012"
374 } 420 }
375 421
376 if (defined $data) { 422 if (defined $data) {
377 $attr .= "DataLength=" . (length $data) . "\012"; 423 $attr .= sprintf "DataLength=%x\012", length $data;
378 $data = "Data\012$data"; 424 $data = "Data\012$data";
379 } else { 425 } else {
380 $data = "EndMessage\012"; 426 $data = "EndMessage\012";
381 } 427 }
382 428
383 my $fh = new IO::Socket::INET 429 socket my $fh, PF_INET, SOCK_STREAM, 0
384 PeerHost => $self->{fcp}{host}, 430 or Carp::croak "unable to create new tcp socket: $!";
385 PeerPort => $self->{fcp}{port}
386 or Carp::croak "FCP::txn: unable to connect to $self->{fcp}{host}:$self->{fcp}{port}: $!\n";
387
388 binmode $fh, ":raw"; 431 binmode $fh, ":raw";
432 fcntl $fh, F_SETFL, O_NONBLOCK;
433 connect $fh, (sockaddr_in $self->{fcp}{port}, inet_aton $self->{fcp}{host})
434 and !$!{EWOULDBLOCK}
435 and !$!{EINPROGRESS}
436 and Carp::croak "FCP::txn: unable to connect to $self->{fcp}{host}:$self->{fcp}{port}: $!\n";
389 437
390 if (0) { 438 $self->{sbuf} =
391 print 439 "\x00\x00\x00\x02"
392 Net::FCP::touc $self->{type}, "\012",
393 $attr,
394 $data, "\012";
395 }
396
397 print $fh
398 "\x00\x00", "\x00\x02", # SESSID, PRESID
399 Net::FCP::touc $self->{type}, "\012", 440 . (Net::FCP::touc $self->{type})
400 $attr, 441 . "\012$attr$data";
401 $data;
402 442
403 #$fh->shutdown (1); # freenet buggy?, well, it's java... 443 #shutdown $fh, 1; # freenet buggy?, well, it's java...
404 444
405 $self->{fh} = $fh; 445 $self->{fh} = $fh;
406 446
407 $Net::FCP::regcb->($self); 447 $self->{w} = $EVENT->new_from_fh ($fh)->cb(sub { $self->fh_ready_w })->poll(0, 1, 1);
408 448
409 $self; 449 $self;
410} 450}
411 451
452=item $txn = $txn->cb ($coderef)
453
454Sets a callback to be called when the request is finished. The coderef
455will be called with the txn as it's sole argument, so it has to call
456C<result> itself.
457
458Returns the txn object, useful for chaining.
459
460Example:
461
462 $fcp->txn_client_get ("freenet:CHK....")
463 ->userdata ("ehrm")
464 ->cb(sub {
465 my $data = shift->result;
466 });
467
468=cut
469
470sub cb($$) {
471 my ($self, $cb) = @_;
472 $self->{cb} = $cb;
473 $self;
474}
475
476=item $txn = $txn->userdata ([$userdata])
477
478Set user-specific data. This is useful in progress callbacks. The data can be accessed
479using C<< $txn->{userdata} >>.
480
481Returns the txn object, useful for chaining.
482
483=cut
484
485sub userdata($$) {
486 my ($self, $data) = @_;
487 $self->{userdata} = $data;
488 $self;
489}
490
491=item $txn->cancel (%attr)
492
493Cancels the operation with a C<cancel> exception anf the given attributes
494(consider at least giving the attribute C<reason>).
495
496UNTESTED.
497
498=cut
499
500sub cancel {
501 my ($self, %attr) = @_;
502 $self->throw (Net::FCP::Exception->new (cancel => { %attr }));
503 $self->set_result;
504 $self->eof;
505}
506
412sub fh_ready { 507sub fh_ready_w {
508 my ($self) = @_;
509
510 my $len = syswrite $self->{fh}, $self->{sbuf};
511
512 if ($len > 0) {
513 substr $self->{sbuf}, 0, $len, "";
514 unless (length $self->{sbuf}) {
515 fcntl $self->{fh}, F_SETFL, 0;
516 $self->{w}->cb(sub { $self->fh_ready_r })->poll (1, 0, 1);
517 }
518 } elsif (defined $len) {
519 $self->throw (Net::FCP::Exception->new (network_error => { reason => "unexpected end of file while writing" }));
520 } else {
521 $self->throw (Net::FCP::Exception->new (network_error => { reason => "$!" }));
522 }
523}
524
525sub fh_ready_r {
413 my ($self) = @_; 526 my ($self) = @_;
414 527
415 if (sysread $self->{fh}, $self->{buf}, 65536, length $self->{buf}) { 528 if (sysread $self->{fh}, $self->{buf}, 65536, length $self->{buf}) {
416 for (;;) { 529 for (;;) {
417 if ($self->{datalen}) { 530 if ($self->{datalen}) {
531 #warn "expecting new datachunk $self->{datalen}, got ".(length $self->{buf})."\n";#d#
418 if (length $self->{buf} >= $self->{datalen}) { 532 if (length $self->{buf} >= $self->{datalen}) {
419 $self->rcv_data (substr $self->{buf}, 0, $self->{datalen}, ""); 533 $self->rcv_data (substr $self->{buf}, 0, delete $self->{datalen}, "");
420 } else { 534 } else {
421 last; 535 last;
422 } 536 }
423 } elsif ($self->{buf} =~ s/^DataChunk\015?\012Length=([0-9a-fA-F]+)\015?\012Data\015?\012//) { 537 } elsif ($self->{buf} =~ s/^DataChunk\015?\012Length=([0-9a-fA-F]+)\015?\012Data\015?\012//) {
424 $self->{datalen} = hex $1; 538 $self->{datalen} = hex $1;
539 #warn "expecting new datachunk $self->{datalen}\n";#d#
425 } elsif ($self->{buf} =~ s/^([a-zA-Z]+)\015?\012(?:(.+?)\015?\012)?EndMessage\015?\012//s) { 540 } elsif ($self->{buf} =~ s/^([a-zA-Z]+)\015?\012(?:(.+?)\015?\012)?EndMessage\015?\012//s) {
426 $self->rcv ($1, { 541 $self->rcv ($1, {
427 map { my ($a, $b) = split /=/, $_, 2; ((Net::FCP::tolc $a), $b) } 542 map { my ($a, $b) = split /=/, $_, 2; ((Net::FCP::tolc $a), $b) }
428 split /\015?\012/, $2 543 split /\015?\012/, $2
429 }); 544 });
430 } else { 545 } else {
431 last; 546 last;
432 } 547 }
433 } 548 }
434 } else { 549 } else {
435 $Net::FCP::unregcb->($self);
436 delete $self->{fh};
437 $self->eof; 550 $self->eof;
438 } 551 }
439}
440
441sub rcv_data {
442 my ($self, $chunk) = @_;
443
444 $self->{data} .= $chunk;
445} 552}
446 553
447sub rcv { 554sub rcv {
448 my ($self, $type, $attr) = @_; 555 my ($self, $type, $attr) = @_;
449 556
456 } else { 563 } else {
457 warn "received unexpected reply type '$type' for '$self->{type}', ignoring\n"; 564 warn "received unexpected reply type '$type' for '$self->{type}', ignoring\n";
458 } 565 }
459} 566}
460 567
568# used as a default exception thrower
569sub rcv_throw_exception {
570 my ($self, $attr, $type) = @_;
571 $self->throw (Net::FCP::Exception->new ($type, $attr));
572}
573
574*rcv_failed = \&Net::FCP::Txn::rcv_throw_exception;
575*rcv_format_error = \&Net::FCP::Txn::rcv_throw_exception;
576
577sub throw {
578 my ($self, $exc) = @_;
579
580 $self->{exception} = $exc;
581 $self->set_result;
582 $self->eof; # must be last to avoid loops
583}
584
461sub set_result { 585sub set_result {
462 my ($self, $result) = @_; 586 my ($self, $result) = @_;
463 587
464 $self->{result} = $result unless exists $self->{result}; 588 unless (exists $self->{result}) {
589 $self->{result} = $result;
590 $self->{cb}->($self) if exists $self->{cb};
591 $self->{signal}->send;
592 }
465} 593}
466 594
467sub eof { 595sub eof {
468 my ($self) = @_; 596 my ($self) = @_;
469 $self->set_result; 597
598 delete $self->{w};
599 delete $self->{fh};
600
601 delete $self->{fcp}{txn}{$self};
602
603 unless (exists $self->{result}) {
604 $self->throw (Net::FCP::Exception->new (short_data => {
605 reason => "unexpected eof or internal node error",
606 }));
607 }
608}
609
610sub progress {
611 my ($self, $type, $attr) = @_;
612
613 $self->{fcp}->progress ($self, $type, $attr);
470} 614}
471 615
472=item $result = $txn->result 616=item $result = $txn->result
473 617
474Waits until a result is available and then returns it. 618Waits until a result is available and then returns it.
475 619
476This waiting is (depending on your event model) not very efficient, as it 620This waiting is (depending on your event model) not very efficient, as it
477is done outside the "mainloop". 621is done outside the "mainloop". The biggest problem, however, is that it's
622blocking one thread of execution. Try to use the callback mechanism, if
623possible, and call result from within the callback (or after is has been
624run), as then no waiting is necessary.
478 625
479=cut 626=cut
480 627
481sub result { 628sub result {
482 my ($self) = @_; 629 my ($self) = @_;
483 630
484 $Net::FCP::waitcb->() while !exists $self->{result}; 631 $self->{signal}->wait while !exists $self->{result};
632
633 die $self->{exception} if $self->{exception};
485 634
486 return $self->{result}; 635 return $self->{result};
487}
488
489sub DESTROY {
490 $Net::FCP::unregcb->($_[0]);
491} 636}
492 637
493package Net::FCP::Txn::ClientHello; 638package Net::FCP::Txn::ClientHello;
494 639
495use base Net::FCP::Txn; 640use base Net::FCP::Txn;
515use base Net::FCP::Txn; 660use base Net::FCP::Txn;
516 661
517sub rcv_success { 662sub rcv_success {
518 my ($self, $attr) = @_; 663 my ($self, $attr) = @_;
519 664
520 $self->set_result ($attr); 665 $self->set_result ($attr->{uri});
521} 666}
522 667
523package Net::FCP::Txn::GenerateSVKPair; 668package Net::FCP::Txn::GenerateSVKPair;
524 669
525use base Net::FCP::Txn; 670use base Net::FCP::Txn;
526 671
527sub rcv_success { 672sub rcv_success {
528 my ($self, $attr) = @_; 673 my ($self, $attr) = @_;
529
530 $self->set_result ([$attr->{PublicKey}, $attr->{PrivateKey}]); 674 $self->set_result ([$attr->{public_key}, $attr->{private_key}, $attr->{crypto_key}]);
531} 675}
532 676
533package Net::FCP::Txn::InvertPrivateKey; 677package Net::FCP::Txn::InvertPrivateKey;
534 678
535use base Net::FCP::Txn; 679use base Net::FCP::Txn;
536 680
537sub rcv_success { 681sub rcv_success {
538 my ($self, $attr) = @_; 682 my ($self, $attr) = @_;
539
540 $self->set_result ($attr->{PublicKey}); 683 $self->set_result ($attr->{public_key});
541} 684}
542 685
543package Net::FCP::Txn::GetSize; 686package Net::FCP::Txn::GetSize;
544 687
545use base Net::FCP::Txn; 688use base Net::FCP::Txn;
546 689
547sub rcv_success { 690sub rcv_success {
548 my ($self, $attr) = @_; 691 my ($self, $attr) = @_;
549
550 $self->set_result ($attr->{Length}); 692 $self->set_result (hex $attr->{length});
693}
694
695package Net::FCP::Txn::GetPut;
696
697# base class for get and put
698
699use base Net::FCP::Txn;
700
701*rcv_uri_error = \&Net::FCP::Txn::rcv_throw_exception;
702*rcv_route_not_found = \&Net::FCP::Txn::rcv_throw_exception;
703
704sub rcv_restarted {
705 my ($self, $attr, $type) = @_;
706
707 delete $self->{datalength};
708 delete $self->{metalength};
709 delete $self->{data};
710
711 $self->progress ($type, $attr);
551} 712}
552 713
553package Net::FCP::Txn::ClientGet; 714package Net::FCP::Txn::ClientGet;
554 715
555use base Net::FCP::Txn; 716use base Net::FCP::Txn::GetPut;
717
718*rcv_data_not_found = \&Net::FCP::Txn::rcv_throw_exception;
719
720sub rcv_data {
721 my ($self, $chunk) = @_;
722
723 $self->{data} .= $chunk;
724
725 $self->progress ("data", { chunk => length $chunk, received => length $self->{data}, total => $self->{datalength} });
726
727 if ($self->{datalength} == length $self->{data}) {
728 my $data = delete $self->{data};
729 my $meta = new Net::FCP::Metadata (substr $data, 0, $self->{metalength}, "");
730
731 $self->set_result ([$meta, $data]);
732 $self->eof;
733 }
734}
556 735
557sub rcv_data_found { 736sub rcv_data_found {
558 my ($self, $attr) = @_; 737 my ($self, $attr, $type) = @_;
738
739 $self->progress ($type, $attr);
559 740
560 $self->{datalength} = hex $attr->{data_length}; 741 $self->{datalength} = hex $attr->{data_length};
561 $self->{metalength} = hex $attr->{metadata_length}; 742 $self->{metalength} = hex $attr->{metadata_length};
562} 743}
563 744
564sub rcv_restarted { 745package Net::FCP::Txn::ClientPut;
565 # nop, maybe feedback
566}
567 746
747use base Net::FCP::Txn::GetPut;
748
749*rcv_size_error = \&Net::FCP::Txn::rcv_throw_exception;
750
751sub rcv_pending {
752 my ($self, $attr, $type) = @_;
753 $self->progress ($type, $attr);
754}
755
756sub rcv_success {
757 my ($self, $attr, $type) = @_;
758 $self->set_result ($attr);
759}
760
761sub rcv_key_collision {
762 my ($self, $attr, $type) = @_;
763 $self->set_result ({ key_collision => 1, %$attr });
764}
765
766=back
767
768=head2 The Net::FCP::Exception CLASS
769
770Any unexpected (non-standard) responses that make it impossible to return
771the advertised result will result in an exception being thrown when the
772C<result> method is called.
773
774These exceptions are represented by objects of this class.
775
776=over 4
777
778=cut
779
780package Net::FCP::Exception;
781
782use overload
783 '""' => sub {
784 "Net::FCP::Exception<<$_[0][0]," . (join ":", %{$_[0][1]}) . ">>";
785 };
786
787=item $exc = new Net::FCP::Exception $type, \%attr
788
789Create a new exception object of the given type (a string like
790C<route_not_found>), and a hashref containing additional attributes
791(usually the attributes of the message causing the exception).
792
793=cut
794
568sub eof { 795sub new {
796 my ($class, $type, $attr) = @_;
797
798 bless [Net::FCP::tolc $type, { %$attr }], $class;
799}
800
801=item $exc->type([$type])
802
803With no arguments, returns the exception type. Otherwise a boolean
804indicating wether the exception is of the given type is returned.
805
806=cut
807
808sub type {
569 my ($self) = @_; 809 my ($self, $type) = @_;
570 810
571 my $data = delete $self->{data}; 811 @_ >= 2
572 my $meta = Net::FCP::parse_metadata substr $data, 0, $self->{metalength}, ""; 812 ? $self->[0] eq $type
813 : $self->[0];
814}
573 815
574 $self->set_result ([$meta, $data]); 816=item $exc->attr([$attr])
817
818With no arguments, returns the attributes. Otherwise the named attribute
819value is returned.
820
821=cut
822
823sub attr {
824 my ($self, $attr) = @_;
825
826 @_ >= 2
827 ? $self->[1]{$attr}
828 : $self->[1];
575} 829}
576 830
577=back 831=back
578 832
579=head1 SEE ALSO 833=head1 SEE ALSO
587 Marc Lehmann <pcg@goof.com> 841 Marc Lehmann <pcg@goof.com>
588 http://www.goof.com/pcg/marc/ 842 http://www.goof.com/pcg/marc/
589 843
590=cut 844=cut
591 845
846package Net::FCP::Event::Auto;
847
848my @models = (
849 [Coro => Coro::Event::],
850 [Event => Event::],
851 [Glib => Glib::],
852 [Tk => Tk::],
853);
854
855sub AUTOLOAD {
856 $AUTOLOAD =~ s/.*://;
857
858 for (@models) {
859 my ($model, $package) = @$_;
860 if (defined ${"$package\::VERSION"}) {
861 $EVENT = "Net::FCP::Event::$model";
862 eval "require $EVENT"; die if $@;
863 goto &{"$EVENT\::$AUTOLOAD"};
864 }
865 }
866
867 for (@models) {
868 my ($model, $package) = @$_;
869 $EVENT = "Net::FCP::Event::$model";
870 if (eval "require $EVENT") {
871 goto &{"$EVENT\::$AUTOLOAD"};
872 }
873 }
874
875 die "No event module selected for Net::FCP and autodetect failed. Install any of these: Coro, Event, Glib or Tk.";
876}
877
5921; 8781;
593 879

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines