ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.301 by root, Tue Jul 10 07:01:51 2007 UTC

… …
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24 24
25use JSON::XS 1.4 ();
25use BDB (); 26use BDB ();
26use Data::Dumper; 27use Data::Dumper;
27use Digest::MD5; 28use Digest::MD5;
28use Fcntl; 29use Fcntl;
29use YAML::Syck (); 30use YAML::Syck ();
… …
49our %COMMAND = (); 50our %COMMAND = ();
50our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
51 52
52our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
56 58
57our $RELOAD; # number of reloads so far 59our $RELOAD; # number of reloads so far
58our @EVENT; 60our @EVENT;
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 239 $d
238 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
239} 241}
240 242
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
244 244
245Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
246 246
247=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
248 248
249Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
250
251=cut
252
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254
255sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) }
250 257
251=item cf::lock_wait $string 258=item cf::lock_wait $string
252 259
253Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
254 261
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 409Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 410never block itself or use any form of Event handling.
404 411
405=cut 412=cut
406 413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
407sub fork_call(&@) { 423sub fork_call(&@) {
408 my ($cb, @args) = @_; 424 my ($cb, @args) = @_;
409 425
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!"; 427# or die "socketpair: $!";
… …
414 430
415 if (my $pid = fork) { 431 if (my $pid = fork) {
416 close $fh2; 432 close $fh2;
417 433
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 436 $res = Coro::Storable::thaw $res;
420 437
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 439
423 die $$res unless "ARRAY" eq ref $res; 440 Carp::confess $$res unless "ARRAY" eq ref $res;
424 441
425 return wantarray ? @$res : $res->[-1]; 442 return wantarray ? @$res : $res->[-1];
426 } else { 443 } else {
427 reset_signals; 444 reset_signals;
428 local $SIG{__WARN__}; 445 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 446 local $SIG{__DIE__};
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452
430 eval { 453 eval {
431 close $fh1; 454 close $fh1;
432 455
433 my @res = eval { $cb->(@args) }; 456 my @res = eval { $cb->(@args) };
457
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
435 }; 460 };
436 461
437 warn $@ if $@; 462 warn $@ if $@;
438 _exit 0; 463 _exit 0;
439 } 464 }
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1054 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1055}
1031 1056
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1057=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1058
1034Register a callback fro execution when the client sends an extcmd packet. 1059Register a callback for execution when the client sends an (synchronous)
1060extcmd packet. Ext commands will be processed in the order they are
1061received by the server, like other user commands. The first argument is
1062the logged-in player. Ext commands can only be processed after a player
1063has logged in successfully.
1035 1064
1036If the callback returns something, it is sent back as if reply was being 1065If the callback returns something, it is sent back as if reply was being
1037called. 1066called.
1038 1067
1068=item cf::register_exticmd $name => \&callback($ns,$packet);
1069
1070Register a callback for execution when the client sends an (asynchronous)
1071exticmd packet. Exti commands are processed by the server as soon as they
1072are received, i.e. out of order w.r.t. other commands. The first argument
1073is a client socket. Exti commands can be received anytime, even before
1074log-in.
1075
1076If the callback returns something, it is sent back as if reply was being
1077called.
1078
1039=cut 1079=cut
1040 1080
1041sub register_extcmd { 1081sub register_extcmd {
1042 my ($name, $cb) = @_; 1082 my ($name, $cb) = @_;
1043 1083
1044 $EXTCMD{$name} = $cb; 1084 $EXTCMD{$name} = $cb;
1085}
1086
1087sub register_exticmd {
1088 my ($name, $cb) = @_;
1089
1090 $EXTICMD{$name} = $cb;
1045} 1091}
1046 1092
1047cf::player->attach ( 1093cf::player->attach (
1048 on_command => sub { 1094 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1095 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1104 cf::override;
1059 }, 1105 },
1060 on_extcmd => sub { 1106 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1107 my ($pl, $buf) = @_;
1062 1108
1063 my $msg = eval { from_json $buf }; 1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1110
1065 if (ref $msg) { 1111 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1113 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1114 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1347 } 1393 }
1348 1394
1349 \@paths 1395 \@paths
1350} 1396}
1351 1397
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1399
1400Expand crossfire pod fragments into protocol xml.
1401
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1446}
1447
1352=item $player->ext_reply ($msgid, %msg) 1448=item $player->ext_reply ($msgid, %msg)
1353 1449
1354Sends an ext reply to the player. 1450Sends an ext reply to the player.
1355 1451
1356=cut 1452=cut
1357 1453
1358sub ext_reply($$%) { 1454sub ext_reply($$%) {
1359 my ($self, $id, %msg) = @_; 1455 my ($self, $id, %msg) = @_;
1360 1456
1361 $msg{msgid} = $id; 1457 $msg{msgid} = $id;
1362 1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1459}
1365 1460
1366=item $player->ext_event ($type, %msg) 1461=item $player->ext_event ($type, %msg)
1367 1462
1368Sends an ext event to the client. 1463Sends an ext event to the client.
… …
2045 2140
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2141 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2142
2048 if ($self->{record_replies}) { 2143 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2144 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2145
2050 } else { 2146 } else {
2147 my $pl = $self->contr;
2148
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply (
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157
2158 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2159 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2160 $self->message ($msg, $flags);
2161 }
2053 } 2162 }
2054} 2163}
2055 2164
2056=item $player_object->may ("access") 2165=item $player_object->may ("access")
2057 2166
… …
2266 my $hp = $exit->stats->hp; 2375 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2376 my $sp = $exit->stats->sp;
2268 2377
2269 $self->enter_link; 2378 $self->enter_link;
2270 2379
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
2383
2271 (async { 2384 (async {
2272 $self->deactivate_recursive; # just to be sure 2385 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2386 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2387 $self->goto ($slaying, $hp, $sp);
2275 2388
… …
2302 2415
2303 utf8::encode $text; 2416 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2418}
2306 2419
2420=item $client->send_msg ($color, $type, $msg, [extra...])
2421
2422Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet.
2426
2427=cut
2428
2429sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_;
2431
2432 $msg = $self->pl->expand_cfpod ($msg);
2433
2434 return unless @extra || length $msg;
2435
2436 if ($self->can_msg) {
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2438 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) {
2450 if (0 && $msg =~ /\[/) {
2451 $self->send_packet ("drawextinfo $color 4 0 $msg")
2452 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg")
2455 }
2456 }
2457 }
2458}
2459
2307=item $client->ext_event ($type, %msg) 2460=item $client->ext_event ($type, %msg)
2308 2461
2309Sends an exti event to the client. 2462Sends an ext event to the client.
2310 2463
2311=cut 2464=cut
2312 2465
2313sub cf::client::ext_event($$%) { 2466sub cf::client::ext_event($$%) {
2314 my ($self, $type, %msg) = @_; 2467 my ($self, $type, %msg) = @_;
2315 2468
2316 $msg{msgtype} = "event_$type"; 2469 $msg{msgtype} = "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2318} 2471}
2319 2472
2320=item $success = $client->query ($flags, "text", \&cb) 2473=item $success = $client->query ($flags, "text", \&cb)
2321 2474
2322Queues a query to the client, calling the given callback with 2475Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2476the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2324C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2477C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2478
2326Queries can fail, so check the return code. Or don't, as queries will become 2479Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2480become reliable at some point in the future.
2328 2481
2329=cut 2482=cut
2330 2483
2331sub cf::client::query { 2484sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2485 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2493 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2494 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2495
2343 $self->send_packet ($self->{query_queue}[0][0]) 2496 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2497 if @{ $self->{query_queue} } == 1;
2498
2499 1
2345} 2500}
2346 2501
2347cf::client->attach ( 2502cf::client->attach (
2503 on_connect => sub {
2504 my ($ns) = @_;
2505
2506 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2507 },
2348 on_reply => sub { 2508 on_reply => sub {
2349 my ($ns, $msg) = @_; 2509 my ($ns, $msg) = @_;
2350 2510
2351 # this weird shuffling is so that direct followup queries 2511 # this weird shuffling is so that direct followup queries
2352 # get handled first 2512 # get handled first
… …
2364 } else { 2524 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2525 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2526 }
2367 } 2527 }
2368 }, 2528 },
2529 on_exticmd => sub {
2530 my ($ns, $buf) = @_;
2531
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533
2534 if (ref $msg) {
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2536 if (my %reply = $cb->($ns, $msg)) {
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 }
2541 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 }
2544
2545 cf::override;
2546 },
2369); 2547);
2370 2548
2371=item $client->async (\&cb) 2549=item $client->async (\&cb)
2372 2550
2373Create a new coroutine, running the specified callback. The coroutine will 2551Create a new coroutine, running the specified callback. The coroutine will
… …
2422 2600
2423=pod 2601=pod
2424 2602
2425The following functions and methods are available within a safe environment: 2603The following functions and methods are available within a safe environment:
2426 2604
2427 cf::object contr pay_amount pay_player map 2605 cf::object
2606 contr pay_amount pay_player map x y force_find force_add
2607 insert remove
2608
2428 cf::object::player player 2609 cf::object::player
2429 cf::player peaceful 2610 player
2430 cf::map trigger 2611
2612 cf::player
2613 peaceful
2614
2615 cf::map
2616 trigger
2431 2617
2432=cut 2618=cut
2433 2619
2434for ( 2620for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)],
2436 ["cf::object::player" => qw(player)], 2623 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 2624 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 2625 ["cf::map" => qw(trigger)],
2439) { 2626) {
2440 no strict 'refs'; 2627 no strict 'refs';
… …
2576 load_facedata "$DATADIR/facedata" 2763 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2764 or die "unable to load facedata\n";
2578} 2765}
2579 2766
2580sub reload_archetypes { 2767sub reload_archetypes {
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770 #d# NEED to laod twice to resolve forward references
2771 # this really needs to be done in an extra post-pass
2772 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 2773 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2774 or die "unable to load archetypes\n";
2583} 2775}
2584 2776
2585sub reload_treasures { 2777sub reload_treasures {
… …
2779 %EXT_CORO = (); 2971 %EXT_CORO = ();
2780 2972
2781 warn "removing commands"; 2973 warn "removing commands";
2782 %COMMAND = (); 2974 %COMMAND = ();
2783 2975
2784 warn "removing ext commands"; 2976 warn "removing ext/exti commands";
2785 %EXTCMD = (); 2977 %EXTCMD = ();
2978 %EXTICMD = ();
2786 2979
2787 warn "unloading/nuking all extensions"; 2980 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 2981 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 2982 warn "... unloading $pkg";
2790 2983

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines