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.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
… …
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) = @_;
… …
1802 $self->set_darkness_map; 1891 $self->set_darkness_map;
1803 Coro::cede; 1892 Coro::cede;
1804 $self->activate; 1893 $self->activate;
1805 } 1894 }
1806 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1900 }
1809 1901
1810 $self->post_load; 1902 $self->post_load;
1811} 1903}
… …
1821 1913
1822 $self 1914 $self
1823} 1915}
1824 1916
1825# 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
1826sub load_diag { 1918sub load_neighbours {
1827 my ($map) = @_; 1919 my ($map) = @_;
1828 1920
1829 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1830 1922
1831 for (0 .. 3) { 1923 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1833 or next; 1925 or next;
1834 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1835 or next; 1927 or next;
1836 $neigh->load; 1928 $neigh->load;
1837 1929
1930 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1933 }
1841 1934
1842 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1844 or next; 1938 or next;
1845 $neigh->load; 1939 $neigh->load;
1846 } 1940 }
1847} 1941}
1848 1942
… …
1853} 1947}
1854 1948
1855sub do_load_sync { 1949sub do_load_sync {
1856 my ($map) = @_; 1950 my ($map) = @_;
1857 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1858 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1859} 1956}
1860 1957
1861our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1862our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1863 1960
1864sub find_async { 1961sub find_async {
1865 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1866 1963
1867 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1868 1965
1869 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1870 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1871 } 1968 }
1872 1969
1873 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1874 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1877 my $map = find $path 1975 if (my $map = find $k) {
1878 or next;
1879 $map->load; 1976 $map->load if $v;
1977 }
1880 1978
1881 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1882 } 1980 }
1883 } 1981 }
1884 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1885 }; 1983 };
1886 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2111 2209
2112 } else { 2210 } else {
2113 my $pl = $self->contr; 2211 my $pl = $self->contr;
2114 2212
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2213 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2214 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2215 $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 2216
2124 } else { 2217 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2218 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2127 } 2220 }
2128 } 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 (@_);
2129} 2232}
2130 2233
2131=item $player_object->may ("access") 2234=item $player_object->may ("access")
2132 2235
2133Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
… …
2212 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
2215 2318
2216 $map->load; 2319 $map->load;
2217 $map->load_diag; 2320 $map->load_neighbours;
2218 2321
2219 return unless $self->contr->active; 2322 return unless $self->contr->active;
2220 $self->activate_recursive; 2323 $self->activate_recursive;
2221 2324
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2326 $self->enter_map ($map, $x, $y);
2224} 2327}
2225 2328
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2330
2228Moves 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
2229her, loading and preparing them map, calling the provided $check callback 2332her, loading and preparing them map, calling the provided $check callback
2230that 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
2231the 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.
2232 2336
2233=cut 2337=cut
2234 2338
2235our $GOTOGEN; 2339our $GOTOGEN;
2236 2340
2237sub cf::object::player::goto { 2341sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2342 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2343
2240 # 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
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2346
2243 $self->enter_link; 2347 $self->enter_link;
… …
2263 2367
2264 if ($gen == $self->{_goto_generation}) { 2368 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2369 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2370 $self->leave_link ($map, $x, $y);
2267 } 2371 }
2372
2373 $done->() if $done;
2268 })->prio (1); 2374 })->prio (1);
2269} 2375}
2270 2376
2271=item $player_object->enter_exit ($exit_object) 2377=item $player_object->enter_exit ($exit_object)
2272 2378
… …
2341 my $hp = $exit->stats->hp; 2447 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2448 my $sp = $exit->stats->sp;
2343 2449
2344 $self->enter_link; 2450 $self->enter_link;
2345 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
2346 (async { 2456 (async {
2347 $self->deactivate_recursive; # just to be sure 2457 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2458 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2459 $self->goto ($slaying, $hp, $sp);
2350 2460
… …
2377 2487
2378 utf8::encode $text; 2488 utf8::encode $text;
2379 $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);
2380} 2490}
2381 2491
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2493
2384Send 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
2385client 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
2386the 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
2387the message unless the client supports the msg packet. 2497the message unless the client supports the msg packet.
2388 2498
2389=cut 2499=cut
2390 2500
2391sub cf::client::send_msg { 2501sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2502 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2503
2394 $msg = $self->pl->expand_cfpod ($msg); 2504 $msg = $self->pl->expand_cfpod ($msg);
2395 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
2396 if ($self->can_msg) { 2520 if ($self->can_msg) {
2397 $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]));
2398 } else { 2527 } 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) { 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
2410 if (0 && $msg =~ /\[/) { 2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2546 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2548 $self->send_packet ("drawinfo $color $msg")
2415 } 2549 }
2416 } 2550 }
2417 } 2551 }
2418} 2552}
2419 2553
2420=item $client->ext_event ($type, %msg) 2554=item $client->ext_msg ($type, @msg)
2421 2555
2422Sends an ext event to the client. 2556Sends an ext event to the client.
2423 2557
2424=cut 2558=cut
2425 2559
2426sub cf::client::ext_event($$%) { 2560sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2561 my ($self, $type, @msg) = @_;
2428 2562
2563 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2566 push @msg, msgtype => "event_$type";
2430 $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 }
2431} 2587}
2432 2588
2433=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
2434 2590
2435Queues a query to the client, calling the given callback with 2591Queues a query to the client, calling the given callback with
… …
2458 2614
2459 1 2615 1
2460} 2616}
2461 2617
2462cf::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 },
2463 on_reply => sub { 2624 on_reply => sub {
2464 my ($ns, $msg) = @_; 2625 my ($ns, $msg) = @_;
2465 2626
2466 # this weird shuffling is so that direct followup queries 2627 # this weird shuffling is so that direct followup queries
2467 # get handled first 2628 # get handled first
… …
2482 } 2643 }
2483 }, 2644 },
2484 on_exticmd => sub { 2645 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2646 my ($ns, $buf) = @_;
2486 2647
2487 my $msg = eval { from_json $buf }; 2648 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2649
2489 if (ref $msg) { 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
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2658 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2659 @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid};
2493 $ns->send ("ext " . cf::to_json \%reply);
2494 }
2495 } 2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2496 } else { 2665 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2667 }
2499 2668
2500 cf::override; 2669 cf::override;
… …
2547our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2549 2718
2550$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2551 2720
2552$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));
2553 2726
2554# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2555 2728
2556=pod 2729=pod
2557 2730
2558The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2559 2732
2560 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
2561 cf::object::player player 2737 cf::object::player
2562 cf::player peaceful 2738 player
2563 cf::map trigger 2739
2740 cf::player
2741 peaceful
2742
2743 cf::map
2744 trigger
2564 2745
2565=cut 2746=cut
2566 2747
2567for ( 2748for (
2568 ["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)],
2569 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2572) { 2755) {
2573 no strict 'refs'; 2756 no strict 'refs';
… …
2649# the server's init and main functions 2832# the server's init and main functions
2650 2833
2651sub load_facedata($) { 2834sub load_facedata($) {
2652 my ($path) = @_; 2835 my ($path) = @_;
2653 2836
2837 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2838
2654 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2655 2840
2656 my $facedata; 2841 my $facedata;
2657 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2843 or die "$path: $!";
… …
2660 $facedata = Coro::Storable::thaw $facedata; 2845 $facedata = Coro::Storable::thaw $facedata;
2661 2846
2662 $facedata->{version} == 2 2847 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 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
2665 { 2857 {
2666 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
2667 2859
2668 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2866
2867 cf::cede_to_tick;
2674 } 2868 }
2675 2869
2676 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2871 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2872 my $idx = cf::face::find $face
2679 or next; 2873 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2874 if (my $smooth = cf::face::find $info->{smooth}) {
2875 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2877 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2878 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2879 }
2685 Coro::cede; 2880
2881 cf::cede_to_tick;
2686 } 2882 }
2687 } 2883 }
2688 2884
2689 { 2885 {
2690 my $anims = $facedata->{animinfo}; 2886 my $anims = $facedata->{animinfo};
2691 2887
2692 while (my ($anim, $info) = each %$anims) { 2888 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2889 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2890 cf::cede_to_tick;
2695 } 2891 }
2696 2892
2697 cf::anim::invalidate_all; # d'oh 2893 cf::anim::invalidate_all; # d'oh
2698 } 2894 }
2699 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
2700 1 2945 1
2701} 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};
2702 2955
2703sub reload_regions { 2956sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2957 load_resource_file "$MAPDIR/regions"
2705 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 }
2706} 2964}
2707 2965
2708sub reload_facedata { 2966sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2967 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2968 or die "unable to load facedata\n";
2711} 2969}
2712 2970
2713sub 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)
2714 load_resource_file "$DATADIR/archetypes" 2977 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2978 or die "unable to load archetypes\n";
2716} 2979}
2717 2980
2718sub reload_treasures { 2981sub reload_treasures {

Diff Legend

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