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.313 by root, Sun Jul 22 14:17:58 2007 UTC vs.
Revision 1.354 by root, Sun Sep 2 12:26:54 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 ();
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 ();
… …
271Wait until the given lock is available and then acquires it and returns 272Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 273a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 274for example when the coroutine gets canceled), the lock is automatically
274returned. 275returned.
275 276
277Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro.
279
276Lock names should begin with a unique identifier (for example, cf::map::find 280Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 281uses map_find and cf::map::load uses map_load).
278 282
279=item $locked = cf::lock_active $string 283=item $locked = cf::lock_active $string
280 284
… …
320 my $guard = Coro::guard { 324 my $guard = Coro::guard {
321 $TICK_WATCHER->start; 325 $TICK_WATCHER->start;
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
329}
330
331=item cf::get_slot $time[, $priority[, $name]]
332
333Allocate $time seconds of blocking CPU time at priority C<$priority>:
334This call blocks and returns only when you have at least C<$time> seconds
335of cpu time till the next tick. The slot is only valid till the next cede.
336
337The optional C<$name> can be used to identify the job to run. It might be
338used for statistical purposes and should identify the same time-class.
339
340Useful for short background jobs.
341
342=cut
343
344our @SLOT_QUEUE;
345our $SLOT_QUEUE;
346
347$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async {
349 my $signal = new Coro::Signal;
350
351 while () {
352 next_job:
353 my $avail = cf::till_tick;
354 if ($avail > 0.01) {
355 for (0 .. $#SLOT_QUEUE) {
356 if ($SLOT_QUEUE[$_][0] < $avail) {
357 my $job = splice @SLOT_QUEUE, $_, 1, ();
358 $job->[2]->send;
359 Coro::cede;
360 goto next_job;
361 }
362 }
363 }
364
365 if (@SLOT_QUEUE) {
366 # we do not use wait_For_tick() as it returns immediately when tick is inactive
367 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait;
369 } else {
370 Coro::schedule;
371 }
372 }
373};
374
375sub get_slot($;$$) {
376 my ($time, $pri, $name) = @_;
377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
383 $SLOT_QUEUE->ready;
384 $sig->wait;
325} 385}
326 386
327=item cf::async { BLOCK } 387=item cf::async { BLOCK }
328 388
329Currently the same as Coro::async_pool, meaning you cannot use 389Currently the same as Coro::async_pool, meaning you cannot use
… …
416Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
418 478
419=cut 479=cut
420 480
421sub _store_scalar {
422 open my $fh, ">", \my $buf
423 or die "fork_call: cannot open fh-to-buf in child : $!";
424 Storable::store_fd $_[0], $fh;
425 close $fh;
426
427 $buf
428}
429
430sub fork_call(&@) { 481sub fork_call(&@) {
431 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
432 483
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 484 # we seemingly have to make a local copy of the whole thing,
434# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
435 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (liekly this will be rather laborious)
436 or die "pipe: $!";
437 487
438 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals; 489 reset_signals;
452 local $SIG{__WARN__}; 490 &$cb
453 local $SIG{__DIE__}; 491 }, @args;
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459 492
460 eval { 493 wantarray ? @res : $res[-1]
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
471 }
472} 494}
473 495
474=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
475 497
476Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
556 if (1) { 578 if (1) {
557 $md5 = 579 $md5 =
558 join "\x00", 580 join "\x00",
559 $processversion, 581 $processversion,
560 map { 582 map {
561 Coro::cede; 583 cf::cede_to_tick;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src; 585 } 0.. $#$src;
564 586
565 587
566 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1125 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1126 1148
1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1128 1150
1129 if (ref $msg) { 1151 if (ref $msg) {
1152 my ($type, $reply, @payload) =
1153 "ARRAY" eq ref $msg
1154 ? @$msg
1155 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1156
1157 my @reply;
1158
1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1131 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1132 $pl->ext_reply ($msg->{msgid}, %reply);
1133 }
1134 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1135 } else { 1166 } else {
1136 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1137 } 1168 }
1138 1169
1139 cf::override; 1170 cf::override;
… …
1294 1325
1295 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1296 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1297 1328
1298 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1299 Coro::cede; 1330 cf::cede_to_tick;
1300} 1331}
1301 1332
1302sub new($) { 1333sub new($) {
1303 my ($login) = @_; 1334 my ($login) = @_;
1304 1335
… …
1308 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1309 1340
1310 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1311 1342
1312 $self 1343 $self
1344}
1345
1346=item $player->send_msg ($channel, $msg, $color, [extra...])
1347
1348=cut
1349
1350sub send_msg {
1351 my $ns = shift->ns
1352 or return;
1353 $ns->send_msg (@_);
1313} 1354}
1314 1355
1315=item $pl->quit_character 1356=item $pl->quit_character
1316 1357
1317Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1372 or return []; 1413 or return [];
1373 1414
1374 my @logins; 1415 my @logins;
1375 1416
1376 for my $login (@$dirs) { 1417 for my $login (@$dirs) {
1418 my $path = path $login;
1419
1420 # a .pst is a dead give-away for a valid player
1421 unless (-e "$path.pst") {
1377 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1378 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1379 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1380 1426
1381 utf8::decode $login; 1427 utf8::decode $login;
1382 push @logins, $login; 1428 push @logins, $login;
1383 } 1429 }
1384 1430
… …
1422sub expand_cfpod { 1468sub expand_cfpod {
1423 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1424 1470
1425 # escape & and < 1471 # escape & and <
1426 s/&/&amp;/g; 1472 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1428 1474
1429 # this is buggy, it needs to properly take care of nested <'s 1475 # this is buggy, it needs to properly take care of nested <'s
1430 1476
1431 1 while 1477 1 while
1432 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1436 # replace G<male|female> tags 1483 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1439 }ge 1486 }ge
1440 # replace H<hint text> 1487 # replace H<hint text>
… …
1461sub hintmode { 1508sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1; 1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode} 1510 $_[0]{hintmode}
1464} 1511}
1465 1512
1466=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1467 1514
1468Sends an ext reply to the player. 1515Sends an ext reply to the player.
1469 1516
1470=cut 1517=cut
1471 1518
1472sub ext_reply($$%) { 1519sub ext_reply($$@) {
1473 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1474 1521
1475 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1477} 1523}
1478 1524
1479=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1480 1526
1481Sends an ext event to the client. 1527Sends an ext event to the client.
1482 1528
1483=cut 1529=cut
1484 1530
1485sub ext_event($$%) { 1531sub ext_msg($$@) {
1486 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1487 1533
1488 $self->ns->ext_event ($type, %msg); 1534 $self->ns->ext_msg ($type, @msg);
1489} 1535}
1490 1536
1491=head3 cf::region 1537=head3 cf::region
1492 1538
1493=over 4 1539=over 4
… …
1812 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1813 1859
1814 my $path = $self->{path}; 1860 my $path = $self->{path};
1815 1861
1816 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1817 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1818 1865
1819 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1820 1867
1821 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1822 1869
1823 $self->alloc; 1870 $self->alloc;
1824 1871
1825 $self->pre_load; 1872 $self->pre_load;
1826 Coro::cede; 1873 cf::cede_to_tick;
1827 1874
1828 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1829 or return; 1876 or return;
1830 1877
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1837 $self->clear_unique_items; 1884 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1839 } 1886 }
1840 } 1887 }
1841 1888
1842 Coro::cede; 1889 cf::cede_to_tick;
1843 # now do the right thing for maps 1890 # now do the right thing for maps
1844 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1845 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1846 unless $self->difficulty; 1893 unless $self->difficulty;
1847 Coro::cede; 1894 cf::cede_to_tick;
1848 1895
1849 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1850 $self->decay_objects; 1897 $self->decay_objects;
1851 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1852 $self->update_buttons; 1899 $self->update_buttons;
1853 Coro::cede; 1900 cf::cede_to_tick;
1854 $self->set_darkness_map; 1901 $self->set_darkness_map;
1855 Coro::cede; 1902 cf::cede_to_tick;
1856 $self->activate; 1903 $self->activate;
1857 } 1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1858 1908
1859 $self->in_memory (cf::MAP_IN_MEMORY); 1909 $self->in_memory (cf::MAP_IN_MEMORY);
1860 } 1910 }
1861 1911
1862 $self->post_load; 1912 $self->post_load;
… …
1873 1923
1874 $self 1924 $self
1875} 1925}
1876 1926
1877# find and load all maps in the 3x3 area around a map 1927# find and load all maps in the 3x3 area around a map
1878sub load_diag { 1928sub load_neighbours {
1879 my ($map) = @_; 1929 my ($map) = @_;
1880 1930
1881 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1882 1932
1883 for (0 .. 3) { 1933 for (0 .. 3) {
1884 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1885 or next; 1935 or next;
1886 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1887 or next; 1937 or next;
1888 $neigh->load; 1938 $neigh->load;
1889 1939
1940 push @neigh,
1890 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1891 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1892 } 1943 }
1893 1944
1894 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1895 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1896 or next; 1948 or next;
1897 $neigh->load; 1949 $neigh->load;
1898 } 1950 }
1899} 1951}
1900 1952
… …
1905} 1957}
1906 1958
1907sub do_load_sync { 1959sub do_load_sync {
1908 my ($map) = @_; 1960 my ($map) = @_;
1909 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1910 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1911} 1966}
1912 1967
1913our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1914our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1915 1970
1916sub find_async { 1971sub find_async {
1917 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1918 1973
1919 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1920 1975
1921 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1922 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1923 } 1978 }
1924 1979
1925 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1926 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1927 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1928 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1929 if (my $map = find $path) { 1985 if (my $map = find $k) {
1930 $map->load; 1986 $map->load if $v;
1931 } 1987 }
1932 1988
1933 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1934 } 1990 }
1935 } 1991 }
1936 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1937 }; 1993 };
1938 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1941} 1997}
1942 1998
1943sub save { 1999sub save {
1944 my ($self) = @_; 2000 my ($self) = @_;
1945 2001
1946 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1947 2003
1948 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1949 2005
1950 return unless $self->dirty; 2006 return unless $self->dirty;
1951 2007
… …
1974 my ($self) = @_; 2030 my ($self) = @_;
1975 2031
1976 # save first because save cedes 2032 # save first because save cedes
1977 $self->save; 2033 $self->save;
1978 2034
1979 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1980 2036
1981 return if $self->players; 2037 return if $self->players;
1982 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1983 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1984 2040
… …
2036my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2037 2093
2038sub nuke { 2094sub nuke {
2039 my ($self) = @_; 2095 my ($self) = @_;
2040 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2041 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2042 2101
2043 $self->unlink_save; 2102 $self->unlink_save;
2044 2103
2045 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2046 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2047 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2048 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2049 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2050 2109
2051 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2052 2112
2053 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2054} 2114}
2055 2115
2056=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2163 2223
2164 } else { 2224 } else {
2165 my $pl = $self->contr; 2225 my $pl = $self->contr;
2166 2226
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog}; 2228 my $dialog = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply ( 2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175 2230
2176 } else { 2231 } else {
2177 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
2178 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2179 } 2234 }
2180 } 2235 }
2236}
2237
2238=item $object->send_msg ($channel, $msg, $color, [extra...])
2239
2240=cut
2241
2242sub cf::object::send_msg {
2243 my $pl = shift->contr
2244 or return;
2245 $pl->send_msg (@_);
2181} 2246}
2182 2247
2183=item $player_object->may ("access") 2248=item $player_object->may ("access")
2184 2249
2185Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
… …
2264 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2265 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2266 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2267 2332
2268 $map->load; 2333 $map->load;
2269 $map->load_diag; 2334 $map->load_neighbours;
2270 2335
2271 return unless $self->contr->active; 2336 return unless $self->contr->active;
2272 $self->activate_recursive; 2337 $self->activate_recursive;
2273 2338
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2445the message, with C<log> being the default. If C<$color> is negative, suppress 2510the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2447 2512
2448=cut 2513=cut
2449 2514
2515our %CHANNEL = (
2516 "c/identify" => {
2517 id => "identify",
2518 title => "Identify",
2519 reply => undef,
2520 tooltip => "Items recently identified",
2521 },
2522 "c/examine" => {
2523 id => "examine",
2524 title => "Examine",
2525 reply => undef,
2526 tooltip => "Signs and other items you examined",
2527 },
2528);
2529
2450sub cf::client::send_msg { 2530sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2452 2532
2453 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2454 2534
2455 $color &= ~cf::NDI_UNIQUE; # just in case... 2535 $color &= cf::NDI_CLIENT_MASK; # just in case...
2536
2537 # check predefined channels, for the benefit of C
2538 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2456 2539
2457 if (ref $channel) { 2540 if (ref $channel) {
2458 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2459 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2460 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2461 $self->ext_event (channel_info => %$channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2462 } 2546 }
2463 2547
2464 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2465 } 2549 }
2466 2550
2467 return unless @extra || length $msg; 2551 return unless @extra || length $msg;
2468 2552
2469 if ($self->can_msg) { 2553 if ($self->can_msg) {
2554 # default colour, mask it out
2555 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2556 if $color & cf::NDI_DEF;
2557
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2558 $self->send_packet ("msg " . $self->{json_coder}->encode (
2559 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2471 } else { 2560 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) { 2561 if ($color >= 0) {
2562 # replace some tags by gcfclient-compatible ones
2563 for ($msg) {
2564 1 while
2565 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2566 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2567 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2568 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2569 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2570 }
2571
2572 $color &= cf::NDI_COLOR_MASK;
2573
2574 utf8::encode $msg;
2575
2483 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2484 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2485 } else { 2579 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2488 } 2582 }
2489 } 2583 }
2490 } 2584 }
2491} 2585}
2492 2586
2493=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2494 2588
2495Sends an ext event to the client. 2589Sends an ext event to the client.
2496 2590
2497=cut 2591=cut
2498 2592
2499sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2500 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2501 2595
2502 return unless $self->extcmd; 2596 if ($self->extcmd == 2) {
2503 2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2504 $msg{msgtype} = "event_$type"; 2599 push @msg, msgtype => "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2600 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2601 }
2602}
2603
2604=item $client->ext_reply ($msgid, @msg)
2605
2606Sends an ext reply to the client.
2607
2608=cut
2609
2610sub cf::client::ext_reply($$@) {
2611 my ($self, $id, @msg) = @_;
2612
2613 if ($self->extcmd == 2) {
2614 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2615 } elsif ($self->extcmd == 1) {
2616 #TODO: version 1, remove
2617 unshift @msg, msgtype => "reply", msgid => $id;
2618 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2619 }
2506} 2620}
2507 2621
2508=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2509 2623
2510Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
… …
2565 my ($ns, $buf) = @_; 2679 my ($ns, $buf) = @_;
2566 2680
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568 2682
2569 if (ref $msg) { 2683 if (ref $msg) {
2684 my ($type, $reply, @payload) =
2685 "ARRAY" eq ref $msg
2686 ? @$msg
2687 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2688
2689 my @reply;
2690
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2691 if (my $cb = $EXTICMD{$type}) {
2571 if (my %reply = $cb->($ns, $msg)) { 2692 @reply = $cb->($ns, @payload);
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2576 } else { 2698 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2699 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 } 2700 }
2579 2701
2580 cf::override; 2702 cf::override;
… …
2627our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2628our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2629 2751
2630$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2631 2753
2632$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2754$safe->permit_only (Opcode::opset qw(
2755 :base_core :base_mem :base_orig :base_math
2756 grepstart grepwhile mapstart mapwhile
2757 sort time
2758));
2633 2759
2634# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2635 2761
2636=pod 2762=pod
2637 2763
2638The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2639 2765
2640 cf::object 2766 cf::object
2641 contr pay_amount pay_player map x y force_find force_add 2767 contr pay_amount pay_player map x y force_find force_add
2642 insert remove 2768 insert remove name archname title slaying race decrease_ob_nr
2643 2769
2644 cf::object::player 2770 cf::object::player
2645 player 2771 player
2646 2772
2647 cf::player 2773 cf::player
… …
2652 2778
2653=cut 2779=cut
2654 2780
2655for ( 2781for (
2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2782 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2783 insert remove inv name archname title slaying race
2657 insert remove)], 2784 decrease_ob_nr)],
2658 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2659 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2660 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2661) { 2788) {
2662 no strict 'refs'; 2789 no strict 'refs';
… …
2738# the server's init and main functions 2865# the server's init and main functions
2739 2866
2740sub load_facedata($) { 2867sub load_facedata($) {
2741 my ($path) = @_; 2868 my ($path) = @_;
2742 2869
2870 # HACK to clear player env face cache, we need some signal framework
2871 # for this (global event?)
2872 %ext::player_env::MUSIC_FACE_CACHE = ();
2873
2874 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2875
2743 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2744 2877
2745 my $facedata; 2878 my $facedata;
2746 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2747 or die "$path: $!"; 2880 or die "$path: $!";
2748 2881
2749 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2750 2883
2751 $facedata->{version} == 2 2884 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed."; 2885 or cf::cleanup "$path: version mismatch, cannot proceed.";
2886
2887 # patch in the exptable
2888 $facedata->{resource}{"res/exp_table"} = {
2889 type => FT_RSRC,
2890 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2891 };
2892 cf::cede_to_tick;
2753 2893
2754 { 2894 {
2755 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2756 2896
2757 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap}; 2900 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2763 2903
2764 cf::cede_to_tick; 2904 cf::cede_to_tick;
2765 } 2905 }
2766 2906
2767 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
… …
2792 2932
2793 { 2933 {
2794 # TODO: for gcfclient pleasure, we should give resources 2934 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index. 2935 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource}; 2936 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical; 2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2798 2939
2799 while (my ($name, $info) = each %$res) { 2940 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2807 2943
2808 if ($name =~ /\.jpg$/) { 2944 if ($info->{type} & 1) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2945 # prepend meta info
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2946
2947 my $meta = $enc->encode ({
2948 name => $name,
2949 %{ $info->{meta} || {} },
2950 });
2951
2952 $data = pack "(w/a*)*", $meta, $info->{data};
2811 } else { 2953 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data}; 2954 $data = $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 } 2955 }
2818 2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2819 cf::cede_to_tick; 2960 cf::cede_to_tick;
2820 } 2961 }
2962
2963 if ($soundconf) {
2964 $soundconf = $enc->decode (delete $soundconf->{data});
2965
2966 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2967 my $sound = $soundconf->{compat}[$_]
2968 or next;
2969
2970 my $face = cf::face::find "sound/$sound->[1]";
2971 cf::sound::set $sound->[0] => $face;
2972 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2973 }
2974
2975 while (my ($k, $v) = each %{$soundconf->{event}}) {
2976 my $face = cf::face::find "sound/$v";
2977 cf::sound::set $k => $face;
2978 }
2979 }
2821 } 2980 }
2822 2981
2823 1 2982 1
2824} 2983}
2825 2984
2985register_exticmd fx_want => sub {
2986 my ($ns, $want) = @_;
2987
2988 while (my ($k, $v) = each %$want) {
2989 $ns->fx_want ($k, $v);
2990 }
2991};
2992
2826sub reload_regions { 2993sub reload_regions {
2994 # HACK to clear player env face cache, we need some signal framework
2995 # for this (global event?)
2996 %ext::player_env::MUSIC_FACE_CACHE = ();
2997
2827 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2828 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2829 3000
2830 for (cf::region::list) { 3001 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/
… …
2867 3038
2868sub init { 3039sub init {
2869 reload_resources; 3040 reload_resources;
2870} 3041}
2871 3042
2872sub cfg_load { 3043sub reload_config {
2873 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2874 or return; 3045 or return;
2875 3046
2876 local $/; 3047 local $/;
2877 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
2897 (async { 3068 (async {
2898 Event::one_event; 3069 Event::one_event;
2899 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2900 }; 3071 };
2901 3072
2902 cfg_load; 3073 reload_config;
2903 db_init; 3074 db_init;
2904 load_extensions; 3075 load_extensions;
2905 3076
2906 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2907 Event::loop; 3078 Event::loop;
… …
3100 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3101 require cf; 3272 require cf;
3102 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3103 3274
3104 warn "loading config and database again"; 3275 warn "loading config and database again";
3105 cf::cfg_load; 3276 cf::reload_config;
3106 3277
3107 warn "loading extensions"; 3278 warn "loading extensions";
3108 cf::load_extensions; 3279 cf::load_extensions;
3109 3280
3110 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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