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.311 by root, Fri Jul 20 16:11:10 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
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1061 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1062}
1031 1063
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1064=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1065
1034Register a callback fro execution when the client sends an extcmd packet. 1066Register a callback for execution when the client sends an (synchronous)
1067extcmd packet. Ext commands will be processed in the order they are
1068received by the server, like other user commands. The first argument is
1069the logged-in player. Ext commands can only be processed after a player
1070has logged in successfully.
1035 1071
1036If the callback returns something, it is sent back as if reply was being 1072If the callback returns something, it is sent back as if reply was being
1037called. 1073called.
1038 1074
1075=item cf::register_exticmd $name => \&callback($ns,$packet);
1076
1077Register a callback for execution when the client sends an (asynchronous)
1078exticmd packet. Exti commands are processed by the server as soon as they
1079are received, i.e. out of order w.r.t. other commands. The first argument
1080is a client socket. Exti commands can be received anytime, even before
1081log-in.
1082
1083If the callback returns something, it is sent back as if reply was being
1084called.
1085
1039=cut 1086=cut
1040 1087
1041sub register_extcmd { 1088sub register_extcmd {
1042 my ($name, $cb) = @_; 1089 my ($name, $cb) = @_;
1043 1090
1044 $EXTCMD{$name} = $cb; 1091 $EXTCMD{$name} = $cb;
1092}
1093
1094sub register_exticmd {
1095 my ($name, $cb) = @_;
1096
1097 $EXTICMD{$name} = $cb;
1045} 1098}
1046 1099
1047cf::player->attach ( 1100cf::player->attach (
1048 on_command => sub { 1101 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1102 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1111 cf::override;
1059 }, 1112 },
1060 on_extcmd => sub { 1113 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1114 my ($pl, $buf) = @_;
1062 1115
1063 my $msg = eval { from_json $buf }; 1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1117
1065 if (ref $msg) { 1118 if (ref $msg) {
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1120 if (my %reply = $cb->($pl, $msg)) {
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1121 $pl->ext_reply ($msg->{msgid}, %reply);
… …
1372 # replace G<male|female> tags 1425 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1426 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1427 $self->gender ? $2 : $1
1375 }ge 1428 }ge
1376 # replace H<hint text> 1429 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1430 || s{H<([^\>]*)>}
1431 {
1432 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1433 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1434 "")
1435 [$self->{hintmode}]
1436 }ge;
1378 1437
1379 # create single paragraphs (very hackish) 1438 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1439 s/(?<=\S)\n(?=\w)/ /g;
1381 1440
1441 # compress some whitespace
1442 s/\s+\n/\n/g; # ws line-ends
1443 s/\n\n+/\n/g; # double lines
1444 s/^\n+//; # beginning lines
1445 s/\n+$//; # ending lines
1446
1382 $_ 1447 $_
1448}
1449
1450sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode}
1383} 1453}
1384 1454
1385=item $player->ext_reply ($msgid, %msg) 1455=item $player->ext_reply ($msgid, %msg)
1386 1456
1387Sends an ext reply to the player. 1457Sends an ext reply to the player.
… …
1390 1460
1391sub ext_reply($$%) { 1461sub ext_reply($$%) {
1392 my ($self, $id, %msg) = @_; 1462 my ($self, $id, %msg) = @_;
1393 1463
1394 $msg{msgid} = $id; 1464 $msg{msgid} = $id;
1395 1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1466}
1398 1467
1399=item $player->ext_event ($type, %msg) 1468=item $player->ext_event ($type, %msg)
1400 1469
1401Sends an ext event to the client. 1470Sends an ext event to the client.
… …
1426 my ($path) = @_; 1495 my ($path) = @_;
1427 1496
1428 my ($match, $specificity); 1497 my ($match, $specificity);
1429 1498
1430 for my $region (list) { 1499 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1500 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1501 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1502 if $region->specificity > $specificity;
1434 } 1503 }
1435 } 1504 }
1436 1505
… …
1556 $self->init; # pass $1 etc. 1625 $self->init; # pass $1 etc.
1557 return $self; 1626 return $self;
1558 } 1627 }
1559 } 1628 }
1560 1629
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1630 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1631 ()
1563} 1632}
1564 1633
1565sub init { 1634sub init {
1566 my ($self) = @_; 1635 my ($self) = @_;
… …
1844 1913
1845 undef $MAP_PREFETCH{$path}; 1914 undef $MAP_PREFETCH{$path};
1846 $MAP_PREFETCHER ||= cf::async { 1915 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) { 1916 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 1917 for my $path (keys %MAP_PREFETCH) {
1849 my $map = find $path 1918 if (my $map = find $path) {
1850 or next;
1851 $map->load; 1919 $map->load;
1920 }
1852 1921
1853 delete $MAP_PREFETCH{$path}; 1922 delete $MAP_PREFETCH{$path};
1854 } 1923 }
1855 } 1924 }
1856 undef $MAP_PREFETCHER; 1925 undef $MAP_PREFETCHER;
… …
2193 2262
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2264 $self->enter_map ($map, $x, $y);
2196} 2265}
2197 2266
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2267=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2268
2200Moves the player to the given map-path and coordinates by first freezing 2269Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2270her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2271that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2272the new (success) or old (failed) map position. In either case, $done will
2273be called at the end of this process.
2204 2274
2205=cut 2275=cut
2206 2276
2207our $GOTOGEN; 2277our $GOTOGEN;
2208 2278
2209sub cf::object::player::goto { 2279sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2280 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2281
2212 # do generation counting so two concurrent goto's will be executed in-order 2282 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2283 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2284
2215 $self->enter_link; 2285 $self->enter_link;
… …
2235 2305
2236 if ($gen == $self->{_goto_generation}) { 2306 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2307 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2308 $self->leave_link ($map, $x, $y);
2239 } 2309 }
2310
2311 $done->() if $done;
2240 })->prio (1); 2312 })->prio (1);
2241} 2313}
2242 2314
2243=item $player_object->enter_exit ($exit_object) 2315=item $player_object->enter_exit ($exit_object)
2244 2316
… …
2313 my $hp = $exit->stats->hp; 2385 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2386 my $sp = $exit->stats->sp;
2315 2387
2316 $self->enter_link; 2388 $self->enter_link;
2317 2389
2390 # if exit is damned, update players death & WoR home-position
2391 $self->contr->savebed ($slaying, $hp, $sp)
2392 if $exit->flag (FLAG_DAMNED);
2393
2318 (async { 2394 (async {
2319 $self->deactivate_recursive; # just to be sure 2395 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2396 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2397 $self->goto ($slaying, $hp, $sp);
2322 2398
… …
2349 2425
2350 utf8::encode $text; 2426 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2427 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2428}
2353 2429
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2430=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2431
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2432Send 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 2433client 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 2434the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2435the message unless the client supports the msg packet.
2360 2436
2361=cut 2437=cut
2362 2438
2363sub cf::client::send_msg { 2439sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2440 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2441
2366 $msg = $self->pl->expand_cfpod ($msg); 2442 $msg = $self->pl->expand_cfpod ($msg);
2367 2443
2444 return unless @extra || length $msg;
2445
2446 $color &= ~cf::NDI_UNIQUE; # just in case...
2447
2448 if (ref $channel) {
2449 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel);
2453 }
2454
2455 $channel = $channel->{id};
2456 }
2457
2368 if ($self->can_msg) { 2458 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2459 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2370 } else { 2460 } else {
2371 # replace some tags by gcfclient-compatible ones 2461 # replace some tags by gcfclient-compatible ones
2372 for ($msg) { 2462 for ($msg) {
2373 1 while 2463 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ 2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ 2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ 2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ 2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${1}[\/color]/; 2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 } 2469 }
2380 2470
2381 if ($color >= 0) { 2471 if ($color >= 0) {
2382 if (0 && $msg =~ /\[/) { 2472 if (0 && $msg =~ /\[/) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2473 $self->send_packet ("drawextinfo $color 4 0 $msg")
2384 } else { 2474 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2476 $self->send_packet ("drawinfo $color $msg")
2387 } 2477 }
2388 } 2478 }
2389 } 2479 }
2390} 2480}
2391 2481
2392=item $client->ext_event ($type, %msg) 2482=item $client->ext_event ($type, %msg)
2393 2483
2394Sends an exti event to the client. 2484Sends an ext event to the client.
2395 2485
2396=cut 2486=cut
2397 2487
2398sub cf::client::ext_event($$%) { 2488sub cf::client::ext_event($$%) {
2399 my ($self, $type, %msg) = @_; 2489 my ($self, $type, %msg) = @_;
2400 2490
2491 return unless $self->extcmd;
2492
2401 $msg{msgtype} = "event_$type"; 2493 $msg{msgtype} = "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2494 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2403} 2495}
2404 2496
2405=item $success = $client->query ($flags, "text", \&cb) 2497=item $success = $client->query ($flags, "text", \&cb)
2406 2498
2407Queues a query to the client, calling the given callback with 2499Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2500the 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>. 2501C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2502
2411Queries can fail, so check the return code. Or don't, as queries will become 2503Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2504become reliable at some point in the future.
2413 2505
2414=cut 2506=cut
2415 2507
2416sub cf::client::query { 2508sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2509 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2517 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2518 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2519
2428 $self->send_packet ($self->{query_queue}[0][0]) 2520 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2521 if @{ $self->{query_queue} } == 1;
2522
2523 1
2430} 2524}
2431 2525
2432cf::client->attach ( 2526cf::client->attach (
2527 on_connect => sub {
2528 my ($ns) = @_;
2529
2530 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2531 },
2433 on_reply => sub { 2532 on_reply => sub {
2434 my ($ns, $msg) = @_; 2533 my ($ns, $msg) = @_;
2435 2534
2436 # this weird shuffling is so that direct followup queries 2535 # this weird shuffling is so that direct followup queries
2437 # get handled first 2536 # get handled first
… …
2449 } else { 2548 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2549 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2550 }
2452 } 2551 }
2453 }, 2552 },
2553 on_exticmd => sub {
2554 my ($ns, $buf) = @_;
2555
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557
2558 if (ref $msg) {
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2560 if (my %reply = $cb->($ns, $msg)) {
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 }
2565 } else {
2566 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2567 }
2568
2569 cf::override;
2570 },
2454); 2571);
2455 2572
2456=item $client->async (\&cb) 2573=item $client->async (\&cb)
2457 2574
2458Create a new coroutine, running the specified callback. The coroutine will 2575Create a new coroutine, running the specified callback. The coroutine will
… …
2507 2624
2508=pod 2625=pod
2509 2626
2510The following functions and methods are available within a safe environment: 2627The following functions and methods are available within a safe environment:
2511 2628
2512 cf::object contr pay_amount pay_player map 2629 cf::object
2630 contr pay_amount pay_player map x y force_find force_add
2631 insert remove
2632
2513 cf::object::player player 2633 cf::object::player
2514 cf::player peaceful 2634 player
2515 cf::map trigger 2635
2636 cf::player
2637 peaceful
2638
2639 cf::map
2640 trigger
2516 2641
2517=cut 2642=cut
2518 2643
2519for ( 2644for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 2645 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2646 insert remove)],
2521 ["cf::object::player" => qw(player)], 2647 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 2648 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 2649 ["cf::map" => qw(trigger)],
2524) { 2650) {
2525 no strict 'refs'; 2651 no strict 'refs';
… …
2617 { 2743 {
2618 my $faces = $facedata->{faceinfo}; 2744 my $faces = $facedata->{faceinfo};
2619 2745
2620 while (my ($face, $info) = each %$faces) { 2746 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2747 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2748 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2625 Coro::cede; 2752
2753 cf::cede_to_tick;
2626 } 2754 }
2627 2755
2628 while (my ($face, $info) = each %$faces) { 2756 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 2757 next unless $info->{smooth};
2630 my $idx = cf::face::find $face 2758 my $idx = cf::face::find $face
2631 or next; 2759 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) { 2760 if (my $smooth = cf::face::find $info->{smooth}) {
2761 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2762 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 2763 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2764 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 2765 }
2637 Coro::cede; 2766
2767 cf::cede_to_tick;
2638 } 2768 }
2639 } 2769 }
2640 2770
2641 { 2771 {
2642 my $anims = $facedata->{animinfo}; 2772 my $anims = $facedata->{animinfo};
2643 2773
2644 while (my ($anim, $info) = each %$anims) { 2774 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2775 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 2776 cf::cede_to_tick;
2647 } 2777 }
2648 2778
2649 cf::anim::invalidate_all; # d'oh 2779 cf::anim::invalidate_all; # d'oh
2780 }
2781
2782 {
2783 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical;
2787
2788 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2796
2797 if ($name =~ /\.jpg$/) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2799 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2800 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 }
2807
2808 cf::cede_to_tick;
2809 }
2650 } 2810 }
2651 2811
2652 1 2812 1
2653} 2813}
2654 2814
2655sub reload_regions { 2815sub reload_regions {
2656 load_resource_file "$MAPDIR/regions" 2816 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 2817 or die "unable to load regions file\n";
2818
2819 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/
2821 if exists $_->{match};
2822 }
2658} 2823}
2659 2824
2660sub reload_facedata { 2825sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 2826 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 2827 or die "unable to load facedata\n";
2663} 2828}
2664 2829
2665sub reload_archetypes { 2830sub reload_archetypes {
2831 load_resource_file "$DATADIR/archetypes"
2832 or die "unable to load archetypes\n";
2833 #d# NEED to laod twice to resolve forward references
2834 # this really needs to be done in an extra post-pass
2835 # (which needs to be synchronous, so solve it differently)
2666 load_resource_file "$DATADIR/archetypes" 2836 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 2837 or die "unable to load archetypes\n";
2668} 2838}
2669 2839
2670sub reload_treasures { 2840sub reload_treasures {
… …
2864 %EXT_CORO = (); 3034 %EXT_CORO = ();
2865 3035
2866 warn "removing commands"; 3036 warn "removing commands";
2867 %COMMAND = (); 3037 %COMMAND = ();
2868 3038
2869 warn "removing ext commands"; 3039 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3040 %EXTCMD = ();
3041 %EXTICMD = ();
2871 3042
2872 warn "unloading/nuking all extensions"; 3043 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3044 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3045 warn "... unloading $pkg";
2875 3046

Diff Legend

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