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.298 by root, Sun Jul 8 14:50:07 2007 UTC vs.
Revision 1.335 by root, Mon Aug 20 22:21:48 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 warn "pst<$res>" unless $res =~ /^pst/;
427 $res = Coro::Storable::thaw $res;
428
429 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
430
431 Carp::confess $$res unless "ARRAY" eq ref $res;
432
433 return wantarray ? @$res : $res->[-1];
434 } else {
435 reset_signals; 486 reset_signals;
436 local $SIG{__WARN__}; 487 &$cb
437 local $SIG{__DIE__}; 488 }, @args;
438 local $Coro::idle;
439 $Coro::current->prio (Coro::PRIO_MAX);
440 eval {
441 close $fh1;
442 489
443 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
444
445 open my $fh, ">", \my $buf
446 or die "fork_call: cannot open fh-to-buf in child : $!";
447 Storable::store_fd +($@ ? \"$@" : \@res), $fh;
448 close $fh;
449
450 warn "writing ", length $buf;
451 my $x;
452 (length $buf) == ($x = syswrite $fh2, $buf)
453 or warn "error writing ".(length $buf)." != $x\n";
454 close $fh2;
455 };
456
457 warn $@ if $@;
458 _exit 0;
459 }
460} 491}
461 492
462=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
463 494
464Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
860 "; 891 ";
861 die if $@; 892 die if $@;
862} 893}
863 894
864our $override; 895our $override;
865our @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?
866 897
867sub override { 898sub override {
868 $override = 1; 899 $override = 1;
869 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
870} 901}
871 902
872sub do_invoke { 903sub do_invoke {
873 my $event = shift; 904 my $event = shift;
874 my $callbacks = shift; 905 my $callbacks = shift;
875 906
876 @invoke_results = (); 907 @INVOKE_RESULTS = ();
877 908
878 local $override; 909 local $override;
879 910
880 for (@$callbacks) { 911 for (@$callbacks) {
881 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
898 929
899Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
900 931
901This 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
902removed 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
903results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
904 935
905=back 936=back
906 937
907=cut 938=cut
908 939
909############################################################################# 940#############################################################################
910# 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}
911 953
912sub reattach { 954sub reattach {
913 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
914 my ($obj) = @_; 956 my ($obj) = @_;
915 957
… …
1102 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1103 1145
1104 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1105 1147
1106 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
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
1109 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
1110 } 1158 if $reply;
1111 } 1159 }
1112 } else { 1160 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1162 }
1115 1163
… …
1285 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1286 1334
1287 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1288 1336
1289 $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 (@_);
1290} 1348}
1291 1349
1292=item $pl->quit_character 1350=item $pl->quit_character
1293 1351
1294Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1438sub hintmode { 1496sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1498 $_[0]{hintmode}
1441} 1499}
1442 1500
1443=item $player->ext_reply ($msgid, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1444 1502
1445Sends an ext reply to the player. 1503Sends an ext reply to the player.
1446 1504
1447=cut 1505=cut
1448 1506
1449sub ext_reply($$%) { 1507sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1451 1509
1452 $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;
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg)); 1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1454} 1517}
1455 1518
1456=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1457 1520
1458Sends an ext event to the client. 1521Sends an ext event to the client.
1459 1522
1460=cut 1523=cut
1461 1524
1462sub ext_event($$%) { 1525sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1464 1527
1465 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1466} 1529}
1467 1530
1468=head3 cf::region 1531=head3 cf::region
1469 1532
1470=over 4 1533=over 4
… …
1483 my ($path) = @_; 1546 my ($path) = @_;
1484 1547
1485 my ($match, $specificity); 1548 my ($match, $specificity);
1486 1549
1487 for my $region (list) { 1550 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1551 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1552 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1553 if $region->specificity > $specificity;
1491 } 1554 }
1492 } 1555 }
1493 1556
… …
1613 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1614 return $self; 1677 return $self;
1615 } 1678 }
1616 } 1679 }
1617 1680
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1682 ()
1620} 1683}
1621 1684
1622sub init { 1685sub init {
1623 my ($self) = @_; 1686 my ($self) = @_;
… …
1831 $self->set_darkness_map; 1894 $self->set_darkness_map;
1832 Coro::cede; 1895 Coro::cede;
1833 $self->activate; 1896 $self->activate;
1834 } 1897 }
1835 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1903 }
1838 1904
1839 $self->post_load; 1905 $self->post_load;
1840} 1906}
… …
1850 1916
1851 $self 1917 $self
1852} 1918}
1853 1919
1854# 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
1855sub load_diag { 1921sub load_neighbours {
1856 my ($map) = @_; 1922 my ($map) = @_;
1857 1923
1858 my @diag; # diagonal neighbours 1924 my @neigh; # diagonal neighbours
1859 1925
1860 for (0 .. 3) { 1926 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1927 my $neigh = $map->tile_path ($_)
1862 or next; 1928 or next;
1863 $neigh = find $neigh, $map 1929 $neigh = find $neigh, $map
1864 or next; 1930 or next;
1865 $neigh->load; 1931 $neigh->load;
1866 1932
1933 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1934 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1935 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1936 }
1870 1937
1871 for (@diag) { 1938 for (grep defined $_->[0], @neigh) {
1939 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1940 my $neigh = find $path, $origin
1873 or next; 1941 or next;
1874 $neigh->load; 1942 $neigh->load;
1875 } 1943 }
1876} 1944}
1877 1945
… …
1901 1969
1902 undef $MAP_PREFETCH{$path}; 1970 undef $MAP_PREFETCH{$path};
1903 $MAP_PREFETCHER ||= cf::async { 1971 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1972 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1973 for my $path (keys %MAP_PREFETCH) {
1906 my $map = find $path 1974 if (my $map = find $path) {
1907 or next;
1908 $map->load; 1975 $map->load;
1976 }
1909 1977
1910 delete $MAP_PREFETCH{$path}; 1978 delete $MAP_PREFETCH{$path};
1911 } 1979 }
1912 } 1980 }
1913 undef $MAP_PREFETCHER; 1981 undef $MAP_PREFETCHER;
… …
2140 2208
2141 } else { 2209 } else {
2142 my $pl = $self->contr; 2210 my $pl = $self->contr;
2143 2211
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2212 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2213 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2214 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2147 $diag->{id},
2148 msgtype => "reply",
2149 msg => $diag->{pl}->expand_cfpod ($msg),
2150 add_topics => []
2151 );
2152 2215
2153 } else { 2216 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2217 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2218 $self->message ($msg, $flags);
2156 } 2219 }
2157 } 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 (@_);
2158} 2231}
2159 2232
2160=item $player_object->may ("access") 2233=item $player_object->may ("access")
2161 2234
2162Returns wether the given player is authorized to access resource "access" 2235Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2314 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2315 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2316 if $x <=0 && $y <= 0;
2244 2317
2245 $map->load; 2318 $map->load;
2246 $map->load_diag; 2319 $map->load_neighbours;
2247 2320
2248 return unless $self->contr->active; 2321 return unless $self->contr->active;
2249 $self->activate_recursive; 2322 $self->activate_recursive;
2250 2323
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2325 $self->enter_map ($map, $x, $y);
2253} 2326}
2254 2327
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2328=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2329
2257Moves 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
2258her, loading and preparing them map, calling the provided $check callback 2331her, loading and preparing them map, calling the provided $check callback
2259that 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
2260the 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.
2261 2335
2262=cut 2336=cut
2263 2337
2264our $GOTOGEN; 2338our $GOTOGEN;
2265 2339
2266sub cf::object::player::goto { 2340sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2341 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2342
2269 # 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
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2344 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2345
2272 $self->enter_link; 2346 $self->enter_link;
… …
2292 2366
2293 if ($gen == $self->{_goto_generation}) { 2367 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2368 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2369 $self->leave_link ($map, $x, $y);
2296 } 2370 }
2371
2372 $done->() if $done;
2297 })->prio (1); 2373 })->prio (1);
2298} 2374}
2299 2375
2300=item $player_object->enter_exit ($exit_object) 2376=item $player_object->enter_exit ($exit_object)
2301 2377
… …
2410 2486
2411 utf8::encode $text; 2487 utf8::encode $text;
2412 $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);
2413} 2489}
2414 2490
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2491=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2492
2417Send 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
2418client 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
2419the 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
2420the message unless the client supports the msg packet. 2496the message unless the client supports the msg packet.
2421 2497
2422=cut 2498=cut
2423 2499
2424sub cf::client::send_msg { 2500sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2501 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2502
2427 $msg = $self->pl->expand_cfpod ($msg); 2503 $msg = $self->pl->expand_cfpod ($msg);
2428 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
2429 return unless @extra || length $msg; 2517 return unless @extra || length $msg;
2430 2518
2431 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
2432 $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]));
2433 } else { 2526 } else {
2434 # replace some tags by gcfclient-compatible ones
2435 for ($msg) {
2436 1 while
2437 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2438 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2439 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2440 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2441 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2442 }
2443
2444 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
2445 if (0 && $msg =~ /\[/) { 2542 if (0 && $msg =~ /\[/) {
2543 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2544 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2545 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2546 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2547 $self->send_packet ("drawinfo $color $msg")
2450 } 2548 }
2451 } 2549 }
2452 } 2550 }
2453} 2551}
2454 2552
2455=item $client->ext_event ($type, %msg) 2553=item $client->ext_msg ($type, @msg)
2456 2554
2457Sends an ext event to the client. 2555Sends an ext event to the client.
2458 2556
2459=cut 2557=cut
2460 2558
2461sub cf::client::ext_event($$%) { 2559sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2560 my ($self, $type, @msg) = @_;
2463 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
2464 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2466} 2570}
2467 2571
2468=item $success = $client->query ($flags, "text", \&cb) 2572=item $success = $client->query ($flags, "text", \&cb)
2469 2573
2470Queues a query to the client, calling the given callback with 2574Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2629 my ($ns, $buf) = @_;
2526 2630
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2631 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2632
2529 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
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2639 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2640 my @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid}; 2641
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply)); 2642 $ns->ext_reply ($reply, @reply)
2534 } 2643 if $reply;
2535 } 2644 }
2536 } else { 2645 } else {
2537 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";
2538 } 2647 }
2539 2648
… …
2587our $safe = new Safe "safe"; 2696our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2697our $safe_hole = new Safe::Hole;
2589 2698
2590$SIG{FPE} = 'IGNORE'; 2699$SIG{FPE} = 'IGNORE';
2591 2700
2592$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));
2593 2706
2594# here we export the classes and methods available to script code 2707# here we export the classes and methods available to script code
2595 2708
2596=pod 2709=pod
2597 2710
2598The following functions and methods are available within a safe environment: 2711The following functions and methods are available within a safe environment:
2599 2712
2600 cf::object 2713 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2714 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2715 insert remove name archname title slaying race
2603 2716
2604 cf::object::player 2717 cf::object::player
2605 player 2718 player
2606 2719
2607 cf::player 2720 cf::player
… …
2612 2725
2613=cut 2726=cut
2614 2727
2615for ( 2728for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2729 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 2730 insert remove inv name archname title slaying race)],
2618 ["cf::object::player" => qw(player)], 2731 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2732 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2733 ["cf::map" => qw(trigger)],
2621) { 2734) {
2622 no strict 'refs'; 2735 no strict 'refs';
… …
2698# the server's init and main functions 2811# the server's init and main functions
2699 2812
2700sub load_facedata($) { 2813sub load_facedata($) {
2701 my ($path) = @_; 2814 my ($path) = @_;
2702 2815
2816 my $enc = JSON::XS->new->utf8->canonical;
2817
2703 warn "loading facedata from $path\n"; 2818 warn "loading facedata from $path\n";
2704 2819
2705 my $facedata; 2820 my $facedata;
2706 0 < aio_load $path, $facedata 2821 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2822 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2824 $facedata = Coro::Storable::thaw $facedata;
2710 2825
2711 $facedata->{version} == 2 2826 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2827 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2828
2829 # patch in the exptable
2830 $facedata->{resource}{"res/exp_table"} = {
2831 type => FT_RSRC,
2832 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2833 };
2834 cf::cede_to_tick;
2835
2714 { 2836 {
2715 my $faces = $facedata->{faceinfo}; 2837 my $faces = $facedata->{faceinfo};
2716 2838
2717 while (my ($face, $info) = each %$faces) { 2839 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2840 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2841 cf::face::set_visibility $idx, $info->{visibility};
2842 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2843 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2844 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2845
2846 cf::cede_to_tick;
2723 } 2847 }
2724 2848
2725 while (my ($face, $info) = each %$faces) { 2849 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2850 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2851 my $idx = cf::face::find $face
2728 or next; 2852 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2853 if (my $smooth = cf::face::find $info->{smooth}) {
2854 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2855 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2856 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2857 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2858 }
2734 Coro::cede; 2859
2860 cf::cede_to_tick;
2735 } 2861 }
2736 } 2862 }
2737 2863
2738 { 2864 {
2739 my $anims = $facedata->{animinfo}; 2865 my $anims = $facedata->{animinfo};
2740 2866
2741 while (my ($anim, $info) = each %$anims) { 2867 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2868 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2869 cf::cede_to_tick;
2744 } 2870 }
2745 2871
2746 cf::anim::invalidate_all; # d'oh 2872 cf::anim::invalidate_all; # d'oh
2747 } 2873 }
2748 2874
2875 {
2876 # TODO: for gcfclient pleasure, we should give resources
2877 # that gcfclient doesn't grok a >10000 face index.
2878 my $res = $facedata->{resource};
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881
2882 while (my ($name, $info) = each %$res) {
2883 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2884 my $data;
2885
2886 if ($info->{type} & 1) {
2887 # prepend meta info
2888
2889 my $meta = $enc->encode ({
2890 name => $name,
2891 %{ $info->{meta} || {} },
2892 });
2893
2894 $data = pack "(w/a*)*", $meta, $info->{data};
2895 }
2896
2897 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type};
2899
2900 cf::cede_to_tick;
2901 }
2902
2903 if ($soundconf) {
2904 $soundconf = $enc->decode (delete $soundconf->{data});
2905
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_]
2908 or next;
2909
2910 my $face = cf::face::find "sound/$sound->[1]";
2911 cf::sound::set $sound->[0] => $face;
2912 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2913 }
2914
2915 while (my ($k, $v) = each %{$soundconf->{event}}) {
2916 my $face = cf::face::find "sound/$v";
2917 cf::sound::set $k => $face;
2918 }
2919 }
2920 }
2921
2749 1 2922 1
2750} 2923}
2924
2925register_exticmd fx_want => sub {
2926 my ($ns, $want) = @_;
2927
2928 while (my ($k, $v) = each %$want) {
2929 $ns->fx_want ($k, $v);
2930 }
2931};
2751 2932
2752sub reload_regions { 2933sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2934 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2935 or die "unable to load regions file\n";
2936
2937 for (cf::region::list) {
2938 $_->{match} = qr/$_->{match}/
2939 if exists $_->{match};
2940 }
2755} 2941}
2756 2942
2757sub reload_facedata { 2943sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2944 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2945 or die "unable to load facedata\n";

Diff Legend

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