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

Diff Legend

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