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.292 by root, Tue Jul 3 00:54:57 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
… …
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
… …
1412 1483
1413 # create single paragraphs (very hackish) 1484 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1485 s/(?<=\S)\n(?=\w)/ /g;
1415 1486
1416 # compress some whitespace 1487 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 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
1418 1492
1419 $_ 1493 $_
1420} 1494}
1421 1495
1422sub hintmode { 1496sub hintmode {
1423 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1424 $_[0]{hintmode} 1498 $_[0]{hintmode}
1425} 1499}
1426 1500
1427=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1428 1502
1429Sends an ext reply to the player. 1503Sends an ext reply to the player.
1430 1504
1431=cut 1505=cut
1432 1506
1433sub ext_reply($$%) { 1507sub ext_reply($$@) {
1434 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1435 1509
1436 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
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;
1437 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1438} 1517}
1439 1518
1440=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1441 1520
1442Sends an ext event to the client. 1521Sends an ext event to the client.
1443 1522
1444=cut 1523=cut
1445 1524
1446sub ext_event($$%) { 1525sub ext_msg($$@) {
1447 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1448 1527
1449 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1450} 1529}
1451 1530
1452=head3 cf::region 1531=head3 cf::region
1453 1532
1454=over 4 1533=over 4
… …
1467 my ($path) = @_; 1546 my ($path) = @_;
1468 1547
1469 my ($match, $specificity); 1548 my ($match, $specificity);
1470 1549
1471 for my $region (list) { 1550 for my $region (list) {
1472 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1473 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1474 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1475 } 1554 }
1476 } 1555 }
1477 1556
… …
1597 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1598 return $self; 1677 return $self;
1599 } 1678 }
1600 } 1679 }
1601 1680
1602 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1603 () 1682 ()
1604} 1683}
1605 1684
1606sub init { 1685sub init {
1607 my ($self) = @_; 1686 my ($self) = @_;
… …
1815 $self->set_darkness_map; 1894 $self->set_darkness_map;
1816 Coro::cede; 1895 Coro::cede;
1817 $self->activate; 1896 $self->activate;
1818 } 1897 }
1819 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1820 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1821 } 1903 }
1822 1904
1823 $self->post_load; 1905 $self->post_load;
1824} 1906}
… …
1834 1916
1835 $self 1917 $self
1836} 1918}
1837 1919
1838# 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
1839sub load_diag { 1921sub load_neighbours {
1840 my ($map) = @_; 1922 my ($map) = @_;
1841 1923
1842 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1843 1925
1844 for (0 .. 3) { 1926 for (0 .. 3) {
1845 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1846 or next; 1928 or next;
1847 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1848 or next; 1930 or next;
1849 $neigh->load; 1931 $neigh->load;
1850 1932
1933 push @neigh,
1851 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1852 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1853 } 1936 }
1854 1937
1855 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1856 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1857 or next; 1941 or next;
1858 $neigh->load; 1942 $neigh->load;
1859 } 1943 }
1860} 1944}
1861 1945
… …
1885 1969
1886 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1887 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1888 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1889 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1890 my $map = find $path 1974 if (my $map = find $path) {
1891 or next;
1892 $map->load; 1975 $map->load;
1976 }
1893 1977
1894 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1895 } 1979 }
1896 } 1980 }
1897 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
… …
2124 2208
2125 } else { 2209 } else {
2126 my $pl = $self->contr; 2210 my $pl = $self->contr;
2127 2211
2128 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2129 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2130 $diag->{pl}->ext_reply ( 2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2131 $diag->{id},
2132 msgtype => "reply",
2133 msg => $diag->{pl}->expand_cfpod ($msg),
2134 add_topics => []
2135 );
2136 2215
2137 } else { 2216 } else {
2138 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2139 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2140 } 2219 }
2141 } 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 (@_);
2142} 2231}
2143 2232
2144=item $player_object->may ("access") 2233=item $player_object->may ("access")
2145 2234
2146Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
… …
2225 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2226 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2227 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2228 2317
2229 $map->load; 2318 $map->load;
2230 $map->load_diag; 2319 $map->load_neighbours;
2231 2320
2232 return unless $self->contr->active; 2321 return unless $self->contr->active;
2233 $self->activate_recursive; 2322 $self->activate_recursive;
2234 2323
2235 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2236 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2237} 2326}
2238 2327
2239=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2240 2329
2241Moves 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
2242her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2243that 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
2244the 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.
2245 2335
2246=cut 2336=cut
2247 2337
2248our $GOTOGEN; 2338our $GOTOGEN;
2249 2339
2250sub cf::object::player::goto { 2340sub cf::object::player::goto {
2251 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2252 2342
2253 # 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
2254 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2255 2345
2256 $self->enter_link; 2346 $self->enter_link;
… …
2276 2366
2277 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2278 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2279 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2280 } 2370 }
2371
2372 $done->() if $done;
2281 })->prio (1); 2373 })->prio (1);
2282} 2374}
2283 2375
2284=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2285 2377
… …
2354 my $hp = $exit->stats->hp; 2446 my $hp = $exit->stats->hp;
2355 my $sp = $exit->stats->sp; 2447 my $sp = $exit->stats->sp;
2356 2448
2357 $self->enter_link; 2449 $self->enter_link;
2358 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
2359 (async { 2455 (async {
2360 $self->deactivate_recursive; # just to be sure 2456 $self->deactivate_recursive; # just to be sure
2361 unless (eval { 2457 unless (eval {
2362 $self->goto ($slaying, $hp, $sp); 2458 $self->goto ($slaying, $hp, $sp);
2363 2459
… …
2390 2486
2391 utf8::encode $text; 2487 utf8::encode $text;
2392 $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);
2393} 2489}
2394 2490
2395=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2396 2492
2397Send 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
2398client 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
2399the 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
2400the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2401 2497
2402=cut 2498=cut
2403 2499
2404sub cf::client::send_msg { 2500sub cf::client::send_msg {
2405 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2406 2502
2407 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2408 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
2409 if ($self->can_msg) { 2519 if ($self->can_msg) {
2520 # default colour, mask it out
2521 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2522 if $color & cf::NDI_DEF;
2523
2410 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2524 $self->send_packet ("msg " . $self->{json_coder}->encode (
2525 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2411 } else { 2526 } else {
2412 # replace some tags by gcfclient-compatible ones
2413 for ($msg) {
2414 1 while
2415 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2416 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2417 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2418 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2419 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2420 }
2421
2422 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
2423 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2424 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2425 } else { 2545 } else {
2426 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2427 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2428 } 2548 }
2429 } 2549 }
2430 } 2550 }
2431} 2551}
2432 2552
2433=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2434 2554
2435Sends an ext event to the client. 2555Sends an ext event to the client.
2436 2556
2437=cut 2557=cut
2438 2558
2439sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2440 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2441 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
2442 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2443 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2444} 2570}
2445 2571
2446=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2447 2573
2448Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
… …
2503 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2504 2630
2505 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2506 2632
2507 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
2508 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2509 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2510 $reply{msgid} = $msg->{msgid}; 2641
2511 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2642 $ns->ext_reply ($reply, @reply)
2512 } 2643 if $reply;
2513 } 2644 }
2514 } else { 2645 } else {
2515 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";
2516 } 2647 }
2517 2648
… …
2565our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2566our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2567 2698
2568$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2569 2700
2570$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));
2571 2706
2572# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2573 2708
2574=pod 2709=pod
2575 2710
2576The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2577 2712
2578 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
2579 cf::object::player player 2717 cf::object::player
2580 cf::player peaceful 2718 player
2581 cf::map trigger 2719
2720 cf::player
2721 peaceful
2722
2723 cf::map
2724 trigger
2582 2725
2583=cut 2726=cut
2584 2727
2585for ( 2728for (
2586 ["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)],
2587 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2588 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2589 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2590) { 2734) {
2591 no strict 'refs'; 2735 no strict 'refs';
… …
2667# the server's init and main functions 2811# the server's init and main functions
2668 2812
2669sub load_facedata($) { 2813sub load_facedata($) {
2670 my ($path) = @_; 2814 my ($path) = @_;
2671 2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2672 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2673 2819
2674 my $facedata; 2820 my $facedata;
2675 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2676 or die "$path: $!"; 2822 or die "$path: $!";
… …
2678 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2679 2825
2680 $facedata->{version} == 2 2826 $facedata->{version} == 2
2681 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2682 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
2683 { 2837 {
2684 my $faces = $facedata->{faceinfo}; 2838 my $faces = $facedata->{faceinfo};
2685 2839
2686 while (my ($face, $info) = each %$faces) { 2840 while (my ($face, $info) = each %$faces) {
2687 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2841 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2688 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2842 cf::face::set_visibility $idx, $info->{visibility};
2843 cf::face::set_magicmap $idx, $info->{magicmap};
2689 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2844 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2690 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2845 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2691 Coro::cede; 2846
2847 cf::cede_to_tick;
2692 } 2848 }
2693 2849
2694 while (my ($face, $info) = each %$faces) { 2850 while (my ($face, $info) = each %$faces) {
2695 next unless $info->{smooth}; 2851 next unless $info->{smooth};
2696 my $idx = cf::face::find $face 2852 my $idx = cf::face::find $face
2697 or next; 2853 or next;
2698 if (my $smooth = cf::face::find $info->{smooth}) { 2854 if (my $smooth = cf::face::find $info->{smooth}) {
2855 cf::face::set_smooth $idx, $smooth;
2699 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2856 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2700 } else { 2857 } else {
2701 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2858 warn "smooth face '$info->{smooth}' not found for face '$face'";
2702 } 2859 }
2703 Coro::cede; 2860
2861 cf::cede_to_tick;
2704 } 2862 }
2705 } 2863 }
2706 2864
2707 { 2865 {
2708 my $anims = $facedata->{animinfo}; 2866 my $anims = $facedata->{animinfo};
2709 2867
2710 while (my ($anim, $info) = each %$anims) { 2868 while (my ($anim, $info) = each %$anims) {
2711 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2869 cf::anim::set $anim, $info->{frames}, $info->{facings};
2712 Coro::cede; 2870 cf::cede_to_tick;
2713 } 2871 }
2714 2872
2715 cf::anim::invalidate_all; # d'oh 2873 cf::anim::invalidate_all; # d'oh
2716 } 2874 }
2717 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
2718 1 2923 1
2719} 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};
2720 2933
2721sub reload_regions { 2934sub reload_regions {
2722 load_resource_file "$MAPDIR/regions" 2935 load_resource_file "$MAPDIR/regions"
2723 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 }
2724} 2942}
2725 2943
2726sub reload_facedata { 2944sub reload_facedata {
2727 load_facedata "$DATADIR/facedata" 2945 load_facedata "$DATADIR/facedata"
2728 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