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.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);
… …
1347 } 1375 }
1348 1376
1349 \@paths 1377 \@paths
1350} 1378}
1351 1379
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1381
1382Expand crossfire pod fragments into protocol xml.
1383
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1352=item $player->ext_reply ($msgid, %msg) 1413=item $player->ext_reply ($msgid, %msg)
1353 1414
1354Sends an ext reply to the player. 1415Sends an ext reply to the player.
1355 1416
1356=cut 1417=cut
1357 1418
1358sub ext_reply($$%) { 1419sub ext_reply($$%) {
1359 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1360 1421
1361 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1362 1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1424}
1365 1425
1366=item $player->ext_event ($type, %msg) 1426=item $player->ext_event ($type, %msg)
1367 1427
1368Sends an ext event to the client. 1428Sends an ext event to the client.
… …
2045 2105
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2106 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2107
2048 if ($self->{record_replies}) { 2108 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2109 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2110
2050 } else { 2111 } else {
2112 my $pl = $self->contr;
2113
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply (
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122
2123 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2124 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2125 $self->message ($msg, $flags);
2126 }
2053 } 2127 }
2054} 2128}
2055 2129
2056=item $player_object->may ("access") 2130=item $player_object->may ("access")
2057 2131
… …
2302 2376
2303 utf8::encode $text; 2377 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2379}
2306 2380
2381=item $client->send_msg ($color, $type, $msg, [extra...])
2382
2383Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet.
2387
2388=cut
2389
2390sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_;
2392
2393 $msg = $self->pl->expand_cfpod ($msg);
2394
2395 if ($self->can_msg) {
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) {
2409 if (0 && $msg =~ /\[/) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg")
2411 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg")
2414 }
2415 }
2416 }
2417}
2418
2307=item $client->ext_event ($type, %msg) 2419=item $client->ext_event ($type, %msg)
2308 2420
2309Sends an exti event to the client. 2421Sends an ext event to the client.
2310 2422
2311=cut 2423=cut
2312 2424
2313sub cf::client::ext_event($$%) { 2425sub cf::client::ext_event($$%) {
2314 my ($self, $type, %msg) = @_; 2426 my ($self, $type, %msg) = @_;
2315 2427
2316 $msg{msgtype} = "event_$type"; 2428 $msg{msgtype} = "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2318} 2430}
2319 2431
2320=item $success = $client->query ($flags, "text", \&cb) 2432=item $success = $client->query ($flags, "text", \&cb)
2321 2433
2322Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
2323the 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>,
2324C<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>.
2325 2437
2326Queries 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
2327reliable at some point in the future. 2439become reliable at some point in the future.
2328 2440
2329=cut 2441=cut
2330 2442
2331sub cf::client::query { 2443sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2452 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2454
2343 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
2345} 2459}
2346 2460
2347cf::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 },
2348 on_reply => sub { 2467 on_reply => sub {
2349 my ($ns, $msg) = @_; 2468 my ($ns, $msg) = @_;
2350 2469
2351 # this weird shuffling is so that direct followup queries 2470 # this weird shuffling is so that direct followup queries
2352 # get handled first 2471 # get handled first
… …
2363 $ns->send_packet ($ns->{query_queue}[0][0]); 2482 $ns->send_packet ($ns->{query_queue}[0][0]);
2364 } else { 2483 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2484 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2485 }
2367 } 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;
2368 }, 2505 },
2369); 2506);
2370 2507
2371=item $client->async (\&cb) 2508=item $client->async (\&cb)
2372 2509
… …
2576 load_facedata "$DATADIR/facedata" 2713 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2714 or die "unable to load facedata\n";
2578} 2715}
2579 2716
2580sub 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)
2581 load_resource_file "$DATADIR/archetypes" 2723 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2724 or die "unable to load archetypes\n";
2583} 2725}
2584 2726
2585sub reload_treasures { 2727sub reload_treasures {
… …
2779 %EXT_CORO = (); 2921 %EXT_CORO = ();
2780 2922
2781 warn "removing commands"; 2923 warn "removing commands";
2782 %COMMAND = (); 2924 %COMMAND = ();
2783 2925
2784 warn "removing ext commands"; 2926 warn "removing ext/exti commands";
2785 %EXTCMD = (); 2927 %EXTCMD = ();
2928 %EXTICMD = ();
2786 2929
2787 warn "unloading/nuking all extensions"; 2930 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 2931 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 2932 warn "... unloading $pkg";
2790 2933

Diff Legend

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