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.344 by root, Mon Aug 27 02:43:38 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 ();
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
1154 my @reply;
1155
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1071 } else { 1163 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1165 }
1074 1166
1075 cf::override; 1167 cf::override;
… …
1246 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1247 1339
1248 $self 1340 $self
1249} 1341}
1250 1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1351}
1352
1251=item $pl->quit_character 1353=item $pl->quit_character
1252 1354
1253Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1356be destroyed. May block for a long time.
1255 1357
… …
1347 } 1449 }
1348 1450
1349 \@paths 1451 \@paths
1350} 1452}
1351 1453
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1455
1456Expand crossfire pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1352=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1353 1505
1354Sends an ext reply to the player. 1506Sends an ext reply to the player.
1355 1507
1356=cut 1508=cut
1357 1509
1358sub ext_reply($$%) { 1510sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1360 1512
1361 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1514}
1365 1515
1366=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1367 1517
1368Sends an ext event to the client. 1518Sends an ext event to the client.
1369 1519
1370=cut 1520=cut
1371 1521
1372sub ext_event($$%) { 1522sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1374 1524
1375 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1376} 1526}
1377 1527
1378=head3 cf::region 1528=head3 cf::region
1379 1529
1380=over 4 1530=over 4
… …
1393 my ($path) = @_; 1543 my ($path) = @_;
1394 1544
1395 my ($match, $specificity); 1545 my ($match, $specificity);
1396 1546
1397 for my $region (list) { 1547 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1401 } 1551 }
1402 } 1552 }
1403 1553
… …
1523 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1524 return $self; 1674 return $self;
1525 } 1675 }
1526 } 1676 }
1527 1677
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1679 ()
1530} 1680}
1531 1681
1532sub init { 1682sub init {
1533 my ($self) = @_; 1683 my ($self) = @_;
… …
1741 $self->set_darkness_map; 1891 $self->set_darkness_map;
1742 Coro::cede; 1892 Coro::cede;
1743 $self->activate; 1893 $self->activate;
1744 } 1894 }
1745 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1746 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1747 } 1900 }
1748 1901
1749 $self->post_load; 1902 $self->post_load;
1750} 1903}
… …
1760 1913
1761 $self 1914 $self
1762} 1915}
1763 1916
1764# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1765sub load_diag { 1918sub load_neighbours {
1766 my ($map) = @_; 1919 my ($map) = @_;
1767 1920
1768 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1769 1922
1770 for (0 .. 3) { 1923 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1772 or next; 1925 or next;
1773 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1774 or next; 1927 or next;
1775 $neigh->load; 1928 $neigh->load;
1776 1929
1930 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 1933 }
1780 1934
1781 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1783 or next; 1938 or next;
1784 $neigh->load; 1939 $neigh->load;
1785 } 1940 }
1786} 1941}
1787 1942
… …
1792} 1947}
1793 1948
1794sub do_load_sync { 1949sub do_load_sync {
1795 my ($map) = @_; 1950 my ($map) = @_;
1796 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1797 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1798} 1956}
1799 1957
1800our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1802 1960
1803sub find_async { 1961sub find_async {
1804 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1805 1963
1806 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1807 1965
1808 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1810 } 1968 }
1811 1969
1812 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1813 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1814 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 1975 if (my $map = find $k) {
1817 or next;
1818 $map->load; 1976 $map->load if $v;
1977 }
1819 1978
1820 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1821 } 1980 }
1822 } 1981 }
1823 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1824 }; 1983 };
1825 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2045 2204
2046 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2205 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
2047 2206
2048 if ($self->{record_replies}) { 2207 if ($self->{record_replies}) {
2049 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2208 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2209
2050 } else { 2210 } else {
2211 my $pl = $self->contr;
2212
2213 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2214 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216
2217 } else {
2051 $msg = $npc->name . " says: $msg" if $npc; 2218 $msg = $npc->name . " says: $msg" if $npc;
2052 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2220 }
2053 } 2221 }
2222}
2223
2224=item $object->send_msg ($channel, $msg, $color, [extra...])
2225
2226=cut
2227
2228sub cf::object::send_msg {
2229 my $pl = shift->contr
2230 or return;
2231 $pl->send_msg (@_);
2054} 2232}
2055 2233
2056=item $player_object->may ("access") 2234=item $player_object->may ("access")
2057 2235
2058Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
… …
2137 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
2138 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
2139 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
2140 2318
2141 $map->load; 2319 $map->load;
2142 $map->load_diag; 2320 $map->load_neighbours;
2143 2321
2144 return unless $self->contr->active; 2322 return unless $self->contr->active;
2145 $self->activate_recursive; 2323 $self->activate_recursive;
2146 2324
2147 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2148 $self->enter_map ($map, $x, $y); 2326 $self->enter_map ($map, $x, $y);
2149} 2327}
2150 2328
2151=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2152 2330
2153Moves the player to the given map-path and coordinates by first freezing 2331Moves the player to the given map-path and coordinates by first freezing
2154her, loading and preparing them map, calling the provided $check callback 2332her, loading and preparing them map, calling the provided $check callback
2155that has to return the map if sucecssful, and then unfreezes the player on 2333that has to return the map if sucecssful, and then unfreezes the player on
2156the new (success) or old (failed) map position. 2334the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process.
2157 2336
2158=cut 2337=cut
2159 2338
2160our $GOTOGEN; 2339our $GOTOGEN;
2161 2340
2162sub cf::object::player::goto { 2341sub cf::object::player::goto {
2163 my ($self, $path, $x, $y, $check) = @_; 2342 my ($self, $path, $x, $y, $check, $done) = @_;
2164 2343
2165 # do generation counting so two concurrent goto's will be executed in-order 2344 # do generation counting so two concurrent goto's will be executed in-order
2166 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2167 2346
2168 $self->enter_link; 2347 $self->enter_link;
… …
2188 2367
2189 if ($gen == $self->{_goto_generation}) { 2368 if ($gen == $self->{_goto_generation}) {
2190 delete $self->{_goto_generation}; 2369 delete $self->{_goto_generation};
2191 $self->leave_link ($map, $x, $y); 2370 $self->leave_link ($map, $x, $y);
2192 } 2371 }
2372
2373 $done->() if $done;
2193 })->prio (1); 2374 })->prio (1);
2194} 2375}
2195 2376
2196=item $player_object->enter_exit ($exit_object) 2377=item $player_object->enter_exit ($exit_object)
2197 2378
… …
2266 my $hp = $exit->stats->hp; 2447 my $hp = $exit->stats->hp;
2267 my $sp = $exit->stats->sp; 2448 my $sp = $exit->stats->sp;
2268 2449
2269 $self->enter_link; 2450 $self->enter_link;
2270 2451
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2271 (async { 2456 (async {
2272 $self->deactivate_recursive; # just to be sure 2457 $self->deactivate_recursive; # just to be sure
2273 unless (eval { 2458 unless (eval {
2274 $self->goto ($slaying, $hp, $sp); 2459 $self->goto ($slaying, $hp, $sp);
2275 2460
… …
2302 2487
2303 utf8::encode $text; 2488 utf8::encode $text;
2304 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2305} 2490}
2306 2491
2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2493
2494Send a drawinfo or msg packet to the client, formatting the msg for the
2495client if neccessary. C<$type> should be a string identifying the type of
2496the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet.
2498
2499=cut
2500
2501sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_;
2503
2504 $msg = $self->pl->expand_cfpod ($msg);
2505
2506 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507
2508 if (ref $channel) {
2509 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel);
2513 }
2514
2515 $channel = $channel->{id};
2516 }
2517
2518 return unless @extra || length $msg;
2519
2520 if ($self->can_msg) {
2521 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF;
2524
2525 $self->send_packet ("msg " . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else {
2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538
2539 $color &= cf::NDI_COLOR_MASK;
2540
2541 utf8::encode $msg;
2542
2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2546 } else {
2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2548 $self->send_packet ("drawinfo $color $msg")
2549 }
2550 }
2551 }
2552}
2553
2307=item $client->ext_event ($type, %msg) 2554=item $client->ext_msg ($type, @msg)
2308 2555
2309Sends an exti event to the client. 2556Sends an ext event to the client.
2310 2557
2311=cut 2558=cut
2312 2559
2313sub cf::client::ext_event($$%) { 2560sub cf::client::ext_msg($$@) {
2314 my ($self, $type, %msg) = @_; 2561 my ($self, $type, @msg) = @_;
2315 2562
2563 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove
2316 $msg{msgtype} = "event_$type"; 2566 push @msg, msgtype => "event_$type";
2317 $self->send_packet ("ext " . cf::to_json \%msg); 2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 }
2569}
2570
2571=item $client->ext_reply ($msgid, @msg)
2572
2573Sends an ext reply to the client.
2574
2575=cut
2576
2577sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_;
2579
2580 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id;
2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2586 }
2318} 2587}
2319 2588
2320=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
2321 2590
2322Queues a query to the client, calling the given callback with 2591Queues a query to the client, calling the given callback with
2323the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2592the 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>. 2593C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2325 2594
2326Queries can fail, so check the return code. Or don't, as queries will become 2595Queries can fail, so check the return code. Or don't, as queries will
2327reliable at some point in the future. 2596become reliable at some point in the future.
2328 2597
2329=cut 2598=cut
2330 2599
2331sub cf::client::query { 2600sub cf::client::query {
2332 my ($self, $flags, $text, $cb) = @_; 2601 my ($self, $flags, $text, $cb) = @_;
… …
2340 utf8::encode $text; 2609 utf8::encode $text;
2341 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2610 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2342 2611
2343 $self->send_packet ($self->{query_queue}[0][0]) 2612 $self->send_packet ($self->{query_queue}[0][0])
2344 if @{ $self->{query_queue} } == 1; 2613 if @{ $self->{query_queue} } == 1;
2614
2615 1
2345} 2616}
2346 2617
2347cf::client->attach ( 2618cf::client->attach (
2619 on_connect => sub {
2620 my ($ns) = @_;
2621
2622 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2623 },
2348 on_reply => sub { 2624 on_reply => sub {
2349 my ($ns, $msg) = @_; 2625 my ($ns, $msg) = @_;
2350 2626
2351 # this weird shuffling is so that direct followup queries 2627 # this weird shuffling is so that direct followup queries
2352 # get handled first 2628 # get handled first
… …
2364 } else { 2640 } else {
2365 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2641 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2366 } 2642 }
2367 } 2643 }
2368 }, 2644 },
2645 on_exticmd => sub {
2646 my ($ns, $buf) = @_;
2647
2648 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2649
2650 if (ref $msg) {
2651 my ($type, $reply, @payload) =
2652 "ARRAY" eq ref $msg
2653 ? @$msg
2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2655
2656 my @reply;
2657
2658 if (my $cb = $EXTICMD{$type}) {
2659 @reply = $cb->($ns, @payload);
2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2665 } else {
2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2667 }
2668
2669 cf::override;
2670 },
2369); 2671);
2370 2672
2371=item $client->async (\&cb) 2673=item $client->async (\&cb)
2372 2674
2373Create a new coroutine, running the specified callback. The coroutine will 2675Create a new coroutine, running the specified callback. The coroutine will
… …
2414our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2415our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2416 2718
2417$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2418 2720
2419$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2721$safe->permit_only (Opcode::opset qw(
2722 :base_core :base_mem :base_orig :base_math
2723 grepstart grepwhile mapstart mapwhile
2724 sort time
2725));
2420 2726
2421# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2422 2728
2423=pod 2729=pod
2424 2730
2425The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2426 2732
2427 cf::object contr pay_amount pay_player map 2733 cf::object
2734 contr pay_amount pay_player map x y force_find force_add
2735 insert remove name archname title slaying race decrease_ob_nr
2736
2428 cf::object::player player 2737 cf::object::player
2429 cf::player peaceful 2738 player
2430 cf::map trigger 2739
2740 cf::player
2741 peaceful
2742
2743 cf::map
2744 trigger
2431 2745
2432=cut 2746=cut
2433 2747
2434for ( 2748for (
2435 ["cf::object" => qw(contr pay_amount pay_player map)], 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2750 insert remove inv name archname title slaying race
2751 decrease_ob_nr)],
2436 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2437 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2438 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2439) { 2755) {
2440 no strict 'refs'; 2756 no strict 'refs';
… …
2516# the server's init and main functions 2832# the server's init and main functions
2517 2833
2518sub load_facedata($) { 2834sub load_facedata($) {
2519 my ($path) = @_; 2835 my ($path) = @_;
2520 2836
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838
2521 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2522 2840
2523 my $facedata; 2841 my $facedata;
2524 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
2525 or die "$path: $!"; 2843 or die "$path: $!";
… …
2527 $facedata = Coro::Storable::thaw $facedata; 2845 $facedata = Coro::Storable::thaw $facedata;
2528 2846
2529 $facedata->{version} == 2 2847 $facedata->{version} == 2
2530 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2531 2849
2850 # patch in the exptable
2851 $facedata->{resource}{"res/exp_table"} = {
2852 type => FT_RSRC,
2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2854 };
2855 cf::cede_to_tick;
2856
2532 { 2857 {
2533 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
2534 2859
2535 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2536 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2537 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap};
2538 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2539 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2540 Coro::cede; 2866
2867 cf::cede_to_tick;
2541 } 2868 }
2542 2869
2543 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
2544 next unless $info->{smooth}; 2871 next unless $info->{smooth};
2545 my $idx = cf::face::find $face 2872 my $idx = cf::face::find $face
2546 or next; 2873 or next;
2547 if (my $smooth = cf::face::find $info->{smooth}) { 2874 if (my $smooth = cf::face::find $info->{smooth}) {
2875 cf::face::set_smooth $idx, $smooth;
2548 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2549 } else { 2877 } else {
2550 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2878 warn "smooth face '$info->{smooth}' not found for face '$face'";
2551 } 2879 }
2552 Coro::cede; 2880
2881 cf::cede_to_tick;
2553 } 2882 }
2554 } 2883 }
2555 2884
2556 { 2885 {
2557 my $anims = $facedata->{animinfo}; 2886 my $anims = $facedata->{animinfo};
2558 2887
2559 while (my ($anim, $info) = each %$anims) { 2888 while (my ($anim, $info) = each %$anims) {
2560 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2889 cf::anim::set $anim, $info->{frames}, $info->{facings};
2561 Coro::cede; 2890 cf::cede_to_tick;
2562 } 2891 }
2563 2892
2564 cf::anim::invalidate_all; # d'oh 2893 cf::anim::invalidate_all; # d'oh
2565 } 2894 }
2566 2895
2896 {
2897 # TODO: for gcfclient pleasure, we should give resources
2898 # that gcfclient doesn't grok a >10000 face index.
2899 my $res = $facedata->{resource};
2900
2901 my $soundconf = delete $res->{"res/sound.conf"};
2902
2903 while (my ($name, $info) = each %$res) {
2904 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2905 my $data;
2906
2907 if ($info->{type} & 1) {
2908 # prepend meta info
2909
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else {
2917 $data = $info->{data};
2918 }
2919
2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2921 cf::face::set_type $idx, $info->{type};
2922
2923 cf::cede_to_tick;
2924 }
2925
2926 if ($soundconf) {
2927 $soundconf = $enc->decode (delete $soundconf->{data});
2928
2929 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2930 my $sound = $soundconf->{compat}[$_]
2931 or next;
2932
2933 my $face = cf::face::find "sound/$sound->[1]";
2934 cf::sound::set $sound->[0] => $face;
2935 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2936 }
2937
2938 while (my ($k, $v) = each %{$soundconf->{event}}) {
2939 my $face = cf::face::find "sound/$v";
2940 cf::sound::set $k => $face;
2941 }
2942 }
2943 }
2944
2567 1 2945 1
2568} 2946}
2947
2948register_exticmd fx_want => sub {
2949 my ($ns, $want) = @_;
2950
2951 while (my ($k, $v) = each %$want) {
2952 $ns->fx_want ($k, $v);
2953 }
2954};
2569 2955
2570sub reload_regions { 2956sub reload_regions {
2571 load_resource_file "$MAPDIR/regions" 2957 load_resource_file "$MAPDIR/regions"
2572 or die "unable to load regions file\n"; 2958 or die "unable to load regions file\n";
2959
2960 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/
2962 if exists $_->{match};
2963 }
2573} 2964}
2574 2965
2575sub reload_facedata { 2966sub reload_facedata {
2576 load_facedata "$DATADIR/facedata" 2967 load_facedata "$DATADIR/facedata"
2577 or die "unable to load facedata\n"; 2968 or die "unable to load facedata\n";
2578} 2969}
2579 2970
2580sub reload_archetypes { 2971sub reload_archetypes {
2972 load_resource_file "$DATADIR/archetypes"
2973 or die "unable to load archetypes\n";
2974 #d# NEED to laod twice to resolve forward references
2975 # this really needs to be done in an extra post-pass
2976 # (which needs to be synchronous, so solve it differently)
2581 load_resource_file "$DATADIR/archetypes" 2977 load_resource_file "$DATADIR/archetypes"
2582 or die "unable to load archetypes\n"; 2978 or die "unable to load archetypes\n";
2583} 2979}
2584 2980
2585sub reload_treasures { 2981sub reload_treasures {
… …
2779 %EXT_CORO = (); 3175 %EXT_CORO = ();
2780 3176
2781 warn "removing commands"; 3177 warn "removing commands";
2782 %COMMAND = (); 3178 %COMMAND = ();
2783 3179
2784 warn "removing ext commands"; 3180 warn "removing ext/exti commands";
2785 %EXTCMD = (); 3181 %EXTCMD = ();
3182 %EXTICMD = ();
2786 3183
2787 warn "unloading/nuking all extensions"; 3184 warn "unloading/nuking all extensions";
2788 for my $pkg (@EXTS) { 3185 for my $pkg (@EXTS) {
2789 warn "... unloading $pkg"; 3186 warn "... unloading $pkg";
2790 3187

Diff Legend

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