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.297 by root, Thu Jul 5 08:10: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<([^\>]*)>}
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 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1352=item $player->ext_reply ($msgid, %msg) 1430=item $player->ext_reply ($msgid, %msg)
1353 1431
1354Sends an ext reply to the player. 1432Sends an ext reply to the player.
1355 1433
1356=cut 1434=cut
1357 1435
1358sub ext_reply($$%) { 1436sub ext_reply($$%) {
1359 my ($self, $id, %msg) = @_; 1437 my ($self, $id, %msg) = @_;
1360 1438
1361 $msg{msgid} = $id; 1439 $msg{msgid} = $id;
1362 1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1441}
1365 1442
1366=item $player->ext_event ($type, %msg) 1443=item $player->ext_event ($type, %msg)
1367 1444
1368Sends an ext event to the client. 1445Sends an ext event to the client.
… …
2045 2122
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2123 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2124
2048 if ($self->{record_replies}) { 2125 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2126 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2127
2050 } else { 2128 } else {
2129 my $pl = $self->contr;
2130
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply (
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139
2140 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2141 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2142 $self->message ($msg, $flags);
2143 }
2053 } 2144 }
2054} 2145}
2055 2146
2056=item $player_object->may ("access") 2147=item $player_object->may ("access")
2057 2148
… …
2266 my $hp = $exit->stats->hp; 2357 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2358 my $sp = $exit->stats->sp;
2268 2359
2269 $self->enter_link; 2360 $self->enter_link;
2270 2361
2362 # if exit is damned, update players death & WoR home-position
2363 $self->contr->savebed ($slaying, $hp, $sp)
2364 if $exit->flag (FLAG_DAMNED);
2365
2271 (async { 2366 (async {
2272 $self->deactivate_recursive; # just to be sure 2367 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2368 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2369 $self->goto ($slaying, $hp, $sp);
2275 2370
… …
2302 2397
2303 utf8::encode $text; 2398 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2399 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2400}
2306 2401
2402=item $client->send_msg ($color, $type, $msg, [extra...])
2403
2404Send a drawinfo or msg packet to the client, formatting the msg for the
2405client if neccessary. C<$type> should be a string identifying the type of
2406the message, with C<log> being the default. If C<$color> is negative, suppress
2407the message unless the client supports the msg packet.
2408
2409=cut
2410
2411sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_;
2413
2414 $msg = $self->pl->expand_cfpod ($msg);
2415
2416 return unless @extra || length $msg;
2417
2418 if ($self->can_msg) {
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2420 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 if ($color >= 0) {
2432 if (0 && $msg =~ /\[/) {
2433 $self->send_packet ("drawextinfo $color 4 0 $msg")
2434 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg")
2437 }
2438 }
2439 }
2440}
2441
2307=item $client->ext_event ($type, %msg) 2442=item $client->ext_event ($type, %msg)
2308 2443
2309Sends an exti event to the client. 2444Sends an ext event to the client.
2310 2445
2311=cut 2446=cut
2312 2447
2313sub cf::client::ext_event($$%) { 2448sub cf::client::ext_event($$%) {
2314 my ($self, $type, %msg) = @_; 2449 my ($self, $type, %msg) = @_;
2315 2450
2316 $msg{msgtype} = "event_$type"; 2451 $msg{msgtype} = "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2452 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2318} 2453}
2319 2454
2320=item $success = $client->query ($flags, "text", \&cb) 2455=item $success = $client->query ($flags, "text", \&cb)
2321 2456
2322Queues a query to the client, calling the given callback with 2457Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2458the 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>. 2459C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2460
2326Queries can fail, so check the return code. Or don't, as queries will become 2461Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2462become reliable at some point in the future.
2328 2463
2329=cut 2464=cut
2330 2465
2331sub cf::client::query { 2466sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2467 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2475 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2476 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2477
2343 $self->send_packet ($self->{query_queue}[0][0]) 2478 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2479 if @{ $self->{query_queue} } == 1;
2480
2481 1
2345} 2482}
2346 2483
2347cf::client->attach ( 2484cf::client->attach (
2485 on_connect => sub {
2486 my ($ns) = @_;
2487
2488 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2489 },
2348 on_reply => sub { 2490 on_reply => sub {
2349 my ($ns, $msg) = @_; 2491 my ($ns, $msg) = @_;
2350 2492
2351 # this weird shuffling is so that direct followup queries 2493 # this weird shuffling is so that direct followup queries
2352 # get handled first 2494 # get handled first
… …
2364 } else { 2506 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2507 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2508 }
2367 } 2509 }
2368 }, 2510 },
2511 on_exticmd => sub {
2512 my ($ns, $buf) = @_;
2513
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515
2516 if (ref $msg) {
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2518 if (my %reply = $cb->($ns, $msg)) {
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 }
2523 } else {
2524 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525 }
2526
2527 cf::override;
2528 },
2369); 2529);
2370 2530
2371=item $client->async (\&cb) 2531=item $client->async (\&cb)
2372 2532
2373Create a new coroutine, running the specified callback. The coroutine will 2533Create a new coroutine, running the specified callback. The coroutine will
… …
2422 2582
2423=pod 2583=pod
2424 2584
2425The following functions and methods are available within a safe environment: 2585The following functions and methods are available within a safe environment:
2426 2586
2427 cf::object contr pay_amount pay_player map 2587 cf::object
2588 contr pay_amount pay_player map x y force_find force_add
2589 insert remove
2590
2428 cf::object::player player 2591 cf::object::player
2429 cf::player peaceful 2592 player
2430 cf::map trigger 2593
2594 cf::player
2595 peaceful
2596
2597 cf::map
2598 trigger
2431 2599
2432=cut 2600=cut
2433 2601
2434for ( 2602for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 2603 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2604 insert remove)],
2436 ["cf::object::player" => qw(player)], 2605 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 2606 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 2607 ["cf::map" => qw(trigger)],
2439) { 2608) {
2440 no strict 'refs'; 2609 no strict 'refs';
… …
2576 load_facedata "$DATADIR/facedata" 2745 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2746 or die "unable to load facedata\n";
2578} 2747}
2579 2748
2580sub reload_archetypes { 2749sub reload_archetypes {
2750 load_resource_file "$DATADIR/archetypes"
2751 or die "unable to load archetypes\n";
2752 #d# NEED to laod twice to resolve forward references
2753 # this really needs to be done in an extra post-pass
2754 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 2755 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2756 or die "unable to load archetypes\n";
2583} 2757}
2584 2758
2585sub reload_treasures { 2759sub reload_treasures {
… …
2779 %EXT_CORO = (); 2953 %EXT_CORO = ();
2780 2954
2781 warn "removing commands"; 2955 warn "removing commands";
2782 %COMMAND = (); 2956 %COMMAND = ();
2783 2957
2784 warn "removing ext commands"; 2958 warn "removing ext/exti commands";
2785 %EXTCMD = (); 2959 %EXTCMD = ();
2960 %EXTICMD = ();
2786 2961
2787 warn "unloading/nuking all extensions"; 2962 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 2963 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 2964 warn "... unloading $pkg";
2790 2965

Diff Legend

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