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.314 by root, Mon Jul 23 16:53:15 2007 UTC vs.
Revision 1.355 by root, Sun Sep 2 12:45:44 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
… …
322 }; 326 };
323 $TICK_WATCHER->stop; 327 $TICK_WATCHER->stop;
324 $guard 328 $guard
325} 329}
326 330
327=item cf::get_slot $time[, $priority] 331=item cf::get_slot $time[, $priority[, $name]]
328 332
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 333Allocate $time seconds of blocking CPU time at priority C<$priority>:
330This call blocks and returns only when you have at least C<$time> seconds 334This call blocks and returns only when you have at least C<$time> seconds
331of cpu time till the next tick. The slot is only valid till the next cede. 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.
332 339
333Useful for short background jobs. 340Useful for short background jobs.
334 341
335=cut 342=cut
336 343
… …
363 Coro::schedule; 370 Coro::schedule;
364 } 371 }
365 } 372 }
366}; 373};
367 374
368sub get_slot($;$) { 375sub get_slot($;$$) {
369 my ($time, $pri) = @_; 376 my ($time, $pri, $name) = @_;
370 377
378 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal;
380
371 push @SLOT_QUEUE, [$time, $pri, my $sig = new Coro::Signal]; 381 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
372 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 382 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
373 $SLOT_QUEUE->ready; 383 $SLOT_QUEUE->ready;
374 $sig->wait; 384 $sig->wait;
375} 385}
376 386
… …
466Coro::Storable. May, of course, block. Note that the executed sub may 476Coro::Storable. May, of course, block. Note that the executed sub may
467never block itself or use any form of Event handling. 477never block itself or use any form of Event handling.
468 478
469=cut 479=cut
470 480
471sub _store_scalar {
472 open my $fh, ">", \my $buf
473 or die "fork_call: cannot open fh-to-buf in child : $!";
474 Storable::store_fd $_[0], $fh;
475 close $fh;
476
477 $buf
478}
479
480sub fork_call(&@) { 481sub fork_call(&@) {
481 my ($cb, @args) = @_; 482 my ($cb, @args) = @_;
482 483
483# 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,
484# or die "socketpair: $!"; 485 # otherwise perl prematurely frees the stuff :/
485 pipe my $fh1, my $fh2 486 # TODO: investigate and fix (likely this will be rather laborious)
486 or die "pipe: $!";
487 487
488 if (my $pid = fork) { 488 my @res = Coro::Util::fork_eval {
489 close $fh2;
490
491 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
492 warn "pst<$res>" unless $res =~ /^pst/;
493 $res = Coro::Storable::thaw $res;
494
495 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
496
497 Carp::confess $$res unless "ARRAY" eq ref $res;
498
499 return wantarray ? @$res : $res->[-1];
500 } else {
501 reset_signals; 489 reset_signals;
502 local $SIG{__WARN__}; 490 &$cb
503 local $SIG{__DIE__}; 491 }, @args;
504 # just in case, this hack effectively disables event
505 # in the child. cleaner and slower would be canceling all watchers,
506 # but this works for the time being.
507 local $Coro::idle;
508 $Coro::current->prio (Coro::PRIO_MAX);
509 492
510 eval { 493 wantarray ? @res : $res[-1]
511 close $fh1;
512
513 my @res = eval { $cb->(@args) };
514
515 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
516 close $fh2;
517 };
518
519 warn $@ if $@;
520 _exit 0;
521 }
522} 494}
523 495
524=item $value = cf::db_get $family => $key 496=item $value = cf::db_get $family => $key
525 497
526Returns a single value from the environment database. 498Returns a single value from the environment database.
… …
606 if (1) { 578 if (1) {
607 $md5 = 579 $md5 =
608 join "\x00", 580 join "\x00",
609 $processversion, 581 $processversion,
610 map { 582 map {
611 Coro::cede; 583 cf::cede_to_tick;
612 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 584 ($src->[$_], Digest::MD5::md5_hex $data[$_])
613 } 0.. $#$src; 585 } 0.. $#$src;
614 586
615 587
616 my $dbmd5 = db_get cache => "$id/md5"; 588 my $dbmd5 = db_get cache => "$id/md5";
… …
1175 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1176 1148
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1150
1179 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
1180 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1181 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1182 $pl->ext_reply ($msg->{msgid}, %reply);
1183 }
1184 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1185 } else { 1166 } else {
1186 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1187 } 1168 }
1188 1169
1189 cf::override; 1170 cf::override;
… …
1344 1325
1345 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1346 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1347 1328
1348 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1349 Coro::cede; 1330 cf::cede_to_tick;
1350} 1331}
1351 1332
1352sub new($) { 1333sub new($) {
1353 my ($login) = @_; 1334 my ($login) = @_;
1354 1335
… …
1358 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1359 1340
1360 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1361 1342
1362 $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 (@_);
1363} 1354}
1364 1355
1365=item $pl->quit_character 1356=item $pl->quit_character
1366 1357
1367Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1422 or return []; 1413 or return [];
1423 1414
1424 my @logins; 1415 my @logins;
1425 1416
1426 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") {
1427 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1428 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1429 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1430 1426
1431 utf8::decode $login; 1427 utf8::decode $login;
1432 push @logins, $login; 1428 push @logins, $login;
1433 } 1429 }
1434 1430
… …
1472sub expand_cfpod { 1468sub expand_cfpod {
1473 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1474 1470
1475 # escape & and < 1471 # escape & and <
1476 s/&/&amp;/g; 1472 s/&/&amp;/g;
1477 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1478 1474
1479 # 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
1480 1476
1481 1 while 1477 1 while
1482 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1483 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1484 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1485 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1486 # replace G<male|female> tags 1483 # replace G<male|female> tags
1487 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1488 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1489 }ge 1486 }ge
1490 # replace H<hint text> 1487 # replace H<hint text>
… …
1511sub hintmode { 1508sub hintmode {
1512 $_[0]{hintmode} = $_[1] if @_ > 1; 1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1513 $_[0]{hintmode} 1510 $_[0]{hintmode}
1514} 1511}
1515 1512
1516=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1517 1514
1518Sends an ext reply to the player. 1515Sends an ext reply to the player.
1519 1516
1520=cut 1517=cut
1521 1518
1522sub ext_reply($$%) { 1519sub ext_reply($$@) {
1523 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1524 1521
1525 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1526 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1527} 1523}
1528 1524
1529=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1530 1526
1531Sends an ext event to the client. 1527Sends an ext event to the client.
1532 1528
1533=cut 1529=cut
1534 1530
1535sub ext_event($$%) { 1531sub ext_msg($$@) {
1536 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1537 1533
1538 $self->ns->ext_event ($type, %msg); 1534 $self->ns->ext_msg ($type, @msg);
1539} 1535}
1540 1536
1541=head3 cf::region 1537=head3 cf::region
1542 1538
1543=over 4 1539=over 4
… …
1862 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1863 1859
1864 my $path = $self->{path}; 1860 my $path = $self->{path};
1865 1861
1866 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1867 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1868 1865
1869 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1870 1867
1871 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1872 1869
1873 $self->alloc; 1870 $self->alloc;
1874 1871
1875 $self->pre_load; 1872 $self->pre_load;
1876 Coro::cede; 1873 cf::cede_to_tick;
1877 1874
1878 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1879 or return; 1876 or return;
1880 1877
1881 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1887 $self->clear_unique_items; 1884 $self->clear_unique_items;
1888 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1889 } 1886 }
1890 } 1887 }
1891 1888
1892 Coro::cede; 1889 cf::cede_to_tick;
1893 # now do the right thing for maps 1890 # now do the right thing for maps
1894 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1895 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1896 unless $self->difficulty; 1893 unless $self->difficulty;
1897 Coro::cede; 1894 cf::cede_to_tick;
1898 1895
1899 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1900 $self->decay_objects; 1897 $self->decay_objects;
1901 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1902 $self->update_buttons; 1899 $self->update_buttons;
1903 Coro::cede; 1900 cf::cede_to_tick;
1904 $self->set_darkness_map; 1901 $self->set_darkness_map;
1905 Coro::cede; 1902 cf::cede_to_tick;
1906 $self->activate; 1903 $self->activate;
1907 } 1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1908 1908
1909 $self->in_memory (cf::MAP_IN_MEMORY); 1909 $self->in_memory (cf::MAP_IN_MEMORY);
1910 } 1910 }
1911 1911
1912 $self->post_load; 1912 $self->post_load;
… …
1923 1923
1924 $self 1924 $self
1925} 1925}
1926 1926
1927# 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
1928sub load_diag { 1928sub load_neighbours {
1929 my ($map) = @_; 1929 my ($map) = @_;
1930 1930
1931 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1932 1932
1933 for (0 .. 3) { 1933 for (0 .. 3) {
1934 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1935 or next; 1935 or next;
1936 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1937 or next; 1937 or next;
1938 $neigh->load; 1938 $neigh->load;
1939 1939
1940 push @neigh,
1940 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1941 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1942 } 1943 }
1943 1944
1944 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1945 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1946 or next; 1948 or next;
1947 $neigh->load; 1949 $neigh->load;
1948 } 1950 }
1949} 1951}
1950 1952
… …
1955} 1957}
1956 1958
1957sub do_load_sync { 1959sub do_load_sync {
1958 my ($map) = @_; 1960 my ($map) = @_;
1959 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1960 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1961} 1966}
1962 1967
1963our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1964our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1965 1970
1966sub find_async { 1971sub find_async {
1967 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1968 1973
1969 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1970 1975
1971 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1972 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1973 } 1978 }
1974 1979
1975 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1976 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1977 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1978 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1979 if (my $map = find $path) { 1985 if (my $map = find $k) {
1980 $map->load; 1986 $map->load if $v;
1981 } 1987 }
1982 1988
1983 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1984 } 1990 }
1985 } 1991 }
1986 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1987 }; 1993 };
1988 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1991} 1997}
1992 1998
1993sub save { 1999sub save {
1994 my ($self) = @_; 2000 my ($self) = @_;
1995 2001
1996 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1997 2003
1998 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1999 2005
2000 return unless $self->dirty; 2006 return unless $self->dirty;
2001 2007
… …
2024 my ($self) = @_; 2030 my ($self) = @_;
2025 2031
2026 # save first because save cedes 2032 # save first because save cedes
2027 $self->save; 2033 $self->save;
2028 2034
2029 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
2030 2036
2031 return if $self->players; 2037 return if $self->players;
2032 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2033 return if $self->{deny_save}; 2039 return if $self->{deny_save};
2034 2040
… …
2086my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2087 2093
2088sub nuke { 2094sub nuke {
2089 my ($self) = @_; 2095 my ($self) = @_;
2090 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2091 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2092 2101
2093 $self->unlink_save; 2102 $self->unlink_save;
2094 2103
2095 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2096 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2097 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2098 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2099 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2100 2109
2101 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2102 2112
2103 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2104} 2114}
2105 2115
2106=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2213 2223
2214 } else { 2224 } else {
2215 my $pl = $self->contr; 2225 my $pl = $self->contr;
2216 2226
2217 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2218 my $diag = $pl->{npc_dialog}; 2228 my $dialog = $pl->{npc_dialog};
2219 $diag->{pl}->ext_reply ( 2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2220 $diag->{id},
2221 msgtype => "reply",
2222 msg => $diag->{pl}->expand_cfpod ($msg),
2223 add_topics => []
2224 );
2225 2230
2226 } else { 2231 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2229 } 2234 }
2230 } 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 (@_);
2231} 2246}
2232 2247
2233=item $player_object->may ("access") 2248=item $player_object->may ("access")
2234 2249
2235Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
… …
2314 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2315 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2316 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2317 2332
2318 $map->load; 2333 $map->load;
2319 $map->load_diag; 2334 $map->load_neighbours;
2320 2335
2321 return unless $self->contr->active; 2336 return unless $self->contr->active;
2322 $self->activate_recursive; 2337 $self->activate_recursive;
2323 2338
2324 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2495the 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
2496the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2497 2512
2498=cut 2513=cut
2499 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
2500sub cf::client::send_msg { 2530sub cf::client::send_msg {
2501 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2502 2532
2503 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2504 2534
2505 $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};
2506 2539
2507 if (ref $channel) { 2540 if (ref $channel) {
2508 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2509 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2510 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2511 $self->ext_event (channel_info => %$channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2512 } 2546 }
2513 2547
2514 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2515 } 2549 }
2516 2550
2517 return unless @extra || length $msg; 2551 return unless @extra || length $msg;
2518 2552
2519 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
2520 $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]));
2521 } else { 2560 } else {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531
2532 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
2533 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2534 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2535 } else { 2579 } else {
2536 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2537 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2538 } 2582 }
2539 } 2583 }
2540 } 2584 }
2541} 2585}
2542 2586
2543=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2544 2588
2545Sends an ext event to the client. 2589Sends an ext event to the client.
2546 2590
2547=cut 2591=cut
2548 2592
2549sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2550 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2551 2595
2552 return unless $self->extcmd; 2596 if ($self->extcmd == 2) {
2553 2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2554 $msg{msgtype} = "event_$type"; 2599 push @msg, msgtype => "event_$type";
2555 $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 }
2556} 2620}
2557 2621
2558=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2559 2623
2560Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
… …
2615 my ($ns, $buf) = @_; 2679 my ($ns, $buf) = @_;
2616 2680
2617 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2618 2682
2619 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
2620 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2691 if (my $cb = $EXTICMD{$type}) {
2621 if (my %reply = $cb->($ns, $msg)) { 2692 @reply = $cb->($ns, @payload);
2622 $reply{msgid} = $msg->{msgid};
2623 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2624 }
2625 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2626 } else { 2698 } else {
2627 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";
2628 } 2700 }
2629 2701
2630 cf::override; 2702 cf::override;
… …
2677our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2678our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2679 2751
2680$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2681 2753
2682$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));
2683 2759
2684# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2685 2761
2686=pod 2762=pod
2687 2763
2688The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2689 2765
2690 cf::object 2766 cf::object
2691 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
2692 insert remove 2768 insert remove name archname title slaying race decrease_ob_nr
2693 2769
2694 cf::object::player 2770 cf::object::player
2695 player 2771 player
2696 2772
2697 cf::player 2773 cf::player
… …
2702 2778
2703=cut 2779=cut
2704 2780
2705for ( 2781for (
2706 ["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
2707 insert remove)], 2784 decrease_ob_nr)],
2708 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2709 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2710 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2711) { 2788) {
2712 no strict 'refs'; 2789 no strict 'refs';
… …
2788# the server's init and main functions 2865# the server's init and main functions
2789 2866
2790sub load_facedata($) { 2867sub load_facedata($) {
2791 my ($path) = @_; 2868 my ($path) = @_;
2792 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
2793 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2794 2877
2795 my $facedata; 2878 my $facedata;
2796 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2797 or die "$path: $!"; 2880 or die "$path: $!";
2798 2881
2799 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2800 2883
2801 $facedata->{version} == 2 2884 $facedata->{version} == 2
2802 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;
2803 2893
2804 { 2894 {
2805 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2806 2896
2807 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2808 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2809 cf::face::set_visibility $idx, $info->{visibility}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2810 cf::face::set_magicmap $idx, $info->{magicmap}; 2900 cf::face::set_magicmap $idx, $info->{magicmap};
2811 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2812 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2813 2903
2814 cf::cede_to_tick; 2904 cf::cede_to_tick;
2815 } 2905 }
2816 2906
2817 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
… …
2842 2932
2843 { 2933 {
2844 # TODO: for gcfclient pleasure, we should give resources 2934 # TODO: for gcfclient pleasure, we should give resources
2845 # that gcfclient doesn't grok a >10000 face index. 2935 # that gcfclient doesn't grok a >10000 face index.
2846 my $res = $facedata->{resource}; 2936 my $res = $facedata->{resource};
2847 my $enc = JSON::XS->new->utf8->canonical; 2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2848 2939
2849 while (my ($name, $info) = each %$res) { 2940 while (my ($name, $info) = each %$res) {
2850 my $meta = $enc->encode ({
2851 name => $name,
2852 type => $info->{type},
2853 copyright => $info->{copyright}, #TODO#
2854 });
2855
2856 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2857 2943
2858 if ($name =~ /\.jpg$/) { 2944 if ($info->{type} & 1) {
2859 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2945 # prepend meta info
2860 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};
2861 } else { 2953 } else {
2862 my $data = pack "(w/a*)*", $meta, $info->{data}; 2954 $data = $info->{data};
2863 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2864
2865 cf::face::set_type $idx, 1;
2866 cf::face::set_data $idx, 0, $data, $chk;
2867 } 2955 }
2868 2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2869 cf::cede_to_tick; 2960 cf::cede_to_tick;
2870 } 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 }
2871 } 2980 }
2872 2981
2873 1 2982 1
2874} 2983}
2875 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
2876sub 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
2877 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2878 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2879 3000
2880 for (cf::region::list) { 3001 for (cf::region::list) {
2881 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/
… …
2917 3038
2918sub init { 3039sub init {
2919 reload_resources; 3040 reload_resources;
2920} 3041}
2921 3042
2922sub cfg_load { 3043sub reload_config {
2923 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2924 or return; 3045 or return;
2925 3046
2926 local $/; 3047 local $/;
2927 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
2947 (async { 3068 (async {
2948 Event::one_event; 3069 Event::one_event;
2949 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2950 }; 3071 };
2951 3072
2952 cfg_load; 3073 reload_config;
2953 db_init; 3074 db_init;
2954 load_extensions; 3075 load_extensions;
2955 3076
2956 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2957 Event::loop; 3078 Event::loop;
… …
3150 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3151 require cf; 3272 require cf;
3152 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3153 3274
3154 warn "loading config and database again"; 3275 warn "loading config and database again";
3155 cf::cfg_load; 3276 cf::reload_config;
3156 3277
3157 warn "loading extensions"; 3278 warn "loading extensions";
3158 cf::load_extensions; 3279 cf::load_extensions;
3159 3280
3160 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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