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.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.336 by root, Tue Aug 21 00:31:18 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
26use JSON::XS 1.4 ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::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
49our %COMMAND = (); 52our %COMMAND = ();
50our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
51 54
52our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
56 60
57our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
58our @EVENT; 62our @EVENT;
163=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
164 168
165These 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
166returns 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
167per 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.
168 178
169=back 179=back
170 180
171=cut 181=cut
172 182
236 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
237 $d 247 $d
238 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
239} 249}
240 250
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
244 252
245Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
246 254
247=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
258
259=cut
260
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262
263sub to_json ($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) }
250 265
251=item cf::lock_wait $string 266=item cf::lock_wait $string
252 267
253Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
254 269
306 my $guard = Coro::guard { 321 my $guard = Coro::guard {
307 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
308 }; 323 };
309 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
310 $guard 325 $guard
326}
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;
311} 382}
312 383
313=item cf::async { BLOCK } 384=item cf::async { BLOCK }
314 385
315Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
405=cut 476=cut
406 477
407sub fork_call(&@) { 478sub fork_call(&@) {
408 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
409 480
410# 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,
411# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
413 or die "pipe: $!";
414 484
415 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 486 reset_signals;
428 local $SIG{__WARN__}; 487 &$cb
429 local $SIG{__DIE__}; 488 }, @args;
430 eval {
431 close $fh1;
432 489
433 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
435 };
436
437 warn $@ if $@;
438 _exit 0;
439 }
440} 491}
441 492
442=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
443 494
444Returns a single value from the environment database. 495Returns a single value from the environment database.
840 "; 891 ";
841 die if $@; 892 die if $@;
842} 893}
843 894
844our $override; 895our $override;
845our @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?
846 897
847sub override { 898sub override {
848 $override = 1; 899 $override = 1;
849 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
850} 901}
851 902
852sub do_invoke { 903sub do_invoke {
853 my $event = shift; 904 my $event = shift;
854 my $callbacks = shift; 905 my $callbacks = shift;
855 906
856 @invoke_results = (); 907 @INVOKE_RESULTS = ();
857 908
858 local $override; 909 local $override;
859 910
860 for (@$callbacks) { 911 for (@$callbacks) {
861 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
878 929
879Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
880 931
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 935
885=back 936=back
886 937
887=cut 938=cut
888 939
889############################################################################# 940#############################################################################
890# 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}
891 953
892sub reattach { 954sub reattach {
893 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 956 my ($obj) = @_;
895 957
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1092}
1031 1093
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1095
1034Register a callback fro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
1035 1101
1036If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
1037called. 1103called.
1038 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
1039=cut 1116=cut
1040 1117
1041sub register_extcmd { 1118sub register_extcmd {
1042 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
1043 1120
1044 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
1045} 1128}
1046 1129
1047cf::player->attach ( 1130cf::player->attach (
1048 on_command => sub { 1131 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
1058 cf::override; 1141 cf::override;
1059 }, 1142 },
1060 on_extcmd => sub { 1143 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1062 1145
1063 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1147
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1068 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1069 } 1158 if $reply;
1070 } 1159 }
1071 } else { 1160 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1162 }
1074 1163
1246 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1247 1336
1248 $self 1337 $self
1249} 1338}
1250 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 (@_);
1348}
1349
1251=item $pl->quit_character 1350=item $pl->quit_character
1252 1351
1253Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1353be destroyed. May block for a long time.
1255 1354
1347 } 1446 }
1348 1447
1349 \@paths 1448 \@paths
1350} 1449}
1351 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1352=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1353 1502
1354Sends an ext reply to the player. 1503Sends an ext reply to the player.
1355 1504
1356=cut 1505=cut
1357 1506
1358sub ext_reply($$%) { 1507sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1360 1509
1361 $msg{msgid} = $id; 1510 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1511}
1365 1512
1366=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1367 1514
1368Sends an ext event to the client. 1515Sends an ext event to the client.
1369 1516
1370=cut 1517=cut
1371 1518
1372sub ext_event($$%) { 1519sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1374 1521
1375 $self->ns->ext_event ($type, %msg); 1522 $self->ns->ext_msg ($type, @msg);
1376} 1523}
1377 1524
1378=head3 cf::region 1525=head3 cf::region
1379 1526
1380=over 4 1527=over 4
1393 my ($path) = @_; 1540 my ($path) = @_;
1394 1541
1395 my ($match, $specificity); 1542 my ($match, $specificity);
1396 1543
1397 for my $region (list) { 1544 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1545 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1546 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1547 if $region->specificity > $specificity;
1401 } 1548 }
1402 } 1549 }
1403 1550
1523 $self->init; # pass $1 etc. 1670 $self->init; # pass $1 etc.
1524 return $self; 1671 return $self;
1525 } 1672 }
1526 } 1673 }
1527 1674
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1675 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1676 ()
1530} 1677}
1531 1678
1532sub init { 1679sub init {
1533 my ($self) = @_; 1680 my ($self) = @_;
1741 $self->set_darkness_map; 1888 $self->set_darkness_map;
1742 Coro::cede; 1889 Coro::cede;
1743 $self->activate; 1890 $self->activate;
1744 } 1891 }
1745 1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1896 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1897 }
1748 1898
1749 $self->post_load; 1899 $self->post_load;
1750} 1900}
1760 1910
1761 $self 1911 $self
1762} 1912}
1763 1913
1764# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1765sub load_diag { 1915sub load_neighbours {
1766 my ($map) = @_; 1916 my ($map) = @_;
1767 1917
1768 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1769 1919
1770 for (0 .. 3) { 1920 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1772 or next; 1922 or next;
1773 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1774 or next; 1924 or next;
1775 $neigh->load; 1925 $neigh->load;
1776 1926
1927 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 1930 }
1780 1931
1781 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1783 or next; 1935 or next;
1784 $neigh->load; 1936 $neigh->load;
1785 } 1937 }
1786} 1938}
1787 1939
1811 1963
1812 undef $MAP_PREFETCH{$path}; 1964 undef $MAP_PREFETCH{$path};
1813 $MAP_PREFETCHER ||= cf::async { 1965 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 1966 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 1967 for my $path (keys %MAP_PREFETCH) {
1816 my $map = find $path 1968 if (my $map = find $path) {
1817 or next;
1818 $map->load; 1969 $map->load;
1970 }
1819 1971
1820 delete $MAP_PREFETCH{$path}; 1972 delete $MAP_PREFETCH{$path};
1821 } 1973 }
1822 } 1974 }
1823 undef $MAP_PREFETCHER; 1975 undef $MAP_PREFETCHER;
2050 2202
2051 } else { 2203 } else {
2052 my $pl = $self->contr; 2204 my $pl = $self->contr;
2053 2205
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2207 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2209
2060 } else { 2210 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2063 } 2213 }
2064 } 2214 }
2215}
2216
2217=item $object->send_msg ($channel, $msg, $color, [extra...])
2218
2219=cut
2220
2221sub cf::object::send_msg {
2222 my $pl = shift->contr
2223 or return;
2224 $pl->send_msg (@_);
2065} 2225}
2066 2226
2067=item $player_object->may ("access") 2227=item $player_object->may ("access")
2068 2228
2069Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
2148 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2151 2311
2152 $map->load; 2312 $map->load;
2153 $map->load_diag; 2313 $map->load_neighbours;
2154 2314
2155 return unless $self->contr->active; 2315 return unless $self->contr->active;
2156 $self->activate_recursive; 2316 $self->activate_recursive;
2157 2317
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2319 $self->enter_map ($map, $x, $y);
2160} 2320}
2161 2321
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2322=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2323
2164Moves the player to the given map-path and coordinates by first freezing 2324Moves the player to the given map-path and coordinates by first freezing
2165her, loading and preparing them map, calling the provided $check callback 2325her, loading and preparing them map, calling the provided $check callback
2166that has to return the map if sucecssful, and then unfreezes the player on 2326that has to return the map if sucecssful, and then unfreezes the player on
2167the new (success) or old (failed) map position. 2327the new (success) or old (failed) map position. In either case, $done will
2328be called at the end of this process.
2168 2329
2169=cut 2330=cut
2170 2331
2171our $GOTOGEN; 2332our $GOTOGEN;
2172 2333
2173sub cf::object::player::goto { 2334sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2335 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2336
2176 # do generation counting so two concurrent goto's will be executed in-order 2337 # do generation counting so two concurrent goto's will be executed in-order
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2339
2179 $self->enter_link; 2340 $self->enter_link;
2199 2360
2200 if ($gen == $self->{_goto_generation}) { 2361 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2362 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2363 $self->leave_link ($map, $x, $y);
2203 } 2364 }
2365
2366 $done->() if $done;
2204 })->prio (1); 2367 })->prio (1);
2205} 2368}
2206 2369
2207=item $player_object->enter_exit ($exit_object) 2370=item $player_object->enter_exit ($exit_object)
2208 2371
2277 my $hp = $exit->stats->hp; 2440 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp; 2441 my $sp = $exit->stats->sp;
2279 2442
2280 $self->enter_link; 2443 $self->enter_link;
2281 2444
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
2448
2282 (async { 2449 (async {
2283 $self->deactivate_recursive; # just to be sure 2450 $self->deactivate_recursive; # just to be sure
2284 unless (eval { 2451 unless (eval {
2285 $self->goto ($slaying, $hp, $sp); 2452 $self->goto ($slaying, $hp, $sp);
2286 2453
2313 2480
2314 utf8::encode $text; 2481 utf8::encode $text;
2315 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2482 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2316} 2483}
2317 2484
2485=item $client->send_msg ($channel, $msg, $color, [extra...])
2486
2487Send a drawinfo or msg packet to the client, formatting the msg for the
2488client if neccessary. C<$type> should be a string identifying the type of
2489the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet.
2491
2492=cut
2493
2494sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_;
2496
2497 $msg = $self->pl->expand_cfpod ($msg);
2498
2499 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500
2501 if (ref $channel) {
2502 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel);
2506 }
2507
2508 $channel = $channel->{id};
2509 }
2510
2511 return unless @extra || length $msg;
2512
2513 if ($self->can_msg) {
2514 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF;
2517
2518 $self->send_packet ("msg " . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2520 } else {
2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 $color &= cf::NDI_COLOR_MASK;
2533
2534 utf8::encode $msg;
2535
2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2539 } else {
2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2541 $self->send_packet ("drawinfo $color $msg")
2542 }
2543 }
2544 }
2545}
2546
2318=item $client->ext_event ($type, %msg) 2547=item $client->ext_msg ($type, @msg)
2319 2548
2320Sends an exti event to the client. 2549Sends an ext event to the client.
2321 2550
2322=cut 2551=cut
2323 2552
2324sub cf::client::ext_event($$%) { 2553sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2554 my ($self, $type, @msg) = @_;
2326 2555
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2561 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2329} 2582}
2330 2583
2331=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2332 2585
2333Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2587the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2588C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2589
2337Queries can fail, so check the return code. Or don't, as queries will become 2590Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2591become reliable at some point in the future.
2339 2592
2340=cut 2593=cut
2341 2594
2342sub cf::client::query { 2595sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2596 my ($self, $flags, $text, $cb) = @_;
2351 utf8::encode $text; 2604 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2605 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2606
2354 $self->send_packet ($self->{query_queue}[0][0]) 2607 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2608 if @{ $self->{query_queue} } == 1;
2609
2610 1
2356} 2611}
2357 2612
2358cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2359 on_reply => sub { 2619 on_reply => sub {
2360 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2361 2621
2362 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2363 # get handled first 2623 # get handled first
2375 } else { 2635 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2636 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2637 }
2378 } 2638 }
2379 }, 2639 },
2640 on_exticmd => sub {
2641 my ($ns, $buf) = @_;
2642
2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2644
2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2651 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 }
2657 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 }
2660
2661 cf::override;
2662 },
2380); 2663);
2381 2664
2382=item $client->async (\&cb) 2665=item $client->async (\&cb)
2383 2666
2384Create a new coroutine, running the specified callback. The coroutine will 2667Create a new coroutine, running the specified callback. The coroutine will
2425our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2427 2710
2428$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2429 2712
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2713$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math
2715 grepstart grepwhile mapstart mapwhile
2716 sort time
2717));
2431 2718
2432# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2433 2720
2434=pod 2721=pod
2435 2722
2436The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2437 2724
2438 cf::object contr pay_amount pay_player map 2725 cf::object
2726 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race
2728
2439 cf::object::player player 2729 cf::object::player
2440 cf::player peaceful 2730 player
2441 cf::map trigger 2731
2732 cf::player
2733 peaceful
2734
2735 cf::map
2736 trigger
2442 2737
2443=cut 2738=cut
2444 2739
2445for ( 2740for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)],
2447 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2450) { 2746) {
2451 no strict 'refs'; 2747 no strict 'refs';
2527# the server's init and main functions 2823# the server's init and main functions
2528 2824
2529sub load_facedata($) { 2825sub load_facedata($) {
2530 my ($path) = @_; 2826 my ($path) = @_;
2531 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2532 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2533 2831
2534 my $facedata; 2832 my $facedata;
2535 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 2834 or die "$path: $!";
2538 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2539 2837
2540 $facedata->{version} == 2 2838 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2847
2543 { 2848 {
2544 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2545 2850
2546 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 2857
2858 cf::cede_to_tick;
2552 } 2859 }
2553 2860
2554 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 2862 next unless $info->{smooth};
2556 my $idx = cf::face::find $face 2863 my $idx = cf::face::find $face
2557 or next; 2864 or next;
2558 if (my $smooth = cf::face::find $info->{smooth}) { 2865 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 2868 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2869 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 2870 }
2563 Coro::cede; 2871
2872 cf::cede_to_tick;
2564 } 2873 }
2565 } 2874 }
2566 2875
2567 { 2876 {
2568 my $anims = $facedata->{animinfo}; 2877 my $anims = $facedata->{animinfo};
2569 2878
2570 while (my ($anim, $info) = each %$anims) { 2879 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2880 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 2881 cf::cede_to_tick;
2573 } 2882 }
2574 2883
2575 cf::anim::invalidate_all; # d'oh 2884 cf::anim::invalidate_all; # d'oh
2576 } 2885 }
2577 2886
2887 {
2888 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource};
2891
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2897
2898 if ($info->{type} & 1) {
2899 # prepend meta info
2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2906 $data = pack "(w/a*)*", $meta, $info->{data};
2907 }
2908
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type};
2911
2912 cf::cede_to_tick;
2913 }
2914
2915 if ($soundconf) {
2916 $soundconf = $enc->decode (delete $soundconf->{data});
2917
2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2919 my $sound = $soundconf->{compat}[$_]
2920 or next;
2921
2922 my $face = cf::face::find "sound/$sound->[1]";
2923 cf::sound::set $sound->[0] => $face;
2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2925 }
2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2930 }
2931 }
2932 }
2933
2578 1 2934 1
2579} 2935}
2936
2937register_exticmd fx_want => sub {
2938 my ($ns, $want) = @_;
2939
2940 while (my ($k, $v) = each %$want) {
2941 $ns->fx_want ($k, $v);
2942 }
2943};
2580 2944
2581sub reload_regions { 2945sub reload_regions {
2582 load_resource_file "$MAPDIR/regions" 2946 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 2947 or die "unable to load regions file\n";
2948
2949 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/
2951 if exists $_->{match};
2952 }
2584} 2953}
2585 2954
2586sub reload_facedata { 2955sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 2956 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 2957 or die "unable to load facedata\n";
2589} 2958}
2590 2959
2591sub reload_archetypes { 2960sub reload_archetypes {
2961 load_resource_file "$DATADIR/archetypes"
2962 or die "unable to load archetypes\n";
2963 #d# NEED to laod twice to resolve forward references
2964 # this really needs to be done in an extra post-pass
2965 # (which needs to be synchronous, so solve it differently)
2592 load_resource_file "$DATADIR/archetypes" 2966 load_resource_file "$DATADIR/archetypes"
2593 or die "unable to load archetypes\n"; 2967 or die "unable to load archetypes\n";
2594} 2968}
2595 2969
2596sub reload_treasures { 2970sub reload_treasures {
2790 %EXT_CORO = (); 3164 %EXT_CORO = ();
2791 3165
2792 warn "removing commands"; 3166 warn "removing commands";
2793 %COMMAND = (); 3167 %COMMAND = ();
2794 3168
2795 warn "removing ext commands"; 3169 warn "removing ext/exti commands";
2796 %EXTCMD = (); 3170 %EXTCMD = ();
3171 %EXTICMD = ();
2797 3172
2798 warn "unloading/nuking all extensions"; 3173 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) { 3174 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg"; 3175 warn "... unloading $pkg";
2801 3176

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines