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.290 by root, Mon Jul 2 03:15:30 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
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
… …
315 }; 323 };
316 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
317 $guard 325 $guard
318} 326}
319 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;
382}
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
323C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 387C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
324thing you are allowed to do is call C<prio> on it. 388thing you are allowed to do is call C<prio> on it.
… …
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
… …
1089 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1090 1145
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($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 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1424} 1511}
1425 1512
1426=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1427 1514
1428Sends an ext event to the client. 1515Sends an ext event to the client.
1429 1516
1430=cut 1517=cut
1431 1518
1432sub ext_event($$%) { 1519sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1434 1521
1435 $self->ns->ext_event ($type, %msg); 1522 $self->ns->ext_msg ($type, @msg);
1436} 1523}
1437 1524
1438=head3 cf::region 1525=head3 cf::region
1439 1526
1440=over 4 1527=over 4
… …
1453 my ($path) = @_; 1540 my ($path) = @_;
1454 1541
1455 my ($match, $specificity); 1542 my ($match, $specificity);
1456 1543
1457 for my $region (list) { 1544 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1545 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1546 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1547 if $region->specificity > $specificity;
1461 } 1548 }
1462 } 1549 }
1463 1550
… …
1583 $self->init; # pass $1 etc. 1670 $self->init; # pass $1 etc.
1584 return $self; 1671 return $self;
1585 } 1672 }
1586 } 1673 }
1587 1674
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1675 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1676 ()
1590} 1677}
1591 1678
1592sub init { 1679sub init {
1593 my ($self) = @_; 1680 my ($self) = @_;
… …
1801 $self->set_darkness_map; 1888 $self->set_darkness_map;
1802 Coro::cede; 1889 Coro::cede;
1803 $self->activate; 1890 $self->activate;
1804 } 1891 }
1805 1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1806 $self->in_memory (cf::MAP_IN_MEMORY); 1896 $self->in_memory (cf::MAP_IN_MEMORY);
1807 } 1897 }
1808 1898
1809 $self->post_load; 1899 $self->post_load;
1810} 1900}
… …
1820 1910
1821 $self 1911 $self
1822} 1912}
1823 1913
1824# 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
1825sub load_diag { 1915sub load_neighbours {
1826 my ($map) = @_; 1916 my ($map) = @_;
1827 1917
1828 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1829 1919
1830 for (0 .. 3) { 1920 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1832 or next; 1922 or next;
1833 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1834 or next; 1924 or next;
1835 $neigh->load; 1925 $neigh->load;
1836 1926
1927 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 1930 }
1840 1931
1841 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1843 or next; 1935 or next;
1844 $neigh->load; 1936 $neigh->load;
1845 } 1937 }
1846} 1938}
1847 1939
… …
1871 1963
1872 undef $MAP_PREFETCH{$path}; 1964 undef $MAP_PREFETCH{$path};
1873 $MAP_PREFETCHER ||= cf::async { 1965 $MAP_PREFETCHER ||= cf::async {
1874 while (%MAP_PREFETCH) { 1966 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 1967 for my $path (keys %MAP_PREFETCH) {
1876 my $map = find $path 1968 if (my $map = find $path) {
1877 or next;
1878 $map->load; 1969 $map->load;
1970 }
1879 1971
1880 delete $MAP_PREFETCH{$path}; 1972 delete $MAP_PREFETCH{$path};
1881 } 1973 }
1882 } 1974 }
1883 undef $MAP_PREFETCHER; 1975 undef $MAP_PREFETCHER;
… …
2110 2202
2111 } else { 2203 } else {
2112 my $pl = $self->contr; 2204 my $pl = $self->contr;
2113 2205
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2207 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2208 $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 2209
2123 } else { 2210 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2126 } 2213 }
2127 } 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 (@_);
2128} 2225}
2129 2226
2130=item $player_object->may ("access") 2227=item $player_object->may ("access")
2131 2228
2132Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
… …
2211 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2214 2311
2215 $map->load; 2312 $map->load;
2216 $map->load_diag; 2313 $map->load_neighbours;
2217 2314
2218 return unless $self->contr->active; 2315 return unless $self->contr->active;
2219 $self->activate_recursive; 2316 $self->activate_recursive;
2220 2317
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2319 $self->enter_map ($map, $x, $y);
2223} 2320}
2224 2321
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2322=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2323
2227Moves 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
2228her, loading and preparing them map, calling the provided $check callback 2325her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the 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.
2231 2329
2232=cut 2330=cut
2233 2331
2234our $GOTOGEN; 2332our $GOTOGEN;
2235 2333
2236sub cf::object::player::goto { 2334sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2335 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2336
2239 # 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
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2339
2242 $self->enter_link; 2340 $self->enter_link;
… …
2262 2360
2263 if ($gen == $self->{_goto_generation}) { 2361 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2362 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2363 $self->leave_link ($map, $x, $y);
2266 } 2364 }
2365
2366 $done->() if $done;
2267 })->prio (1); 2367 })->prio (1);
2268} 2368}
2269 2369
2270=item $player_object->enter_exit ($exit_object) 2370=item $player_object->enter_exit ($exit_object)
2271 2371
… …
2340 my $hp = $exit->stats->hp; 2440 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp; 2441 my $sp = $exit->stats->sp;
2342 2442
2343 $self->enter_link; 2443 $self->enter_link;
2344 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
2345 (async { 2449 (async {
2346 $self->deactivate_recursive; # just to be sure 2450 $self->deactivate_recursive; # just to be sure
2347 unless (eval { 2451 unless (eval {
2348 $self->goto ($slaying, $hp, $sp); 2452 $self->goto ($slaying, $hp, $sp);
2349 2453
… …
2376 2480
2377 utf8::encode $text; 2481 utf8::encode $text;
2378 $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);
2379} 2483}
2380 2484
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2485=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2486
2383Send 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
2384client 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
2385the 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
2386the message unless the client supports the msg packet. 2490the message unless the client supports the msg packet.
2387 2491
2388=cut 2492=cut
2389 2493
2390sub cf::client::send_msg { 2494sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2495 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2496
2393 $msg = $self->pl->expand_cfpod ($msg); 2497 $msg = $self->pl->expand_cfpod ($msg);
2394 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
2395 if ($self->can_msg) { 2513 if ($self->can_msg) {
2514 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF;
2517
2396 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2518 $self->send_packet ("msg " . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2397 } else { 2520 } 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) { 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
2409 if (0 && $msg =~ /\[/) { 2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2539 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2541 $self->send_packet ("drawinfo $color $msg")
2414 } 2542 }
2415 } 2543 }
2416 } 2544 }
2417} 2545}
2418 2546
2419=item $client->ext_event ($type, %msg) 2547=item $client->ext_msg ($type, @msg)
2420 2548
2421Sends an ext event to the client. 2549Sends an ext event to the client.
2422 2550
2423=cut 2551=cut
2424 2552
2425sub cf::client::ext_event($$%) { 2553sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2554 my ($self, $type, @msg) = @_;
2427 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
2428 $msg{msgtype} = "event_$type"; 2561 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2430} 2582}
2431 2583
2432=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2433 2585
2434Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
… …
2489 my ($ns, $buf) = @_; 2641 my ($ns, $buf) = @_;
2490 2642
2491 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2492 2644
2493 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
2494 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2651 if (my $cb = $EXTICMD{$type}) {
2495 if (my %reply = $cb->($ns, $msg)) { 2652 my @reply = $cb->($ns, @payload);
2496 $reply{msgid} = $msg->{msgid}; 2653
2497 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2654 $ns->ext_reply ($reply, @reply)
2498 } 2655 if $reply;
2499 } 2656 }
2500 } else { 2657 } else {
2501 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";
2502 } 2659 }
2503 2660
… …
2551our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2552our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2553 2710
2554$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2555 2712
2556$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));
2557 2718
2558# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2559 2720
2560=pod 2721=pod
2561 2722
2562The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2563 2724
2564 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
2565 cf::object::player player 2729 cf::object::player
2566 cf::player peaceful 2730 player
2567 cf::map trigger 2731
2732 cf::player
2733 peaceful
2734
2735 cf::map
2736 trigger
2568 2737
2569=cut 2738=cut
2570 2739
2571for ( 2740for (
2572 ["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)],
2573 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2574 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2575 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2576) { 2746) {
2577 no strict 'refs'; 2747 no strict 'refs';
… …
2653# the server's init and main functions 2823# the server's init and main functions
2654 2824
2655sub load_facedata($) { 2825sub load_facedata($) {
2656 my ($path) = @_; 2826 my ($path) = @_;
2657 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2658 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2659 2831
2660 my $facedata; 2832 my $facedata;
2661 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2662 or die "$path: $!"; 2834 or die "$path: $!";
… …
2664 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2665 2837
2666 $facedata->{version} == 2 2838 $facedata->{version} == 2
2667 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2668 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
2669 { 2848 {
2670 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2671 2850
2672 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2673 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2674 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap};
2675 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2676 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2677 Coro::cede; 2857
2858 cf::cede_to_tick;
2678 } 2859 }
2679 2860
2680 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2681 next unless $info->{smooth}; 2862 next unless $info->{smooth};
2682 my $idx = cf::face::find $face 2863 my $idx = cf::face::find $face
2683 or next; 2864 or next;
2684 if (my $smooth = cf::face::find $info->{smooth}) { 2865 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth;
2685 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2686 } else { 2868 } else {
2687 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2869 warn "smooth face '$info->{smooth}' not found for face '$face'";
2688 } 2870 }
2689 Coro::cede; 2871
2872 cf::cede_to_tick;
2690 } 2873 }
2691 } 2874 }
2692 2875
2693 { 2876 {
2694 my $anims = $facedata->{animinfo}; 2877 my $anims = $facedata->{animinfo};
2695 2878
2696 while (my ($anim, $info) = each %$anims) { 2879 while (my ($anim, $info) = each %$anims) {
2697 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2880 cf::anim::set $anim, $info->{frames}, $info->{facings};
2698 Coro::cede; 2881 cf::cede_to_tick;
2699 } 2882 }
2700 2883
2701 cf::anim::invalidate_all; # d'oh 2884 cf::anim::invalidate_all; # d'oh
2702 } 2885 }
2703 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
2704 1 2934 1
2705} 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};
2706 2944
2707sub reload_regions { 2945sub reload_regions {
2708 load_resource_file "$MAPDIR/regions" 2946 load_resource_file "$MAPDIR/regions"
2709 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 }
2710} 2953}
2711 2954
2712sub reload_facedata { 2955sub reload_facedata {
2713 load_facedata "$DATADIR/facedata" 2956 load_facedata "$DATADIR/facedata"
2714 or die "unable to load facedata\n"; 2957 or die "unable to load facedata\n";

Diff Legend

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