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.284 by root, Sun Jun 24 04:15:42 2007 UTC vs.
Revision 1.290 by root, Mon Jul 2 03:15:30 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
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1037}
1031 1038
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1040
1034Register a callback fro execution when the client sends an extcmd packet. 1041Register a callback for execution when the client sends an (synchronous)
1042extcmd packet. Ext commands will be processed in the order they are
1043received by the server, like other user commands. The first argument is
1044the logged-in player. Ext commands can only be processed after a player
1045has logged in successfully.
1035 1046
1036If the callback returns something, it is sent back as if reply was being 1047If the callback returns something, it is sent back as if reply was being
1037called. 1048called.
1038 1049
1050=item cf::register_exticmd $name => \&callback($ns,$packet);
1051
1052Register a callback for execution when the client sends an (asynchronous)
1053exticmd packet. Exti commands are processed by the server as soon as they
1054are received, i.e. out of order w.r.t. other commands. The first argument
1055is a client socket. Exti commands can be received anytime, even before
1056log-in.
1057
1058If the callback returns something, it is sent back as if reply was being
1059called.
1060
1039=cut 1061=cut
1040 1062
1041sub register_extcmd { 1063sub register_extcmd {
1042 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
1043 1065
1044 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
1045} 1073}
1046 1074
1047cf::player->attach ( 1075cf::player->attach (
1048 on_command => sub { 1076 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1086 cf::override;
1059 }, 1087 },
1060 on_extcmd => sub { 1088 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1089 my ($pl, $buf) = @_;
1062 1090
1063 my $msg = eval { from_json $buf }; 1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1092
1065 if (ref $msg) { 1093 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1095 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1096 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1390 1418
1391sub ext_reply($$%) { 1419sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1393 1421
1394 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1395 1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1424}
1398 1425
1399=item $player->ext_event ($type, %msg) 1426=item $player->ext_event ($type, %msg)
1400 1427
1401Sends an ext event to the client. 1428Sends an ext event to the client.
… …
2364 my ($self, $color, $type, $msg, @extra) = @_; 2391 my ($self, $color, $type, $msg, @extra) = @_;
2365 2392
2366 $msg = $self->pl->expand_cfpod ($msg); 2393 $msg = $self->pl->expand_cfpod ($msg);
2367 2394
2368 if ($self->can_msg) { 2395 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2370 } else { 2397 } else {
2371 # replace some tags by gcfclient-compatible ones 2398 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2399 for ($msg) {
2373 1 while 2400 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2406 }
2380 2407
2381 if ($color >= 0) { 2408 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) { 2409 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2410 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2411 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2413 $self->send_packet ("drawinfo $color $msg")
2387 } 2414 }
2388 } 2415 }
2389 } 2416 }
2390} 2417}
2391 2418
2392=item $client->ext_event ($type, %msg) 2419=item $client->ext_event ($type, %msg)
2393 2420
2394Sends an exti event to the client. 2421Sends an ext event to the client.
2395 2422
2396=cut 2423=cut
2397 2424
2398sub cf::client::ext_event($$%) { 2425sub cf::client::ext_event($$%) {
2399 my ($self, $type, %msg) = @_; 2426 my ($self, $type, %msg) = @_;
2400 2427
2401 $msg{msgtype} = "event_$type"; 2428 $msg{msgtype} = "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2403} 2430}
2404 2431
2405=item $success = $client->query ($flags, "text", \&cb) 2432=item $success = $client->query ($flags, "text", \&cb)
2406 2433
2407Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2435the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2436C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2437
2411Queries can fail, so check the return code. Or don't, as queries will become 2438Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2439become reliable at some point in the future.
2413 2440
2414=cut 2441=cut
2415 2442
2416sub cf::client::query { 2443sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2452 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2454
2428 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2430} 2459}
2431 2460
2432cf::client->attach ( 2461cf::client->attach (
2462 on_connect => sub {
2463 my ($ns) = @_;
2464
2465 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2466 },
2433 on_reply => sub { 2467 on_reply => sub {
2434 my ($ns, $msg) = @_; 2468 my ($ns, $msg) = @_;
2435 2469
2436 # this weird shuffling is so that direct followup queries 2470 # this weird shuffling is so that direct followup queries
2437 # get handled first 2471 # get handled first
… …
2448 $ns->send_packet ($ns->{query_queue}[0][0]); 2482 $ns->send_packet ($ns->{query_queue}[0][0]);
2449 } else { 2483 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2484 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2485 }
2452 } 2486 }
2487 },
2488 on_exticmd => sub {
2489 my ($ns, $buf) = @_;
2490
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492
2493 if (ref $msg) {
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2495 if (my %reply = $cb->($ns, $msg)) {
2496 $reply{msgid} = $msg->{msgid};
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2498 }
2499 }
2500 } else {
2501 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2502 }
2503
2504 cf::override;
2453 }, 2505 },
2454); 2506);
2455 2507
2456=item $client->async (\&cb) 2508=item $client->async (\&cb)
2457 2509
… …
2661 load_facedata "$DATADIR/facedata" 2713 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 2714 or die "unable to load facedata\n";
2663} 2715}
2664 2716
2665sub reload_archetypes { 2717sub reload_archetypes {
2718 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n";
2720 #d# NEED to laod twice to resolve forward references
2721 # this really needs to be done in an extra post-pass
2722 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 2723 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 2724 or die "unable to load archetypes\n";
2668} 2725}
2669 2726
2670sub reload_treasures { 2727sub reload_treasures {
… …
2864 %EXT_CORO = (); 2921 %EXT_CORO = ();
2865 2922
2866 warn "removing commands"; 2923 warn "removing commands";
2867 %COMMAND = (); 2924 %COMMAND = ();
2868 2925
2869 warn "removing ext commands"; 2926 warn "removing ext/exti commands";
2870 %EXTCMD = (); 2927 %EXTCMD = ();
2928 %EXTICMD = ();
2871 2929
2872 warn "unloading/nuking all extensions"; 2930 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 2931 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 2932 warn "... unloading $pkg";
2875 2933

Diff Legend

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