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.289 by root, Sat Jun 30 03:00:54 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->convert_blessed->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) = @_;
… …
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
1396 $self->send ("ext " . cf::to_json \%msg); 1423 $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
… …
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 ($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 {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2385 $self->send_packet ("drawinfo $color $msg") 2413 $self->send_packet ("drawinfo $color $msg")
2386 } 2414 }
2387 } 2415 }
2388 } 2416 }
2389} 2417}
2390 2418
2391=item $client->ext_event ($type, %msg) 2419=item $client->ext_event ($type, %msg)
2392 2420
2393Sends an exti event to the client. 2421Sends an ext event to the client.
2394 2422
2395=cut 2423=cut
2396 2424
2397sub cf::client::ext_event($$%) { 2425sub cf::client::ext_event($$%) {
2398 my ($self, $type, %msg) = @_; 2426 my ($self, $type, %msg) = @_;
… …
2405 2433
2406Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2407the 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>,
2408C<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>.
2409 2437
2410Queries 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
2411reliable at some point in the future. 2439become reliable at some point in the future.
2412 2440
2413=cut 2441=cut
2414 2442
2415sub cf::client::query { 2443sub cf::client::query {
2416 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
… …
2424 utf8::encode $text; 2452 utf8::encode $text;
2425 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2426 2454
2427 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2428 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2429} 2459}
2430 2460
2431cf::client->attach ( 2461cf::client->attach (
2432 on_reply => sub { 2462 on_reply => sub {
2433 my ($ns, $msg) = @_; 2463 my ($ns, $msg) = @_;
… …
2447 $ns->send_packet ($ns->{query_queue}[0][0]); 2477 $ns->send_packet ($ns->{query_queue}[0][0]);
2448 } else { 2478 } else {
2449 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2479 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2450 } 2480 }
2451 } 2481 }
2482 },
2483 on_exticmd => sub {
2484 my ($ns, $buf) = @_;
2485
2486 my $msg = eval { from_json $buf };
2487
2488 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 }
2495 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 }
2498
2499 cf::override;
2452 }, 2500 },
2453); 2501);
2454 2502
2455=item $client->async (\&cb) 2503=item $client->async (\&cb)
2456 2504
… …
2660 load_facedata "$DATADIR/facedata" 2708 load_facedata "$DATADIR/facedata"
2661 or die "unable to load facedata\n"; 2709 or die "unable to load facedata\n";
2662} 2710}
2663 2711
2664sub reload_archetypes { 2712sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n";
2715 #d# NEED to laod twice to resolve forward references
2716 # this really needs to be done in an extra post-pass
2717 # (which needs to be synchronous, so solve it differently)
2665 load_resource_file "$DATADIR/archetypes" 2718 load_resource_file "$DATADIR/archetypes"
2666 or die "unable to load archetypes\n"; 2719 or die "unable to load archetypes\n";
2667} 2720}
2668 2721
2669sub reload_treasures { 2722sub reload_treasures {
… …
2863 %EXT_CORO = (); 2916 %EXT_CORO = ();
2864 2917
2865 warn "removing commands"; 2918 warn "removing commands";
2866 %COMMAND = (); 2919 %COMMAND = ();
2867 2920
2868 warn "removing ext commands"; 2921 warn "removing ext/exti commands";
2869 %EXTCMD = (); 2922 %EXTCMD = ();
2923 %EXTICMD = ();
2870 2924
2871 warn "unloading/nuking all extensions"; 2925 warn "unloading/nuking all extensions";
2872 for my $pkg (@EXTS) { 2926 for my $pkg (@EXTS) {
2873 warn "... unloading $pkg"; 2927 warn "... unloading $pkg";
2874 2928

Diff Legend

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