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.334 by root, Mon Aug 20 22:09:04 2007 UTC

10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
26use JSON::XS 1.4 ();
25use BDB (); 27use BDB ();
26use Data::Dumper; 28use Data::Dumper;
27use Digest::MD5; 29use Digest::MD5;
28use Fcntl; 30use Fcntl;
29use YAML::Syck (); 31use YAML::Syck ();
30use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
31use Time::HiRes; 33use Time::HiRes;
32use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
33 36
34# configure various modules to our taste 37# configure various modules to our taste
35# 38#
36$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
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
1095 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1096 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1097 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1098 } 1158 if $reply;
1099 } 1159 }
1100 } else { 1160 } else {
1101 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1102 } 1162 }
1103 1163
1273 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1274 1334
1275 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1276 1336
1277 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1278} 1348}
1279 1349
1280=item $pl->quit_character 1350=item $pl->quit_character
1281 1351
1282Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1401 # replace G<male|female> tags 1471 # replace G<male|female> tags
1402 || s{G<([^>|]*)\|([^>]*)>}{ 1472 || s{G<([^>|]*)\|([^>]*)>}{
1403 $self->gender ? $2 : $1 1473 $self->gender ? $2 : $1
1404 }ge 1474 }ge
1405 # replace H<hint text> 1475 # replace H<hint text>
1406 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g; 1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1407 1483
1408 # create single paragraphs (very hackish) 1484 # create single paragraphs (very hackish)
1409 s/(?<=\S)\n(?=\w)/ /g; 1485 s/(?<=\S)\n(?=\w)/ /g;
1410 1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1411 $_ 1493 $_
1412} 1494}
1413 1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1414=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1415 1502
1416Sends an ext reply to the player. 1503Sends an ext reply to the player.
1417 1504
1418=cut 1505=cut
1419 1506
1420sub ext_reply($$%) { 1507sub ext_reply($$@) {
1421 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1422 1509
1423 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1424 $self->send ("ext " . cf::to_json \%msg); 1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1425} 1517}
1426 1518
1427=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1428 1520
1429Sends an ext event to the client. 1521Sends an ext event to the client.
1430 1522
1431=cut 1523=cut
1432 1524
1433sub ext_event($$%) { 1525sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1435 1527
1436 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1437} 1529}
1438 1530
1439=head3 cf::region 1531=head3 cf::region
1440 1532
1441=over 4 1533=over 4
1454 my ($path) = @_; 1546 my ($path) = @_;
1455 1547
1456 my ($match, $specificity); 1548 my ($match, $specificity);
1457 1549
1458 for my $region (list) { 1550 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1462 } 1554 }
1463 } 1555 }
1464 1556
1584 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1585 return $self; 1677 return $self;
1586 } 1678 }
1587 } 1679 }
1588 1680
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1682 ()
1591} 1683}
1592 1684
1593sub init { 1685sub init {
1594 my ($self) = @_; 1686 my ($self) = @_;
1802 $self->set_darkness_map; 1894 $self->set_darkness_map;
1803 Coro::cede; 1895 Coro::cede;
1804 $self->activate; 1896 $self->activate;
1805 } 1897 }
1806 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1903 }
1809 1904
1810 $self->post_load; 1905 $self->post_load;
1811} 1906}
1821 1916
1822 $self 1917 $self
1823} 1918}
1824 1919
1825# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1826sub load_diag { 1921sub load_neighbours {
1827 my ($map) = @_; 1922 my ($map) = @_;
1828 1923
1829 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1830 1925
1831 for (0 .. 3) { 1926 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1833 or next; 1928 or next;
1834 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1835 or next; 1930 or next;
1836 $neigh->load; 1931 $neigh->load;
1837 1932
1933 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1936 }
1841 1937
1842 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1844 or next; 1941 or next;
1845 $neigh->load; 1942 $neigh->load;
1846 } 1943 }
1847} 1944}
1848 1945
1872 1969
1873 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 1974 if (my $map = find $path) {
1878 or next;
1879 $map->load; 1975 $map->load;
1976 }
1880 1977
1881 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1882 } 1979 }
1883 } 1980 }
1884 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
2111 2208
2112 } else { 2209 } else {
2113 my $pl = $self->contr; 2210 my $pl = $self->contr;
2114 2211
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2214 $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 2215
2124 } else { 2216 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2127 } 2219 }
2128 } 2220 }
2221}
2222
2223=item $object->send_msg ($channel, $msg, $color, [extra...])
2224
2225=cut
2226
2227sub cf::object::send_msg {
2228 my $pl = shift->contr
2229 or return;
2230 $pl->send_msg (@_);
2129} 2231}
2130 2232
2131=item $player_object->may ("access") 2233=item $player_object->may ("access")
2132 2234
2133Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2215 2317
2216 $map->load; 2318 $map->load;
2217 $map->load_diag; 2319 $map->load_neighbours;
2218 2320
2219 return unless $self->contr->active; 2321 return unless $self->contr->active;
2220 $self->activate_recursive; 2322 $self->activate_recursive;
2221 2323
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2224} 2326}
2225 2327
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2329
2228Moves the player to the given map-path and coordinates by first freezing 2330Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2332that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2333the new (success) or old (failed) map position. In either case, $done will
2334be called at the end of this process.
2232 2335
2233=cut 2336=cut
2234 2337
2235our $GOTOGEN; 2338our $GOTOGEN;
2236 2339
2237sub cf::object::player::goto { 2340sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2342
2240 # do generation counting so two concurrent goto's will be executed in-order 2343 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2345
2243 $self->enter_link; 2346 $self->enter_link;
2263 2366
2264 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2267 } 2370 }
2371
2372 $done->() if $done;
2268 })->prio (1); 2373 })->prio (1);
2269} 2374}
2270 2375
2271=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2272 2377
2341 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2343 2448
2344 $self->enter_link; 2449 $self->enter_link;
2345 2450
2451 # if exit is damned, update players death & WoR home-position
2452 $self->contr->savebed ($slaying, $hp, $sp)
2453 if $exit->flag (FLAG_DAMNED);
2454
2346 (async { 2455 (async {
2347 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2457 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2350 2459
2377 2486
2378 utf8::encode $text; 2487 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2488 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2489}
2381 2490
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2492
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2493Send 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 2494client 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 2495the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2388 2497
2389=cut 2498=cut
2390 2499
2391sub cf::client::send_msg { 2500sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2502
2394 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2395 2504
2505 $color &= cf::NDI_CLIENT_MASK; # just in case...
2506
2507 if (ref $channel) {
2508 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_msg (channel_info => $channel);
2512 }
2513
2514 $channel = $channel->{id};
2515 }
2516
2517 return unless @extra || length $msg;
2518
2396 if ($self->can_msg) { 2519 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2526 } 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) { 2527 if ($color >= 0) {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 $color &= cf::NDI_COLOR_MASK;
2539
2540 utf8::encode $msg;
2541
2410 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2545 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2415 } 2548 }
2416 } 2549 }
2417 } 2550 }
2418} 2551}
2419 2552
2420=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2421 2554
2422Sends an ext event to the client. 2555Sends an ext event to the client.
2423 2556
2424=cut 2557=cut
2425 2558
2426sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2428 2561
2562 my $extcmd = $self->extcmd;
2563
2564 if ($extcmd == 2) {
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($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 }
2431} 2570}
2432 2571
2433=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2434 2573
2435Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
2458 2597
2459 1 2598 1
2460} 2599}
2461 2600
2462cf::client->attach ( 2601cf::client->attach (
2602 on_connect => sub {
2603 my ($ns) = @_;
2604
2605 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2606 },
2463 on_reply => sub { 2607 on_reply => sub {
2464 my ($ns, $msg) = @_; 2608 my ($ns, $msg) = @_;
2465 2609
2466 # this weird shuffling is so that direct followup queries 2610 # this weird shuffling is so that direct followup queries
2467 # get handled first 2611 # get handled first
2482 } 2626 }
2483 }, 2627 },
2484 on_exticmd => sub { 2628 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2486 2630
2487 my $msg = eval { from_json $buf }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2632
2489 if (ref $msg) { 2633 if (ref $msg) {
2634 my ($type, $reply, @payload) =
2635 "ARRAY" eq ref $msg
2636 ? @$msg
2637 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2638
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid}; 2641
2493 $ns->send ("ext " . cf::to_json \%reply); 2642 $ns->ext_reply ($reply, @reply)
2494 } 2643 if $reply;
2495 } 2644 }
2496 } else { 2645 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2646 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2647 }
2499 2648
2547our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2549 2698
2550$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2551 2700
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2701$safe->permit_only (Opcode::opset qw(
2702 :base_core :base_mem :base_orig :base_math
2703 grepstart grepwhile mapstart mapwhile
2704 sort time
2705));
2553 2706
2554# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2555 2708
2556=pod 2709=pod
2557 2710
2558The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2559 2712
2560 cf::object contr pay_amount pay_player map 2713 cf::object
2714 contr pay_amount pay_player map x y force_find force_add
2715 insert remove name archname title slaying race
2716
2561 cf::object::player player 2717 cf::object::player
2562 cf::player peaceful 2718 player
2563 cf::map trigger 2719
2720 cf::player
2721 peaceful
2722
2723 cf::map
2724 trigger
2564 2725
2565=cut 2726=cut
2566 2727
2567for ( 2728for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2730 insert remove inv name archname title slaying race)],
2569 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2572) { 2734) {
2573 no strict 'refs'; 2735 no strict 'refs';
2649# the server's init and main functions 2811# the server's init and main functions
2650 2812
2651sub load_facedata($) { 2813sub load_facedata($) {
2652 my ($path) = @_; 2814 my ($path) = @_;
2653 2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2654 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2655 2819
2656 my $facedata; 2820 my $facedata;
2657 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2822 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2661 2825
2662 $facedata->{version} == 2 2826 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 2828
2829 # patch in the exptable
2830 cf::cede_to_tick;
2831 $facedata->{resource}{"res/exp_table"} = {
2832 type => FT_RSRC,
2833 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2834 };
2835 cf::cede_to_tick;
2836
2665 { 2837 {
2666 my $faces = $facedata->{faceinfo}; 2838 my $faces = $facedata->{faceinfo};
2667 2839
2668 while (my ($face, $info) = each %$faces) { 2840 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2841 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2842 cf::face::set_visibility $idx, $info->{visibility};
2843 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2844 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2845 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2846
2847 cf::cede_to_tick;
2674 } 2848 }
2675 2849
2676 while (my ($face, $info) = each %$faces) { 2850 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2851 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2852 my $idx = cf::face::find $face
2679 or next; 2853 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2854 if (my $smooth = cf::face::find $info->{smooth}) {
2855 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2856 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2857 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2858 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2859 }
2685 Coro::cede; 2860
2861 cf::cede_to_tick;
2686 } 2862 }
2687 } 2863 }
2688 2864
2689 { 2865 {
2690 my $anims = $facedata->{animinfo}; 2866 my $anims = $facedata->{animinfo};
2691 2867
2692 while (my ($anim, $info) = each %$anims) { 2868 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2869 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2870 cf::cede_to_tick;
2695 } 2871 }
2696 2872
2697 cf::anim::invalidate_all; # d'oh 2873 cf::anim::invalidate_all; # d'oh
2698 } 2874 }
2699 2875
2876 {
2877 # TODO: for gcfclient pleasure, we should give resources
2878 # that gcfclient doesn't grok a >10000 face index.
2879 my $res = $facedata->{resource};
2880
2881 my $soundconf = delete $res->{"res/sound.conf"};
2882
2883 while (my ($name, $info) = each %$res) {
2884 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2885 my $data;
2886
2887 if ($info->{type} & 1) {
2888 # prepend meta info
2889
2890 my $meta = $enc->encode ({
2891 name => $name,
2892 %{ $info->{meta} || {} },
2893 });
2894
2895 $data = pack "(w/a*)*", $meta, $info->{data};
2896 }
2897
2898 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2899 cf::face::set_type $idx, $info->{type};
2900
2901 cf::cede_to_tick;
2902 }
2903
2904 if ($soundconf) {
2905 $soundconf = $enc->decode (delete $soundconf->{data});
2906
2907 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2908 my $sound = $soundconf->{compat}[$_]
2909 or next;
2910
2911 my $face = cf::face::find "sound/$sound->[1]";
2912 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 }
2915
2916 while (my ($k, $v) = each %{$soundconf->{event}}) {
2917 my $face = cf::face::find "sound/$v";
2918 cf::sound::set $k => $face;
2919 }
2920 }
2921 }
2922
2700 1 2923 1
2701} 2924}
2925
2926register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_;
2928
2929 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v);
2931 }
2932};
2702 2933
2703sub reload_regions { 2934sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2936 or die "unable to load regions file\n";
2937
2938 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/
2940 if exists $_->{match};
2941 }
2706} 2942}
2707 2943
2708sub reload_facedata { 2944sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2946 or die "unable to load facedata\n";
2711} 2947}
2712 2948
2713sub reload_archetypes { 2949sub reload_archetypes {
2950 load_resource_file "$DATADIR/archetypes"
2951 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2955 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2956 or die "unable to load archetypes\n";
2716} 2957}
2717 2958
2718sub reload_treasures { 2959sub reload_treasures {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines