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.336 by root, Tue Aug 21 00:31:18 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 $self->ns->ext_reply ($id, @msg)
1424 $self->send ("ext " . cf::to_json \%msg);
1425} 1511}
1426 1512
1427=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1428 1514
1429Sends an ext event to the client. 1515Sends an ext event to the client.
1430 1516
1431=cut 1517=cut
1432 1518
1433sub ext_event($$%) { 1519sub ext_msg($$@) {
1434 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1435 1521
1436 $self->ns->ext_event ($type, %msg); 1522 $self->ns->ext_msg ($type, @msg);
1437} 1523}
1438 1524
1439=head3 cf::region 1525=head3 cf::region
1440 1526
1441=over 4 1527=over 4
1454 my ($path) = @_; 1540 my ($path) = @_;
1455 1541
1456 my ($match, $specificity); 1542 my ($match, $specificity);
1457 1543
1458 for my $region (list) { 1544 for my $region (list) {
1459 if ($region->match && $path =~ $region->match) { 1545 if ($region->{match} && $path =~ $region->{match}) {
1460 ($match, $specificity) = ($region, $region->specificity) 1546 ($match, $specificity) = ($region, $region->specificity)
1461 if $region->specificity > $specificity; 1547 if $region->specificity > $specificity;
1462 } 1548 }
1463 } 1549 }
1464 1550
1584 $self->init; # pass $1 etc. 1670 $self->init; # pass $1 etc.
1585 return $self; 1671 return $self;
1586 } 1672 }
1587 } 1673 }
1588 1674
1589 Carp::carp "unable to resolve path '$path' (base '$base')."; 1675 Carp::cluck "unable to resolve path '$path' (base '$base').";
1590 () 1676 ()
1591} 1677}
1592 1678
1593sub init { 1679sub init {
1594 my ($self) = @_; 1680 my ($self) = @_;
1802 $self->set_darkness_map; 1888 $self->set_darkness_map;
1803 Coro::cede; 1889 Coro::cede;
1804 $self->activate; 1890 $self->activate;
1805 } 1891 }
1806 1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1807 $self->in_memory (cf::MAP_IN_MEMORY); 1896 $self->in_memory (cf::MAP_IN_MEMORY);
1808 } 1897 }
1809 1898
1810 $self->post_load; 1899 $self->post_load;
1811} 1900}
1821 1910
1822 $self 1911 $self
1823} 1912}
1824 1913
1825# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1826sub load_diag { 1915sub load_neighbours {
1827 my ($map) = @_; 1916 my ($map) = @_;
1828 1917
1829 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1830 1919
1831 for (0 .. 3) { 1920 for (0 .. 3) {
1832 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1833 or next; 1922 or next;
1834 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1835 or next; 1924 or next;
1836 $neigh->load; 1925 $neigh->load;
1837 1926
1927 push @neigh,
1838 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1839 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1840 } 1930 }
1841 1931
1842 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1843 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1844 or next; 1935 or next;
1845 $neigh->load; 1936 $neigh->load;
1846 } 1937 }
1847} 1938}
1848 1939
1872 1963
1873 undef $MAP_PREFETCH{$path}; 1964 undef $MAP_PREFETCH{$path};
1874 $MAP_PREFETCHER ||= cf::async { 1965 $MAP_PREFETCHER ||= cf::async {
1875 while (%MAP_PREFETCH) { 1966 while (%MAP_PREFETCH) {
1876 for my $path (keys %MAP_PREFETCH) { 1967 for my $path (keys %MAP_PREFETCH) {
1877 my $map = find $path 1968 if (my $map = find $path) {
1878 or next;
1879 $map->load; 1969 $map->load;
1970 }
1880 1971
1881 delete $MAP_PREFETCH{$path}; 1972 delete $MAP_PREFETCH{$path};
1882 } 1973 }
1883 } 1974 }
1884 undef $MAP_PREFETCHER; 1975 undef $MAP_PREFETCHER;
2111 2202
2112 } else { 2203 } else {
2113 my $pl = $self->contr; 2204 my $pl = $self->contr;
2114 2205
2115 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2116 my $diag = $pl->{npc_dialog}; 2207 my $dialog = $pl->{npc_dialog};
2117 $diag->{pl}->ext_reply ( 2208 $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 2209
2124 } else { 2210 } else {
2125 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
2126 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2127 } 2213 }
2128 } 2214 }
2215}
2216
2217=item $object->send_msg ($channel, $msg, $color, [extra...])
2218
2219=cut
2220
2221sub cf::object::send_msg {
2222 my $pl = shift->contr
2223 or return;
2224 $pl->send_msg (@_);
2129} 2225}
2130 2226
2131=item $player_object->may ("access") 2227=item $player_object->may ("access")
2132 2228
2133Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
2212 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2213 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2214 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2215 2311
2216 $map->load; 2312 $map->load;
2217 $map->load_diag; 2313 $map->load_neighbours;
2218 2314
2219 return unless $self->contr->active; 2315 return unless $self->contr->active;
2220 $self->activate_recursive; 2316 $self->activate_recursive;
2221 2317
2222 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2223 $self->enter_map ($map, $x, $y); 2319 $self->enter_map ($map, $x, $y);
2224} 2320}
2225 2321
2226=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2322=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2227 2323
2228Moves the player to the given map-path and coordinates by first freezing 2324Moves the player to the given map-path and coordinates by first freezing
2229her, loading and preparing them map, calling the provided $check callback 2325her, loading and preparing them map, calling the provided $check callback
2230that has to return the map if sucecssful, and then unfreezes the player on 2326that has to return the map if sucecssful, and then unfreezes the player on
2231the new (success) or old (failed) map position. 2327the new (success) or old (failed) map position. In either case, $done will
2328be called at the end of this process.
2232 2329
2233=cut 2330=cut
2234 2331
2235our $GOTOGEN; 2332our $GOTOGEN;
2236 2333
2237sub cf::object::player::goto { 2334sub cf::object::player::goto {
2238 my ($self, $path, $x, $y, $check) = @_; 2335 my ($self, $path, $x, $y, $check, $done) = @_;
2239 2336
2240 # do generation counting so two concurrent goto's will be executed in-order 2337 # do generation counting so two concurrent goto's will be executed in-order
2241 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2242 2339
2243 $self->enter_link; 2340 $self->enter_link;
2263 2360
2264 if ($gen == $self->{_goto_generation}) { 2361 if ($gen == $self->{_goto_generation}) {
2265 delete $self->{_goto_generation}; 2362 delete $self->{_goto_generation};
2266 $self->leave_link ($map, $x, $y); 2363 $self->leave_link ($map, $x, $y);
2267 } 2364 }
2365
2366 $done->() if $done;
2268 })->prio (1); 2367 })->prio (1);
2269} 2368}
2270 2369
2271=item $player_object->enter_exit ($exit_object) 2370=item $player_object->enter_exit ($exit_object)
2272 2371
2341 my $hp = $exit->stats->hp; 2440 my $hp = $exit->stats->hp;
2342 my $sp = $exit->stats->sp; 2441 my $sp = $exit->stats->sp;
2343 2442
2344 $self->enter_link; 2443 $self->enter_link;
2345 2444
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
2448
2346 (async { 2449 (async {
2347 $self->deactivate_recursive; # just to be sure 2450 $self->deactivate_recursive; # just to be sure
2348 unless (eval { 2451 unless (eval {
2349 $self->goto ($slaying, $hp, $sp); 2452 $self->goto ($slaying, $hp, $sp);
2350 2453
2377 2480
2378 utf8::encode $text; 2481 utf8::encode $text;
2379 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2482 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2380} 2483}
2381 2484
2382=item $client->send_msg ($color, $type, $msg, [extra...]) 2485=item $client->send_msg ($channel, $msg, $color, [extra...])
2383 2486
2384Send a drawinfo or msg packet to the client, formatting the msg for the 2487Send 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 2488client 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 2489the message, with C<log> being the default. If C<$color> is negative, suppress
2387the message unless the client supports the msg packet. 2490the message unless the client supports the msg packet.
2388 2491
2389=cut 2492=cut
2390 2493
2391sub cf::client::send_msg { 2494sub cf::client::send_msg {
2392 my ($self, $color, $type, $msg, @extra) = @_; 2495 my ($self, $channel, $msg, $color, @extra) = @_;
2393 2496
2394 $msg = $self->pl->expand_cfpod ($msg); 2497 $msg = $self->pl->expand_cfpod ($msg);
2395 2498
2499 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500
2501 if (ref $channel) {
2502 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel);
2506 }
2507
2508 $channel = $channel->{id};
2509 }
2510
2511 return unless @extra || length $msg;
2512
2396 if ($self->can_msg) { 2513 if ($self->can_msg) {
2397 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2514 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF;
2517
2518 $self->send_packet ("msg " . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2398 } else { 2520 } 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) { 2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 $color &= cf::NDI_COLOR_MASK;
2533
2534 utf8::encode $msg;
2535
2410 if (0 && $msg =~ /\[/) { 2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2411 $self->send_packet ("drawextinfo $color 4 0 $msg") 2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2412 } else { 2539 } else {
2413 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2414 $self->send_packet ("drawinfo $color $msg") 2541 $self->send_packet ("drawinfo $color $msg")
2415 } 2542 }
2416 } 2543 }
2417 } 2544 }
2418} 2545}
2419 2546
2420=item $client->ext_event ($type, %msg) 2547=item $client->ext_msg ($type, @msg)
2421 2548
2422Sends an ext event to the client. 2549Sends an ext event to the client.
2423 2550
2424=cut 2551=cut
2425 2552
2426sub cf::client::ext_event($$%) { 2553sub cf::client::ext_msg($$@) {
2427 my ($self, $type, %msg) = @_; 2554 my ($self, $type, @msg) = @_;
2428 2555
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove
2429 $msg{msgtype} = "event_$type"; 2561 push @msg, msgtype => "event_$type";
2430 $self->send_packet ("ext " . cf::to_json \%msg); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 }
2431} 2582}
2432 2583
2433=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2434 2585
2435Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
2458 2609
2459 1 2610 1
2460} 2611}
2461 2612
2462cf::client->attach ( 2613cf::client->attach (
2614 on_connect => sub {
2615 my ($ns) = @_;
2616
2617 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2618 },
2463 on_reply => sub { 2619 on_reply => sub {
2464 my ($ns, $msg) = @_; 2620 my ($ns, $msg) = @_;
2465 2621
2466 # this weird shuffling is so that direct followup queries 2622 # this weird shuffling is so that direct followup queries
2467 # get handled first 2623 # get handled first
2482 } 2638 }
2483 }, 2639 },
2484 on_exticmd => sub { 2640 on_exticmd => sub {
2485 my ($ns, $buf) = @_; 2641 my ($ns, $buf) = @_;
2486 2642
2487 my $msg = eval { from_json $buf }; 2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2488 2644
2489 if (ref $msg) { 2645 if (ref $msg) {
2646 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg
2648 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650
2490 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2651 if (my $cb = $EXTICMD{$type}) {
2491 if (my %reply = $cb->($ns, $msg)) { 2652 my @reply = $cb->($ns, @payload);
2492 $reply{msgid} = $msg->{msgid}; 2653
2493 $ns->send ("ext " . cf::to_json \%reply); 2654 $ns->ext_reply ($reply, @reply)
2494 } 2655 if $reply;
2495 } 2656 }
2496 } else { 2657 } else {
2497 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2498 } 2659 }
2499 2660
2547our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2548our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2549 2710
2550$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2551 2712
2552$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2713$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math
2715 grepstart grepwhile mapstart mapwhile
2716 sort time
2717));
2553 2718
2554# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2555 2720
2556=pod 2721=pod
2557 2722
2558The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2559 2724
2560 cf::object contr pay_amount pay_player map 2725 cf::object
2726 contr pay_amount pay_player map x y force_find force_add
2727 insert remove name archname title slaying race
2728
2561 cf::object::player player 2729 cf::object::player
2562 cf::player peaceful 2730 player
2563 cf::map trigger 2731
2732 cf::player
2733 peaceful
2734
2735 cf::map
2736 trigger
2564 2737
2565=cut 2738=cut
2566 2739
2567for ( 2740for (
2568 ["cf::object" => qw(contr pay_amount pay_player map)], 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)],
2569 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2570 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2571 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2572) { 2746) {
2573 no strict 'refs'; 2747 no strict 'refs';
2649# the server's init and main functions 2823# the server's init and main functions
2650 2824
2651sub load_facedata($) { 2825sub load_facedata($) {
2652 my ($path) = @_; 2826 my ($path) = @_;
2653 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2654 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2655 2831
2656 my $facedata; 2832 my $facedata;
2657 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2658 or die "$path: $!"; 2834 or die "$path: $!";
2660 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2661 2837
2662 $facedata->{version} == 2 2838 $facedata->{version} == 2
2663 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2664 2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2847
2665 { 2848 {
2666 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2667 2850
2668 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2669 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2670 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap};
2671 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2672 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2673 Coro::cede; 2857
2858 cf::cede_to_tick;
2674 } 2859 }
2675 2860
2676 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2677 next unless $info->{smooth}; 2862 next unless $info->{smooth};
2678 my $idx = cf::face::find $face 2863 my $idx = cf::face::find $face
2679 or next; 2864 or next;
2680 if (my $smooth = cf::face::find $info->{smooth}) { 2865 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth;
2681 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2682 } else { 2868 } else {
2683 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2869 warn "smooth face '$info->{smooth}' not found for face '$face'";
2684 } 2870 }
2685 Coro::cede; 2871
2872 cf::cede_to_tick;
2686 } 2873 }
2687 } 2874 }
2688 2875
2689 { 2876 {
2690 my $anims = $facedata->{animinfo}; 2877 my $anims = $facedata->{animinfo};
2691 2878
2692 while (my ($anim, $info) = each %$anims) { 2879 while (my ($anim, $info) = each %$anims) {
2693 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2880 cf::anim::set $anim, $info->{frames}, $info->{facings};
2694 Coro::cede; 2881 cf::cede_to_tick;
2695 } 2882 }
2696 2883
2697 cf::anim::invalidate_all; # d'oh 2884 cf::anim::invalidate_all; # d'oh
2698 } 2885 }
2699 2886
2887 {
2888 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource};
2891
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2897
2898 if ($info->{type} & 1) {
2899 # prepend meta info
2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2906 $data = pack "(w/a*)*", $meta, $info->{data};
2907 }
2908
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type};
2911
2912 cf::cede_to_tick;
2913 }
2914
2915 if ($soundconf) {
2916 $soundconf = $enc->decode (delete $soundconf->{data});
2917
2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2919 my $sound = $soundconf->{compat}[$_]
2920 or next;
2921
2922 my $face = cf::face::find "sound/$sound->[1]";
2923 cf::sound::set $sound->[0] => $face;
2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2925 }
2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2930 }
2931 }
2932 }
2933
2700 1 2934 1
2701} 2935}
2936
2937register_exticmd fx_want => sub {
2938 my ($ns, $want) = @_;
2939
2940 while (my ($k, $v) = each %$want) {
2941 $ns->fx_want ($k, $v);
2942 }
2943};
2702 2944
2703sub reload_regions { 2945sub reload_regions {
2704 load_resource_file "$MAPDIR/regions" 2946 load_resource_file "$MAPDIR/regions"
2705 or die "unable to load regions file\n"; 2947 or die "unable to load regions file\n";
2948
2949 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/
2951 if exists $_->{match};
2952 }
2706} 2953}
2707 2954
2708sub reload_facedata { 2955sub reload_facedata {
2709 load_facedata "$DATADIR/facedata" 2956 load_facedata "$DATADIR/facedata"
2710 or die "unable to load facedata\n"; 2957 or die "unable to load facedata\n";
2711} 2958}
2712 2959
2713sub reload_archetypes { 2960sub reload_archetypes {
2961 load_resource_file "$DATADIR/archetypes"
2962 or die "unable to load archetypes\n";
2963 #d# NEED to laod twice to resolve forward references
2964 # this really needs to be done in an extra post-pass
2965 # (which needs to be synchronous, so solve it differently)
2714 load_resource_file "$DATADIR/archetypes" 2966 load_resource_file "$DATADIR/archetypes"
2715 or die "unable to load archetypes\n"; 2967 or die "unable to load archetypes\n";
2716} 2968}
2717 2969
2718sub reload_treasures { 2970sub reload_treasures {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines