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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
315 }; 323 };
316 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
317 $guard 325 $guard
318} 326}
319 327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
382}
383
320=item cf::async { BLOCK } 384=item cf::async { BLOCK }
321 385
322Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
411 475
412=cut 476=cut
413 477
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 478sub fork_call(&@) {
424 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
425 480
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
429 or die "pipe: $!";
430 484
431 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 486 reset_signals;
445 local $SIG{__WARN__}; 487 &$cb
446 local $SIG{__DIE__}; 488 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 489
453 eval { 490 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 491}
466 492
467=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
468 494
469Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
865 "; 891 ";
866 die if $@; 892 die if $@;
867} 893}
868 894
869our $override; 895our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 897
872sub override { 898sub override {
873 $override = 1; 899 $override = 1;
874 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
875} 901}
876 902
877sub do_invoke { 903sub do_invoke {
878 my $event = shift; 904 my $event = shift;
879 my $callbacks = shift; 905 my $callbacks = shift;
880 906
881 @invoke_results = (); 907 @INVOKE_RESULTS = ();
882 908
883 local $override; 909 local $override;
884 910
885 for (@$callbacks) { 911 for (@$callbacks) {
886 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
903 929
904Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
905 931
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 935
910=back 936=back
911 937
912=cut 938=cut
913 939
914############################################################################# 940#############################################################################
915# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
916 953
917sub reattach { 954sub reattach {
918 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 956 my ($obj) = @_;
920 957
… …
1107 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1108 1145
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1147
1111 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1114 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1115 } 1158 if $reply;
1116 } 1159 }
1117 } else { 1160 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1162 }
1120 1163
… …
1290 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1291 1334
1292 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1293 1336
1294 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1295} 1348}
1296 1349
1297=item $pl->quit_character 1350=item $pl->quit_character
1298 1351
1299Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1435 s/\s+\n/\n/g; # ws line-ends 1488 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines 1489 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines 1490 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines 1491 s/\n+$//; # ending lines
1439 1492
1440 warn $_;#d#
1441 $_ 1493 $_
1442} 1494}
1443 1495
1444sub hintmode { 1496sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode} 1498 $_[0]{hintmode}
1447} 1499}
1448 1500
1449=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1450 1502
1451Sends an ext reply to the player. 1503Sends an ext reply to the player.
1452 1504
1453=cut 1505=cut
1454 1506
1455sub ext_reply($$%) { 1507sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1457 1509
1458 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1460} 1517}
1461 1518
1462=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1463 1520
1464Sends an ext event to the client. 1521Sends an ext event to the client.
1465 1522
1466=cut 1523=cut
1467 1524
1468sub ext_event($$%) { 1525sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1470 1527
1471 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1472} 1529}
1473 1530
1474=head3 cf::region 1531=head3 cf::region
1475 1532
1476=over 4 1533=over 4
… …
1489 my ($path) = @_; 1546 my ($path) = @_;
1490 1547
1491 my ($match, $specificity); 1548 my ($match, $specificity);
1492 1549
1493 for my $region (list) { 1550 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1497 } 1554 }
1498 } 1555 }
1499 1556
… …
1619 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1620 return $self; 1677 return $self;
1621 } 1678 }
1622 } 1679 }
1623 1680
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1682 ()
1626} 1683}
1627 1684
1628sub init { 1685sub init {
1629 my ($self) = @_; 1686 my ($self) = @_;
… …
1837 $self->set_darkness_map; 1894 $self->set_darkness_map;
1838 Coro::cede; 1895 Coro::cede;
1839 $self->activate; 1896 $self->activate;
1840 } 1897 }
1841 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1842 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1843 } 1903 }
1844 1904
1845 $self->post_load; 1905 $self->post_load;
1846} 1906}
… …
1907 1967
1908 undef $MAP_PREFETCH{$path}; 1968 undef $MAP_PREFETCH{$path};
1909 $MAP_PREFETCHER ||= cf::async { 1969 $MAP_PREFETCHER ||= cf::async {
1910 while (%MAP_PREFETCH) { 1970 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 1971 for my $path (keys %MAP_PREFETCH) {
1912 my $map = find $path 1972 if (my $map = find $path) {
1913 or next;
1914 $map->load; 1973 $map->load;
1974 }
1915 1975
1916 delete $MAP_PREFETCH{$path}; 1976 delete $MAP_PREFETCH{$path};
1917 } 1977 }
1918 } 1978 }
1919 undef $MAP_PREFETCHER; 1979 undef $MAP_PREFETCHER;
… …
2146 2206
2147 } else { 2207 } else {
2148 my $pl = $self->contr; 2208 my $pl = $self->contr;
2149 2209
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2210 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2211 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2213
2159 } else { 2214 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2215 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2162 } 2217 }
2163 } 2218 }
2219}
2220
2221=item $object->send_msg ($channel, $msg, $color, [extra...])
2222
2223=cut
2224
2225sub cf::object::send_msg {
2226 my $pl = shift->contr
2227 or return;
2228 $pl->send_msg (@_);
2164} 2229}
2165 2230
2166=item $player_object->may ("access") 2231=item $player_object->may ("access")
2167 2232
2168Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
… …
2256 2321
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2323 $self->enter_map ($map, $x, $y);
2259} 2324}
2260 2325
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2326=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2327
2263Moves the player to the given map-path and coordinates by first freezing 2328Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2329her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2330that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2331the new (success) or old (failed) map position. In either case, $done will
2332be called at the end of this process.
2267 2333
2268=cut 2334=cut
2269 2335
2270our $GOTOGEN; 2336our $GOTOGEN;
2271 2337
2272sub cf::object::player::goto { 2338sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2339 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2340
2275 # do generation counting so two concurrent goto's will be executed in-order 2341 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2343
2278 $self->enter_link; 2344 $self->enter_link;
… …
2298 2364
2299 if ($gen == $self->{_goto_generation}) { 2365 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2366 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2367 $self->leave_link ($map, $x, $y);
2302 } 2368 }
2369
2370 $done->() if $done;
2303 })->prio (1); 2371 })->prio (1);
2304} 2372}
2305 2373
2306=item $player_object->enter_exit ($exit_object) 2374=item $player_object->enter_exit ($exit_object)
2307 2375
… …
2416 2484
2417 utf8::encode $text; 2485 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2486 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2487}
2420 2488
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2489=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2490
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2491Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2492client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2493the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2494the message unless the client supports the msg packet.
2427 2495
2428=cut 2496=cut
2429 2497
2430sub cf::client::send_msg { 2498sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2499 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2500
2433 $msg = $self->pl->expand_cfpod ($msg); 2501 $msg = $self->pl->expand_cfpod ($msg);
2434 2502
2503 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504
2505 if (ref $channel) {
2506 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel);
2510 }
2511
2512 $channel = $channel->{id};
2513 }
2514
2435 return unless @extra || length $msg; 2515 return unless @extra || length $msg;
2436 2516
2437 if ($self->can_msg) { 2517 if ($self->can_msg) {
2518 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF;
2521
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2522 $self->send_packet ("msg " . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2439 } else { 2524 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535
2536 $color &= cf::NDI_COLOR_MASK;
2537
2538 utf8::encode $msg;
2539
2451 if (0 && $msg =~ /\[/) { 2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2543 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2545 $self->send_packet ("drawinfo $color $msg")
2456 } 2546 }
2457 } 2547 }
2458 } 2548 }
2459} 2549}
2460 2550
2461=item $client->ext_event ($type, %msg) 2551=item $client->ext_msg ($type, @msg)
2462 2552
2463Sends an ext event to the client. 2553Sends an ext event to the client.
2464 2554
2465=cut 2555=cut
2466 2556
2467sub cf::client::ext_event($$%) { 2557sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2558 my ($self, $type, @msg) = @_;
2469 2559
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2565 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 }
2472} 2568}
2473 2569
2474=item $success = $client->query ($flags, "text", \&cb) 2570=item $success = $client->query ($flags, "text", \&cb)
2475 2571
2476Queues a query to the client, calling the given callback with 2572Queues a query to the client, calling the given callback with
… …
2531 my ($ns, $buf) = @_; 2627 my ($ns, $buf) = @_;
2532 2628
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2629 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2630
2535 if (ref $msg) { 2631 if (ref $msg) {
2632 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg
2634 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2637 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2638 my @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid}; 2639
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2640 $ns->ext_reply ($reply, @reply)
2540 } 2641 if $reply;
2541 } 2642 }
2542 } else { 2643 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2645 }
2545 2646
… …
2593our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2595 2696
2596$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2597 2698
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2699$safe->permit_only (Opcode::opset qw(
2700 :base_core :base_mem :base_orig :base_math
2701 grepstart grepwhile mapstart mapwhile
2702 sort time
2703));
2599 2704
2600# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2601 2706
2602=pod 2707=pod
2603 2708
2604The following functions and methods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2605 2710
2606 cf::object 2711 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 2712 contr pay_amount pay_player map x y force_find force_add
2608 insert remove 2713 insert remove name archname title slaying race
2609 2714
2610 cf::object::player 2715 cf::object::player
2611 player 2716 player
2612 2717
2613 cf::player 2718 cf::player
… …
2618 2723
2619=cut 2724=cut
2620 2725
2621for ( 2726for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 2728 insert remove inv name archname title slaying race)],
2624 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2627) { 2732) {
2628 no strict 'refs'; 2733 no strict 'refs';
… …
2720 { 2825 {
2721 my $faces = $facedata->{faceinfo}; 2826 my $faces = $facedata->{faceinfo};
2722 2827
2723 while (my ($face, $info) = each %$faces) { 2828 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2829 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2830 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2728 Coro::cede; 2834
2835 cf::cede_to_tick;
2729 } 2836 }
2730 2837
2731 while (my ($face, $info) = each %$faces) { 2838 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 2839 next unless $info->{smooth};
2733 my $idx = cf::face::find $face 2840 my $idx = cf::face::find $face
2734 or next; 2841 or next;
2735 if (my $smooth = cf::face::find $info->{smooth}) { 2842 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 2845 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2846 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 2847 }
2740 Coro::cede; 2848
2849 cf::cede_to_tick;
2741 } 2850 }
2742 } 2851 }
2743 2852
2744 { 2853 {
2745 my $anims = $facedata->{animinfo}; 2854 my $anims = $facedata->{animinfo};
2746 2855
2747 while (my ($anim, $info) = each %$anims) { 2856 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2857 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 2858 cf::cede_to_tick;
2750 } 2859 }
2751 2860
2752 cf::anim::invalidate_all; # d'oh 2861 cf::anim::invalidate_all; # d'oh
2753 } 2862 }
2754 2863
2864 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2872 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2889 }
2890
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick;
2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 }
2914
2755 1 2915 1
2756} 2916}
2917
2918register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_;
2920
2921 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v);
2923 }
2924};
2757 2925
2758sub reload_regions { 2926sub reload_regions {
2759 load_resource_file "$MAPDIR/regions" 2927 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 2928 or die "unable to load regions file\n";
2929
2930 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/
2932 if exists $_->{match};
2933 }
2761} 2934}
2762 2935
2763sub reload_facedata { 2936sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 2937 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 2938 or die "unable to load facedata\n";

Diff Legend

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