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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.292 by root, Tue Jul 3 00:54:57 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<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/;
1418
1419 $_
1420}
1421
1422sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode}
1425}
1426
1352=item $player->ext_reply ($msgid, %msg) 1427=item $player->ext_reply ($msgid, %msg)
1353 1428
1354Sends an ext reply to the player. 1429Sends an ext reply to the player.
1355 1430
1356=cut 1431=cut
1357 1432
1358sub ext_reply($$%) { 1433sub ext_reply($$%) {
1359 my ($self, $id, %msg) = @_; 1434 my ($self, $id, %msg) = @_;
1360 1435
1361 $msg{msgid} = $id; 1436 $msg{msgid} = $id;
1362 1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1438}
1365 1439
1366=item $player->ext_event ($type, %msg) 1440=item $player->ext_event ($type, %msg)
1367 1441
1368Sends an ext event to the client. 1442Sends an ext event to the client.
… …
2052 my $pl = $self->contr; 2126 my $pl = $self->contr;
2053 2127
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2129 my $diag = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2130 $diag->{pl}->ext_reply (
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => [] 2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2058 ); 2135 );
2059 2136
2060 } else { 2137 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2138 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2139 $self->message ($msg, $flags);
… …
2313 2390
2314 utf8::encode $text; 2391 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2392 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2393}
2317 2394
2395=item $client->send_msg ($color, $type, $msg, [extra...])
2396
2397Send a drawinfo or msg packet to the client, formatting the msg for the
2398client if neccessary. C<$type> should be a string identifying the type of
2399the message, with C<log> being the default. If C<$color> is negative, suppress
2400the message unless the client supports the msg packet.
2401
2402=cut
2403
2404sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_;
2406
2407 $msg = $self->pl->expand_cfpod ($msg);
2408
2409 if ($self->can_msg) {
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2411 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 if ($color >= 0) {
2423 if (0 && $msg =~ /\[/) {
2424 $self->send_packet ("drawextinfo $color 4 0 $msg")
2425 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg")
2428 }
2429 }
2430 }
2431}
2432
2318=item $client->ext_event ($type, %msg) 2433=item $client->ext_event ($type, %msg)
2319 2434
2320Sends an exti event to the client. 2435Sends an ext event to the client.
2321 2436
2322=cut 2437=cut
2323 2438
2324sub cf::client::ext_event($$%) { 2439sub cf::client::ext_event($$%) {
2325 my ($self, $type, %msg) = @_; 2440 my ($self, $type, %msg) = @_;
2326 2441
2327 $msg{msgtype} = "event_$type"; 2442 $msg{msgtype} = "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2329} 2444}
2330 2445
2331=item $success = $client->query ($flags, "text", \&cb) 2446=item $success = $client->query ($flags, "text", \&cb)
2332 2447
2333Queues a query to the client, calling the given callback with 2448Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2449the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2450C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2451
2337Queries can fail, so check the return code. Or don't, as queries will become 2452Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2453become reliable at some point in the future.
2339 2454
2340=cut 2455=cut
2341 2456
2342sub cf::client::query { 2457sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2458 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2466 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2467 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2468
2354 $self->send_packet ($self->{query_queue}[0][0]) 2469 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2470 if @{ $self->{query_queue} } == 1;
2471
2472 1
2356} 2473}
2357 2474
2358cf::client->attach ( 2475cf::client->attach (
2476 on_connect => sub {
2477 my ($ns) = @_;
2478
2479 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2480 },
2359 on_reply => sub { 2481 on_reply => sub {
2360 my ($ns, $msg) = @_; 2482 my ($ns, $msg) = @_;
2361 2483
2362 # this weird shuffling is so that direct followup queries 2484 # this weird shuffling is so that direct followup queries
2363 # get handled first 2485 # get handled first
… …
2374 $ns->send_packet ($ns->{query_queue}[0][0]); 2496 $ns->send_packet ($ns->{query_queue}[0][0]);
2375 } else { 2497 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2498 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2499 }
2378 } 2500 }
2501 },
2502 on_exticmd => sub {
2503 my ($ns, $buf) = @_;
2504
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506
2507 if (ref $msg) {
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2509 if (my %reply = $cb->($ns, $msg)) {
2510 $reply{msgid} = $msg->{msgid};
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2512 }
2513 }
2514 } else {
2515 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2516 }
2517
2518 cf::override;
2379 }, 2519 },
2380); 2520);
2381 2521
2382=item $client->async (\&cb) 2522=item $client->async (\&cb)
2383 2523
… …
2587 load_facedata "$DATADIR/facedata" 2727 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 2728 or die "unable to load facedata\n";
2589} 2729}
2590 2730
2591sub reload_archetypes { 2731sub reload_archetypes {
2732 load_resource_file "$DATADIR/archetypes"
2733 or die "unable to load archetypes\n";
2734 #d# NEED to laod twice to resolve forward references
2735 # this really needs to be done in an extra post-pass
2736 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 2737 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 2738 or die "unable to load archetypes\n";
2594} 2739}
2595 2740
2596sub reload_treasures { 2741sub reload_treasures {
… …
2790 %EXT_CORO = (); 2935 %EXT_CORO = ();
2791 2936
2792 warn "removing commands"; 2937 warn "removing commands";
2793 %COMMAND = (); 2938 %COMMAND = ();
2794 2939
2795 warn "removing ext commands"; 2940 warn "removing ext/exti commands";
2796 %EXTCMD = (); 2941 %EXTCMD = ();
2942 %EXTICMD = ();
2797 2943
2798 warn "unloading/nuking all extensions"; 2944 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 2945 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 2946 warn "... unloading $pkg";
2801 2947

Diff Legend

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