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.289 by root, Sat Jun 30 03:00:54 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
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
29use Fcntl; 30use Fcntl;
30use YAML::Syck (); 31use YAML::Syck ();
31use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
32use Time::HiRes; 33use Time::HiRes;
33use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
34 36
35# configure various modules to our taste 37# configure various modules to our taste
36# 38#
37$Storable::canonical = 1; # reduce rsync transfers 39$Storable::canonical = 1; # reduce rsync transfers
38Coro::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
… …
165=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
166 168
167These 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
168returns 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
169per 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.
170 178
171=back 179=back
172 180
173=cut 181=cut
174 182
… …
248 256
249Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
250 258
251=cut 259=cut
252 260
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 262
255sub to_json ($) { $json_coder->encode ($_[0]) } 263sub to_json ($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 264sub from_json ($) { $json_coder->decode ($_[0]) }
257 265
258=item cf::lock_wait $string 266=item cf::lock_wait $string
… …
313 my $guard = Coro::guard { 321 my $guard = Coro::guard {
314 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
315 }; 323 };
316 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
317 $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;
318} 382}
319 383
320=item cf::async { BLOCK } 384=item cf::async { BLOCK }
321 385
322Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
… …
412=cut 476=cut
413 477
414sub fork_call(&@) { 478sub fork_call(&@) {
415 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
416 480
417# 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,
418# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
420 or die "pipe: $!";
421 484
422 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 486 reset_signals;
435 local $SIG{__WARN__}; 487 &$cb
436 local $SIG{__DIE__}; 488 }, @args;
437 eval {
438 close $fh1;
439 489
440 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 491}
448 492
449=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
450 494
451Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
847 "; 891 ";
848 die if $@; 892 die if $@;
849} 893}
850 894
851our $override; 895our $override;
852our @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?
853 897
854sub override { 898sub override {
855 $override = 1; 899 $override = 1;
856 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
857} 901}
858 902
859sub do_invoke { 903sub do_invoke {
860 my $event = shift; 904 my $event = shift;
861 my $callbacks = shift; 905 my $callbacks = shift;
862 906
863 @invoke_results = (); 907 @INVOKE_RESULTS = ();
864 908
865 local $override; 909 local $override;
866 910
867 for (@$callbacks) { 911 for (@$callbacks) {
868 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
885 929
886Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
887 931
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 935
892=back 936=back
893 937
894=cut 938=cut
895 939
896############################################################################# 940#############################################################################
897# 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}
898 953
899sub reattach { 954sub reattach {
900 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 956 my ($obj) = @_;
902 957
… …
1086 cf::override; 1141 cf::override;
1087 }, 1142 },
1088 on_extcmd => sub { 1143 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1090 1145
1091 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1147
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1096 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1097 } 1158 if $reply;
1098 } 1159 }
1099 } else { 1160 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1162 }
1102 1163
… …
1272 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1273 1334
1274 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1275 1336
1276 $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 (@_);
1277} 1348}
1278 1349
1279=item $pl->quit_character 1350=item $pl->quit_character
1280 1351
1281Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1400 # replace G<male|female> tags 1471 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1472 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1 1473 $self->gender ? $2 : $1
1403 }ge 1474 }ge
1404 # replace H<hint text> 1475 # replace H<hint text>
1405 || 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;
1406 1483
1407 # create single paragraphs (very hackish) 1484 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g; 1485 s/(?<=\S)\n(?=\w)/ /g;
1409 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
1410 $_ 1493 $_
1411} 1494}
1412 1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1413=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1414 1502
1415Sends an ext reply to the player. 1503Sends an ext reply to the player.
1416 1504
1417=cut 1505=cut
1418 1506
1419sub ext_reply($$%) { 1507sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1421 1509
1422 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1423 $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 }
1424} 1517}
1425 1518
1426=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1427 1520
1428Sends an ext event to the client. 1521Sends an ext event to the client.
1429 1522
1430=cut 1523=cut
1431 1524
1432sub ext_event($$%) { 1525sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1434 1527
1435 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1436} 1529}
1437 1530
1438=head3 cf::region 1531=head3 cf::region
1439 1532
1440=over 4 1533=over 4
… …
1453 my ($path) = @_; 1546 my ($path) = @_;
1454 1547
1455 my ($match, $specificity); 1548 my ($match, $specificity);
1456 1549
1457 for my $region (list) { 1550 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1461 } 1554 }
1462 } 1555 }
1463 1556
… …
1583 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1584 return $self; 1677 return $self;
1585 } 1678 }
1586 } 1679 }
1587 1680
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1682 ()
1590} 1683}
1591 1684
1592sub init { 1685sub init {
1593 my ($self) = @_; 1686 my ($self) = @_;
… …
1801 $self->set_darkness_map; 1894 $self->set_darkness_map;
1802 Coro::cede; 1895 Coro::cede;
1803 $self->activate; 1896 $self->activate;
1804 } 1897 }
1805 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1806 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 1903 }
1808 1904
1809 $self->post_load; 1905 $self->post_load;
1810} 1906}
… …
1820 1916
1821 $self 1917 $self
1822} 1918}
1823 1919
1824# 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
1825sub load_diag { 1921sub load_neighbours {
1826 my ($map) = @_; 1922 my ($map) = @_;
1827 1923
1828 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1829 1925
1830 for (0 .. 3) { 1926 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1832 or next; 1928 or next;
1833 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1834 or next; 1930 or next;
1835 $neigh->load; 1931 $neigh->load;
1836 1932
1933 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 1936 }
1840 1937
1841 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1843 or next; 1941 or next;
1844 $neigh->load; 1942 $neigh->load;
1845 } 1943 }
1846} 1944}
1847 1945
… …
1871 1969
1872 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1873 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1876 my $map = find $path 1974 if (my $map = find $path) {
1877 or next;
1878 $map->load; 1975 $map->load;
1976 }
1879 1977
1880 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1881 } 1979 }
1882 } 1980 }
1883 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
… …
2110 2208
2111 } else { 2209 } else {
2112 my $pl = $self->contr; 2210 my $pl = $self->contr;
2113 2211
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2215
2123 } else { 2216 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2126 } 2219 }
2127 } 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 (@_);
2128} 2231}
2129 2232
2130=item $player_object->may ("access") 2233=item $player_object->may ("access")
2131 2234
2132Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2214 2317
2215 $map->load; 2318 $map->load;
2216 $map->load_diag; 2319 $map->load_neighbours;
2217 2320
2218 return unless $self->contr->active; 2321 return unless $self->contr->active;
2219 $self->activate_recursive; 2322 $self->activate_recursive;
2220 2323
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2223} 2326}
2224 2327
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2329
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the 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.
2231 2335
2232=cut 2336=cut
2233 2337
2234our $GOTOGEN; 2338our $GOTOGEN;
2235 2339
2236sub cf::object::player::goto { 2340sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2342
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2345
2242 $self->enter_link; 2346 $self->enter_link;
… …
2262 2366
2263 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2266 } 2370 }
2371
2372 $done->() if $done;
2267 })->prio (1); 2373 })->prio (1);
2268} 2374}
2269 2375
2270=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2271 2377
… …
2340 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2342 2448
2343 $self->enter_link; 2449 $self->enter_link;
2344 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
2345 (async { 2455 (async {
2346 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2457 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2349 2459
… …
2376 2486
2377 utf8::encode $text; 2487 utf8::encode $text;
2378 $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);
2379} 2489}
2380 2490
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2492
2383Send 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
2384client 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
2385the 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
2386the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2387 2497
2388=cut 2498=cut
2389 2499
2390sub cf::client::send_msg { 2500sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2502
2393 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2394 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
2395 if ($self->can_msg) { 2519 if ($self->can_msg) {
2396 $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]));
2397 } else { 2526 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 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
2409 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2545 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2414 } 2548 }
2415 } 2549 }
2416 } 2550 }
2417} 2551}
2418 2552
2419=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2420 2554
2421Sends an ext event to the client. 2555Sends an ext event to the client.
2422 2556
2423=cut 2557=cut
2424 2558
2425sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2427 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
2428 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2430} 2570}
2431 2571
2432=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2433 2573
2434Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
… …
2457 2597
2458 1 2598 1
2459} 2599}
2460 2600
2461cf::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 },
2462 on_reply => sub { 2607 on_reply => sub {
2463 my ($ns, $msg) = @_; 2608 my ($ns, $msg) = @_;
2464 2609
2465 # this weird shuffling is so that direct followup queries 2610 # this weird shuffling is so that direct followup queries
2466 # get handled first 2611 # get handled first
… …
2481 } 2626 }
2482 }, 2627 },
2483 on_exticmd => sub { 2628 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2485 2630
2486 my $msg = eval { from_json $buf }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2632
2488 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
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid}; 2641
2492 $ns->send ("ext " . cf::to_json \%reply); 2642 $ns->ext_reply ($reply, @reply)
2493 } 2643 if $reply;
2494 } 2644 }
2495 } else { 2645 } else {
2496 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";
2497 } 2647 }
2498 2648
… …
2546our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2548 2698
2549$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2550 2700
2551$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));
2552 2706
2553# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2554 2708
2555=pod 2709=pod
2556 2710
2557The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2558 2712
2559 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
2560 cf::object::player player 2717 cf::object::player
2561 cf::player peaceful 2718 player
2562 cf::map trigger 2719
2720 cf::player
2721 peaceful
2722
2723 cf::map
2724 trigger
2563 2725
2564=cut 2726=cut
2565 2727
2566for ( 2728for (
2567 ["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)],
2568 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2571) { 2734) {
2572 no strict 'refs'; 2735 no strict 'refs';
… …
2648# the server's init and main functions 2811# the server's init and main functions
2649 2812
2650sub load_facedata($) { 2813sub load_facedata($) {
2651 my ($path) = @_; 2814 my ($path) = @_;
2652 2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2653 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2654 2819
2655 my $facedata; 2820 my $facedata;
2656 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 2822 or die "$path: $!";
… …
2659 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2660 2825
2661 $facedata->{version} == 2 2826 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 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
2664 { 2837 {
2665 my $faces = $facedata->{faceinfo}; 2838 my $faces = $facedata->{faceinfo};
2666 2839
2667 while (my ($face, $info) = each %$faces) { 2840 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2841 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2842 cf::face::set_visibility $idx, $info->{visibility};
2843 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2844 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2845 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 2846
2847 cf::cede_to_tick;
2673 } 2848 }
2674 2849
2675 while (my ($face, $info) = each %$faces) { 2850 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 2851 next unless $info->{smooth};
2677 my $idx = cf::face::find $face 2852 my $idx = cf::face::find $face
2678 or next; 2853 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) { 2854 if (my $smooth = cf::face::find $info->{smooth}) {
2855 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2856 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 2857 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2858 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 2859 }
2684 Coro::cede; 2860
2861 cf::cede_to_tick;
2685 } 2862 }
2686 } 2863 }
2687 2864
2688 { 2865 {
2689 my $anims = $facedata->{animinfo}; 2866 my $anims = $facedata->{animinfo};
2690 2867
2691 while (my ($anim, $info) = each %$anims) { 2868 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2869 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 2870 cf::cede_to_tick;
2694 } 2871 }
2695 2872
2696 cf::anim::invalidate_all; # d'oh 2873 cf::anim::invalidate_all; # d'oh
2697 } 2874 }
2698 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
2699 1 2923 1
2700} 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};
2701 2933
2702sub reload_regions { 2934sub reload_regions {
2703 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2704 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 }
2705} 2942}
2706 2943
2707sub reload_facedata { 2944sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 2946 or die "unable to load facedata\n";

Diff Legend

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