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.298 by root, Sun Jul 8 14:50:07 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
… …
414 421
415 if (my $pid = fork) { 422 if (my $pid = fork) {
416 close $fh2; 423 close $fh2;
417 424
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 427 $res = Coro::Storable::thaw $res;
420 428
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 430
423 die $$res unless "ARRAY" eq ref $res; 431 Carp::confess $$res unless "ARRAY" eq ref $res;
424 432
425 return wantarray ? @$res : $res->[-1]; 433 return wantarray ? @$res : $res->[-1];
426 } else { 434 } else {
427 reset_signals; 435 reset_signals;
428 local $SIG{__WARN__}; 436 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 437 local $SIG{__DIE__};
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
430 eval { 440 eval {
431 close $fh1; 441 close $fh1;
432 442
433 my @res = eval { $cb->(@args) }; 443 my @res = eval { $cb->(@args) };
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
435 }; 455 };
436 456
437 warn $@ if $@; 457 warn $@ if $@;
438 _exit 0; 458 _exit 0;
439 } 459 }
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1049 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1050}
1031 1051
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1052=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1053
1034Register a callback fro execution when the client sends an extcmd packet. 1054Register a callback for execution when the client sends an (synchronous)
1055extcmd packet. Ext commands will be processed in the order they are
1056received by the server, like other user commands. The first argument is
1057the logged-in player. Ext commands can only be processed after a player
1058has logged in successfully.
1035 1059
1036If the callback returns something, it is sent back as if reply was being 1060If the callback returns something, it is sent back as if reply was being
1037called. 1061called.
1038 1062
1063=item cf::register_exticmd $name => \&callback($ns,$packet);
1064
1065Register a callback for execution when the client sends an (asynchronous)
1066exticmd packet. Exti commands are processed by the server as soon as they
1067are received, i.e. out of order w.r.t. other commands. The first argument
1068is a client socket. Exti commands can be received anytime, even before
1069log-in.
1070
1071If the callback returns something, it is sent back as if reply was being
1072called.
1073
1039=cut 1074=cut
1040 1075
1041sub register_extcmd { 1076sub register_extcmd {
1042 my ($name, $cb) = @_; 1077 my ($name, $cb) = @_;
1043 1078
1044 $EXTCMD{$name} = $cb; 1079 $EXTCMD{$name} = $cb;
1080}
1081
1082sub register_exticmd {
1083 my ($name, $cb) = @_;
1084
1085 $EXTICMD{$name} = $cb;
1045} 1086}
1046 1087
1047cf::player->attach ( 1088cf::player->attach (
1048 on_command => sub { 1089 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1090 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1099 cf::override;
1059 }, 1100 },
1060 on_extcmd => sub { 1101 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1102 my ($pl, $buf) = @_;
1062 1103
1063 my $msg = eval { from_json $buf }; 1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1105
1065 if (ref $msg) { 1106 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1108 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1109 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1372 # replace G<male|female> tags 1413 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1414 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1415 $self->gender ? $2 : $1
1375 }ge 1416 }ge
1376 # replace H<hint text> 1417 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1418 || s{H<([^\>]*)>}
1419 {
1420 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1421 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1422 "")
1423 [$self->{hintmode}]
1424 }ge;
1378 1425
1379 # create single paragraphs (very hackish) 1426 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1427 s/(?<=\S)\n(?=\w)/ /g;
1381 1428
1429 # compress some whitespace
1430 s/\s+\n/\n/g; # ws line-ends
1431 s/\n\n+/\n/g; # double lines
1432 s/^\n+//; # beginning lines
1433 s/\n+$//; # ending lines
1434
1382 $_ 1435 $_
1436}
1437
1438sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode}
1383} 1441}
1384 1442
1385=item $player->ext_reply ($msgid, %msg) 1443=item $player->ext_reply ($msgid, %msg)
1386 1444
1387Sends an ext reply to the player. 1445Sends an ext reply to the player.
… …
1390 1448
1391sub ext_reply($$%) { 1449sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1450 my ($self, $id, %msg) = @_;
1393 1451
1394 $msg{msgid} = $id; 1452 $msg{msgid} = $id;
1395 1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1454}
1398 1455
1399=item $player->ext_event ($type, %msg) 1456=item $player->ext_event ($type, %msg)
1400 1457
1401Sends an ext event to the client. 1458Sends an ext event to the client.
… …
2313 my $hp = $exit->stats->hp; 2370 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2371 my $sp = $exit->stats->sp;
2315 2372
2316 $self->enter_link; 2373 $self->enter_link;
2317 2374
2375 # if exit is damned, update players death & WoR home-position
2376 $self->contr->savebed ($slaying, $hp, $sp)
2377 if $exit->flag (FLAG_DAMNED);
2378
2318 (async { 2379 (async {
2319 $self->deactivate_recursive; # just to be sure 2380 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2381 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2382 $self->goto ($slaying, $hp, $sp);
2322 2383
… …
2363sub cf::client::send_msg { 2424sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2425 my ($self, $color, $type, $msg, @extra) = @_;
2365 2426
2366 $msg = $self->pl->expand_cfpod ($msg); 2427 $msg = $self->pl->expand_cfpod ($msg);
2367 2428
2429 return unless @extra || length $msg;
2430
2368 if ($self->can_msg) { 2431 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2370 } else { 2433 } else {
2371 # replace some tags by gcfclient-compatible ones 2434 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2435 for ($msg) {
2373 1 while 2436 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2442 }
2380 2443
2381 if ($color >= 0) { 2444 if ($color >= 0) {
2382 if ($msg =~ /\[/) { 2445 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2446 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2447 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2449 $self->send_packet ("drawinfo $color $msg")
2386 } 2450 }
2387 } 2451 }
2388 } 2452 }
2389} 2453}
2390 2454
2391=item $client->ext_event ($type, %msg) 2455=item $client->ext_event ($type, %msg)
2392 2456
2393Sends an exti event to the client. 2457Sends an ext event to the client.
2394 2458
2395=cut 2459=cut
2396 2460
2397sub cf::client::ext_event($$%) { 2461sub cf::client::ext_event($$%) {
2398 my ($self, $type, %msg) = @_; 2462 my ($self, $type, %msg) = @_;
2399 2463
2400 $msg{msgtype} = "event_$type"; 2464 $msg{msgtype} = "event_$type";
2401 $self->send_packet ("ext " . cf::to_json \%msg); 2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2402} 2466}
2403 2467
2404=item $success = $client->query ($flags, "text", \&cb) 2468=item $success = $client->query ($flags, "text", \&cb)
2405 2469
2406Queues a query to the client, calling the given callback with 2470Queues a query to the client, calling the given callback with
2407the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2471the 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>. 2472C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2409 2473
2410Queries can fail, so check the return code. Or don't, as queries will become 2474Queries can fail, so check the return code. Or don't, as queries will
2411reliable at some point in the future. 2475become reliable at some point in the future.
2412 2476
2413=cut 2477=cut
2414 2478
2415sub cf::client::query { 2479sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2480 my ($self, $flags, $text, $cb) = @_;
… …
2424 utf8::encode $text; 2488 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2489 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2490
2427 $self->send_packet ($self->{query_queue}[0][0]) 2491 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2492 if @{ $self->{query_queue} } == 1;
2493
2494 1
2429} 2495}
2430 2496
2431cf::client->attach ( 2497cf::client->attach (
2498 on_connect => sub {
2499 my ($ns) = @_;
2500
2501 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2502 },
2432 on_reply => sub { 2503 on_reply => sub {
2433 my ($ns, $msg) = @_; 2504 my ($ns, $msg) = @_;
2434 2505
2435 # this weird shuffling is so that direct followup queries 2506 # this weird shuffling is so that direct followup queries
2436 # get handled first 2507 # get handled first
… …
2448 } else { 2519 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2520 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2521 }
2451 } 2522 }
2452 }, 2523 },
2524 on_exticmd => sub {
2525 my ($ns, $buf) = @_;
2526
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528
2529 if (ref $msg) {
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2531 if (my %reply = $cb->($ns, $msg)) {
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 }
2536 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 }
2539
2540 cf::override;
2541 },
2453); 2542);
2454 2543
2455=item $client->async (\&cb) 2544=item $client->async (\&cb)
2456 2545
2457Create a new coroutine, running the specified callback. The coroutine will 2546Create a new coroutine, running the specified callback. The coroutine will
… …
2506 2595
2507=pod 2596=pod
2508 2597
2509The following functions and methods are available within a safe environment: 2598The following functions and methods are available within a safe environment:
2510 2599
2511 cf::object contr pay_amount pay_player map 2600 cf::object
2601 contr pay_amount pay_player map x y force_find force_add
2602 insert remove
2603
2512 cf::object::player player 2604 cf::object::player
2513 cf::player peaceful 2605 player
2514 cf::map trigger 2606
2607 cf::player
2608 peaceful
2609
2610 cf::map
2611 trigger
2515 2612
2516=cut 2613=cut
2517 2614
2518for ( 2615for (
2519 ["cf::object" => qw(contr pay_amount pay_player map)], 2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)],
2520 ["cf::object::player" => qw(player)], 2618 ["cf::object::player" => qw(player)],
2521 ["cf::player" => qw(peaceful)], 2619 ["cf::player" => qw(peaceful)],
2522 ["cf::map" => qw(trigger)], 2620 ["cf::map" => qw(trigger)],
2523) { 2621) {
2524 no strict 'refs'; 2622 no strict 'refs';
… …
2660 load_facedata "$DATADIR/facedata" 2758 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 2759 or die "unable to load facedata\n";
2662} 2760}
2663 2761
2664sub reload_archetypes { 2762sub reload_archetypes {
2763 load_resource_file "$DATADIR/archetypes"
2764 or die "unable to load archetypes\n";
2765 #d# NEED to laod twice to resolve forward references
2766 # this really needs to be done in an extra post-pass
2767 # (which needs to be synchronous, so solve it differently)
2665 load_resource_file "$DATADIR/archetypes" 2768 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 2769 or die "unable to load archetypes\n";
2667} 2770}
2668 2771
2669sub reload_treasures { 2772sub reload_treasures {
… …
2863 %EXT_CORO = (); 2966 %EXT_CORO = ();
2864 2967
2865 warn "removing commands"; 2968 warn "removing commands";
2866 %COMMAND = (); 2969 %COMMAND = ();
2867 2970
2868 warn "removing ext commands"; 2971 warn "removing ext/exti commands";
2869 %EXTCMD = (); 2972 %EXTCMD = ();
2973 %EXTICMD = ();
2870 2974
2871 warn "unloading/nuking all extensions"; 2975 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 2976 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 2977 warn "... unloading $pkg";
2874 2978

Diff Legend

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