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.331 by root, Mon Aug 13 13:10:01 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
… …
306 my $guard = Coro::guard { 320 my $guard = Coro::guard {
307 $TICK_WATCHER->start; 321 $TICK_WATCHER->start;
308 }; 322 };
309 $TICK_WATCHER->stop; 323 $TICK_WATCHER->stop;
310 $guard 324 $guard
325}
326
327=item cf::get_slot $time[, $priority[, $name]]
328
329Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede.
332
333The optional C<$name> can be used to identify the job to run. It might be
334used for statistical purposes and should identify the same time-class.
335
336Useful for short background jobs.
337
338=cut
339
340our @SLOT_QUEUE;
341our $SLOT_QUEUE;
342
343$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async {
345 my $signal = new Coro::Signal;
346
347 while () {
348 next_job:
349 my $avail = cf::till_tick;
350 if ($avail > 0.01) {
351 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) {
353 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send;
355 Coro::cede;
356 goto next_job;
357 }
358 }
359 }
360
361 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait;
365 } else {
366 Coro::schedule;
367 }
368 }
369};
370
371sub get_slot($;$$) {
372 my ($time, $pri, $name) = @_;
373
374 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal;
376
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready;
380 $sig->wait;
311} 381}
312 382
313=item cf::async { BLOCK } 383=item cf::async { BLOCK }
314 384
315Currently the same as Coro::async_pool, meaning you cannot use 385Currently the same as Coro::async_pool, meaning you cannot use
… …
402Coro::Storable. May, of course, block. Note that the executed sub may 472Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 473never block itself or use any form of Event handling.
404 474
405=cut 475=cut
406 476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
407sub fork_call(&@) { 486sub fork_call(&@) {
408 my ($cb, @args) = @_; 487 my ($cb, @args) = @_;
409 488
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
411# or die "socketpair: $!"; 490# or die "socketpair: $!";
… …
414 493
415 if (my $pid = fork) { 494 if (my $pid = fork) {
416 close $fh2; 495 close $fh2;
417 496
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
419 $res = Coro::Storable::thaw $res; 499 $res = Coro::Storable::thaw $res;
420 500
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422 502
423 die $$res unless "ARRAY" eq ref $res; 503 Carp::confess $$res unless "ARRAY" eq ref $res;
424 504
425 return wantarray ? @$res : $res->[-1]; 505 return wantarray ? @$res : $res->[-1];
426 } else { 506 } else {
427 reset_signals; 507 reset_signals;
428 local $SIG{__WARN__}; 508 local $SIG{__WARN__};
429 local $SIG{__DIE__}; 509 local $SIG{__DIE__};
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515
430 eval { 516 eval {
431 close $fh1; 517 close $fh1;
432 518
433 my @res = eval { $cb->(@args) }; 519 my @res = eval { $cb->(@args) };
520
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
435 }; 523 };
436 524
437 warn $@ if $@; 525 warn $@ if $@;
438 _exit 0; 526 _exit 0;
439 } 527 }
… …
840 "; 928 ";
841 die if $@; 929 die if $@;
842} 930}
843 931
844our $override; 932our $override;
845our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 933our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
846 934
847sub override { 935sub override {
848 $override = 1; 936 $override = 1;
849 @invoke_results = (); 937 @INVOKE_RESULTS = (@_);
850} 938}
851 939
852sub do_invoke { 940sub do_invoke {
853 my $event = shift; 941 my $event = shift;
854 my $callbacks = shift; 942 my $callbacks = shift;
855 943
856 @invoke_results = (); 944 @INVOKE_RESULTS = ();
857 945
858 local $override; 946 local $override;
859 947
860 for (@$callbacks) { 948 for (@$callbacks) {
861 eval { &{$_->[1]} }; 949 eval { &{$_->[1]} };
… …
878 966
879Generate an object-specific event with the given arguments. 967Generate an object-specific event with the given arguments.
880 968
881This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 969This 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 970removed in future versions), and there is no public API to access override
883results (if you must, access C<@cf::invoke_results> directly). 971results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 972
885=back 973=back
886 974
887=cut 975=cut
888 976
889############################################################################# 977#############################################################################
890# object support 978# object support
979#
980
981sub _can_merge {
982 my ($ob1, $ob2) = @_;
983
984 local $Storable::canonical = 1;
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987
988 $fob1 eq $fob2
989}
891 990
892sub reattach { 991sub reattach {
893 # basically do the same as instantiate, without calling instantiate 992 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 993 my ($obj) = @_;
895 994
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1128 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1129}
1031 1130
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1131=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1132
1034Register a callback fro execution when the client sends an extcmd packet. 1133Register a callback for execution when the client sends an (synchronous)
1134extcmd packet. Ext commands will be processed in the order they are
1135received by the server, like other user commands. The first argument is
1136the logged-in player. Ext commands can only be processed after a player
1137has logged in successfully.
1035 1138
1036If the callback returns something, it is sent back as if reply was being 1139If the callback returns something, it is sent back as if reply was being
1037called. 1140called.
1038 1141
1142=item cf::register_exticmd $name => \&callback($ns,$packet);
1143
1144Register a callback for execution when the client sends an (asynchronous)
1145exticmd packet. Exti commands are processed by the server as soon as they
1146are received, i.e. out of order w.r.t. other commands. The first argument
1147is a client socket. Exti commands can be received anytime, even before
1148log-in.
1149
1150If the callback returns something, it is sent back as if reply was being
1151called.
1152
1039=cut 1153=cut
1040 1154
1041sub register_extcmd { 1155sub register_extcmd {
1042 my ($name, $cb) = @_; 1156 my ($name, $cb) = @_;
1043 1157
1044 $EXTCMD{$name} = $cb; 1158 $EXTCMD{$name} = $cb;
1159}
1160
1161sub register_exticmd {
1162 my ($name, $cb) = @_;
1163
1164 $EXTICMD{$name} = $cb;
1045} 1165}
1046 1166
1047cf::player->attach ( 1167cf::player->attach (
1048 on_command => sub { 1168 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1169 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1178 cf::override;
1059 }, 1179 },
1060 on_extcmd => sub { 1180 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1181 my ($pl, $buf) = @_;
1062 1182
1063 my $msg = eval { from_json $buf }; 1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1184
1065 if (ref $msg) { 1185 if (ref $msg) {
1186 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg
1188 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1191 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1192 my @reply = $cb->($pl, @payload);
1193
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1194 $pl->ext_reply ($reply, @reply)
1069 } 1195 if $reply;
1070 } 1196 }
1071 } else { 1197 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1199 }
1074 1200
… …
1246 $cf::PLAYER{$login} = $self; 1372 $cf::PLAYER{$login} = $self;
1247 1373
1248 $self 1374 $self
1249} 1375}
1250 1376
1377=item $player->send_msg ($channel, $msg, $color, [extra...])
1378
1379=cut
1380
1381sub send_msg {
1382 my $ns = shift->ns
1383 or return;
1384 $ns->send_msg (@_);
1385}
1386
1251=item $pl->quit_character 1387=item $pl->quit_character
1252 1388
1253Nukes the player without looking back. If logged in, the connection will 1389Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1390be destroyed. May block for a long time.
1255 1391
… …
1347 } 1483 }
1348 1484
1349 \@paths 1485 \@paths
1350} 1486}
1351 1487
1488=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1489
1490Expand crossfire pod fragments into protocol xml.
1491
1492=cut
1493
1494sub expand_cfpod {
1495 ((my $self), (local $_)) = @_;
1496
1497 # escape & and <
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500
1501 # this is buggy, it needs to properly take care of nested <'s
1502
1503 1 while
1504 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/
1508 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1
1511 }ge
1512 # replace H<hint text>
1513 || s{H<([^\>]*)>}
1514 {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "")
1518 [$self->{hintmode}]
1519 }ge;
1520
1521 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g;
1523
1524 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines
1529
1530 $_
1531}
1532
1533sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode}
1536}
1537
1352=item $player->ext_reply ($msgid, %msg) 1538=item $player->ext_reply ($msgid, @msg)
1353 1539
1354Sends an ext reply to the player. 1540Sends an ext reply to the player.
1355 1541
1356=cut 1542=cut
1357 1543
1358sub ext_reply($$%) { 1544sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1545 my ($self, $id, @msg) = @_;
1360 1546
1361 $msg{msgid} = $id; 1547 if ($self->ns->extcmd == 2) {
1362 1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1363 $self->send ("ext " . cf::to_json \%msg); 1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1364} 1554}
1365 1555
1366=item $player->ext_event ($type, %msg) 1556=item $player->ext_msg ($type, @msg)
1367 1557
1368Sends an ext event to the client. 1558Sends an ext event to the client.
1369 1559
1370=cut 1560=cut
1371 1561
1372sub ext_event($$%) { 1562sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1563 my ($self, $type, @msg) = @_;
1374 1564
1375 $self->ns->ext_event ($type, %msg); 1565 $self->ns->ext_msg ($type, @msg);
1376} 1566}
1377 1567
1378=head3 cf::region 1568=head3 cf::region
1379 1569
1380=over 4 1570=over 4
… …
1393 my ($path) = @_; 1583 my ($path) = @_;
1394 1584
1395 my ($match, $specificity); 1585 my ($match, $specificity);
1396 1586
1397 for my $region (list) { 1587 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1588 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1589 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1590 if $region->specificity > $specificity;
1401 } 1591 }
1402 } 1592 }
1403 1593
… …
1523 $self->init; # pass $1 etc. 1713 $self->init; # pass $1 etc.
1524 return $self; 1714 return $self;
1525 } 1715 }
1526 } 1716 }
1527 1717
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1718 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1719 ()
1530} 1720}
1531 1721
1532sub init { 1722sub init {
1533 my ($self) = @_; 1723 my ($self) = @_;
… …
1741 $self->set_darkness_map; 1931 $self->set_darkness_map;
1742 Coro::cede; 1932 Coro::cede;
1743 $self->activate; 1933 $self->activate;
1744 } 1934 }
1745 1935
1936 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME);
1938
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1939 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1940 }
1748 1941
1749 $self->post_load; 1942 $self->post_load;
1750} 1943}
… …
1811 2004
1812 undef $MAP_PREFETCH{$path}; 2005 undef $MAP_PREFETCH{$path};
1813 $MAP_PREFETCHER ||= cf::async { 2006 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 2007 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2008 for my $path (keys %MAP_PREFETCH) {
1816 my $map = find $path 2009 if (my $map = find $path) {
1817 or next;
1818 $map->load; 2010 $map->load;
2011 }
1819 2012
1820 delete $MAP_PREFETCH{$path}; 2013 delete $MAP_PREFETCH{$path};
1821 } 2014 }
1822 } 2015 }
1823 undef $MAP_PREFETCHER; 2016 undef $MAP_PREFETCHER;
… …
2045 2238
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2239 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2240
2048 if ($self->{record_replies}) { 2241 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2242 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2243
2050 } else { 2244 } else {
2245 my $pl = $self->contr;
2246
2247 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2248 my $dialog = $pl->{npc_dialog};
2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2250
2251 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2252 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2253 $self->message ($msg, $flags);
2254 }
2053 } 2255 }
2256}
2257
2258=item $object->send_msg ($channel, $msg, $color, [extra...])
2259
2260=cut
2261
2262sub cf::object::send_msg {
2263 my $pl = shift->contr
2264 or return;
2265 $pl->send_msg (@_);
2054} 2266}
2055 2267
2056=item $player_object->may ("access") 2268=item $player_object->may ("access")
2057 2269
2058Returns wether the given player is authorized to access resource "access" 2270Returns wether the given player is authorized to access resource "access"
… …
2146 2358
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2360 $self->enter_map ($map, $x, $y);
2149} 2361}
2150 2362
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2363=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2364
2153Moves the player to the given map-path and coordinates by first freezing 2365Moves the player to the given map-path and coordinates by first freezing
2154her, loading and preparing them map, calling the provided $check callback 2366her, loading and preparing them map, calling the provided $check callback
2155that has to return the map if sucecssful, and then unfreezes the player on 2367that has to return the map if sucecssful, and then unfreezes the player on
2156the new (success) or old (failed) map position. 2368the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process.
2157 2370
2158=cut 2371=cut
2159 2372
2160our $GOTOGEN; 2373our $GOTOGEN;
2161 2374
2162sub cf::object::player::goto { 2375sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2376 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2377
2165 # do generation counting so two concurrent goto's will be executed in-order 2378 # do generation counting so two concurrent goto's will be executed in-order
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2380
2168 $self->enter_link; 2381 $self->enter_link;
… …
2188 2401
2189 if ($gen == $self->{_goto_generation}) { 2402 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2403 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2404 $self->leave_link ($map, $x, $y);
2192 } 2405 }
2406
2407 $done->() if $done;
2193 })->prio (1); 2408 })->prio (1);
2194} 2409}
2195 2410
2196=item $player_object->enter_exit ($exit_object) 2411=item $player_object->enter_exit ($exit_object)
2197 2412
… …
2266 my $hp = $exit->stats->hp; 2481 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2482 my $sp = $exit->stats->sp;
2268 2483
2269 $self->enter_link; 2484 $self->enter_link;
2270 2485
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2271 (async { 2490 (async {
2272 $self->deactivate_recursive; # just to be sure 2491 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2492 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2493 $self->goto ($slaying, $hp, $sp);
2275 2494
… …
2302 2521
2303 utf8::encode $text; 2522 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2523 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2524}
2306 2525
2526=item $client->send_msg ($channel, $msg, $color, [extra...])
2527
2528Send a drawinfo or msg packet to the client, formatting the msg for the
2529client if neccessary. C<$type> should be a string identifying the type of
2530the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet.
2532
2533=cut
2534
2535sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_;
2537
2538 $msg = $self->pl->expand_cfpod ($msg);
2539
2540 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541
2542 if (ref $channel) {
2543 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel);
2547 }
2548
2549 $channel = $channel->{id};
2550 }
2551
2552 return unless @extra || length $msg;
2553
2554 if ($self->can_msg) {
2555 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF;
2558
2559 $self->send_packet ("msg " . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2561 } else {
2562 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones
2564 for ($msg) {
2565 1 while
2566 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2567 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2568 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2569 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2570 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2571 }
2572
2573 $color &= cf::NDI_COLOR_MASK;
2574
2575 utf8::encode $msg;
2576
2577 if (0 && $msg =~ /\[/) {
2578 # COMMAND/INFO
2579 $self->send_packet ("drawextinfo $color 10 8 $msg")
2580 } else {
2581 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2582 $self->send_packet ("drawinfo $color $msg")
2583 }
2584 }
2585 }
2586}
2587
2307=item $client->ext_event ($type, %msg) 2588=item $client->ext_msg ($type, @msg)
2308 2589
2309Sends an exti event to the client. 2590Sends an ext event to the client.
2310 2591
2311=cut 2592=cut
2312 2593
2313sub cf::client::ext_event($$%) { 2594sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2595 my ($self, $type, @msg) = @_;
2315 2596
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2602 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 }
2318} 2605}
2319 2606
2320=item $success = $client->query ($flags, "text", \&cb) 2607=item $success = $client->query ($flags, "text", \&cb)
2321 2608
2322Queues a query to the client, calling the given callback with 2609Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2610the 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>. 2611C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2612
2326Queries can fail, so check the return code. Or don't, as queries will become 2613Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2614become reliable at some point in the future.
2328 2615
2329=cut 2616=cut
2330 2617
2331sub cf::client::query { 2618sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2619 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2627 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2628 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2629
2343 $self->send_packet ($self->{query_queue}[0][0]) 2630 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2631 if @{ $self->{query_queue} } == 1;
2632
2633 1
2345} 2634}
2346 2635
2347cf::client->attach ( 2636cf::client->attach (
2637 on_connect => sub {
2638 my ($ns) = @_;
2639
2640 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2641 },
2348 on_reply => sub { 2642 on_reply => sub {
2349 my ($ns, $msg) = @_; 2643 my ($ns, $msg) = @_;
2350 2644
2351 # this weird shuffling is so that direct followup queries 2645 # this weird shuffling is so that direct followup queries
2352 # get handled first 2646 # get handled first
… …
2364 } else { 2658 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2659 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2660 }
2367 } 2661 }
2368 }, 2662 },
2663 on_exticmd => sub {
2664 my ($ns, $buf) = @_;
2665
2666 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2667
2668 if (ref $msg) {
2669 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg
2671 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673
2674 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 }
2680 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 }
2683
2684 cf::override;
2685 },
2369); 2686);
2370 2687
2371=item $client->async (\&cb) 2688=item $client->async (\&cb)
2372 2689
2373Create a new coroutine, running the specified callback. The coroutine will 2690Create a new coroutine, running the specified callback. The coroutine will
… …
2414our $safe = new Safe "safe"; 2731our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 2732our $safe_hole = new Safe::Hole;
2416 2733
2417$SIG{FPE} = 'IGNORE'; 2734$SIG{FPE} = 'IGNORE';
2418 2735
2419$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2736$safe->permit_only (Opcode::opset qw(
2737 :base_core :base_mem :base_orig :base_math
2738 grepstart grepwhile mapstart mapwhile
2739 sort time
2740));
2420 2741
2421# here we export the classes and methods available to script code 2742# here we export the classes and methods available to script code
2422 2743
2423=pod 2744=pod
2424 2745
2425The following functions and methods are available within a safe environment: 2746The following functions and methods are available within a safe environment:
2426 2747
2427 cf::object contr pay_amount pay_player map 2748 cf::object
2749 contr pay_amount pay_player map x y force_find force_add
2750 insert remove name archname title slaying race
2751
2428 cf::object::player player 2752 cf::object::player
2429 cf::player peaceful 2753 player
2430 cf::map trigger 2754
2755 cf::player
2756 peaceful
2757
2758 cf::map
2759 trigger
2431 2760
2432=cut 2761=cut
2433 2762
2434for ( 2763for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)],
2436 ["cf::object::player" => qw(player)], 2766 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 2767 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 2768 ["cf::map" => qw(trigger)],
2439) { 2769) {
2440 no strict 'refs'; 2770 no strict 'refs';
… …
2532 { 2862 {
2533 my $faces = $facedata->{faceinfo}; 2863 my $faces = $facedata->{faceinfo};
2534 2864
2535 while (my ($face, $info) = each %$faces) { 2865 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2866 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2867 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2540 Coro::cede; 2871
2872 cf::cede_to_tick;
2541 } 2873 }
2542 2874
2543 while (my ($face, $info) = each %$faces) { 2875 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 2876 next unless $info->{smooth};
2545 my $idx = cf::face::find $face 2877 my $idx = cf::face::find $face
2546 or next; 2878 or next;
2547 if (my $smooth = cf::face::find $info->{smooth}) { 2879 if (my $smooth = cf::face::find $info->{smooth}) {
2880 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2881 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 2882 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2883 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 2884 }
2552 Coro::cede; 2885
2886 cf::cede_to_tick;
2553 } 2887 }
2554 } 2888 }
2555 2889
2556 { 2890 {
2557 my $anims = $facedata->{animinfo}; 2891 my $anims = $facedata->{animinfo};
2558 2892
2559 while (my ($anim, $info) = each %$anims) { 2893 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2894 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 2895 cf::cede_to_tick;
2562 } 2896 }
2563 2897
2564 cf::anim::invalidate_all; # d'oh 2898 cf::anim::invalidate_all; # d'oh
2565 } 2899 }
2566 2900
2901 {
2902 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908
2909 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2916
2917 if ($info->{type} & 1) {
2918 # prepend meta info
2919
2920 my $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2922
2923 cf::face::set_data $idx, 0, $data, $chk;
2924 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2926 }
2927
2928 cf::face::set_type $idx, $info->{type};
2929
2930 cf::cede_to_tick;
2931 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2950 }
2951
2567 1 2952 1
2568} 2953}
2954
2955register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_;
2957
2958 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v);
2960 }
2961};
2569 2962
2570sub reload_regions { 2963sub reload_regions {
2571 load_resource_file "$MAPDIR/regions" 2964 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 2965 or die "unable to load regions file\n";
2966
2967 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/
2969 if exists $_->{match};
2970 }
2573} 2971}
2574 2972
2575sub reload_facedata { 2973sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 2974 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2975 or die "unable to load facedata\n";
2578} 2976}
2579 2977
2580sub reload_archetypes { 2978sub reload_archetypes {
2979 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n";
2981 #d# NEED to laod twice to resolve forward references
2982 # this really needs to be done in an extra post-pass
2983 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 2984 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2985 or die "unable to load archetypes\n";
2583} 2986}
2584 2987
2585sub reload_treasures { 2988sub reload_treasures {
… …
2779 %EXT_CORO = (); 3182 %EXT_CORO = ();
2780 3183
2781 warn "removing commands"; 3184 warn "removing commands";
2782 %COMMAND = (); 3185 %COMMAND = ();
2783 3186
2784 warn "removing ext commands"; 3187 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3188 %EXTCMD = ();
3189 %EXTICMD = ();
2786 3190
2787 warn "unloading/nuking all extensions"; 3191 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3192 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3193 warn "... unloading $pkg";
2790 3194

Diff Legend

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