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.312 by root, Sat Jul 21 18:01:26 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 ();
30use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
31use Time::HiRes; 32use Time::HiRes;
32use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
33 35
34# configure various modules to our taste 36# configure various modules to our taste
35# 37#
36$Storable::canonical = 1; # reduce rsync transfers 38$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
49our %COMMAND = (); 51our %COMMAND = ();
50our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
51 53
52our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
56 59
57our $RELOAD; # number of reloads so far 60our $RELOAD; # number of reloads so far
58our @EVENT; 61our @EVENT;
… …
163=item cf::wait_for_tick, cf::wait_for_tick_begin 166=item cf::wait_for_tick, cf::wait_for_tick_begin
164 167
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 169returns directly I<after> the tick processing (and consequently, can only wake one process
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
168 177
169=back 178=back
170 179
171=cut 180=cut
172 181
… …
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 246 $d
238 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
239} 248}
240 249
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
244 251
245Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
246 253
247=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
248 255
249Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
257
258=cut
259
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261
262sub to_json ($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) }
250 264
251=item cf::lock_wait $string 265=item cf::lock_wait $string
252 266
253Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
254 268
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 416Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 417never block itself or use any form of Event handling.
404 418
405=cut 419=cut
406 420
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
407sub fork_call(&@) { 430sub fork_call(&@) {
408 my ($cb, @args) = @_; 431 my ($cb, @args) = @_;
409 432
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!"; 434# or die "socketpair: $!";
… …
414 437
415 if (my $pid = fork) { 438 if (my $pid = fork) {
416 close $fh2; 439 close $fh2;
417 440
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 443 $res = Coro::Storable::thaw $res;
420 444
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 446
423 die $$res unless "ARRAY" eq ref $res; 447 Carp::confess $$res unless "ARRAY" eq ref $res;
424 448
425 return wantarray ? @$res : $res->[-1]; 449 return wantarray ? @$res : $res->[-1];
426 } else { 450 } else {
427 reset_signals; 451 reset_signals;
428 local $SIG{__WARN__}; 452 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
430 eval { 460 eval {
431 close $fh1; 461 close $fh1;
432 462
433 my @res = eval { $cb->(@args) }; 463 my @res = eval { $cb->(@args) };
464
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
435 }; 467 };
436 468
437 warn $@ if $@; 469 warn $@ if $@;
438 _exit 0; 470 _exit 0;
439 } 471 }
… …
840 "; 872 ";
841 die if $@; 873 die if $@;
842} 874}
843 875
844our $override; 876our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 878
847sub override { 879sub override {
848 $override = 1; 880 $override = 1;
849 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
850} 882}
851 883
852sub do_invoke { 884sub do_invoke {
853 my $event = shift; 885 my $event = shift;
854 my $callbacks = shift; 886 my $callbacks = shift;
855 887
856 @invoke_results = (); 888 @INVOKE_RESULTS = ();
857 889
858 local $override; 890 local $override;
859 891
860 for (@$callbacks) { 892 for (@$callbacks) {
861 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
… …
878 910
879Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
880 912
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
882removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 916
885=back 917=back
886 918
887=cut 919=cut
888 920
889############################################################################# 921#############################################################################
890# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
891 934
892sub reattach { 935sub reattach {
893 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 937 my ($obj) = @_;
895 938
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1072 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1073}
1031 1074
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1075=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1076
1034Register a callback fro execution when the client sends an extcmd packet. 1077Register a callback for execution when the client sends an (synchronous)
1078extcmd packet. Ext commands will be processed in the order they are
1079received by the server, like other user commands. The first argument is
1080the logged-in player. Ext commands can only be processed after a player
1081has logged in successfully.
1035 1082
1036If the callback returns something, it is sent back as if reply was being 1083If the callback returns something, it is sent back as if reply was being
1037called. 1084called.
1038 1085
1086=item cf::register_exticmd $name => \&callback($ns,$packet);
1087
1088Register a callback for execution when the client sends an (asynchronous)
1089exticmd packet. Exti commands are processed by the server as soon as they
1090are received, i.e. out of order w.r.t. other commands. The first argument
1091is a client socket. Exti commands can be received anytime, even before
1092log-in.
1093
1094If the callback returns something, it is sent back as if reply was being
1095called.
1096
1039=cut 1097=cut
1040 1098
1041sub register_extcmd { 1099sub register_extcmd {
1042 my ($name, $cb) = @_; 1100 my ($name, $cb) = @_;
1043 1101
1044 $EXTCMD{$name} = $cb; 1102 $EXTCMD{$name} = $cb;
1103}
1104
1105sub register_exticmd {
1106 my ($name, $cb) = @_;
1107
1108 $EXTICMD{$name} = $cb;
1045} 1109}
1046 1110
1047cf::player->attach ( 1111cf::player->attach (
1048 on_command => sub { 1112 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1113 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1122 cf::override;
1059 }, 1123 },
1060 on_extcmd => sub { 1124 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
1062 1126
1063 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1128
1065 if (ref $msg) { 1129 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1372 # replace G<male|female> tags 1436 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1437 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1438 $self->gender ? $2 : $1
1375 }ge 1439 }ge
1376 # replace H<hint text> 1440 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1378 1448
1379 # create single paragraphs (very hackish) 1449 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1450 s/(?<=\S)\n(?=\w)/ /g;
1381 1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1382 $_ 1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1383} 1464}
1384 1465
1385=item $player->ext_reply ($msgid, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1386 1467
1387Sends an ext reply to the player. 1468Sends an ext reply to the player.
… …
1390 1471
1391sub ext_reply($$%) { 1472sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1393 1474
1394 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1395 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1477}
1398 1478
1399=item $player->ext_event ($type, %msg) 1479=item $player->ext_event ($type, %msg)
1400 1480
1401Sends an ext event to the client. 1481Sends an ext event to the client.
… …
1426 my ($path) = @_; 1506 my ($path) = @_;
1427 1507
1428 my ($match, $specificity); 1508 my ($match, $specificity);
1429 1509
1430 for my $region (list) { 1510 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1511 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1512 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1513 if $region->specificity > $specificity;
1434 } 1514 }
1435 } 1515 }
1436 1516
… …
1556 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1557 return $self; 1637 return $self;
1558 } 1638 }
1559 } 1639 }
1560 1640
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1642 ()
1563} 1643}
1564 1644
1565sub init { 1645sub init {
1566 my ($self) = @_; 1646 my ($self) = @_;
… …
1844 1924
1845 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1846 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1849 my $map = find $path 1929 if (my $map = find $path) {
1850 or next;
1851 $map->load; 1930 $map->load;
1931 }
1852 1932
1853 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1854 } 1934 }
1855 } 1935 }
1856 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
… …
2193 2273
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
2196} 2276}
2197 2277
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2279
2200Moves the player to the given map-path and coordinates by first freezing 2280Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2281her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2282that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2283the new (success) or old (failed) map position. In either case, $done will
2284be called at the end of this process.
2204 2285
2205=cut 2286=cut
2206 2287
2207our $GOTOGEN; 2288our $GOTOGEN;
2208 2289
2209sub cf::object::player::goto { 2290sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2292
2212 # do generation counting so two concurrent goto's will be executed in-order 2293 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2295
2215 $self->enter_link; 2296 $self->enter_link;
… …
2235 2316
2236 if ($gen == $self->{_goto_generation}) { 2317 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2318 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2239 } 2320 }
2321
2322 $done->() if $done;
2240 })->prio (1); 2323 })->prio (1);
2241} 2324}
2242 2325
2243=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
2244 2327
… …
2313 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
2315 2398
2316 $self->enter_link; 2399 $self->enter_link;
2317 2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
2404
2318 (async { 2405 (async {
2319 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2407 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
2322 2409
… …
2349 2436
2350 utf8::encode $text; 2437 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2439}
2353 2440
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2442
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2443Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2444client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2445the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2446the message unless the client supports the msg packet.
2360 2447
2361=cut 2448=cut
2362 2449
2363sub cf::client::send_msg { 2450sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2451 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2452
2366 $msg = $self->pl->expand_cfpod ($msg); 2453 $msg = $self->pl->expand_cfpod ($msg);
2367 2454
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case...
2458
2459 if (ref $channel) {
2460 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel);
2464 }
2465
2466 $channel = $channel->{id};
2467 }
2468
2368 if ($self->can_msg) { 2469 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2370 } else { 2471 } else {
2371 # replace some tags by gcfclient-compatible ones 2472 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2473 for ($msg) {
2373 1 while 2474 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2480 }
2380 2481
2381 if ($color >= 0) { 2482 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) { 2483 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2484 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2485 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2487 $self->send_packet ("drawinfo $color $msg")
2387 } 2488 }
2388 } 2489 }
2389 } 2490 }
2390} 2491}
2391 2492
2392=item $client->ext_event ($type, %msg) 2493=item $client->ext_event ($type, %msg)
2393 2494
2394Sends an exti event to the client. 2495Sends an ext event to the client.
2395 2496
2396=cut 2497=cut
2397 2498
2398sub cf::client::ext_event($$%) { 2499sub cf::client::ext_event($$%) {
2399 my ($self, $type, %msg) = @_; 2500 my ($self, $type, %msg) = @_;
2400 2501
2502 return unless $self->extcmd;
2503
2401 $msg{msgtype} = "event_$type"; 2504 $msg{msgtype} = "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2403} 2506}
2404 2507
2405=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
2406 2509
2407Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2511the 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>. 2512C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2513
2411Queries can fail, so check the return code. Or don't, as queries will become 2514Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2515become reliable at some point in the future.
2413 2516
2414=cut 2517=cut
2415 2518
2416sub cf::client::query { 2519sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2520 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2528 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2529 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2530
2428 $self->send_packet ($self->{query_queue}[0][0]) 2531 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2532 if @{ $self->{query_queue} } == 1;
2533
2534 1
2430} 2535}
2431 2536
2432cf::client->attach ( 2537cf::client->attach (
2538 on_connect => sub {
2539 my ($ns) = @_;
2540
2541 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2542 },
2433 on_reply => sub { 2543 on_reply => sub {
2434 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2435 2545
2436 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2437 # get handled first 2547 # get handled first
… …
2449 } else { 2559 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2560 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2561 }
2452 } 2562 }
2453 }, 2563 },
2564 on_exticmd => sub {
2565 my ($ns, $buf) = @_;
2566
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568
2569 if (ref $msg) {
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2571 if (my %reply = $cb->($ns, $msg)) {
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 }
2576 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 }
2579
2580 cf::override;
2581 },
2454); 2582);
2455 2583
2456=item $client->async (\&cb) 2584=item $client->async (\&cb)
2457 2585
2458Create a new coroutine, running the specified callback. The coroutine will 2586Create a new coroutine, running the specified callback. The coroutine will
… …
2507 2635
2508=pod 2636=pod
2509 2637
2510The following functions and methods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2511 2639
2512 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2513 cf::object::player player 2644 cf::object::player
2514 cf::player peaceful 2645 player
2515 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2516 2652
2517=cut 2653=cut
2518 2654
2519for ( 2655for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2521 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2524) { 2661) {
2525 no strict 'refs'; 2662 no strict 'refs';
… …
2617 { 2754 {
2618 my $faces = $facedata->{faceinfo}; 2755 my $faces = $facedata->{faceinfo};
2619 2756
2620 while (my ($face, $info) = each %$faces) { 2757 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2625 Coro::cede; 2763
2764 cf::cede_to_tick;
2626 } 2765 }
2627 2766
2628 while (my ($face, $info) = each %$faces) { 2767 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 2768 next unless $info->{smooth};
2630 my $idx = cf::face::find $face 2769 my $idx = cf::face::find $face
2631 or next; 2770 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) { 2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 2774 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 2776 }
2637 Coro::cede; 2777
2778 cf::cede_to_tick;
2638 } 2779 }
2639 } 2780 }
2640 2781
2641 { 2782 {
2642 my $anims = $facedata->{animinfo}; 2783 my $anims = $facedata->{animinfo};
2643 2784
2644 while (my ($anim, $info) = each %$anims) { 2785 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 2787 cf::cede_to_tick;
2647 } 2788 }
2648 2789
2649 cf::anim::invalidate_all; # d'oh 2790 cf::anim::invalidate_all; # d'oh
2791 }
2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2650 } 2821 }
2651 2822
2652 1 2823 1
2653} 2824}
2654 2825
2655sub reload_regions { 2826sub reload_regions {
2656 load_resource_file "$MAPDIR/regions" 2827 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2658} 2834}
2659 2835
2660sub reload_facedata { 2836sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 2837 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 2838 or die "unable to load facedata\n";
2663} 2839}
2664 2840
2665sub reload_archetypes { 2841sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 2847 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 2848 or die "unable to load archetypes\n";
2668} 2849}
2669 2850
2670sub reload_treasures { 2851sub reload_treasures {
… …
2864 %EXT_CORO = (); 3045 %EXT_CORO = ();
2865 3046
2866 warn "removing commands"; 3047 warn "removing commands";
2867 %COMMAND = (); 3048 %COMMAND = ();
2868 3049
2869 warn "removing ext commands"; 3050 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3051 %EXTCMD = ();
3052 %EXTICMD = ();
2871 3053
2872 warn "unloading/nuking all extensions"; 3054 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3055 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3056 warn "... unloading $pkg";
2875 3057

Diff Legend

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