ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/server/lib/cf.pm
(Generate patch)

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.301 by root, Tue Jul 10 07:01:51 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.
… …
409Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
411 475
412=cut 476=cut
413 477
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422
423sub fork_call(&@) { 478sub fork_call(&@) {
424 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
425 480
426# 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,
427# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
429 or die "pipe: $!";
430 484
431 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 486 reset_signals;
445 local $SIG{__WARN__}; 487 &$cb
446 local $SIG{__DIE__}; 488 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 489
453 eval { 490 wantarray ? @res : $res[-1]
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
464 }
465} 491}
466 492
467=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
468 494
469Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
865 "; 891 ";
866 die if $@; 892 die if $@;
867} 893}
868 894
869our $override; 895our $override;
870our @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?
871 897
872sub override { 898sub override {
873 $override = 1; 899 $override = 1;
874 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
875} 901}
876 902
877sub do_invoke { 903sub do_invoke {
878 my $event = shift; 904 my $event = shift;
879 my $callbacks = shift; 905 my $callbacks = shift;
880 906
881 @invoke_results = (); 907 @INVOKE_RESULTS = ();
882 908
883 local $override; 909 local $override;
884 910
885 for (@$callbacks) { 911 for (@$callbacks) {
886 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
903 929
904Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
905 931
906This 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
907removed 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
908results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 935
910=back 936=back
911 937
912=cut 938=cut
913 939
914############################################################################# 940#############################################################################
915# 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}
916 953
917sub reattach { 954sub reattach {
918 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 956 my ($obj) = @_;
920 957
… …
1107 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1108 1145
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1147
1111 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
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1114 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1115 } 1158 if $reply;
1116 } 1159 }
1117 } else { 1160 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1162 }
1120 1163
… …
1290 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1291 1334
1292 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1293 1336
1294 $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 (@_);
1295} 1348}
1296 1349
1297=item $pl->quit_character 1350=item $pl->quit_character
1298 1351
1299Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1443sub hintmode { 1496sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode} 1498 $_[0]{hintmode}
1446} 1499}
1447 1500
1448=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1449 1502
1450Sends an ext reply to the player. 1503Sends an ext reply to the player.
1451 1504
1452=cut 1505=cut
1453 1506
1454sub ext_reply($$%) { 1507sub ext_reply($$@) {
1455 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1456 1509
1457 $msg{msgid} = $id; 1510 $self->ns->ext_reply ($id, @msg)
1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1459} 1511}
1460 1512
1461=item $player->ext_event ($type, %msg) 1513=item $player->ext_msg ($type, @msg)
1462 1514
1463Sends an ext event to the client. 1515Sends an ext event to the client.
1464 1516
1465=cut 1517=cut
1466 1518
1467sub ext_event($$%) { 1519sub ext_msg($$@) {
1468 my ($self, $type, %msg) = @_; 1520 my ($self, $type, @msg) = @_;
1469 1521
1470 $self->ns->ext_event ($type, %msg); 1522 $self->ns->ext_msg ($type, @msg);
1471} 1523}
1472 1524
1473=head3 cf::region 1525=head3 cf::region
1474 1526
1475=over 4 1527=over 4
… …
1488 my ($path) = @_; 1540 my ($path) = @_;
1489 1541
1490 my ($match, $specificity); 1542 my ($match, $specificity);
1491 1543
1492 for my $region (list) { 1544 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) { 1545 if ($region->{match} && $path =~ $region->{match}) {
1494 ($match, $specificity) = ($region, $region->specificity) 1546 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity; 1547 if $region->specificity > $specificity;
1496 } 1548 }
1497 } 1549 }
1498 1550
… …
1618 $self->init; # pass $1 etc. 1670 $self->init; # pass $1 etc.
1619 return $self; 1671 return $self;
1620 } 1672 }
1621 } 1673 }
1622 1674
1623 Carp::carp "unable to resolve path '$path' (base '$base')."; 1675 Carp::cluck "unable to resolve path '$path' (base '$base').";
1624 () 1676 ()
1625} 1677}
1626 1678
1627sub init { 1679sub init {
1628 my ($self) = @_; 1680 my ($self) = @_;
… …
1836 $self->set_darkness_map; 1888 $self->set_darkness_map;
1837 Coro::cede; 1889 Coro::cede;
1838 $self->activate; 1890 $self->activate;
1839 } 1891 }
1840 1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1841 $self->in_memory (cf::MAP_IN_MEMORY); 1896 $self->in_memory (cf::MAP_IN_MEMORY);
1842 } 1897 }
1843 1898
1844 $self->post_load; 1899 $self->post_load;
1845} 1900}
… …
1855 1910
1856 $self 1911 $self
1857} 1912}
1858 1913
1859# 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
1860sub load_diag { 1915sub load_neighbours {
1861 my ($map) = @_; 1916 my ($map) = @_;
1862 1917
1863 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1864 1919
1865 for (0 .. 3) { 1920 for (0 .. 3) {
1866 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1867 or next; 1922 or next;
1868 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1869 or next; 1924 or next;
1870 $neigh->load; 1925 $neigh->load;
1871 1926
1927 push @neigh,
1872 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1873 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1874 } 1930 }
1875 1931
1876 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1877 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1878 or next; 1935 or next;
1879 $neigh->load; 1936 $neigh->load;
1880 } 1937 }
1881} 1938}
1882 1939
… …
1906 1963
1907 undef $MAP_PREFETCH{$path}; 1964 undef $MAP_PREFETCH{$path};
1908 $MAP_PREFETCHER ||= cf::async { 1965 $MAP_PREFETCHER ||= cf::async {
1909 while (%MAP_PREFETCH) { 1966 while (%MAP_PREFETCH) {
1910 for my $path (keys %MAP_PREFETCH) { 1967 for my $path (keys %MAP_PREFETCH) {
1911 my $map = find $path 1968 if (my $map = find $path) {
1912 or next;
1913 $map->load; 1969 $map->load;
1970 }
1914 1971
1915 delete $MAP_PREFETCH{$path}; 1972 delete $MAP_PREFETCH{$path};
1916 } 1973 }
1917 } 1974 }
1918 undef $MAP_PREFETCHER; 1975 undef $MAP_PREFETCHER;
… …
2145 2202
2146 } else { 2203 } else {
2147 my $pl = $self->contr; 2204 my $pl = $self->contr;
2148 2205
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2206 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog}; 2207 my $dialog = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply ( 2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157 2209
2158 } else { 2210 } else {
2159 $msg = $npc->name . " says: $msg" if $npc; 2211 $msg = $npc->name . " says: $msg" if $npc;
2160 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2161 } 2213 }
2162 } 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 (@_);
2163} 2225}
2164 2226
2165=item $player_object->may ("access") 2227=item $player_object->may ("access")
2166 2228
2167Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
… …
2246 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2247 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2248 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2249 2311
2250 $map->load; 2312 $map->load;
2251 $map->load_diag; 2313 $map->load_neighbours;
2252 2314
2253 return unless $self->contr->active; 2315 return unless $self->contr->active;
2254 $self->activate_recursive; 2316 $self->activate_recursive;
2255 2317
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2257 $self->enter_map ($map, $x, $y); 2319 $self->enter_map ($map, $x, $y);
2258} 2320}
2259 2321
2260=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2322=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2261 2323
2262Moves 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
2263her, loading and preparing them map, calling the provided $check callback 2325her, loading and preparing them map, calling the provided $check callback
2264that 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
2265the 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.
2266 2329
2267=cut 2330=cut
2268 2331
2269our $GOTOGEN; 2332our $GOTOGEN;
2270 2333
2271sub cf::object::player::goto { 2334sub cf::object::player::goto {
2272 my ($self, $path, $x, $y, $check) = @_; 2335 my ($self, $path, $x, $y, $check, $done) = @_;
2273 2336
2274 # 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
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2276 2339
2277 $self->enter_link; 2340 $self->enter_link;
… …
2297 2360
2298 if ($gen == $self->{_goto_generation}) { 2361 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation}; 2362 delete $self->{_goto_generation};
2300 $self->leave_link ($map, $x, $y); 2363 $self->leave_link ($map, $x, $y);
2301 } 2364 }
2365
2366 $done->() if $done;
2302 })->prio (1); 2367 })->prio (1);
2303} 2368}
2304 2369
2305=item $player_object->enter_exit ($exit_object) 2370=item $player_object->enter_exit ($exit_object)
2306 2371
… …
2415 2480
2416 utf8::encode $text; 2481 utf8::encode $text;
2417 $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);
2418} 2483}
2419 2484
2420=item $client->send_msg ($color, $type, $msg, [extra...]) 2485=item $client->send_msg ($channel, $msg, $color, [extra...])
2421 2486
2422Send 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
2423client 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
2424the 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
2425the message unless the client supports the msg packet. 2490the message unless the client supports the msg packet.
2426 2491
2427=cut 2492=cut
2428 2493
2429sub cf::client::send_msg { 2494sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_; 2495 my ($self, $channel, $msg, $color, @extra) = @_;
2431 2496
2432 $msg = $self->pl->expand_cfpod ($msg); 2497 $msg = $self->pl->expand_cfpod ($msg);
2433 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
2434 return unless @extra || length $msg; 2511 return unless @extra || length $msg;
2435 2512
2436 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
2437 $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]));
2438 } else { 2520 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 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
2450 if (0 && $msg =~ /\[/) { 2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2451 $self->send_packet ("drawextinfo $color 4 0 $msg") 2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2452 } else { 2539 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg") 2541 $self->send_packet ("drawinfo $color $msg")
2455 } 2542 }
2456 } 2543 }
2457 } 2544 }
2458} 2545}
2459 2546
2460=item $client->ext_event ($type, %msg) 2547=item $client->ext_msg ($type, @msg)
2461 2548
2462Sends an ext event to the client. 2549Sends an ext event to the client.
2463 2550
2464=cut 2551=cut
2465 2552
2466sub cf::client::ext_event($$%) { 2553sub cf::client::ext_msg($$@) {
2467 my ($self, $type, %msg) = @_; 2554 my ($self, $type, @msg) = @_;
2468 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
2469 $msg{msgtype} = "event_$type"; 2561 push @msg, msgtype => "event_$type";
2470 $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 }
2471} 2582}
2472 2583
2473=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
2474 2585
2475Queues a query to the client, calling the given callback with 2586Queues a query to the client, calling the given callback with
… …
2530 my ($ns, $buf) = @_; 2641 my ($ns, $buf) = @_;
2531 2642
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2643 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533 2644
2534 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
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2651 if (my $cb = $EXTICMD{$type}) {
2536 if (my %reply = $cb->($ns, $msg)) { 2652 my @reply = $cb->($ns, @payload);
2537 $reply{msgid} = $msg->{msgid}; 2653
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2654 $ns->ext_reply ($reply, @reply)
2539 } 2655 if $reply;
2540 } 2656 }
2541 } else { 2657 } else {
2542 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";
2543 } 2659 }
2544 2660
… …
2592our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2593our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2594 2710
2595$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2596 2712
2597$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));
2598 2718
2599# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2600 2720
2601=pod 2721=pod
2602 2722
2603The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2604 2724
2605 cf::object 2725 cf::object
2606 contr pay_amount pay_player map x y force_find force_add 2726 contr pay_amount pay_player map x y force_find force_add
2607 insert remove 2727 insert remove name archname title slaying race
2608 2728
2609 cf::object::player 2729 cf::object::player
2610 player 2730 player
2611 2731
2612 cf::player 2732 cf::player
… …
2617 2737
2618=cut 2738=cut
2619 2739
2620for ( 2740for (
2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)], 2742 insert remove inv name archname title slaying race)],
2623 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2624 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2625 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2626) { 2746) {
2627 no strict 'refs'; 2747 no strict 'refs';
… …
2703# the server's init and main functions 2823# the server's init and main functions
2704 2824
2705sub load_facedata($) { 2825sub load_facedata($) {
2706 my ($path) = @_; 2826 my ($path) = @_;
2707 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2708 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2709 2831
2710 my $facedata; 2832 my $facedata;
2711 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2712 or die "$path: $!"; 2834 or die "$path: $!";
… …
2714 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2715 2837
2716 $facedata->{version} == 2 2838 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718 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
2719 { 2848 {
2720 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2721 2850
2722 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2727 Coro::cede; 2857
2858 cf::cede_to_tick;
2728 } 2859 }
2729 2860
2730 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth}; 2862 next unless $info->{smooth};
2732 my $idx = cf::face::find $face 2863 my $idx = cf::face::find $face
2733 or next; 2864 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) { 2865 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth;
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2736 } else { 2868 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2869 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 } 2870 }
2739 Coro::cede; 2871
2872 cf::cede_to_tick;
2740 } 2873 }
2741 } 2874 }
2742 2875
2743 { 2876 {
2744 my $anims = $facedata->{animinfo}; 2877 my $anims = $facedata->{animinfo};
2745 2878
2746 while (my ($anim, $info) = each %$anims) { 2879 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2880 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede; 2881 cf::cede_to_tick;
2749 } 2882 }
2750 2883
2751 cf::anim::invalidate_all; # d'oh 2884 cf::anim::invalidate_all; # d'oh
2752 } 2885 }
2753 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
2754 1 2934 1
2755} 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};
2756 2944
2757sub reload_regions { 2945sub reload_regions {
2758 load_resource_file "$MAPDIR/regions" 2946 load_resource_file "$MAPDIR/regions"
2759 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 }
2760} 2953}
2761 2954
2762sub reload_facedata { 2955sub reload_facedata {
2763 load_facedata "$DATADIR/facedata" 2956 load_facedata "$DATADIR/facedata"
2764 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