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.311 by root, Fri Jul 20 16:11:10 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
… …
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 (likely 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";
… …
918 940
919=cut 941=cut
920 942
921############################################################################# 943#############################################################################
922# object support 944# object support
945#
946
947sub _can_merge {
948 my ($ob1, $ob2) = @_;
949
950 local $Storable::canonical = 1;
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953
954 $fob1 eq $fob2
955}
923 956
924sub reattach { 957sub reattach {
925 # basically do the same as instantiate, without calling instantiate 958 # basically do the same as instantiate, without calling instantiate
926 my ($obj) = @_; 959 my ($obj) = @_;
927 960
… …
1114 my ($pl, $buf) = @_; 1147 my ($pl, $buf) = @_;
1115 1148
1116 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1149 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1117 1150
1118 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
1119 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1159 if (my $cb = $EXTCMD{$type}) {
1120 if (my %reply = $cb->($pl, $msg)) { 1160 @reply = $cb->($pl, @payload);
1121 $pl->ext_reply ($msg->{msgid}, %reply);
1122 }
1123 } 1161 }
1162
1163 $pl->ext_reply ($reply, @reply)
1164 if $reply;
1165
1124 } else { 1166 } else {
1125 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1167 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1126 } 1168 }
1127 1169
1128 cf::override; 1170 cf::override;
… …
1283 1325
1284 aio_mkdir playerdir $pl, 0770; 1326 aio_mkdir playerdir $pl, 0770;
1285 $pl->{last_save} = $cf::RUNTIME; 1327 $pl->{last_save} = $cf::RUNTIME;
1286 1328
1287 $pl->save_pl ($path); 1329 $pl->save_pl ($path);
1288 Coro::cede; 1330 cf::cede_to_tick;
1289} 1331}
1290 1332
1291sub new($) { 1333sub new($) {
1292 my ($login) = @_; 1334 my ($login) = @_;
1293 1335
… …
1297 $self->{deny_save} = 1; 1339 $self->{deny_save} = 1;
1298 1340
1299 $cf::PLAYER{$login} = $self; 1341 $cf::PLAYER{$login} = $self;
1300 1342
1301 $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 (@_);
1302} 1354}
1303 1355
1304=item $pl->quit_character 1356=item $pl->quit_character
1305 1357
1306Nukes the player without looking back. If logged in, the connection will 1358Nukes the player without looking back. If logged in, the connection will
… …
1361 or return []; 1413 or return [];
1362 1414
1363 my @logins; 1415 my @logins;
1364 1416
1365 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") {
1366 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1422 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1367 aio_read $fh, 0, 512, my $buf, 0 or next; 1423 aio_read $fh, 0, 512, my $buf, 0 or next;
1368 $buf !~ /^password -------------$/m or next; # official not-valid tag 1424 $buf !~ /^password -------------$/m or next; # official not-valid tag
1425 }
1369 1426
1370 utf8::decode $login; 1427 utf8::decode $login;
1371 push @logins, $login; 1428 push @logins, $login;
1372 } 1429 }
1373 1430
… …
1411sub expand_cfpod { 1468sub expand_cfpod {
1412 ((my $self), (local $_)) = @_; 1469 ((my $self), (local $_)) = @_;
1413 1470
1414 # escape & and < 1471 # escape & and <
1415 s/&/&amp;/g; 1472 s/&/&amp;/g;
1416 s/(?<![BIUGH])</&lt;/g; 1473 s/(?<![BIUGHT])</&lt;/g;
1417 1474
1418 # 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
1419 1476
1420 1 while 1477 1 while
1421 # replace B<>, I<>, U<> etc. 1478 # replace B<>, I<>, U<> etc.
1422 s/B<([^\>]*)>/<b>$1<\/b>/ 1479 s/B<([^\>]*)>/<b>$1<\/b>/
1423 || s/I<([^\>]*)>/<i>$1<\/i>/ 1480 || s/I<([^\>]*)>/<i>$1<\/i>/
1424 || s/U<([^\>]*)>/<u>$1<\/u>/ 1481 || s/U<([^\>]*)>/<u>$1<\/u>/
1482 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1425 # replace G<male|female> tags 1483 # replace G<male|female> tags
1426 || s{G<([^>|]*)\|([^>]*)>}{ 1484 || s{G<([^>|]*)\|([^>]*)>}{
1427 $self->gender ? $2 : $1 1485 $self->gender ? $2 : $1
1428 }ge 1486 }ge
1429 # replace H<hint text> 1487 # replace H<hint text>
… …
1450sub hintmode { 1508sub hintmode {
1451 $_[0]{hintmode} = $_[1] if @_ > 1; 1509 $_[0]{hintmode} = $_[1] if @_ > 1;
1452 $_[0]{hintmode} 1510 $_[0]{hintmode}
1453} 1511}
1454 1512
1455=item $player->ext_reply ($msgid, %msg) 1513=item $player->ext_reply ($msgid, @msg)
1456 1514
1457Sends an ext reply to the player. 1515Sends an ext reply to the player.
1458 1516
1459=cut 1517=cut
1460 1518
1461sub ext_reply($$%) { 1519sub ext_reply($$@) {
1462 my ($self, $id, %msg) = @_; 1520 my ($self, $id, @msg) = @_;
1463 1521
1464 $msg{msgid} = $id; 1522 $self->ns->ext_reply ($id, @msg)
1465 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1466} 1523}
1467 1524
1468=item $player->ext_event ($type, %msg) 1525=item $player->ext_msg ($type, @msg)
1469 1526
1470Sends an ext event to the client. 1527Sends an ext event to the client.
1471 1528
1472=cut 1529=cut
1473 1530
1474sub ext_event($$%) { 1531sub ext_msg($$@) {
1475 my ($self, $type, %msg) = @_; 1532 my ($self, $type, @msg) = @_;
1476 1533
1477 $self->ns->ext_event ($type, %msg); 1534 $self->ns->ext_msg ($type, @msg);
1478} 1535}
1479 1536
1480=head3 cf::region 1537=head3 cf::region
1481 1538
1482=over 4 1539=over 4
… …
1801 local $self->{deny_reset} = 1; # loading can take a long time 1858 local $self->{deny_reset} = 1; # loading can take a long time
1802 1859
1803 my $path = $self->{path}; 1860 my $path = $self->{path};
1804 1861
1805 { 1862 {
1863 my $guard1 = cf::lock_acquire "map_data:$path";
1806 my $guard = cf::lock_acquire "map_load:$path"; 1864 my $guard2 = cf::lock_acquire "map_load:$path";
1807 1865
1808 return if $self->in_memory != cf::MAP_SWAPPED; 1866 return if $self->in_memory != cf::MAP_SWAPPED;
1809 1867
1810 $self->in_memory (cf::MAP_LOADING); 1868 $self->in_memory (cf::MAP_LOADING);
1811 1869
1812 $self->alloc; 1870 $self->alloc;
1813 1871
1814 $self->pre_load; 1872 $self->pre_load;
1815 Coro::cede; 1873 cf::cede_to_tick;
1816 1874
1817 $self->_load_objects ($self->{load_path}, 1) 1875 $self->_load_objects ($self->{load_path}, 1)
1818 or return; 1876 or return;
1819 1877
1820 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1878 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1826 $self->clear_unique_items; 1884 $self->clear_unique_items;
1827 $self->_load_objects ($uniq, 0); 1885 $self->_load_objects ($uniq, 0);
1828 } 1886 }
1829 } 1887 }
1830 1888
1831 Coro::cede; 1889 cf::cede_to_tick;
1832 # now do the right thing for maps 1890 # now do the right thing for maps
1833 $self->link_multipart_objects; 1891 $self->link_multipart_objects;
1834 $self->difficulty ($self->estimate_difficulty) 1892 $self->difficulty ($self->estimate_difficulty)
1835 unless $self->difficulty; 1893 unless $self->difficulty;
1836 Coro::cede; 1894 cf::cede_to_tick;
1837 1895
1838 unless ($self->{deny_activate}) { 1896 unless ($self->{deny_activate}) {
1839 $self->decay_objects; 1897 $self->decay_objects;
1840 $self->fix_auto_apply; 1898 $self->fix_auto_apply;
1841 $self->update_buttons; 1899 $self->update_buttons;
1842 Coro::cede; 1900 cf::cede_to_tick;
1843 $self->set_darkness_map; 1901 $self->set_darkness_map;
1844 Coro::cede; 1902 cf::cede_to_tick;
1845 $self->activate; 1903 $self->activate;
1846 } 1904 }
1905
1906 $self->{last_save} = $cf::RUNTIME;
1907 $self->last_access ($cf::RUNTIME);
1847 1908
1848 $self->in_memory (cf::MAP_IN_MEMORY); 1909 $self->in_memory (cf::MAP_IN_MEMORY);
1849 } 1910 }
1850 1911
1851 $self->post_load; 1912 $self->post_load;
… …
1862 1923
1863 $self 1924 $self
1864} 1925}
1865 1926
1866# 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
1867sub load_diag { 1928sub load_neighbours {
1868 my ($map) = @_; 1929 my ($map) = @_;
1869 1930
1870 my @diag; # diagonal neighbours 1931 my @neigh; # diagonal neighbours
1871 1932
1872 for (0 .. 3) { 1933 for (0 .. 3) {
1873 my $neigh = $map->tile_path ($_) 1934 my $neigh = $map->tile_path ($_)
1874 or next; 1935 or next;
1875 $neigh = find $neigh, $map 1936 $neigh = find $neigh, $map
1876 or next; 1937 or next;
1877 $neigh->load; 1938 $neigh->load;
1878 1939
1940 push @neigh,
1879 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1941 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1880 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1942 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1881 } 1943 }
1882 1944
1883 for (@diag) { 1945 for (grep defined $_->[0], @neigh) {
1946 my ($path, $origin) = @$_;
1884 my $neigh = find @$_ 1947 my $neigh = find $path, $origin
1885 or next; 1948 or next;
1886 $neigh->load; 1949 $neigh->load;
1887 } 1950 }
1888} 1951}
1889 1952
… …
1894} 1957}
1895 1958
1896sub do_load_sync { 1959sub do_load_sync {
1897 my ($map) = @_; 1960 my ($map) = @_;
1898 1961
1962 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1963 if $Coro::current == $Coro::main;
1964
1899 cf::sync_job { $map->load }; 1965 cf::sync_job { $map->load };
1900} 1966}
1901 1967
1902our %MAP_PREFETCH; 1968our %MAP_PREFETCH;
1903our $MAP_PREFETCHER = undef; 1969our $MAP_PREFETCHER = undef;
1904 1970
1905sub find_async { 1971sub find_async {
1906 my ($path, $origin) = @_; 1972 my ($path, $origin, $load) = @_;
1907 1973
1908 $path = normalise $path, $origin && $origin->{path}; 1974 $path = normalise $path, $origin && $origin->{path};
1909 1975
1910 if (my $map = $cf::MAP{$path}) { 1976 if (my $map = $cf::MAP{$path}) {
1911 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1977 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1912 } 1978 }
1913 1979
1914 undef $MAP_PREFETCH{$path}; 1980 $MAP_PREFETCH{$path} |= $load;
1981
1915 $MAP_PREFETCHER ||= cf::async { 1982 $MAP_PREFETCHER ||= cf::async {
1916 while (%MAP_PREFETCH) { 1983 while (%MAP_PREFETCH) {
1917 for my $path (keys %MAP_PREFETCH) { 1984 while (my ($k, $v) = each %MAP_PREFETCH) {
1918 if (my $map = find $path) { 1985 if (my $map = find $k) {
1919 $map->load; 1986 $map->load if $v;
1920 } 1987 }
1921 1988
1922 delete $MAP_PREFETCH{$path}; 1989 delete $MAP_PREFETCH{$k};
1923 } 1990 }
1924 } 1991 }
1925 undef $MAP_PREFETCHER; 1992 undef $MAP_PREFETCHER;
1926 }; 1993 };
1927 $MAP_PREFETCHER->prio (6); 1994 $MAP_PREFETCHER->prio (6);
… …
1930} 1997}
1931 1998
1932sub save { 1999sub save {
1933 my ($self) = @_; 2000 my ($self) = @_;
1934 2001
1935 my $lock = cf::lock_acquire "map_data:" . $self->path; 2002 my $lock = cf::lock_acquire "map_data:$self->{path}";
1936 2003
1937 $self->{last_save} = $cf::RUNTIME; 2004 $self->{last_save} = $cf::RUNTIME;
1938 2005
1939 return unless $self->dirty; 2006 return unless $self->dirty;
1940 2007
… …
1963 my ($self) = @_; 2030 my ($self) = @_;
1964 2031
1965 # save first because save cedes 2032 # save first because save cedes
1966 $self->save; 2033 $self->save;
1967 2034
1968 my $lock = cf::lock_acquire "map_data:" . $self->path; 2035 my $lock = cf::lock_acquire "map_data:$self->{path}";
1969 2036
1970 return if $self->players; 2037 return if $self->players;
1971 return if $self->in_memory != cf::MAP_IN_MEMORY; 2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
1972 return if $self->{deny_save}; 2039 return if $self->{deny_save};
1973 2040
… …
2025my $nuke_counter = "aaaa"; 2092my $nuke_counter = "aaaa";
2026 2093
2027sub nuke { 2094sub nuke {
2028 my ($self) = @_; 2095 my ($self) = @_;
2029 2096
2097 {
2098 my $lock = cf::lock_acquire "map_data:$self->{path}";
2099
2030 delete $cf::MAP{$self->path}; 2100 delete $cf::MAP{$self->path};
2031 2101
2032 $self->unlink_save; 2102 $self->unlink_save;
2033 2103
2034 bless $self, "cf::map"; 2104 bless $self, "cf::map";
2035 delete $self->{deny_reset}; 2105 delete $self->{deny_reset};
2036 $self->{deny_save} = 1; 2106 $self->{deny_save} = 1;
2037 $self->reset_timeout (1); 2107 $self->reset_timeout (1);
2038 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2108 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2039 2109
2040 $cf::MAP{$self->path} = $self; 2110 $cf::MAP{$self->path} = $self;
2111 }
2041 2112
2042 $self->reset; # polite request, might not happen 2113 $self->reset; # polite request, might not happen
2043} 2114}
2044 2115
2045=item $maps = cf::map::tmp_maps 2116=item $maps = cf::map::tmp_maps
… …
2152 2223
2153 } else { 2224 } else {
2154 my $pl = $self->contr; 2225 my $pl = $self->contr;
2155 2226
2156 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2227 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2157 my $diag = $pl->{npc_dialog}; 2228 my $dialog = $pl->{npc_dialog};
2158 $diag->{pl}->ext_reply ( 2229 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2159 $diag->{id},
2160 msgtype => "reply",
2161 msg => $diag->{pl}->expand_cfpod ($msg),
2162 add_topics => []
2163 );
2164 2230
2165 } else { 2231 } else {
2166 $msg = $npc->name . " says: $msg" if $npc; 2232 $msg = $npc->name . " says: $msg" if $npc;
2167 $self->message ($msg, $flags); 2233 $self->message ($msg, $flags);
2168 } 2234 }
2169 } 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 (@_);
2170} 2246}
2171 2247
2172=item $player_object->may ("access") 2248=item $player_object->may ("access")
2173 2249
2174Returns wether the given player is authorized to access resource "access" 2250Returns wether the given player is authorized to access resource "access"
… …
2253 # use -1 or undef as default coordinates, not 0, 0 2329 # use -1 or undef as default coordinates, not 0, 0
2254 ($x, $y) = ($map->enter_x, $map->enter_y) 2330 ($x, $y) = ($map->enter_x, $map->enter_y)
2255 if $x <=0 && $y <= 0; 2331 if $x <=0 && $y <= 0;
2256 2332
2257 $map->load; 2333 $map->load;
2258 $map->load_diag; 2334 $map->load_neighbours;
2259 2335
2260 return unless $self->contr->active; 2336 return unless $self->contr->active;
2261 $self->activate_recursive; 2337 $self->activate_recursive;
2262 2338
2263 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2434the 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
2435the message unless the client supports the msg packet. 2511the message unless the client supports the msg packet.
2436 2512
2437=cut 2513=cut
2438 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
2439sub cf::client::send_msg { 2530sub cf::client::send_msg {
2440 my ($self, $channel, $msg, $color, @extra) = @_; 2531 my ($self, $channel, $msg, $color, @extra) = @_;
2441 2532
2442 $msg = $self->pl->expand_cfpod ($msg); 2533 $msg = $self->pl->expand_cfpod ($msg);
2443 2534
2444 return unless @extra || length $msg;
2445
2446 $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};
2447 2539
2448 if (ref $channel) { 2540 if (ref $channel) {
2449 # send meta info to client, if not yet sent 2541 # send meta info to client, if not yet sent
2450 unless (exists $self->{channel}{$channel->{id}}) { 2542 unless (exists $self->{channel}{$channel->{id}}) {
2451 $self->{channel}{$channel->{id}} = $channel; 2543 $self->{channel}{$channel->{id}} = $channel;
2452 $self->ext_event (channel_info => %$channel); 2544 $self->ext_msg (channel_info => $channel)
2545 if $self->can_msg;
2453 } 2546 }
2454 2547
2455 $channel = $channel->{id}; 2548 $channel = $channel->{id};
2456 } 2549 }
2457 2550
2551 return unless @extra || length $msg;
2552
2458 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
2459 $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]));
2460 } else { 2560 } else {
2461 # replace some tags by gcfclient-compatible ones
2462 for ($msg) {
2463 1 while
2464 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2465 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2466 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2467 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2468 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2469 }
2470
2471 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
2472 if (0 && $msg =~ /\[/) { 2576 if (0 && $msg =~ /\[/) {
2577 # COMMAND/INFO
2473 $self->send_packet ("drawextinfo $color 4 0 $msg") 2578 $self->send_packet ("drawextinfo $color 10 8 $msg")
2474 } else { 2579 } else {
2475 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2476 $self->send_packet ("drawinfo $color $msg") 2581 $self->send_packet ("drawinfo $color $msg")
2477 } 2582 }
2478 } 2583 }
2479 } 2584 }
2480} 2585}
2481 2586
2482=item $client->ext_event ($type, %msg) 2587=item $client->ext_msg ($type, @msg)
2483 2588
2484Sends an ext event to the client. 2589Sends an ext event to the client.
2485 2590
2486=cut 2591=cut
2487 2592
2488sub cf::client::ext_event($$%) { 2593sub cf::client::ext_msg($$@) {
2489 my ($self, $type, %msg) = @_; 2594 my ($self, $type, @msg) = @_;
2490 2595
2491 return unless $self->extcmd; 2596 if ($self->extcmd == 2) {
2492 2597 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2598 } elsif ($self->extcmd == 1) { # TODO: remove
2493 $msg{msgtype} = "event_$type"; 2599 push @msg, msgtype => "event_$type";
2494 $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 }
2495} 2620}
2496 2621
2497=item $success = $client->query ($flags, "text", \&cb) 2622=item $success = $client->query ($flags, "text", \&cb)
2498 2623
2499Queues a query to the client, calling the given callback with 2624Queues a query to the client, calling the given callback with
… …
2554 my ($ns, $buf) = @_; 2679 my ($ns, $buf) = @_;
2555 2680
2556 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2681 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2557 2682
2558 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
2559 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2691 if (my $cb = $EXTICMD{$type}) {
2560 if (my %reply = $cb->($ns, $msg)) { 2692 @reply = $cb->($ns, @payload);
2561 $reply{msgid} = $msg->{msgid};
2562 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2563 }
2564 } 2693 }
2694
2695 $ns->ext_reply ($reply, @reply)
2696 if $reply;
2697
2565 } else { 2698 } else {
2566 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";
2567 } 2700 }
2568 2701
2569 cf::override; 2702 cf::override;
… …
2616our $safe = new Safe "safe"; 2749our $safe = new Safe "safe";
2617our $safe_hole = new Safe::Hole; 2750our $safe_hole = new Safe::Hole;
2618 2751
2619$SIG{FPE} = 'IGNORE'; 2752$SIG{FPE} = 'IGNORE';
2620 2753
2621$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));
2622 2759
2623# here we export the classes and methods available to script code 2760# here we export the classes and methods available to script code
2624 2761
2625=pod 2762=pod
2626 2763
2627The following functions and methods are available within a safe environment: 2764The following functions and methods are available within a safe environment:
2628 2765
2629 cf::object 2766 cf::object
2630 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
2631 insert remove 2768 insert remove name archname title slaying race decrease_ob_nr
2632 2769
2633 cf::object::player 2770 cf::object::player
2634 player 2771 player
2635 2772
2636 cf::player 2773 cf::player
… …
2641 2778
2642=cut 2779=cut
2643 2780
2644for ( 2781for (
2645 ["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
2646 insert remove)], 2784 decrease_ob_nr)],
2647 ["cf::object::player" => qw(player)], 2785 ["cf::object::player" => qw(player)],
2648 ["cf::player" => qw(peaceful)], 2786 ["cf::player" => qw(peaceful)],
2649 ["cf::map" => qw(trigger)], 2787 ["cf::map" => qw(trigger)],
2650) { 2788) {
2651 no strict 'refs'; 2789 no strict 'refs';
… …
2727# the server's init and main functions 2865# the server's init and main functions
2728 2866
2729sub load_facedata($) { 2867sub load_facedata($) {
2730 my ($path) = @_; 2868 my ($path) = @_;
2731 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
2732 warn "loading facedata from $path\n"; 2876 warn "loading facedata from $path\n";
2733 2877
2734 my $facedata; 2878 my $facedata;
2735 0 < aio_load $path, $facedata 2879 0 < aio_load $path, $facedata
2736 or die "$path: $!"; 2880 or die "$path: $!";
2737 2881
2738 $facedata = Coro::Storable::thaw $facedata; 2882 $facedata = Coro::Storable::thaw $facedata;
2739 2883
2740 $facedata->{version} == 2 2884 $facedata->{version} == 2
2741 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;
2742 2893
2743 { 2894 {
2744 my $faces = $facedata->{faceinfo}; 2895 my $faces = $facedata->{faceinfo};
2745 2896
2746 while (my ($face, $info) = each %$faces) { 2897 while (my ($face, $info) = each %$faces) {
2747 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2898 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2748 cf::face::set_visibility $idx, $info->{visibility}; 2899 cf::face::set_visibility $idx, $info->{visibility};
2749 cf::face::set_magicmap $idx, $info->{magicmap}; 2900 cf::face::set_magicmap $idx, $info->{magicmap};
2750 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2901 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2751 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2902 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2752 2903
2753 cf::cede_to_tick; 2904 cf::cede_to_tick;
2754 } 2905 }
2755 2906
2756 while (my ($face, $info) = each %$faces) { 2907 while (my ($face, $info) = each %$faces) {
… …
2781 2932
2782 { 2933 {
2783 # TODO: for gcfclient pleasure, we should give resources 2934 # TODO: for gcfclient pleasure, we should give resources
2784 # that gcfclient doesn't grok a >10000 face index. 2935 # that gcfclient doesn't grok a >10000 face index.
2785 my $res = $facedata->{resource}; 2936 my $res = $facedata->{resource};
2786 my $enc = JSON::XS->new->utf8->canonical; 2937
2938 my $soundconf = delete $res->{"res/sound.conf"};
2787 2939
2788 while (my ($name, $info) = each %$res) { 2940 while (my ($name, $info) = each %$res) {
2789 my $meta = $enc->encode ({
2790 name => $name,
2791 type => $info->{type},
2792 copyright => $info->{copyright}, #TODO#
2793 });
2794
2795 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2941 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2942 my $data;
2796 2943
2797 if ($name =~ /\.jpg$/) { 2944 if ($info->{type} & 1) {
2798 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2945 # prepend meta info
2799 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};
2800 } else { 2953 } else {
2801 my $data = pack "(w/a*)*", $meta, $info->{data}; 2954 $data = $info->{data};
2802 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2803
2804 cf::face::set_type $idx, 1;
2805 cf::face::set_data $idx, 0, $data, $chk;
2806 } 2955 }
2807 2956
2957 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2958 cf::face::set_type $idx, $info->{type};
2959
2808 cf::cede_to_tick; 2960 cf::cede_to_tick;
2809 } 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 }
2810 } 2980 }
2811 2981
2812 1 2982 1
2813} 2983}
2814 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
2815sub 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
2816 load_resource_file "$MAPDIR/regions" 2998 load_resource_file "$MAPDIR/regions"
2817 or die "unable to load regions file\n"; 2999 or die "unable to load regions file\n";
2818 3000
2819 for (cf::region::list) { 3001 for (cf::region::list) {
2820 $_->{match} = qr/$_->{match}/ 3002 $_->{match} = qr/$_->{match}/
… …
2856 3038
2857sub init { 3039sub init {
2858 reload_resources; 3040 reload_resources;
2859} 3041}
2860 3042
2861sub cfg_load { 3043sub reload_config {
2862 open my $fh, "<:utf8", "$CONFDIR/config" 3044 open my $fh, "<:utf8", "$CONFDIR/config"
2863 or return; 3045 or return;
2864 3046
2865 local $/; 3047 local $/;
2866 *CFG = YAML::Syck::Load <$fh>; 3048 *CFG = YAML::Syck::Load <$fh>;
… …
2886 (async { 3068 (async {
2887 Event::one_event; 3069 Event::one_event;
2888 })->prio (Coro::PRIO_MAX); 3070 })->prio (Coro::PRIO_MAX);
2889 }; 3071 };
2890 3072
2891 cfg_load; 3073 reload_config;
2892 db_init; 3074 db_init;
2893 load_extensions; 3075 load_extensions;
2894 3076
2895 $TICK_WATCHER->start; 3077 $TICK_WATCHER->start;
2896 Event::loop; 3078 Event::loop;
… …
3089 warn "reloading cf.pm"; 3271 warn "reloading cf.pm";
3090 require cf; 3272 require cf;
3091 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3273 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3092 3274
3093 warn "loading config and database again"; 3275 warn "loading config and database again";
3094 cf::cfg_load; 3276 cf::reload_config;
3095 3277
3096 warn "loading extensions"; 3278 warn "loading extensions";
3097 cf::load_extensions; 3279 cf::load_extensions;
3098 3280
3099 warn "reattaching attachments to objects/players"; 3281 warn "reattaching attachments to objects/players";

Diff Legend

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