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.283 by root, Sun Jun 24 04:09:29 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);
… …
1372 # replace G<male|female> tags 1418 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1419 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1420 $self->gender ? $2 : $1
1375 }ge 1421 }ge
1376 # replace H<hint text> 1422 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 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;
1378 1430
1379 # create single paragraphs (very hackish) 1431 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1432 s/(?<=\S)\n(?=\w)/ /g;
1381 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
1382 $_ 1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1383} 1446}
1384 1447
1385=item $player->ext_reply ($msgid, %msg) 1448=item $player->ext_reply ($msgid, %msg)
1386 1449
1387Sends an ext reply to the player. 1450Sends an ext reply to the player.
… …
1390 1453
1391sub ext_reply($$%) { 1454sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1455 my ($self, $id, %msg) = @_;
1393 1456
1394 $msg{msgid} = $id; 1457 $msg{msgid} = $id;
1395 1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1459}
1398 1460
1399=item $player->ext_event ($type, %msg) 1461=item $player->ext_event ($type, %msg)
1400 1462
1401Sends an ext event to the client. 1463Sends an ext event to the client.
… …
2313 my $hp = $exit->stats->hp; 2375 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2376 my $sp = $exit->stats->sp;
2315 2377
2316 $self->enter_link; 2378 $self->enter_link;
2317 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
2318 (async { 2384 (async {
2319 $self->deactivate_recursive; # just to be sure 2385 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2386 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2387 $self->goto ($slaying, $hp, $sp);
2322 2388
… …
2363sub cf::client::send_msg { 2429sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2430 my ($self, $color, $type, $msg, @extra) = @_;
2365 2431
2366 $msg = $self->pl->expand_cfpod ($msg); 2432 $msg = $self->pl->expand_cfpod ($msg);
2367 2433
2434 return unless @extra || length $msg;
2435
2368 if ($self->can_msg) { 2436 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2370 } else { 2438 } else {
2371 # replace some tags by gcfclient-compatible ones 2439 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2440 for ($msg) {
2373 1 while 2441 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2447 }
2380 2448
2381 if ($color >= 0) { 2449 if ($color >= 0) {
2382 if ($msg =~ /\[/) { 2450 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2451 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2452 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2454 $self->send_packet ("drawinfo $color $msg")
2386 } 2455 }
2387 } 2456 }
2388 } 2457 }
2389} 2458}
2390 2459
2391=item $client->ext_event ($type, %msg) 2460=item $client->ext_event ($type, %msg)
2392 2461
2393Sends an exti event to the client. 2462Sends an ext event to the client.
2394 2463
2395=cut 2464=cut
2396 2465
2397sub cf::client::ext_event($$%) { 2466sub cf::client::ext_event($$%) {
2398 my ($self, $type, %msg) = @_; 2467 my ($self, $type, %msg) = @_;
2399 2468
2400 $msg{msgtype} = "event_$type"; 2469 $msg{msgtype} = "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2402} 2471}
2403 2472
2404=item $success = $client->query ($flags, "text", \&cb) 2473=item $success = $client->query ($flags, "text", \&cb)
2405 2474
2406Queues a query to the client, calling the given callback with 2475Queues a query to the client, calling the given callback with
2407the 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>,
2408C<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>.
2409 2478
2410Queries 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
2411reliable at some point in the future. 2480become reliable at some point in the future.
2412 2481
2413=cut 2482=cut
2414 2483
2415sub cf::client::query { 2484sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2485 my ($self, $flags, $text, $cb) = @_;
… …
2424 utf8::encode $text; 2493 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2494 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2495
2427 $self->send_packet ($self->{query_queue}[0][0]) 2496 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2497 if @{ $self->{query_queue} } == 1;
2498
2499 1
2429} 2500}
2430 2501
2431cf::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 },
2432 on_reply => sub { 2508 on_reply => sub {
2433 my ($ns, $msg) = @_; 2509 my ($ns, $msg) = @_;
2434 2510
2435 # this weird shuffling is so that direct followup queries 2511 # this weird shuffling is so that direct followup queries
2436 # get handled first 2512 # get handled first
… …
2448 } else { 2524 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2525 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2526 }
2451 } 2527 }
2452 }, 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 },
2453); 2547);
2454 2548
2455=item $client->async (\&cb) 2549=item $client->async (\&cb)
2456 2550
2457Create a new coroutine, running the specified callback. The coroutine will 2551Create a new coroutine, running the specified callback. The coroutine will
… …
2506 2600
2507=pod 2601=pod
2508 2602
2509The following functions and methods are available within a safe environment: 2603The following functions and methods are available within a safe environment:
2510 2604
2511 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
2512 cf::object::player player 2609 cf::object::player
2513 cf::player peaceful 2610 player
2514 cf::map trigger 2611
2612 cf::player
2613 peaceful
2614
2615 cf::map
2616 trigger
2515 2617
2516=cut 2618=cut
2517 2619
2518for ( 2620for (
2519 ["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)],
2520 ["cf::object::player" => qw(player)], 2623 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 2624 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 2625 ["cf::map" => qw(trigger)],
2523) { 2626) {
2524 no strict 'refs'; 2627 no strict 'refs';
… …
2660 load_facedata "$DATADIR/facedata" 2763 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 2764 or die "unable to load facedata\n";
2662} 2765}
2663 2766
2664sub 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)
2665 load_resource_file "$DATADIR/archetypes" 2773 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 2774 or die "unable to load archetypes\n";
2667} 2775}
2668 2776
2669sub reload_treasures { 2777sub reload_treasures {
… …
2863 %EXT_CORO = (); 2971 %EXT_CORO = ();
2864 2972
2865 warn "removing commands"; 2973 warn "removing commands";
2866 %COMMAND = (); 2974 %COMMAND = ();
2867 2975
2868 warn "removing ext commands"; 2976 warn "removing ext/exti commands";
2869 %EXTCMD = (); 2977 %EXTCMD = ();
2978 %EXTICMD = ();
2870 2979
2871 warn "unloading/nuking all extensions"; 2980 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 2981 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 2982 warn "... unloading $pkg";
2874 2983

Diff Legend

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