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.286 by root, Sun Jun 24 04:27:20 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;
… …
1244 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1245 1337
1246 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1247 1339
1248 $self 1340 $self
1341}
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 (@_);
1249} 1351}
1250 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
… …
1372 # replace G<male|female> tags 1474 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{ 1475 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1 1476 $self->gender ? $2 : $1
1375 }ge 1477 }ge
1376 # replace H<hint text> 1478 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 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;
1378 1486
1379 # create single paragraphs (very hackish) 1487 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g; 1488 s/(?<=\S)\n(?=\w)/ /g;
1381 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
1382 $_ 1496 $_
1383} 1497}
1384 1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1385=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1386 1505
1387Sends an ext reply to the player. 1506Sends an ext reply to the player.
1388 1507
1389=cut 1508=cut
1390 1509
1391sub ext_reply($$%) { 1510sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1393 1512
1394 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1514}
1398 1515
1399=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1400 1517
1401Sends an ext event to the client. 1518Sends an ext event to the client.
1402 1519
1403=cut 1520=cut
1404 1521
1405sub ext_event($$%) { 1522sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1407 1524
1408 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1409} 1526}
1410 1527
1411=head3 cf::region 1528=head3 cf::region
1412 1529
1413=over 4 1530=over 4
… …
1426 my ($path) = @_; 1543 my ($path) = @_;
1427 1544
1428 my ($match, $specificity); 1545 my ($match, $specificity);
1429 1546
1430 for my $region (list) { 1547 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1434 } 1551 }
1435 } 1552 }
1436 1553
… …
1556 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1557 return $self; 1674 return $self;
1558 } 1675 }
1559 } 1676 }
1560 1677
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1679 ()
1563} 1680}
1564 1681
1565sub init { 1682sub init {
1566 my ($self) = @_; 1683 my ($self) = @_;
… …
1774 $self->set_darkness_map; 1891 $self->set_darkness_map;
1775 Coro::cede; 1892 Coro::cede;
1776 $self->activate; 1893 $self->activate;
1777 } 1894 }
1778 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1779 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1780 } 1900 }
1781 1901
1782 $self->post_load; 1902 $self->post_load;
1783} 1903}
… …
1793 1913
1794 $self 1914 $self
1795} 1915}
1796 1916
1797# 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
1798sub load_diag { 1918sub load_neighbours {
1799 my ($map) = @_; 1919 my ($map) = @_;
1800 1920
1801 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1802 1922
1803 for (0 .. 3) { 1923 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1805 or next; 1925 or next;
1806 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1807 or next; 1927 or next;
1808 $neigh->load; 1928 $neigh->load;
1809 1929
1930 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 1933 }
1813 1934
1814 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1816 or next; 1938 or next;
1817 $neigh->load; 1939 $neigh->load;
1818 } 1940 }
1819} 1941}
1820 1942
… …
1825} 1947}
1826 1948
1827sub do_load_sync { 1949sub do_load_sync {
1828 my ($map) = @_; 1950 my ($map) = @_;
1829 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1830 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1831} 1956}
1832 1957
1833our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1835 1960
1836sub find_async { 1961sub find_async {
1837 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1838 1963
1839 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1840 1965
1841 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1843 } 1968 }
1844 1969
1845 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1846 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1847 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 1975 if (my $map = find $k) {
1850 or next;
1851 $map->load; 1976 $map->load if $v;
1977 }
1852 1978
1853 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1854 } 1980 }
1855 } 1981 }
1856 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1857 }; 1983 };
1858 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2083 2209
2084 } else { 2210 } else {
2085 my $pl = $self->contr; 2211 my $pl = $self->contr;
2086 2212
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2213 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2214 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2216
2096 } else { 2217 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2218 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2099 } 2220 }
2100 } 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 (@_);
2101} 2232}
2102 2233
2103=item $player_object->may ("access") 2234=item $player_object->may ("access")
2104 2235
2105Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
… …
2184 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
2187 2318
2188 $map->load; 2319 $map->load;
2189 $map->load_diag; 2320 $map->load_neighbours;
2190 2321
2191 return unless $self->contr->active; 2322 return unless $self->contr->active;
2192 $self->activate_recursive; 2323 $self->activate_recursive;
2193 2324
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2326 $self->enter_map ($map, $x, $y);
2196} 2327}
2197 2328
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2330
2200Moves 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
2201her, loading and preparing them map, calling the provided $check callback 2332her, loading and preparing them map, calling the provided $check callback
2202that 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
2203the 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.
2204 2336
2205=cut 2337=cut
2206 2338
2207our $GOTOGEN; 2339our $GOTOGEN;
2208 2340
2209sub cf::object::player::goto { 2341sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2342 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2343
2212 # 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
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2346
2215 $self->enter_link; 2347 $self->enter_link;
… …
2235 2367
2236 if ($gen == $self->{_goto_generation}) { 2368 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2369 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2370 $self->leave_link ($map, $x, $y);
2239 } 2371 }
2372
2373 $done->() if $done;
2240 })->prio (1); 2374 })->prio (1);
2241} 2375}
2242 2376
2243=item $player_object->enter_exit ($exit_object) 2377=item $player_object->enter_exit ($exit_object)
2244 2378
… …
2313 my $hp = $exit->stats->hp; 2447 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp; 2448 my $sp = $exit->stats->sp;
2315 2449
2316 $self->enter_link; 2450 $self->enter_link;
2317 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
2318 (async { 2456 (async {
2319 $self->deactivate_recursive; # just to be sure 2457 $self->deactivate_recursive; # just to be sure
2320 unless (eval { 2458 unless (eval {
2321 $self->goto ($slaying, $hp, $sp); 2459 $self->goto ($slaying, $hp, $sp);
2322 2460
… …
2349 2487
2350 utf8::encode $text; 2488 utf8::encode $text;
2351 $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);
2352} 2490}
2353 2491
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2493
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2494Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2495client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2496the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2497the message unless the client supports the msg packet.
2360 2498
2361=cut 2499=cut
2362 2500
2363sub cf::client::send_msg { 2501sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2502 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2503
2366 $msg = $self->pl->expand_cfpod ($msg); 2504 $msg = $self->pl->expand_cfpod ($msg);
2367 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
2368 if ($self->can_msg) { 2520 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 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]));
2370 } else { 2527 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 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
2382 if (0 && $msg =~ /\[/) { 2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2546 } else {
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2548 $self->send_packet ("drawinfo $color $msg")
2387 } 2549 }
2388 } 2550 }
2389 } 2551 }
2390} 2552}
2391 2553
2392=item $client->ext_event ($type, %msg) 2554=item $client->ext_msg ($type, @msg)
2393 2555
2394Sends an exti event to the client. 2556Sends an ext event to the client.
2395 2557
2396=cut 2558=cut
2397 2559
2398sub cf::client::ext_event($$%) { 2560sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2561 my ($self, $type, @msg) = @_;
2400 2562
2563 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2566 push @msg, msgtype => "event_$type";
2402 $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 }
2403} 2587}
2404 2588
2405=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
2406 2590
2407Queues a query to the client, calling the given callback with 2591Queues a query to the client, calling the given callback with
2408the 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>,
2409C<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>.
2410 2594
2411Queries 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
2412reliable at some point in the future. 2596become reliable at some point in the future.
2413 2597
2414=cut 2598=cut
2415 2599
2416sub cf::client::query { 2600sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2601 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2609 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2610 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2611
2428 $self->send_packet ($self->{query_queue}[0][0]) 2612 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2613 if @{ $self->{query_queue} } == 1;
2614
2615 1
2430} 2616}
2431 2617
2432cf::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 },
2433 on_reply => sub { 2624 on_reply => sub {
2434 my ($ns, $msg) = @_; 2625 my ($ns, $msg) = @_;
2435 2626
2436 # this weird shuffling is so that direct followup queries 2627 # this weird shuffling is so that direct followup queries
2437 # get handled first 2628 # get handled first
… …
2449 } else { 2640 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2641 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2642 }
2452 } 2643 }
2453 }, 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 },
2454); 2671);
2455 2672
2456=item $client->async (\&cb) 2673=item $client->async (\&cb)
2457 2674
2458Create a new coroutine, running the specified callback. The coroutine will 2675Create a new coroutine, running the specified callback. The coroutine will
… …
2499our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2501 2718
2502$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2503 2720
2504$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));
2505 2726
2506# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2507 2728
2508=pod 2729=pod
2509 2730
2510The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2511 2732
2512 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
2513 cf::object::player player 2737 cf::object::player
2514 cf::player peaceful 2738 player
2515 cf::map trigger 2739
2740 cf::player
2741 peaceful
2742
2743 cf::map
2744 trigger
2516 2745
2517=cut 2746=cut
2518 2747
2519for ( 2748for (
2520 ["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)],
2521 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2524) { 2755) {
2525 no strict 'refs'; 2756 no strict 'refs';
… …
2601# the server's init and main functions 2832# the server's init and main functions
2602 2833
2603sub load_facedata($) { 2834sub load_facedata($) {
2604 my ($path) = @_; 2835 my ($path) = @_;
2605 2836
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838
2606 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2607 2840
2608 my $facedata; 2841 my $facedata;
2609 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 2843 or die "$path: $!";
… …
2612 $facedata = Coro::Storable::thaw $facedata; 2845 $facedata = Coro::Storable::thaw $facedata;
2613 2846
2614 $facedata->{version} == 2 2847 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 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
2617 { 2857 {
2618 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
2619 2859
2620 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 2866
2867 cf::cede_to_tick;
2626 } 2868 }
2627 2869
2628 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 2871 next unless $info->{smooth};
2630 my $idx = cf::face::find $face 2872 my $idx = cf::face::find $face
2631 or next; 2873 or next;
2632 if (my $smooth = cf::face::find $info->{smooth}) { 2874 if (my $smooth = cf::face::find $info->{smooth}) {
2875 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 2877 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2878 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 2879 }
2637 Coro::cede; 2880
2881 cf::cede_to_tick;
2638 } 2882 }
2639 } 2883 }
2640 2884
2641 { 2885 {
2642 my $anims = $facedata->{animinfo}; 2886 my $anims = $facedata->{animinfo};
2643 2887
2644 while (my ($anim, $info) = each %$anims) { 2888 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2889 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 2890 cf::cede_to_tick;
2647 } 2891 }
2648 2892
2649 cf::anim::invalidate_all; # d'oh 2893 cf::anim::invalidate_all; # d'oh
2650 } 2894 }
2651 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
2652 1 2945 1
2653} 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};
2654 2955
2655sub reload_regions { 2956sub reload_regions {
2656 load_resource_file "$MAPDIR/regions" 2957 load_resource_file "$MAPDIR/regions"
2657 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 }
2658} 2964}
2659 2965
2660sub reload_facedata { 2966sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 2967 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 2968 or die "unable to load facedata\n";
2663} 2969}
2664 2970
2665sub 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)
2666 load_resource_file "$DATADIR/archetypes" 2977 load_resource_file "$DATADIR/archetypes"
2667 or die "unable to load archetypes\n"; 2978 or die "unable to load archetypes\n";
2668} 2979}
2669 2980
2670sub reload_treasures { 2981sub reload_treasures {
… …
2864 %EXT_CORO = (); 3175 %EXT_CORO = ();
2865 3176
2866 warn "removing commands"; 3177 warn "removing commands";
2867 %COMMAND = (); 3178 %COMMAND = ();
2868 3179
2869 warn "removing ext commands"; 3180 warn "removing ext/exti commands";
2870 %EXTCMD = (); 3181 %EXTCMD = ();
3182 %EXTICMD = ();
2871 3183
2872 warn "unloading/nuking all extensions"; 3184 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) { 3185 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg"; 3186 warn "... unloading $pkg";
2875 3187

Diff Legend

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