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.294 by root, Tue Jul 3 06:00:48 2007 UTC vs.
Revision 1.339 by root, Fri Aug 24 00:26:10 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
… …
1412 1486
1413 # create single paragraphs (very hackish) 1487 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1488 s/(?<=\S)\n(?=\w)/ /g;
1415 1489
1416 # compress some whitespace 1490 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/; 1491 s/\s+\n/\n/g; # ws line-ends
1418 1492 s/\n\n+/\n/g; # double lines
1419 s/^\s+//; 1493 s/^\n+//; # beginning lines
1420 s/\s+$//; 1494 s/\n+$//; # ending lines
1421 1495
1422 $_ 1496 $_
1423} 1497}
1424 1498
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 $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
… …
2357 my $hp = $exit->stats->hp; 2447 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp; 2448 my $sp = $exit->stats->sp;
2359 2449
2360 $self->enter_link; 2450 $self->enter_link;
2361 2451
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2362 (async { 2456 (async {
2363 $self->deactivate_recursive; # just to be sure 2457 $self->deactivate_recursive; # just to be sure
2364 unless (eval { 2458 unless (eval {
2365 $self->goto ($slaying, $hp, $sp); 2459 $self->goto ($slaying, $hp, $sp);
2366 2460
… …
2393 2487
2394 utf8::encode $text; 2488 utf8::encode $text;
2395 $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);
2396} 2490}
2397 2491
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2492=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2493
2400Send 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
2401client 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
2402the 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
2403the message unless the client supports the msg packet. 2497the message unless the client supports the msg packet.
2404 2498
2405=cut 2499=cut
2406 2500
2407sub cf::client::send_msg { 2501sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2502 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2503
2410 $msg = $self->pl->expand_cfpod ($msg); 2504 $msg = $self->pl->expand_cfpod ($msg);
2411 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
2412 return unless @extra || length $msg; 2518 return unless @extra || length $msg;
2413 2519
2414 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
2415 $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]));
2416 } else { 2527 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 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
2428 if (0 && $msg =~ /\[/) { 2543 if (0 && $msg =~ /\[/) {
2544 # COMMAND/INFO
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2545 $self->send_packet ("drawextinfo $color 10 8 $msg")
2430 } else { 2546 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2547 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg") 2548 $self->send_packet ("drawinfo $color $msg")
2433 } 2549 }
2434 } 2550 }
2435 } 2551 }
2436} 2552}
2437 2553
2438=item $client->ext_event ($type, %msg) 2554=item $client->ext_msg ($type, @msg)
2439 2555
2440Sends an ext event to the client. 2556Sends an ext event to the client.
2441 2557
2442=cut 2558=cut
2443 2559
2444sub cf::client::ext_event($$%) { 2560sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2561 my ($self, $type, @msg) = @_;
2446 2562
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove
2447 $msg{msgtype} = "event_$type"; 2568 push @msg, msgtype => "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 }
2571}
2572
2573=item $client->ext_reply ($msgid, @msg)
2574
2575Sends an ext reply to the client.
2576
2577=cut
2578
2579sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_;
2581
2582 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) {
2585 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 }
2449} 2589}
2450 2590
2451=item $success = $client->query ($flags, "text", \&cb) 2591=item $success = $client->query ($flags, "text", \&cb)
2452 2592
2453Queues a query to the client, calling the given callback with 2593Queues a query to the client, calling the given callback with
… …
2508 my ($ns, $buf) = @_; 2648 my ($ns, $buf) = @_;
2509 2649
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2650 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 2651
2512 if (ref $msg) { 2652 if (ref $msg) {
2653 my ($type, $reply, @payload) =
2654 "ARRAY" eq ref $msg
2655 ? @$msg
2656 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2657
2658 my @reply;
2659
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2660 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 2661 @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 } 2662 }
2663
2664 $ns->ext_reply ($reply, @reply)
2665 if $reply;
2666
2519 } else { 2667 } else {
2520 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2668 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521 } 2669 }
2522 2670
2523 cf::override; 2671 cf::override;
… …
2570our $safe = new Safe "safe"; 2718our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 2719our $safe_hole = new Safe::Hole;
2572 2720
2573$SIG{FPE} = 'IGNORE'; 2721$SIG{FPE} = 'IGNORE';
2574 2722
2575$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2723$safe->permit_only (Opcode::opset qw(
2724 :base_core :base_mem :base_orig :base_math
2725 grepstart grepwhile mapstart mapwhile
2726 sort time
2727));
2576 2728
2577# here we export the classes and methods available to script code 2729# here we export the classes and methods available to script code
2578 2730
2579=pod 2731=pod
2580 2732
2581The following functions and methods are available within a safe environment: 2733The following functions and methods are available within a safe environment:
2582 2734
2583 cf::object contr pay_amount pay_player map 2735 cf::object
2736 contr pay_amount pay_player map x y force_find force_add
2737 insert remove name archname title slaying race
2738
2584 cf::object::player player 2739 cf::object::player
2585 cf::player peaceful 2740 player
2586 cf::map trigger 2741
2742 cf::player
2743 peaceful
2744
2745 cf::map
2746 trigger
2587 2747
2588=cut 2748=cut
2589 2749
2590for ( 2750for (
2591 ["cf::object" => qw(contr pay_amount pay_player map)], 2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)],
2592 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2594 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2595) { 2756) {
2596 no strict 'refs'; 2757 no strict 'refs';
… …
2672# the server's init and main functions 2833# the server's init and main functions
2673 2834
2674sub load_facedata($) { 2835sub load_facedata($) {
2675 my ($path) = @_; 2836 my ($path) = @_;
2676 2837
2838 my $enc = JSON::XS->new->utf8->canonical;
2839
2677 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2678 2841
2679 my $facedata; 2842 my $facedata;
2680 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2681 or die "$path: $!"; 2844 or die "$path: $!";
… …
2683 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2684 2847
2685 $facedata->{version} == 2 2848 $facedata->{version} == 2
2686 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2687 2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2857
2688 { 2858 {
2689 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2690 2860
2691 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2696 Coro::cede; 2867
2868 cf::cede_to_tick;
2697 } 2869 }
2698 2870
2699 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 2872 next unless $info->{smooth};
2701 my $idx = cf::face::find $face 2873 my $idx = cf::face::find $face
2702 or next; 2874 or next;
2703 if (my $smooth = cf::face::find $info->{smooth}) { 2875 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 2878 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 2879 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 2880 }
2708 Coro::cede; 2881
2882 cf::cede_to_tick;
2709 } 2883 }
2710 } 2884 }
2711 2885
2712 { 2886 {
2713 my $anims = $facedata->{animinfo}; 2887 my $anims = $facedata->{animinfo};
2714 2888
2715 while (my ($anim, $info) = each %$anims) { 2889 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 2890 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 2891 cf::cede_to_tick;
2718 } 2892 }
2719 2893
2720 cf::anim::invalidate_all; # d'oh 2894 cf::anim::invalidate_all; # d'oh
2721 } 2895 }
2722 2896
2897 {
2898 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource};
2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2907
2908 if ($info->{type} & 1) {
2909 # prepend meta info
2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2917 } else {
2918 $data = $info->{data};
2919 }
2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick;
2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 }
2945
2723 1 2946 1
2724} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2725 2956
2726sub reload_regions { 2957sub reload_regions {
2727 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2728 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2960
2961 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/
2963 if exists $_->{match};
2964 }
2729} 2965}
2730 2966
2731sub reload_facedata { 2967sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 2968 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n"; 2969 or die "unable to load facedata\n";

Diff Legend

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