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.287 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.345 by root, Tue Aug 28 19:30:11 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
… …
164=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
165 168
166These 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
167returns 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
168per 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.
169 178
170=back 179=back
171 180
172=cut 181=cut
173 182
… …
237 $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;
238 $d 247 $d
239 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
240} 249}
241 250
242use JSON::XS ();
243
244=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
245 252
246Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
247 254
248=item $json = cf::to_json $ref 255=item $json = cf::to_json $ref
249 256
250Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
251 258
252=cut 259=cut
253 260
254our $json_coder = JSON::XS->new->convert_blessed->utf8; 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 262
256sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
258 265
259=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
314 my $guard = Coro::guard { 321 my $guard = Coro::guard {
315 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
316 }; 323 };
317 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
318 $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;
319} 382}
320 383
321=item cf::async { BLOCK } 384=item cf::async { BLOCK }
322 385
323Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
… …
413=cut 476=cut
414 477
415sub fork_call(&@) { 478sub fork_call(&@) {
416 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
417 480
418# 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,
419# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
420 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
421 or die "pipe: $!";
422 484
423 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
424 close $fh2;
425
426 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 die $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 486 reset_signals;
436 local $SIG{__WARN__}; 487 &$cb
437 local $SIG{__DIE__}; 488 }, @args;
438 eval {
439 close $fh1;
440 489
441 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
442 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
443 };
444
445 warn $@ if $@;
446 _exit 0;
447 }
448} 491}
449 492
450=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
451 494
452Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
848 "; 891 ";
849 die if $@; 892 die if $@;
850} 893}
851 894
852our $override; 895our $override;
853our @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?
854 897
855sub override { 898sub override {
856 $override = 1; 899 $override = 1;
857 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
858} 901}
859 902
860sub do_invoke { 903sub do_invoke {
861 my $event = shift; 904 my $event = shift;
862 my $callbacks = shift; 905 my $callbacks = shift;
863 906
864 @invoke_results = (); 907 @INVOKE_RESULTS = ();
865 908
866 local $override; 909 local $override;
867 910
868 for (@$callbacks) { 911 for (@$callbacks) {
869 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
886 929
887Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
888 931
889This 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
890removed 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
891results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
892 935
893=back 936=back
894 937
895=cut 938=cut
896 939
897############################################################################# 940#############################################################################
898# 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}
899 953
900sub reattach { 954sub reattach {
901 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
902 my ($obj) = @_; 956 my ($obj) = @_;
903 957
… …
1087 cf::override; 1141 cf::override;
1088 }, 1142 },
1089 on_extcmd => sub { 1143 on_extcmd => sub {
1090 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1091 1145
1092 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1093 1147
1094 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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1097 $pl->ext_reply ($msg->{msgid}, %reply);
1098 }
1099 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1100 } else { 1163 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1165 }
1103 1166
1104 cf::override; 1167 cf::override;
… …
1273 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1274 1337
1275 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1276 1339
1277 $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 (@_);
1278} 1351}
1279 1352
1280=item $pl->quit_character 1353=item $pl->quit_character
1281 1354
1282Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1401 # replace G<male|female> tags 1474 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1475 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1476 $self->gender ? $2 : $1
1404 }ge 1477 }ge
1405 # replace H<hint text> 1478 # replace H<hint text>
1406 || 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;
1407 1486
1408 # create single paragraphs (very hackish) 1487 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1488 s/(?<=\S)\n(?=\w)/ /g;
1410 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
1411 $_ 1496 $_
1412} 1497}
1413 1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503
1414=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1415 1505
1416Sends an ext reply to the player. 1506Sends an ext reply to the player.
1417 1507
1418=cut 1508=cut
1419 1509
1420sub ext_reply($$%) { 1510sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1422 1512
1423 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1514}
1426 1515
1427=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1428 1517
1429Sends an ext event to the client. 1518Sends an ext event to the client.
1430 1519
1431=cut 1520=cut
1432 1521
1433sub ext_event($$%) { 1522sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1435 1524
1436 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1437} 1526}
1438 1527
1439=head3 cf::region 1528=head3 cf::region
1440 1529
1441=over 4 1530=over 4
… …
1454 my ($path) = @_; 1543 my ($path) = @_;
1455 1544
1456 my ($match, $specificity); 1545 my ($match, $specificity);
1457 1546
1458 for my $region (list) { 1547 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1462 } 1551 }
1463 } 1552 }
1464 1553
… …
1584 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1585 return $self; 1674 return $self;
1586 } 1675 }
1587 } 1676 }
1588 1677
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1679 ()
1591} 1680}
1592 1681
1593sub init { 1682sub init {
1594 my ($self) = @_; 1683 my ($self) = @_;
… …
1760 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1761 1850
1762 my $path = $self->{path}; 1851 my $path = $self->{path};
1763 1852
1764 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1765 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1766 1856
1767 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1768 1858
1769 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1770 1860
… …
1802 $self->set_darkness_map; 1892 $self->set_darkness_map;
1803 Coro::cede; 1893 Coro::cede;
1804 $self->activate; 1894 $self->activate;
1805 } 1895 }
1806 1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1899
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1901 }
1809 1902
1810 $self->post_load; 1903 $self->post_load;
1811} 1904}
… …
1821 1914
1822 $self 1915 $self
1823} 1916}
1824 1917
1825# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1826sub load_diag { 1919sub load_neighbours {
1827 my ($map) = @_; 1920 my ($map) = @_;
1828 1921
1829 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1830 1923
1831 for (0 .. 3) { 1924 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1833 or next; 1926 or next;
1834 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1835 or next; 1928 or next;
1836 $neigh->load; 1929 $neigh->load;
1837 1930
1931 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1934 }
1841 1935
1842 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1844 or next; 1939 or next;
1845 $neigh->load; 1940 $neigh->load;
1846 } 1941 }
1847} 1942}
1848 1943
… …
1853} 1948}
1854 1949
1855sub do_load_sync { 1950sub do_load_sync {
1856 my ($map) = @_; 1951 my ($map) = @_;
1857 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1858 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1859} 1957}
1860 1958
1861our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1863 1961
1864sub find_async { 1962sub find_async {
1865 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1866 1964
1867 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1868 1966
1869 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 1969 }
1872 1970
1873 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1874 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 1976 if (my $map = find $k) {
1878 or next;
1879 $map->load; 1977 $map->load if $v;
1978 }
1880 1979
1881 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1882 } 1981 }
1883 } 1982 }
1884 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1885 }; 1984 };
1886 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1889} 1988}
1890 1989
1891sub save { 1990sub save {
1892 my ($self) = @_; 1991 my ($self) = @_;
1893 1992
1894 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
1895 1994
1896 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
1897 1996
1898 return unless $self->dirty; 1997 return unless $self->dirty;
1899 1998
… …
1922 my ($self) = @_; 2021 my ($self) = @_;
1923 2022
1924 # save first because save cedes 2023 # save first because save cedes
1925 $self->save; 2024 $self->save;
1926 2025
1927 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
1928 2027
1929 return if $self->players; 2028 return if $self->players;
1930 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
1931 return if $self->{deny_save}; 2030 return if $self->{deny_save};
1932 2031
… …
2111 2210
2112 } else { 2211 } else {
2113 my $pl = $self->contr; 2212 my $pl = $self->contr;
2114 2213
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2216 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2118 $diag->{id},
2119 msgtype => "reply",
2120 msg => $diag->{pl}->expand_cfpod ($msg),
2121 add_topics => []
2122 );
2123 2217
2124 } else { 2218 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2127 } 2221 }
2128 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
2129} 2233}
2130 2234
2131=item $player_object->may ("access") 2235=item $player_object->may ("access")
2132 2236
2133Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2215 2319
2216 $map->load; 2320 $map->load;
2217 $map->load_diag; 2321 $map->load_neighbours;
2218 2322
2219 return unless $self->contr->active; 2323 return unless $self->contr->active;
2220 $self->activate_recursive; 2324 $self->activate_recursive;
2221 2325
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2327 $self->enter_map ($map, $x, $y);
2224} 2328}
2225 2329
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2330=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2331
2228Moves the player to the given map-path and coordinates by first freezing 2332Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2333her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2334that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2335the new (success) or old (failed) map position. In either case, $done will
2336be called at the end of this process.
2232 2337
2233=cut 2338=cut
2234 2339
2235our $GOTOGEN; 2340our $GOTOGEN;
2236 2341
2237sub cf::object::player::goto { 2342sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2343 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2344
2240 # do generation counting so two concurrent goto's will be executed in-order 2345 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2346 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2347
2243 $self->enter_link; 2348 $self->enter_link;
… …
2263 2368
2264 if ($gen == $self->{_goto_generation}) { 2369 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2370 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2371 $self->leave_link ($map, $x, $y);
2267 } 2372 }
2373
2374 $done->() if $done;
2268 })->prio (1); 2375 })->prio (1);
2269} 2376}
2270 2377
2271=item $player_object->enter_exit ($exit_object) 2378=item $player_object->enter_exit ($exit_object)
2272 2379
… …
2341 my $hp = $exit->stats->hp; 2448 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2449 my $sp = $exit->stats->sp;
2343 2450
2344 $self->enter_link; 2451 $self->enter_link;
2345 2452
2453 # if exit is damned, update players death & WoR home-position
2454 $self->contr->savebed ($slaying, $hp, $sp)
2455 if $exit->flag (FLAG_DAMNED);
2456
2346 (async { 2457 (async {
2347 $self->deactivate_recursive; # just to be sure 2458 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2459 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2460 $self->goto ($slaying, $hp, $sp);
2350 2461
… …
2377 2488
2378 utf8::encode $text; 2489 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2490 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2491}
2381 2492
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2493=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2494
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2495Send a drawinfo or msg packet to the client, formatting the msg for the
2385client if neccessary. C<$type> should be a string identifying the type of 2496client if neccessary. C<$type> should be a string identifying the type of
2386the message, with C<log> being the default. If C<$color> is negative, suppress 2497the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2498the message unless the client supports the msg packet.
2388 2499
2389=cut 2500=cut
2390 2501
2391sub cf::client::send_msg { 2502sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2503 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2504
2394 $msg = $self->pl->expand_cfpod ($msg); 2505 $msg = $self->pl->expand_cfpod ($msg);
2395 2506
2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2508
2509 if (ref $channel) {
2510 # send meta info to client, if not yet sent
2511 unless (exists $self->{channel}{$channel->{id}}) {
2512 $self->{channel}{$channel->{id}} = $channel;
2513 $self->ext_msg (channel_info => $channel);
2514 }
2515
2516 $channel = $channel->{id};
2517 }
2518
2519 return unless @extra || length $msg;
2520
2396 if ($self->can_msg) { 2521 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2528 } else {
2399 # replace some tags by gcfclient-compatible ones
2400 for ($msg) {
2401 1 while
2402 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2403 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2404 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2405 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2406 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2407 }
2408
2409 if ($color >= 0) { 2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2410 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2547 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2415 } 2550 }
2416 } 2551 }
2417 } 2552 }
2418} 2553}
2419 2554
2420=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2421 2556
2422Sends an ext event to the client. 2557Sends an ext event to the client.
2423 2558
2424=cut 2559=cut
2425 2560
2426sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2428 2563
2564 if ($self->extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2431} 2588}
2432 2589
2433=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2434 2591
2435Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
… …
2458 2615
2459 1 2616 1
2460} 2617}
2461 2618
2462cf::client->attach ( 2619cf::client->attach (
2620 on_connect => sub {
2621 my ($ns) = @_;
2622
2623 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2624 },
2463 on_reply => sub { 2625 on_reply => sub {
2464 my ($ns, $msg) = @_; 2626 my ($ns, $msg) = @_;
2465 2627
2466 # this weird shuffling is so that direct followup queries 2628 # this weird shuffling is so that direct followup queries
2467 # get handled first 2629 # get handled first
… …
2482 } 2644 }
2483 }, 2645 },
2484 on_exticmd => sub { 2646 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2647 my ($ns, $buf) = @_;
2486 2648
2487 my $msg = eval { from_json $buf }; 2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2650
2489 if (ref $msg) { 2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2659 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2660 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2496 } else { 2666 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2668 }
2499 2669
2500 cf::override; 2670 cf::override;
… …
2547our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2549 2719
2550$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2551 2721
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2553 2727
2554# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2555 2729
2556=pod 2730=pod
2557 2731
2558The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2559 2733
2560 cf::object contr pay_amount pay_player map 2734 cf::object
2735 contr pay_amount pay_player map x y force_find force_add
2736 insert remove name archname title slaying race decrease_ob_nr
2737
2561 cf::object::player player 2738 cf::object::player
2562 cf::player peaceful 2739 player
2563 cf::map trigger 2740
2741 cf::player
2742 peaceful
2743
2744 cf::map
2745 trigger
2564 2746
2565=cut 2747=cut
2566 2748
2567for ( 2749for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2752 decrease_ob_nr)],
2569 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2572) { 2756) {
2573 no strict 'refs'; 2757 no strict 'refs';
… …
2649# the server's init and main functions 2833# the server's init and main functions
2650 2834
2651sub load_facedata($) { 2835sub load_facedata($) {
2652 my ($path) = @_; 2836 my ($path) = @_;
2653 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2654 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2655 2841
2656 my $facedata; 2842 my $facedata;
2657 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2844 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2661 2847
2662 $facedata->{version} == 2 2848 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2665 { 2858 {
2666 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2667 2860
2668 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2867
2868 cf::cede_to_tick;
2674 } 2869 }
2675 2870
2676 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2679 or next; 2874 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2878 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2880 }
2685 Coro::cede; 2881
2882 cf::cede_to_tick;
2686 } 2883 }
2687 } 2884 }
2688 2885
2689 { 2886 {
2690 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2691 2888
2692 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2891 cf::cede_to_tick;
2695 } 2892 }
2696 2893
2697 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2698 } 2895 }
2699 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2700 1 2946 1
2701} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2702 2956
2703sub reload_regions { 2957sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2706} 2965}
2707 2966
2708sub reload_facedata { 2967sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";
2711} 2970}
2712 2971
2713sub reload_archetypes { 2972sub reload_archetypes {
2973 load_resource_file "$DATADIR/archetypes"
2974 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2978 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2979 or die "unable to load archetypes\n";
2716} 2980}
2717 2981
2718sub reload_treasures { 2982sub reload_treasures {
… …
2734 2998
2735sub init { 2999sub init {
2736 reload_resources; 3000 reload_resources;
2737} 3001}
2738 3002
2739sub cfg_load { 3003sub reload_config {
2740 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2741 or return; 3005 or return;
2742 3006
2743 local $/; 3007 local $/;
2744 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2764 (async { 3028 (async {
2765 Event::one_event; 3029 Event::one_event;
2766 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2767 }; 3031 };
2768 3032
2769 cfg_load; 3033 reload_config;
2770 db_init; 3034 db_init;
2771 load_extensions; 3035 load_extensions;
2772 3036
2773 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2774 Event::loop; 3038 Event::loop;
… …
2967 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
2968 require cf; 3232 require cf;
2969 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2970 3234
2971 warn "loading config and database again"; 3235 warn "loading config and database again";
2972 cf::cfg_load; 3236 cf::reload_config;
2973 3237
2974 warn "loading extensions"; 3238 warn "loading extensions";
2975 cf::load_extensions; 3239 cf::load_extensions;
2976 3240
2977 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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