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.352 by root, Sun Sep 2 04:57:14 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 (liekly 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
… …
1478sub expand_cfpod { 1463sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1464 ((my $self), (local $_)) = @_;
1480 1465
1481 # escape & and < 1466 # escape & and <
1482 s/&/&amp;/g; 1467 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g; 1468 s/(?<![BIUGHT])</&lt;/g;
1484 1469
1485 # this is buggy, it needs to properly take care of nested <'s 1470 # this is buggy, it needs to properly take care of nested <'s
1486 1471
1487 1 while 1472 1 while
1488 # replace B<>, I<>, U<> etc. 1473 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1474 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1492 # replace G<male|female> tags 1478 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1479 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1 1480 $self->gender ? $2 : $1
1495 }ge 1481 }ge
1496 # replace H<hint text> 1482 # replace H<hint text>
… …
1517sub hintmode { 1503sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1505 $_[0]{hintmode}
1520} 1506}
1521 1507
1522=item $player->ext_reply ($msgid, %msg) 1508=item $player->ext_reply ($msgid, @msg)
1523 1509
1524Sends an ext reply to the player. 1510Sends an ext reply to the player.
1525 1511
1526=cut 1512=cut
1527 1513
1528sub ext_reply($$%) { 1514sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1515 my ($self, $id, @msg) = @_;
1530 1516
1531 $msg{msgid} = $id; 1517 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1518}
1534 1519
1535=item $player->ext_event ($type, %msg) 1520=item $player->ext_msg ($type, @msg)
1536 1521
1537Sends an ext event to the client. 1522Sends an ext event to the client.
1538 1523
1539=cut 1524=cut
1540 1525
1541sub ext_event($$%) { 1526sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1527 my ($self, $type, @msg) = @_;
1543 1528
1544 $self->ns->ext_event ($type, %msg); 1529 $self->ns->ext_msg ($type, @msg);
1545} 1530}
1546 1531
1547=head3 cf::region 1532=head3 cf::region
1548 1533
1549=over 4 1534=over 4
… …
1868 local $self->{deny_reset} = 1; # loading can take a long time 1853 local $self->{deny_reset} = 1; # loading can take a long time
1869 1854
1870 my $path = $self->{path}; 1855 my $path = $self->{path};
1871 1856
1872 { 1857 {
1858 my $guard1 = cf::lock_acquire "map_data:$path";
1873 my $guard = cf::lock_acquire "map_load:$path"; 1859 my $guard2 = cf::lock_acquire "map_load:$path";
1874 1860
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1861 return if $self->in_memory != cf::MAP_SWAPPED;
1876 1862
1877 $self->in_memory (cf::MAP_LOADING); 1863 $self->in_memory (cf::MAP_LOADING);
1878 1864
1879 $self->alloc; 1865 $self->alloc;
1880 1866
1881 $self->pre_load; 1867 $self->pre_load;
1882 Coro::cede; 1868 cf::cede_to_tick;
1883 1869
1884 $self->_load_objects ($self->{load_path}, 1) 1870 $self->_load_objects ($self->{load_path}, 1)
1885 or return; 1871 or return;
1886 1872
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1893 $self->clear_unique_items; 1879 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1880 $self->_load_objects ($uniq, 0);
1895 } 1881 }
1896 } 1882 }
1897 1883
1898 Coro::cede; 1884 cf::cede_to_tick;
1899 # now do the right thing for maps 1885 # now do the right thing for maps
1900 $self->link_multipart_objects; 1886 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1887 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1888 unless $self->difficulty;
1903 Coro::cede; 1889 cf::cede_to_tick;
1904 1890
1905 unless ($self->{deny_activate}) { 1891 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1892 $self->decay_objects;
1907 $self->fix_auto_apply; 1893 $self->fix_auto_apply;
1908 $self->update_buttons; 1894 $self->update_buttons;
1909 Coro::cede; 1895 cf::cede_to_tick;
1910 $self->set_darkness_map; 1896 $self->set_darkness_map;
1911 Coro::cede; 1897 cf::cede_to_tick;
1912 $self->activate; 1898 $self->activate;
1913 } 1899 }
1900
1901 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME);
1914 1903
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1904 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1905 }
1917 1906
1918 $self->post_load; 1907 $self->post_load;
… …
1929 1918
1930 $self 1919 $self
1931} 1920}
1932 1921
1933# find and load all maps in the 3x3 area around a map 1922# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1923sub load_neighbours {
1935 my ($map) = @_; 1924 my ($map) = @_;
1936 1925
1937 my @diag; # diagonal neighbours 1926 my @neigh; # diagonal neighbours
1938 1927
1939 for (0 .. 3) { 1928 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1929 my $neigh = $map->tile_path ($_)
1941 or next; 1930 or next;
1942 $neigh = find $neigh, $map 1931 $neigh = find $neigh, $map
1943 or next; 1932 or next;
1944 $neigh->load; 1933 $neigh->load;
1945 1934
1935 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1936 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1937 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 1938 }
1949 1939
1950 for (@diag) { 1940 for (grep defined $_->[0], @neigh) {
1941 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 1942 my $neigh = find $path, $origin
1952 or next; 1943 or next;
1953 $neigh->load; 1944 $neigh->load;
1954 } 1945 }
1955} 1946}
1956 1947
… …
1961} 1952}
1962 1953
1963sub do_load_sync { 1954sub do_load_sync {
1964 my ($map) = @_; 1955 my ($map) = @_;
1965 1956
1957 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1958 if $Coro::current == $Coro::main;
1959
1966 cf::sync_job { $map->load }; 1960 cf::sync_job { $map->load };
1967} 1961}
1968 1962
1969our %MAP_PREFETCH; 1963our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 1964our $MAP_PREFETCHER = undef;
1971 1965
1972sub find_async { 1966sub find_async {
1973 my ($path, $origin) = @_; 1967 my ($path, $origin, $load) = @_;
1974 1968
1975 $path = normalise $path, $origin && $origin->{path}; 1969 $path = normalise $path, $origin && $origin->{path};
1976 1970
1977 if (my $map = $cf::MAP{$path}) { 1971 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 1973 }
1980 1974
1981 undef $MAP_PREFETCH{$path}; 1975 $MAP_PREFETCH{$path} |= $load;
1976
1982 $MAP_PREFETCHER ||= cf::async { 1977 $MAP_PREFETCHER ||= cf::async {
1983 while (%MAP_PREFETCH) { 1978 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 1979 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 1980 if (my $map = find $k) {
1986 $map->load; 1981 $map->load if $v;
1987 } 1982 }
1988 1983
1989 delete $MAP_PREFETCH{$path}; 1984 delete $MAP_PREFETCH{$k};
1990 } 1985 }
1991 } 1986 }
1992 undef $MAP_PREFETCHER; 1987 undef $MAP_PREFETCHER;
1993 }; 1988 };
1994 $MAP_PREFETCHER->prio (6); 1989 $MAP_PREFETCHER->prio (6);
… …
1997} 1992}
1998 1993
1999sub save { 1994sub save {
2000 my ($self) = @_; 1995 my ($self) = @_;
2001 1996
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 1997 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 1998
2004 $self->{last_save} = $cf::RUNTIME; 1999 $self->{last_save} = $cf::RUNTIME;
2005 2000
2006 return unless $self->dirty; 2001 return unless $self->dirty;
2007 2002
… …
2030 my ($self) = @_; 2025 my ($self) = @_;
2031 2026
2032 # save first because save cedes 2027 # save first because save cedes
2033 $self->save; 2028 $self->save;
2034 2029
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2030 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2031
2037 return if $self->players; 2032 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2033 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2034 return if $self->{deny_save};
2040 2035
… …
2092my $nuke_counter = "aaaa"; 2087my $nuke_counter = "aaaa";
2093 2088
2094sub nuke { 2089sub nuke {
2095 my ($self) = @_; 2090 my ($self) = @_;
2096 2091
2092 {
2093 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094
2097 delete $cf::MAP{$self->path}; 2095 delete $cf::MAP{$self->path};
2098 2096
2099 $self->unlink_save; 2097 $self->unlink_save;
2100 2098
2101 bless $self, "cf::map"; 2099 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2100 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2101 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2102 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2103 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2104
2107 $cf::MAP{$self->path} = $self; 2105 $cf::MAP{$self->path} = $self;
2106 }
2108 2107
2109 $self->reset; # polite request, might not happen 2108 $self->reset; # polite request, might not happen
2110} 2109}
2111 2110
2112=item $maps = cf::map::tmp_maps 2111=item $maps = cf::map::tmp_maps
… …
2219 2218
2220 } else { 2219 } else {
2221 my $pl = $self->contr; 2220 my $pl = $self->contr;
2222 2221
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2222 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2223 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2224 $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 2225
2232 } else { 2226 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2227 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2228 $self->message ($msg, $flags);
2235 } 2229 }
2236 } 2230 }
2231}
2232
2233=item $object->send_msg ($channel, $msg, $color, [extra...])
2234
2235=cut
2236
2237sub cf::object::send_msg {
2238 my $pl = shift->contr
2239 or return;
2240 $pl->send_msg (@_);
2237} 2241}
2238 2242
2239=item $player_object->may ("access") 2243=item $player_object->may ("access")
2240 2244
2241Returns wether the given player is authorized to access resource "access" 2245Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2324 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2325 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2326 if $x <=0 && $y <= 0;
2323 2327
2324 $map->load; 2328 $map->load;
2325 $map->load_diag; 2329 $map->load_neighbours;
2326 2330
2327 return unless $self->contr->active; 2331 return unless $self->contr->active;
2328 $self->activate_recursive; 2332 $self->activate_recursive;
2329 2333
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2334 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 2505the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2506the message unless the client supports the msg packet.
2503 2507
2504=cut 2508=cut
2505 2509
2510our %CHANNEL = (
2511 "c/identify" => {
2512 id => "identify",
2513 title => "Identify",
2514 reply => undef,
2515 tooltip => "Items recently identified",
2516 },
2517 "c/examine" => {
2518 id => "examine",
2519 title => "Examine",
2520 reply => undef,
2521 tooltip => "Signs and other items you examined",
2522 },
2523);
2524
2506sub cf::client::send_msg { 2525sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2526 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2527
2509 $msg = $self->pl->expand_cfpod ($msg); 2528 $msg = $self->pl->expand_cfpod ($msg);
2510 2529
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2530 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531
2532 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel};
2512 2534
2513 if (ref $channel) { 2535 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2536 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2537 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2538 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2539 $self->ext_msg (channel_info => $channel);
2518 } 2540 }
2519 2541
2520 $channel = $channel->{id}; 2542 $channel = $channel->{id};
2521 } 2543 }
2522 2544
2523 return unless @extra || length $msg; 2545 return unless @extra || length $msg;
2524 2546
2525 if ($self->can_msg) { 2547 if ($self->can_msg) {
2548 # default colour, mask it out
2549 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2550 if $color & cf::NDI_DEF;
2551
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2552 $self->send_packet ("msg " . $self->{json_coder}->encode (
2553 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2554 } 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) { 2555 if ($color >= 0) {
2556 # replace some tags by gcfclient-compatible ones
2557 for ($msg) {
2558 1 while
2559 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2560 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2561 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2562 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2563 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2564 }
2565
2566 $color &= cf::NDI_COLOR_MASK;
2567
2568 utf8::encode $msg;
2569
2539 if (0 && $msg =~ /\[/) { 2570 if (0 && $msg =~ /\[/) {
2571 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2572 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2573 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2574 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2575 $self->send_packet ("drawinfo $color $msg")
2544 } 2576 }
2545 } 2577 }
2546 } 2578 }
2547} 2579}
2548 2580
2549=item $client->ext_event ($type, %msg) 2581=item $client->ext_msg ($type, @msg)
2550 2582
2551Sends an ext event to the client. 2583Sends an ext event to the client.
2552 2584
2553=cut 2585=cut
2554 2586
2555sub cf::client::ext_event($$%) { 2587sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2588 my ($self, $type, @msg) = @_;
2557 2589
2558 return unless $self->extcmd; 2590 if ($self->extcmd == 2) {
2559 2591 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2592 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2593 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2594 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2595 }
2596}
2597
2598=item $client->ext_reply ($msgid, @msg)
2599
2600Sends an ext reply to the client.
2601
2602=cut
2603
2604sub cf::client::ext_reply($$@) {
2605 my ($self, $id, @msg) = @_;
2606
2607 if ($self->extcmd == 2) {
2608 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2609 } elsif ($self->extcmd == 1) {
2610 #TODO: version 1, remove
2611 unshift @msg, msgtype => "reply", msgid => $id;
2612 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2613 }
2562} 2614}
2563 2615
2564=item $success = $client->query ($flags, "text", \&cb) 2616=item $success = $client->query ($flags, "text", \&cb)
2565 2617
2566Queues a query to the client, calling the given callback with 2618Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2673 my ($ns, $buf) = @_;
2622 2674
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2675 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2676
2625 if (ref $msg) { 2677 if (ref $msg) {
2678 my ($type, $reply, @payload) =
2679 "ARRAY" eq ref $msg
2680 ? @$msg
2681 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2682
2683 my @reply;
2684
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2685 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2686 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2687 }
2688
2689 $ns->ext_reply ($reply, @reply)
2690 if $reply;
2691
2632 } else { 2692 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2693 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2694 }
2635 2695
2636 cf::override; 2696 cf::override;
… …
2683our $safe = new Safe "safe"; 2743our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2744our $safe_hole = new Safe::Hole;
2685 2745
2686$SIG{FPE} = 'IGNORE'; 2746$SIG{FPE} = 'IGNORE';
2687 2747
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2748$safe->permit_only (Opcode::opset qw(
2749 :base_core :base_mem :base_orig :base_math
2750 grepstart grepwhile mapstart mapwhile
2751 sort time
2752));
2689 2753
2690# here we export the classes and methods available to script code 2754# here we export the classes and methods available to script code
2691 2755
2692=pod 2756=pod
2693 2757
2694The following functions and methods are available within a safe environment: 2758The following functions and methods are available within a safe environment:
2695 2759
2696 cf::object 2760 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2761 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2762 insert remove name archname title slaying race decrease_ob_nr
2699 2763
2700 cf::object::player 2764 cf::object::player
2701 player 2765 player
2702 2766
2703 cf::player 2767 cf::player
… …
2708 2772
2709=cut 2773=cut
2710 2774
2711for ( 2775for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2776 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2777 insert remove inv name archname title slaying race
2713 insert remove)], 2778 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2779 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2780 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2781 ["cf::map" => qw(trigger)],
2717) { 2782) {
2718 no strict 'refs'; 2783 no strict 'refs';
… …
2794# the server's init and main functions 2859# the server's init and main functions
2795 2860
2796sub load_facedata($) { 2861sub load_facedata($) {
2797 my ($path) = @_; 2862 my ($path) = @_;
2798 2863
2864 # HACK to clear player env face cache, we need some signal framework
2865 # for this (global event?)
2866 %ext::player_env::MUSIC_FACE_CACHE = ();
2867
2868 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2869
2799 warn "loading facedata from $path\n"; 2870 warn "loading facedata from $path\n";
2800 2871
2801 my $facedata; 2872 my $facedata;
2802 0 < aio_load $path, $facedata 2873 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2874 or die "$path: $!";
2804 2875
2805 $facedata = Coro::Storable::thaw $facedata; 2876 $facedata = Coro::Storable::thaw $facedata;
2806 2877
2807 $facedata->{version} == 2 2878 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 2879 or cf::cleanup "$path: version mismatch, cannot proceed.";
2880
2881 # patch in the exptable
2882 $facedata->{resource}{"res/exp_table"} = {
2883 type => FT_RSRC,
2884 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2885 };
2886 cf::cede_to_tick;
2809 2887
2810 { 2888 {
2811 my $faces = $facedata->{faceinfo}; 2889 my $faces = $facedata->{faceinfo};
2812 2890
2813 while (my ($face, $info) = each %$faces) { 2891 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2892 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 2893 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 2894 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2895 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2896 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 2897
2820 cf::cede_to_tick; 2898 cf::cede_to_tick;
2821 } 2899 }
2822 2900
2823 while (my ($face, $info) = each %$faces) { 2901 while (my ($face, $info) = each %$faces) {
… …
2848 2926
2849 { 2927 {
2850 # TODO: for gcfclient pleasure, we should give resources 2928 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 2929 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 2930 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 2931
2932 my $soundconf = delete $res->{"res/sound.conf"};
2854 2933
2855 while (my ($name, $info) = each %$res) { 2934 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; 2935 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2936 my $data;
2863 2937
2864 if ($name =~ /\.jpg$/) { 2938 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2939 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2940
2941 my $meta = $enc->encode ({
2942 name => $name,
2943 %{ $info->{meta} || {} },
2944 });
2945
2946 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 2947 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 2948 $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 } 2949 }
2874 2950
2951 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2952 cf::face::set_type $idx, $info->{type};
2953
2875 cf::cede_to_tick; 2954 cf::cede_to_tick;
2876 } 2955 }
2956
2957 if ($soundconf) {
2958 $soundconf = $enc->decode (delete $soundconf->{data});
2959
2960 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2961 my $sound = $soundconf->{compat}[$_]
2962 or next;
2963
2964 my $face = cf::face::find "sound/$sound->[1]";
2965 cf::sound::set $sound->[0] => $face;
2966 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2967 }
2968
2969 while (my ($k, $v) = each %{$soundconf->{event}}) {
2970 my $face = cf::face::find "sound/$v";
2971 cf::sound::set $k => $face;
2972 }
2973 }
2877 } 2974 }
2878 2975
2879 1 2976 1
2880} 2977}
2881 2978
2979register_exticmd fx_want => sub {
2980 my ($ns, $want) = @_;
2981
2982 while (my ($k, $v) = each %$want) {
2983 $ns->fx_want ($k, $v);
2984 }
2985};
2986
2882sub reload_regions { 2987sub reload_regions {
2988 # HACK to clear player env face cache, we need some signal framework
2989 # for this (global event?)
2990 %ext::player_env::MUSIC_FACE_CACHE = ();
2991
2883 load_resource_file "$MAPDIR/regions" 2992 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 2993 or die "unable to load regions file\n";
2885 2994
2886 for (cf::region::list) { 2995 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 2996 $_->{match} = qr/$_->{match}/
… …
2923 3032
2924sub init { 3033sub init {
2925 reload_resources; 3034 reload_resources;
2926} 3035}
2927 3036
2928sub cfg_load { 3037sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3038 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3039 or return;
2931 3040
2932 local $/; 3041 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3042 *CFG = YAML::Syck::Load <$fh>;
… …
2953 (async { 3062 (async {
2954 Event::one_event; 3063 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3064 })->prio (Coro::PRIO_MAX);
2956 }; 3065 };
2957 3066
2958 cfg_load; 3067 reload_config;
2959 db_init; 3068 db_init;
2960 load_extensions; 3069 load_extensions;
2961 3070
2962 $TICK_WATCHER->start; 3071 $TICK_WATCHER->start;
2963 Event::loop; 3072 Event::loop;
… …
3156 warn "reloading cf.pm"; 3265 warn "reloading cf.pm";
3157 require cf; 3266 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3267 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3268
3160 warn "loading config and database again"; 3269 warn "loading config and database again";
3161 cf::cfg_load; 3270 cf::reload_config;
3162 3271
3163 warn "loading extensions"; 3272 warn "loading extensions";
3164 cf::load_extensions; 3273 cf::load_extensions;
3165 3274
3166 warn "reattaching attachments to objects/players"; 3275 warn "reattaching attachments to objects/players";

Diff Legend

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