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.338 by root, Tue Aug 21 01:07:47 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
1154 my @reply;
1155
1107 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1108 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1109 $pl->ext_reply ($msg->{msgid}, %reply);
1110 }
1111 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1112 } else { 1163 } else {
1113 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1114 } 1165 }
1115 1166
1116 cf::override; 1167 cf::override;
… …
1285 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1286 1337
1287 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1288 1339
1289 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1290} 1351}
1291 1352
1292=item $pl->quit_character 1353=item $pl->quit_character
1293 1354
1294Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1438sub hintmode { 1499sub hintmode {
1439 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1440 $_[0]{hintmode} 1501 $_[0]{hintmode}
1441} 1502}
1442 1503
1443=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1444 1505
1445Sends an ext reply to the player. 1506Sends an ext reply to the player.
1446 1507
1447=cut 1508=cut
1448 1509
1449sub ext_reply($$%) { 1510sub ext_reply($$@) {
1450 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1451 1512
1452 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1453 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1454} 1514}
1455 1515
1456=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1457 1517
1458Sends an ext event to the client. 1518Sends an ext event to the client.
1459 1519
1460=cut 1520=cut
1461 1521
1462sub ext_event($$%) { 1522sub ext_msg($$@) {
1463 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1464 1524
1465 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1466} 1526}
1467 1527
1468=head3 cf::region 1528=head3 cf::region
1469 1529
1470=over 4 1530=over 4
… …
1483 my ($path) = @_; 1543 my ($path) = @_;
1484 1544
1485 my ($match, $specificity); 1545 my ($match, $specificity);
1486 1546
1487 for my $region (list) { 1547 for my $region (list) {
1488 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1489 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1490 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1491 } 1551 }
1492 } 1552 }
1493 1553
… …
1613 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1614 return $self; 1674 return $self;
1615 } 1675 }
1616 } 1676 }
1617 1677
1618 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1619 () 1679 ()
1620} 1680}
1621 1681
1622sub init { 1682sub init {
1623 my ($self) = @_; 1683 my ($self) = @_;
… …
1831 $self->set_darkness_map; 1891 $self->set_darkness_map;
1832 Coro::cede; 1892 Coro::cede;
1833 $self->activate; 1893 $self->activate;
1834 } 1894 }
1835 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1836 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1837 } 1900 }
1838 1901
1839 $self->post_load; 1902 $self->post_load;
1840} 1903}
… …
1850 1913
1851 $self 1914 $self
1852} 1915}
1853 1916
1854# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1855sub load_diag { 1918sub load_neighbours {
1856 my ($map) = @_; 1919 my ($map) = @_;
1857 1920
1858 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1859 1922
1860 for (0 .. 3) { 1923 for (0 .. 3) {
1861 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1862 or next; 1925 or next;
1863 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1864 or next; 1927 or next;
1865 $neigh->load; 1928 $neigh->load;
1866 1929
1930 push @neigh,
1867 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1868 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1869 } 1933 }
1870 1934
1871 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1872 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1873 or next; 1938 or next;
1874 $neigh->load; 1939 $neigh->load;
1875 } 1940 }
1876} 1941}
1877 1942
… …
1901 1966
1902 undef $MAP_PREFETCH{$path}; 1967 undef $MAP_PREFETCH{$path};
1903 $MAP_PREFETCHER ||= cf::async { 1968 $MAP_PREFETCHER ||= cf::async {
1904 while (%MAP_PREFETCH) { 1969 while (%MAP_PREFETCH) {
1905 for my $path (keys %MAP_PREFETCH) { 1970 for my $path (keys %MAP_PREFETCH) {
1906 my $map = find $path 1971 if (my $map = find $path) {
1907 or next;
1908 $map->load; 1972 $map->load;
1973 }
1909 1974
1910 delete $MAP_PREFETCH{$path}; 1975 delete $MAP_PREFETCH{$path};
1911 } 1976 }
1912 } 1977 }
1913 undef $MAP_PREFETCHER; 1978 undef $MAP_PREFETCHER;
… …
2140 2205
2141 } else { 2206 } else {
2142 my $pl = $self->contr; 2207 my $pl = $self->contr;
2143 2208
2144 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2209 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2145 my $diag = $pl->{npc_dialog}; 2210 my $dialog = $pl->{npc_dialog};
2146 $diag->{pl}->ext_reply ( 2211 $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 2212
2153 } else { 2213 } else {
2154 $msg = $npc->name . " says: $msg" if $npc; 2214 $msg = $npc->name . " says: $msg" if $npc;
2155 $self->message ($msg, $flags); 2215 $self->message ($msg, $flags);
2156 } 2216 }
2157 } 2217 }
2218}
2219
2220=item $object->send_msg ($channel, $msg, $color, [extra...])
2221
2222=cut
2223
2224sub cf::object::send_msg {
2225 my $pl = shift->contr
2226 or return;
2227 $pl->send_msg (@_);
2158} 2228}
2159 2229
2160=item $player_object->may ("access") 2230=item $player_object->may ("access")
2161 2231
2162Returns wether the given player is authorized to access resource "access" 2232Returns wether the given player is authorized to access resource "access"
… …
2241 # use -1 or undef as default coordinates, not 0, 0 2311 # use -1 or undef as default coordinates, not 0, 0
2242 ($x, $y) = ($map->enter_x, $map->enter_y) 2312 ($x, $y) = ($map->enter_x, $map->enter_y)
2243 if $x <=0 && $y <= 0; 2313 if $x <=0 && $y <= 0;
2244 2314
2245 $map->load; 2315 $map->load;
2246 $map->load_diag; 2316 $map->load_neighbours;
2247 2317
2248 return unless $self->contr->active; 2318 return unless $self->contr->active;
2249 $self->activate_recursive; 2319 $self->activate_recursive;
2250 2320
2251 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2321 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2252 $self->enter_map ($map, $x, $y); 2322 $self->enter_map ($map, $x, $y);
2253} 2323}
2254 2324
2255=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2325=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2256 2326
2257Moves the player to the given map-path and coordinates by first freezing 2327Moves the player to the given map-path and coordinates by first freezing
2258her, loading and preparing them map, calling the provided $check callback 2328her, loading and preparing them map, calling the provided $check callback
2259that has to return the map if sucecssful, and then unfreezes the player on 2329that has to return the map if sucecssful, and then unfreezes the player on
2260the new (success) or old (failed) map position. 2330the new (success) or old (failed) map position. In either case, $done will
2331be called at the end of this process.
2261 2332
2262=cut 2333=cut
2263 2334
2264our $GOTOGEN; 2335our $GOTOGEN;
2265 2336
2266sub cf::object::player::goto { 2337sub cf::object::player::goto {
2267 my ($self, $path, $x, $y, $check) = @_; 2338 my ($self, $path, $x, $y, $check, $done) = @_;
2268 2339
2269 # do generation counting so two concurrent goto's will be executed in-order 2340 # do generation counting so two concurrent goto's will be executed in-order
2270 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2341 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2271 2342
2272 $self->enter_link; 2343 $self->enter_link;
… …
2292 2363
2293 if ($gen == $self->{_goto_generation}) { 2364 if ($gen == $self->{_goto_generation}) {
2294 delete $self->{_goto_generation}; 2365 delete $self->{_goto_generation};
2295 $self->leave_link ($map, $x, $y); 2366 $self->leave_link ($map, $x, $y);
2296 } 2367 }
2368
2369 $done->() if $done;
2297 })->prio (1); 2370 })->prio (1);
2298} 2371}
2299 2372
2300=item $player_object->enter_exit ($exit_object) 2373=item $player_object->enter_exit ($exit_object)
2301 2374
… …
2410 2483
2411 utf8::encode $text; 2484 utf8::encode $text;
2412 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2485 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2413} 2486}
2414 2487
2415=item $client->send_msg ($color, $type, $msg, [extra...]) 2488=item $client->send_msg ($channel, $msg, $color, [extra...])
2416 2489
2417Send a drawinfo or msg packet to the client, formatting the msg for the 2490Send 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 2491client 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 2492the message, with C<log> being the default. If C<$color> is negative, suppress
2420the message unless the client supports the msg packet. 2493the message unless the client supports the msg packet.
2421 2494
2422=cut 2495=cut
2423 2496
2424sub cf::client::send_msg { 2497sub cf::client::send_msg {
2425 my ($self, $color, $type, $msg, @extra) = @_; 2498 my ($self, $channel, $msg, $color, @extra) = @_;
2426 2499
2427 $msg = $self->pl->expand_cfpod ($msg); 2500 $msg = $self->pl->expand_cfpod ($msg);
2428 2501
2502 $color &= cf::NDI_CLIENT_MASK; # just in case...
2503
2504 if (ref $channel) {
2505 # send meta info to client, if not yet sent
2506 unless (exists $self->{channel}{$channel->{id}}) {
2507 $self->{channel}{$channel->{id}} = $channel;
2508 $self->ext_msg (channel_info => $channel);
2509 }
2510
2511 $channel = $channel->{id};
2512 }
2513
2429 return unless @extra || length $msg; 2514 return unless @extra || length $msg;
2430 2515
2431 if ($self->can_msg) { 2516 if ($self->can_msg) {
2517 # default colour, mask it out
2518 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2519 if $color & cf::NDI_DEF;
2520
2432 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2521 $self->send_packet ("msg " . $self->{json_coder}->encode (
2522 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2433 } else { 2523 } 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) { 2524 if ($color >= 0) {
2525 # replace some tags by gcfclient-compatible ones
2526 for ($msg) {
2527 1 while
2528 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2529 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2530 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2531 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2532 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2533 }
2534
2535 $color &= cf::NDI_COLOR_MASK;
2536
2537 utf8::encode $msg;
2538
2445 if (0 && $msg =~ /\[/) { 2539 if (0 && $msg =~ /\[/) {
2540 # COMMAND/INFO
2446 $self->send_packet ("drawextinfo $color 4 0 $msg") 2541 $self->send_packet ("drawextinfo $color 10 8 $msg")
2447 } else { 2542 } else {
2448 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2543 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2449 $self->send_packet ("drawinfo $color $msg") 2544 $self->send_packet ("drawinfo $color $msg")
2450 } 2545 }
2451 } 2546 }
2452 } 2547 }
2453} 2548}
2454 2549
2455=item $client->ext_event ($type, %msg) 2550=item $client->ext_msg ($type, @msg)
2456 2551
2457Sends an ext event to the client. 2552Sends an ext event to the client.
2458 2553
2459=cut 2554=cut
2460 2555
2461sub cf::client::ext_event($$%) { 2556sub cf::client::ext_msg($$@) {
2462 my ($self, $type, %msg) = @_; 2557 my ($self, $type, @msg) = @_;
2463 2558
2559 my $extcmd = $self->extcmd;
2560
2561 if ($extcmd == 2) {
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2563 } elsif ($extcmd == 1) { # TODO: remove
2464 $msg{msgtype} = "event_$type"; 2564 push @msg, msgtype => "event_$type";
2465 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 }
2567}
2568
2569=item $client->ext_reply ($msgid, @msg)
2570
2571Sends an ext reply to the client.
2572
2573=cut
2574
2575sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_;
2577
2578 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) {
2581 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id;
2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2584 }
2466} 2585}
2467 2586
2468=item $success = $client->query ($flags, "text", \&cb) 2587=item $success = $client->query ($flags, "text", \&cb)
2469 2588
2470Queues a query to the client, calling the given callback with 2589Queues a query to the client, calling the given callback with
… …
2525 my ($ns, $buf) = @_; 2644 my ($ns, $buf) = @_;
2526 2645
2527 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2646 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2528 2647
2529 if (ref $msg) { 2648 if (ref $msg) {
2649 my ($type, $reply, @payload) =
2650 "ARRAY" eq ref $msg
2651 ? @$msg
2652 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2653
2654 my @reply;
2655
2530 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2656 if (my $cb = $EXTICMD{$type}) {
2531 if (my %reply = $cb->($ns, $msg)) { 2657 @reply = $cb->($ns, @payload);
2532 $reply{msgid} = $msg->{msgid};
2533 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2534 }
2535 } 2658 }
2659
2660 $ns->ext_reply ($reply, @reply)
2661 if $reply;
2662
2536 } else { 2663 } else {
2537 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2664 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2538 } 2665 }
2539 2666
2540 cf::override; 2667 cf::override;
… …
2587our $safe = new Safe "safe"; 2714our $safe = new Safe "safe";
2588our $safe_hole = new Safe::Hole; 2715our $safe_hole = new Safe::Hole;
2589 2716
2590$SIG{FPE} = 'IGNORE'; 2717$SIG{FPE} = 'IGNORE';
2591 2718
2592$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2719$safe->permit_only (Opcode::opset qw(
2720 :base_core :base_mem :base_orig :base_math
2721 grepstart grepwhile mapstart mapwhile
2722 sort time
2723));
2593 2724
2594# here we export the classes and methods available to script code 2725# here we export the classes and methods available to script code
2595 2726
2596=pod 2727=pod
2597 2728
2598The following functions and methods are available within a safe environment: 2729The following functions and methods are available within a safe environment:
2599 2730
2600 cf::object 2731 cf::object
2601 contr pay_amount pay_player map x y force_find force_add 2732 contr pay_amount pay_player map x y force_find force_add
2602 insert remove 2733 insert remove name archname title slaying race
2603 2734
2604 cf::object::player 2735 cf::object::player
2605 player 2736 player
2606 2737
2607 cf::player 2738 cf::player
… …
2612 2743
2613=cut 2744=cut
2614 2745
2615for ( 2746for (
2616 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2617 insert remove)], 2748 insert remove inv name archname title slaying race)],
2618 ["cf::object::player" => qw(player)], 2749 ["cf::object::player" => qw(player)],
2619 ["cf::player" => qw(peaceful)], 2750 ["cf::player" => qw(peaceful)],
2620 ["cf::map" => qw(trigger)], 2751 ["cf::map" => qw(trigger)],
2621) { 2752) {
2622 no strict 'refs'; 2753 no strict 'refs';
… …
2698# the server's init and main functions 2829# the server's init and main functions
2699 2830
2700sub load_facedata($) { 2831sub load_facedata($) {
2701 my ($path) = @_; 2832 my ($path) = @_;
2702 2833
2834 my $enc = JSON::XS->new->utf8->canonical;
2835
2703 warn "loading facedata from $path\n"; 2836 warn "loading facedata from $path\n";
2704 2837
2705 my $facedata; 2838 my $facedata;
2706 0 < aio_load $path, $facedata 2839 0 < aio_load $path, $facedata
2707 or die "$path: $!"; 2840 or die "$path: $!";
… …
2709 $facedata = Coro::Storable::thaw $facedata; 2842 $facedata = Coro::Storable::thaw $facedata;
2710 2843
2711 $facedata->{version} == 2 2844 $facedata->{version} == 2
2712 or cf::cleanup "$path: version mismatch, cannot proceed."; 2845 or cf::cleanup "$path: version mismatch, cannot proceed.";
2713 2846
2847 # patch in the exptable
2848 $facedata->{resource}{"res/exp_table"} = {
2849 type => FT_RSRC,
2850 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2851 };
2852 cf::cede_to_tick;
2853
2714 { 2854 {
2715 my $faces = $facedata->{faceinfo}; 2855 my $faces = $facedata->{faceinfo};
2716 2856
2717 while (my ($face, $info) = each %$faces) { 2857 while (my ($face, $info) = each %$faces) {
2718 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2858 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2719 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2859 cf::face::set_visibility $idx, $info->{visibility};
2860 cf::face::set_magicmap $idx, $info->{magicmap};
2720 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2721 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2722 Coro::cede; 2863
2864 cf::cede_to_tick;
2723 } 2865 }
2724 2866
2725 while (my ($face, $info) = each %$faces) { 2867 while (my ($face, $info) = each %$faces) {
2726 next unless $info->{smooth}; 2868 next unless $info->{smooth};
2727 my $idx = cf::face::find $face 2869 my $idx = cf::face::find $face
2728 or next; 2870 or next;
2729 if (my $smooth = cf::face::find $info->{smooth}) { 2871 if (my $smooth = cf::face::find $info->{smooth}) {
2872 cf::face::set_smooth $idx, $smooth;
2730 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2873 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2731 } else { 2874 } else {
2732 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2875 warn "smooth face '$info->{smooth}' not found for face '$face'";
2733 } 2876 }
2734 Coro::cede; 2877
2878 cf::cede_to_tick;
2735 } 2879 }
2736 } 2880 }
2737 2881
2738 { 2882 {
2739 my $anims = $facedata->{animinfo}; 2883 my $anims = $facedata->{animinfo};
2740 2884
2741 while (my ($anim, $info) = each %$anims) { 2885 while (my ($anim, $info) = each %$anims) {
2742 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2886 cf::anim::set $anim, $info->{frames}, $info->{facings};
2743 Coro::cede; 2887 cf::cede_to_tick;
2744 } 2888 }
2745 2889
2746 cf::anim::invalidate_all; # d'oh 2890 cf::anim::invalidate_all; # d'oh
2747 } 2891 }
2748 2892
2893 {
2894 # TODO: for gcfclient pleasure, we should give resources
2895 # that gcfclient doesn't grok a >10000 face index.
2896 my $res = $facedata->{resource};
2897
2898 my $soundconf = delete $res->{"res/sound.conf"};
2899
2900 while (my ($name, $info) = each %$res) {
2901 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data;
2903
2904 if ($info->{type} & 1) {
2905 # prepend meta info
2906
2907 my $meta = $enc->encode ({
2908 name => $name,
2909 %{ $info->{meta} || {} },
2910 });
2911
2912 $data = pack "(w/a*)*", $meta, $info->{data};
2913 } else {
2914 $data = $info->{data};
2915 }
2916
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2918 cf::face::set_type $idx, $info->{type};
2919
2920 cf::cede_to_tick;
2921 }
2922
2923 if ($soundconf) {
2924 $soundconf = $enc->decode (delete $soundconf->{data});
2925
2926 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2927 my $sound = $soundconf->{compat}[$_]
2928 or next;
2929
2930 my $face = cf::face::find "sound/$sound->[1]";
2931 cf::sound::set $sound->[0] => $face;
2932 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2933 }
2934
2935 while (my ($k, $v) = each %{$soundconf->{event}}) {
2936 my $face = cf::face::find "sound/$v";
2937 cf::sound::set $k => $face;
2938 }
2939 }
2940 }
2941
2749 1 2942 1
2750} 2943}
2944
2945register_exticmd fx_want => sub {
2946 my ($ns, $want) = @_;
2947
2948 while (my ($k, $v) = each %$want) {
2949 $ns->fx_want ($k, $v);
2950 }
2951};
2751 2952
2752sub reload_regions { 2953sub reload_regions {
2753 load_resource_file "$MAPDIR/regions" 2954 load_resource_file "$MAPDIR/regions"
2754 or die "unable to load regions file\n"; 2955 or die "unable to load regions file\n";
2956
2957 for (cf::region::list) {
2958 $_->{match} = qr/$_->{match}/
2959 if exists $_->{match};
2960 }
2755} 2961}
2756 2962
2757sub reload_facedata { 2963sub reload_facedata {
2758 load_facedata "$DATADIR/facedata" 2964 load_facedata "$DATADIR/facedata"
2759 or die "unable to load facedata\n"; 2965 or die "unable to load facedata\n";

Diff Legend

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