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.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.343 by root, Mon Aug 27 01:13: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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 486 reset_signals;
435 local $SIG{__WARN__}; 487 &$cb
436 local $SIG{__DIE__}; 488 }, @args;
437 eval {
438 close $fh1;
439 489
440 my @res = eval { $cb->(@args) }; 490 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
446 }
447} 491}
448 492
449=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
450 494
451Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
847 "; 891 ";
848 die if $@; 892 die if $@;
849} 893}
850 894
851our $override; 895our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 897
854sub override { 898sub override {
855 $override = 1; 899 $override = 1;
856 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
857} 901}
858 902
859sub do_invoke { 903sub do_invoke {
860 my $event = shift; 904 my $event = shift;
861 my $callbacks = shift; 905 my $callbacks = shift;
862 906
863 @invoke_results = (); 907 @INVOKE_RESULTS = ();
864 908
865 local $override; 909 local $override;
866 910
867 for (@$callbacks) { 911 for (@$callbacks) {
868 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
… …
885 929
886Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
887 931
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 935
892=back 936=back
893 937
894=cut 938=cut
895 939
896############################################################################# 940#############################################################################
897# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
898 953
899sub reattach { 954sub reattach {
900 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 956 my ($obj) = @_;
902 957
… …
1089 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1090 1145
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1147
1093 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1099 } else { 1163 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1165 }
1102 1166
1103 cf::override; 1167 cf::override;
… …
1272 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1273 1337
1274 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1275 1339
1276 $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 (@_);
1277} 1351}
1278 1352
1279=item $pl->quit_character 1353=item $pl->quit_character
1280 1354
1281Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1425sub hintmode { 1499sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1501 $_[0]{hintmode}
1428} 1502}
1429 1503
1430=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1431 1505
1432Sends an ext reply to the player. 1506Sends an ext reply to the player.
1433 1507
1434=cut 1508=cut
1435 1509
1436sub ext_reply($$%) { 1510sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1438 1512
1439 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1514}
1442 1515
1443=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1444 1517
1445Sends an ext event to the client. 1518Sends an ext event to the client.
1446 1519
1447=cut 1520=cut
1448 1521
1449sub ext_event($$%) { 1522sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1451 1524
1452 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1453} 1526}
1454 1527
1455=head3 cf::region 1528=head3 cf::region
1456 1529
1457=over 4 1530=over 4
… …
1470 my ($path) = @_; 1543 my ($path) = @_;
1471 1544
1472 my ($match, $specificity); 1545 my ($match, $specificity);
1473 1546
1474 for my $region (list) { 1547 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1548 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1549 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1550 if $region->specificity > $specificity;
1478 } 1551 }
1479 } 1552 }
1480 1553
… …
1600 $self->init; # pass $1 etc. 1673 $self->init; # pass $1 etc.
1601 return $self; 1674 return $self;
1602 } 1675 }
1603 } 1676 }
1604 1677
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1678 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1679 ()
1607} 1680}
1608 1681
1609sub init { 1682sub init {
1610 my ($self) = @_; 1683 my ($self) = @_;
… …
1818 $self->set_darkness_map; 1891 $self->set_darkness_map;
1819 Coro::cede; 1892 Coro::cede;
1820 $self->activate; 1893 $self->activate;
1821 } 1894 }
1822 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1823 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1824 } 1900 }
1825 1901
1826 $self->post_load; 1902 $self->post_load;
1827} 1903}
… …
1837 1913
1838 $self 1914 $self
1839} 1915}
1840 1916
1841# 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
1842sub load_diag { 1918sub load_neighbours {
1843 my ($map) = @_; 1919 my ($map) = @_;
1844 1920
1845 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1846 1922
1847 for (0 .. 3) { 1923 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1849 or next; 1925 or next;
1850 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1851 or next; 1927 or next;
1852 $neigh->load; 1928 $neigh->load;
1853 1929
1930 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 1933 }
1857 1934
1858 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1860 or next; 1938 or next;
1861 $neigh->load; 1939 $neigh->load;
1862 } 1940 }
1863} 1941}
1864 1942
… …
1869} 1947}
1870 1948
1871sub do_load_sync { 1949sub do_load_sync {
1872 my ($map) = @_; 1950 my ($map) = @_;
1873 1951
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current == $Coro::main;
1954
1874 cf::sync_job { $map->load }; 1955 cf::sync_job { $map->load };
1875} 1956}
1876 1957
1877our %MAP_PREFETCH; 1958our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 1959our $MAP_PREFETCHER = undef;
1879 1960
1880sub find_async { 1961sub find_async {
1881 my ($path, $origin) = @_; 1962 my ($path, $origin, $load) = @_;
1882 1963
1883 $path = normalise $path, $origin && $origin->{path}; 1964 $path = normalise $path, $origin && $origin->{path};
1884 1965
1885 if (my $map = $cf::MAP{$path}) { 1966 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1887 } 1968 }
1888 1969
1889 undef $MAP_PREFETCH{$path}; 1970 $MAP_PREFETCH{$path} |= $load;
1971
1890 $MAP_PREFETCHER ||= cf::async { 1972 $MAP_PREFETCHER ||= cf::async {
1891 while (%MAP_PREFETCH) { 1973 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 1974 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 1975 if (my $map = find $k) {
1894 or next;
1895 $map->load; 1976 $map->load if $v;
1977 }
1896 1978
1897 delete $MAP_PREFETCH{$path}; 1979 delete $MAP_PREFETCH{$k};
1898 } 1980 }
1899 } 1981 }
1900 undef $MAP_PREFETCHER; 1982 undef $MAP_PREFETCHER;
1901 }; 1983 };
1902 $MAP_PREFETCHER->prio (6); 1984 $MAP_PREFETCHER->prio (6);
… …
2127 2209
2128 } else { 2210 } else {
2129 my $pl = $self->contr; 2211 my $pl = $self->contr;
2130 2212
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2213 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2214 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2216
2140 } else { 2217 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2218 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2219 $self->message ($msg, $flags);
2143 } 2220 }
2144 } 2221 }
2222}
2223
2224=item $object->send_msg ($channel, $msg, $color, [extra...])
2225
2226=cut
2227
2228sub cf::object::send_msg {
2229 my $pl = shift->contr
2230 or return;
2231 $pl->send_msg (@_);
2145} 2232}
2146 2233
2147=item $player_object->may ("access") 2234=item $player_object->may ("access")
2148 2235
2149Returns wether the given player is authorized to access resource "access" 2236Returns wether the given player is authorized to access resource "access"
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2315 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2316 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2317 if $x <=0 && $y <= 0;
2231 2318
2232 $map->load; 2319 $map->load;
2233 $map->load_diag; 2320 $map->load_neighbours;
2234 2321
2235 return unless $self->contr->active; 2322 return unless $self->contr->active;
2236 $self->activate_recursive; 2323 $self->activate_recursive;
2237 2324
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2326 $self->enter_map ($map, $x, $y);
2240} 2327}
2241 2328
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2329=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2330
2244Moves the player to the given map-path and coordinates by first freezing 2331Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2332her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2333that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2334the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process.
2248 2336
2249=cut 2337=cut
2250 2338
2251our $GOTOGEN; 2339our $GOTOGEN;
2252 2340
2253sub cf::object::player::goto { 2341sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2342 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2343
2256 # do generation counting so two concurrent goto's will be executed in-order 2344 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2346
2259 $self->enter_link; 2347 $self->enter_link;
… …
2279 2367
2280 if ($gen == $self->{_goto_generation}) { 2368 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2369 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2370 $self->leave_link ($map, $x, $y);
2283 } 2371 }
2372
2373 $done->() if $done;
2284 })->prio (1); 2374 })->prio (1);
2285} 2375}
2286 2376
2287=item $player_object->enter_exit ($exit_object) 2377=item $player_object->enter_exit ($exit_object)
2288 2378
… …
2397 2487
2398 utf8::encode $text; 2488 utf8::encode $text;
2399 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2489 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2400} 2490}
2401 2491
2402=item $client->send_msg ($color, $type, $msg, [extra...]) 2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2403 2493
2404Send a drawinfo or msg packet to the client, formatting the msg for the 2494Send a drawinfo or msg packet to the client, formatting the msg for the
2405client if neccessary. C<$type> should be a string identifying the type of 2495client if neccessary. C<$type> should be a string identifying the type of
2406the message, with C<log> being the default. If C<$color> is negative, suppress 2496the message, with C<log> being the default. If C<$color> is negative, suppress
2407the message unless the client supports the msg packet. 2497the message unless the client supports the msg packet.
2408 2498
2409=cut 2499=cut
2410 2500
2411sub cf::client::send_msg { 2501sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_; 2502 my ($self, $channel, $msg, $color, @extra) = @_;
2413 2503
2414 $msg = $self->pl->expand_cfpod ($msg); 2504 $msg = $self->pl->expand_cfpod ($msg);
2415 2505
2506 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507
2508 if (ref $channel) {
2509 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel);
2513 }
2514
2515 $channel = $channel->{id};
2516 }
2517
2416 return unless @extra || length $msg; 2518 return unless @extra || length $msg;
2417 2519
2418 if ($self->can_msg) { 2520 if ($self->can_msg) {
2521 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF;
2524
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2525 $self->send_packet ("msg " . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2420 } else { 2527 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 if ($color >= 0) { 2528 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones
2530 for ($msg) {
2531 1 while
2532 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2533 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2534 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2535 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2536 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2537 }
2538
2539 $color &= cf::NDI_COLOR_MASK;
2540
2541 utf8::encode $msg;
2542
2432 if (0 && $msg =~ /\[/) { 2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2433 $self->send_packet ("drawextinfo $color 4 0 $msg") 2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2434 } else { 2546 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg") 2548 $self->send_packet ("drawinfo $color $msg")
2437 } 2549 }
2438 } 2550 }
2439 } 2551 }
2440} 2552}
2441 2553
2442=item $client->ext_event ($type, %msg) 2554=item $client->ext_msg ($type, @msg)
2443 2555
2444Sends an ext event to the client. 2556Sends an ext event to the client.
2445 2557
2446=cut 2558=cut
2447 2559
2448sub cf::client::ext_event($$%) { 2560sub cf::client::ext_msg($$@) {
2449 my ($self, $type, %msg) = @_; 2561 my ($self, $type, @msg) = @_;
2450 2562
2563 if ($self->extcmd == 2) {
2564 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2565 } elsif ($self->extcmd == 1) { # TODO: remove
2451 $msg{msgtype} = "event_$type"; 2566 push @msg, msgtype => "event_$type";
2452 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2567 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2568 }
2569}
2570
2571=item $client->ext_reply ($msgid, @msg)
2572
2573Sends an ext reply to the client.
2574
2575=cut
2576
2577sub cf::client::ext_reply($$@) {
2578 my ($self, $id, @msg) = @_;
2579
2580 if ($self->extcmd == 2) {
2581 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2582 } elsif ($self->extcmd == 1) {
2583 #TODO: version 1, remove
2584 unshift @msg, msgtype => "reply", msgid => $id;
2585 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2586 }
2453} 2587}
2454 2588
2455=item $success = $client->query ($flags, "text", \&cb) 2589=item $success = $client->query ($flags, "text", \&cb)
2456 2590
2457Queues a query to the client, calling the given callback with 2591Queues a query to the client, calling the given callback with
… …
2512 my ($ns, $buf) = @_; 2646 my ($ns, $buf) = @_;
2513 2647
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2648 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515 2649
2516 if (ref $msg) { 2650 if (ref $msg) {
2651 my ($type, $reply, @payload) =
2652 "ARRAY" eq ref $msg
2653 ? @$msg
2654 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2655
2656 my @reply;
2657
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2658 if (my $cb = $EXTICMD{$type}) {
2518 if (my %reply = $cb->($ns, $msg)) { 2659 @reply = $cb->($ns, @payload);
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 } 2660 }
2661
2662 $ns->ext_reply ($reply, @reply)
2663 if $reply;
2664
2523 } else { 2665 } else {
2524 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2666 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525 } 2667 }
2526 2668
2527 cf::override; 2669 cf::override;
… …
2574our $safe = new Safe "safe"; 2716our $safe = new Safe "safe";
2575our $safe_hole = new Safe::Hole; 2717our $safe_hole = new Safe::Hole;
2576 2718
2577$SIG{FPE} = 'IGNORE'; 2719$SIG{FPE} = 'IGNORE';
2578 2720
2579$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2721$safe->permit_only (Opcode::opset qw(
2722 :base_core :base_mem :base_orig :base_math
2723 grepstart grepwhile mapstart mapwhile
2724 sort time
2725));
2580 2726
2581# here we export the classes and methods available to script code 2727# here we export the classes and methods available to script code
2582 2728
2583=pod 2729=pod
2584 2730
2585The following functions and methods are available within a safe environment: 2731The following functions and methods are available within a safe environment:
2586 2732
2587 cf::object 2733 cf::object
2588 contr pay_amount pay_player map x y force_find force_add 2734 contr pay_amount pay_player map x y force_find force_add
2589 insert remove 2735 insert remove name archname title slaying race decrease_ob_nr
2590 2736
2591 cf::object::player 2737 cf::object::player
2592 player 2738 player
2593 2739
2594 cf::player 2740 cf::player
… …
2599 2745
2600=cut 2746=cut
2601 2747
2602for ( 2748for (
2603 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2749 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2750 insert remove inv name archname title slaying race
2604 insert remove)], 2751 decrease_ob_nr)],
2605 ["cf::object::player" => qw(player)], 2752 ["cf::object::player" => qw(player)],
2606 ["cf::player" => qw(peaceful)], 2753 ["cf::player" => qw(peaceful)],
2607 ["cf::map" => qw(trigger)], 2754 ["cf::map" => qw(trigger)],
2608) { 2755) {
2609 no strict 'refs'; 2756 no strict 'refs';
… …
2685# the server's init and main functions 2832# the server's init and main functions
2686 2833
2687sub load_facedata($) { 2834sub load_facedata($) {
2688 my ($path) = @_; 2835 my ($path) = @_;
2689 2836
2837 my $enc = JSON::XS->new->utf8->canonical;
2838
2690 warn "loading facedata from $path\n"; 2839 warn "loading facedata from $path\n";
2691 2840
2692 my $facedata; 2841 my $facedata;
2693 0 < aio_load $path, $facedata 2842 0 < aio_load $path, $facedata
2694 or die "$path: $!"; 2843 or die "$path: $!";
… …
2696 $facedata = Coro::Storable::thaw $facedata; 2845 $facedata = Coro::Storable::thaw $facedata;
2697 2846
2698 $facedata->{version} == 2 2847 $facedata->{version} == 2
2699 or cf::cleanup "$path: version mismatch, cannot proceed."; 2848 or cf::cleanup "$path: version mismatch, cannot proceed.";
2700 2849
2850 # patch in the exptable
2851 $facedata->{resource}{"res/exp_table"} = {
2852 type => FT_RSRC,
2853 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2854 };
2855 cf::cede_to_tick;
2856
2701 { 2857 {
2702 my $faces = $facedata->{faceinfo}; 2858 my $faces = $facedata->{faceinfo};
2703 2859
2704 while (my ($face, $info) = each %$faces) { 2860 while (my ($face, $info) = each %$faces) {
2705 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2861 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2706 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2862 cf::face::set_visibility $idx, $info->{visibility};
2863 cf::face::set_magicmap $idx, $info->{magicmap};
2707 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2864 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2708 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2865 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2709 Coro::cede; 2866
2867 cf::cede_to_tick;
2710 } 2868 }
2711 2869
2712 while (my ($face, $info) = each %$faces) { 2870 while (my ($face, $info) = each %$faces) {
2713 next unless $info->{smooth}; 2871 next unless $info->{smooth};
2714 my $idx = cf::face::find $face 2872 my $idx = cf::face::find $face
2715 or next; 2873 or next;
2716 if (my $smooth = cf::face::find $info->{smooth}) { 2874 if (my $smooth = cf::face::find $info->{smooth}) {
2875 cf::face::set_smooth $idx, $smooth;
2717 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2876 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2718 } else { 2877 } else {
2719 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2878 warn "smooth face '$info->{smooth}' not found for face '$face'";
2720 } 2879 }
2721 Coro::cede; 2880
2881 cf::cede_to_tick;
2722 } 2882 }
2723 } 2883 }
2724 2884
2725 { 2885 {
2726 my $anims = $facedata->{animinfo}; 2886 my $anims = $facedata->{animinfo};
2727 2887
2728 while (my ($anim, $info) = each %$anims) { 2888 while (my ($anim, $info) = each %$anims) {
2729 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2889 cf::anim::set $anim, $info->{frames}, $info->{facings};
2730 Coro::cede; 2890 cf::cede_to_tick;
2731 } 2891 }
2732 2892
2733 cf::anim::invalidate_all; # d'oh 2893 cf::anim::invalidate_all; # d'oh
2734 } 2894 }
2735 2895
2896 {
2897 # TODO: for gcfclient pleasure, we should give resources
2898 # that gcfclient doesn't grok a >10000 face index.
2899 my $res = $facedata->{resource};
2900
2901 my $soundconf = delete $res->{"res/sound.conf"};
2902
2903 while (my ($name, $info) = each %$res) {
2904 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2905 my $data;
2906
2907 if ($info->{type} & 1) {
2908 # prepend meta info
2909
2910 my $meta = $enc->encode ({
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 $data = pack "(w/a*)*", $meta, $info->{data};
2916 } else {
2917 $data = $info->{data};
2918 }
2919
2920 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2921 cf::face::set_type $idx, $info->{type};
2922
2923 cf::cede_to_tick;
2924 }
2925
2926 if ($soundconf) {
2927 $soundconf = $enc->decode (delete $soundconf->{data});
2928
2929 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2930 my $sound = $soundconf->{compat}[$_]
2931 or next;
2932
2933 my $face = cf::face::find "sound/$sound->[1]";
2934 cf::sound::set $sound->[0] => $face;
2935 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2936 }
2937
2938 while (my ($k, $v) = each %{$soundconf->{event}}) {
2939 my $face = cf::face::find "sound/$v";
2940 cf::sound::set $k => $face;
2941 }
2942 }
2943 }
2944
2736 1 2945 1
2737} 2946}
2947
2948register_exticmd fx_want => sub {
2949 my ($ns, $want) = @_;
2950
2951 while (my ($k, $v) = each %$want) {
2952 $ns->fx_want ($k, $v);
2953 }
2954};
2738 2955
2739sub reload_regions { 2956sub reload_regions {
2740 load_resource_file "$MAPDIR/regions" 2957 load_resource_file "$MAPDIR/regions"
2741 or die "unable to load regions file\n"; 2958 or die "unable to load regions file\n";
2959
2960 for (cf::region::list) {
2961 $_->{match} = qr/$_->{match}/
2962 if exists $_->{match};
2963 }
2742} 2964}
2743 2965
2744sub reload_facedata { 2966sub reload_facedata {
2745 load_facedata "$DATADIR/facedata" 2967 load_facedata "$DATADIR/facedata"
2746 or die "unable to load facedata\n"; 2968 or die "unable to load facedata\n";

Diff Legend

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