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.346 by root, Tue Aug 28 19:38:40 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 ();
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
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(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 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; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @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 489
516 eval { 490 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} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
612 if (1) { 575 if (1) {
613 $md5 = 576 $md5 =
614 join "\x00", 577 join "\x00",
615 $processversion, 578 $processversion,
616 map { 579 map {
617 Coro::cede; 580 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 582 } 0.. $#$src;
620 583
621 584
622 my $dbmd5 = db_get cache => "$id/md5"; 585 my $dbmd5 = db_get cache => "$id/md5";
… …
1181 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
1182 1145
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1147
1185 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
1154 my @reply;
1155
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1156 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1157 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1191 } else { 1163 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1165 }
1194 1166
1195 cf::override; 1167 cf::override;
… …
1350 1322
1351 aio_mkdir playerdir $pl, 0770; 1323 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1324 $pl->{last_save} = $cf::RUNTIME;
1353 1325
1354 $pl->save_pl ($path); 1326 $pl->save_pl ($path);
1355 Coro::cede; 1327 cf::cede_to_tick;
1356} 1328}
1357 1329
1358sub new($) { 1330sub new($) {
1359 my ($login) = @_; 1331 my ($login) = @_;
1360 1332
… …
1364 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1365 1337
1366 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1367 1339
1368 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1369} 1351}
1370 1352
1371=item $pl->quit_character 1353=item $pl->quit_character
1372 1354
1373Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1517sub hintmode { 1499sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1501 $_[0]{hintmode}
1520} 1502}
1521 1503
1522=item $player->ext_reply ($msgid, %msg) 1504=item $player->ext_reply ($msgid, @msg)
1523 1505
1524Sends an ext reply to the player. 1506Sends an ext reply to the player.
1525 1507
1526=cut 1508=cut
1527 1509
1528sub ext_reply($$%) { 1510sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1511 my ($self, $id, @msg) = @_;
1530 1512
1531 $msg{msgid} = $id; 1513 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1514}
1534 1515
1535=item $player->ext_event ($type, %msg) 1516=item $player->ext_msg ($type, @msg)
1536 1517
1537Sends an ext event to the client. 1518Sends an ext event to the client.
1538 1519
1539=cut 1520=cut
1540 1521
1541sub ext_event($$%) { 1522sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1523 my ($self, $type, @msg) = @_;
1543 1524
1544 $self->ns->ext_event ($type, %msg); 1525 $self->ns->ext_msg ($type, @msg);
1545} 1526}
1546 1527
1547=head3 cf::region 1528=head3 cf::region
1548 1529
1549=over 4 1530=over 4
… …
1868 local $self->{deny_reset} = 1; # loading can take a long time 1849 local $self->{deny_reset} = 1; # loading can take a long time
1869 1850
1870 my $path = $self->{path}; 1851 my $path = $self->{path};
1871 1852
1872 { 1853 {
1854 my $guard1 = cf::lock_acquire "map_data:$path";
1873 my $guard = cf::lock_acquire "map_load:$path"; 1855 my $guard2 = cf::lock_acquire "map_load:$path";
1874 1856
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1857 return if $self->in_memory != cf::MAP_SWAPPED;
1876 1858
1877 $self->in_memory (cf::MAP_LOADING); 1859 $self->in_memory (cf::MAP_LOADING);
1878 1860
1879 $self->alloc; 1861 $self->alloc;
1880 1862
1881 $self->pre_load; 1863 $self->pre_load;
1882 Coro::cede; 1864 cf::cede_to_tick;
1883 1865
1884 $self->_load_objects ($self->{load_path}, 1) 1866 $self->_load_objects ($self->{load_path}, 1)
1885 or return; 1867 or return;
1886 1868
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1869 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1893 $self->clear_unique_items; 1875 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1876 $self->_load_objects ($uniq, 0);
1895 } 1877 }
1896 } 1878 }
1897 1879
1898 Coro::cede; 1880 cf::cede_to_tick;
1899 # now do the right thing for maps 1881 # now do the right thing for maps
1900 $self->link_multipart_objects; 1882 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1883 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1884 unless $self->difficulty;
1903 Coro::cede; 1885 cf::cede_to_tick;
1904 1886
1905 unless ($self->{deny_activate}) { 1887 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1888 $self->decay_objects;
1907 $self->fix_auto_apply; 1889 $self->fix_auto_apply;
1908 $self->update_buttons; 1890 $self->update_buttons;
1909 Coro::cede; 1891 cf::cede_to_tick;
1910 $self->set_darkness_map; 1892 $self->set_darkness_map;
1911 Coro::cede; 1893 cf::cede_to_tick;
1912 $self->activate; 1894 $self->activate;
1913 } 1895 }
1896
1897 $self->{last_save} = $cf::RUNTIME;
1898 $self->last_access ($cf::RUNTIME);
1914 1899
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1900 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1901 }
1917 1902
1918 $self->post_load; 1903 $self->post_load;
… …
1929 1914
1930 $self 1915 $self
1931} 1916}
1932 1917
1933# find and load all maps in the 3x3 area around a map 1918# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1919sub load_neighbours {
1935 my ($map) = @_; 1920 my ($map) = @_;
1936 1921
1937 my @diag; # diagonal neighbours 1922 my @neigh; # diagonal neighbours
1938 1923
1939 for (0 .. 3) { 1924 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1925 my $neigh = $map->tile_path ($_)
1941 or next; 1926 or next;
1942 $neigh = find $neigh, $map 1927 $neigh = find $neigh, $map
1943 or next; 1928 or next;
1944 $neigh->load; 1929 $neigh->load;
1945 1930
1931 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1932 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1933 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 1934 }
1949 1935
1950 for (@diag) { 1936 for (grep defined $_->[0], @neigh) {
1937 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 1938 my $neigh = find $path, $origin
1952 or next; 1939 or next;
1953 $neigh->load; 1940 $neigh->load;
1954 } 1941 }
1955} 1942}
1956 1943
… …
1961} 1948}
1962 1949
1963sub do_load_sync { 1950sub do_load_sync {
1964 my ($map) = @_; 1951 my ($map) = @_;
1965 1952
1953 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1954 if $Coro::current == $Coro::main;
1955
1966 cf::sync_job { $map->load }; 1956 cf::sync_job { $map->load };
1967} 1957}
1968 1958
1969our %MAP_PREFETCH; 1959our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 1960our $MAP_PREFETCHER = undef;
1971 1961
1972sub find_async { 1962sub find_async {
1973 my ($path, $origin) = @_; 1963 my ($path, $origin, $load) = @_;
1974 1964
1975 $path = normalise $path, $origin && $origin->{path}; 1965 $path = normalise $path, $origin && $origin->{path};
1976 1966
1977 if (my $map = $cf::MAP{$path}) { 1967 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1968 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 1969 }
1980 1970
1981 undef $MAP_PREFETCH{$path}; 1971 $MAP_PREFETCH{$path} |= $load;
1972
1982 $MAP_PREFETCHER ||= cf::async { 1973 $MAP_PREFETCHER ||= cf::async {
1983 while (%MAP_PREFETCH) { 1974 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 1975 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 1976 if (my $map = find $k) {
1986 $map->load; 1977 $map->load if $v;
1987 } 1978 }
1988 1979
1989 delete $MAP_PREFETCH{$path}; 1980 delete $MAP_PREFETCH{$k};
1990 } 1981 }
1991 } 1982 }
1992 undef $MAP_PREFETCHER; 1983 undef $MAP_PREFETCHER;
1993 }; 1984 };
1994 $MAP_PREFETCHER->prio (6); 1985 $MAP_PREFETCHER->prio (6);
… …
1997} 1988}
1998 1989
1999sub save { 1990sub save {
2000 my ($self) = @_; 1991 my ($self) = @_;
2001 1992
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 1993 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 1994
2004 $self->{last_save} = $cf::RUNTIME; 1995 $self->{last_save} = $cf::RUNTIME;
2005 1996
2006 return unless $self->dirty; 1997 return unless $self->dirty;
2007 1998
… …
2030 my ($self) = @_; 2021 my ($self) = @_;
2031 2022
2032 # save first because save cedes 2023 # save first because save cedes
2033 $self->save; 2024 $self->save;
2034 2025
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2026 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2027
2037 return if $self->players; 2028 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2029 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2030 return if $self->{deny_save};
2040 2031
… …
2219 2210
2220 } else { 2211 } else {
2221 my $pl = $self->contr; 2212 my $pl = $self->contr;
2222 2213
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2214 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2215 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2216 $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 2217
2232 } else { 2218 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2219 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2220 $self->message ($msg, $flags);
2235 } 2221 }
2236 } 2222 }
2223}
2224
2225=item $object->send_msg ($channel, $msg, $color, [extra...])
2226
2227=cut
2228
2229sub cf::object::send_msg {
2230 my $pl = shift->contr
2231 or return;
2232 $pl->send_msg (@_);
2237} 2233}
2238 2234
2239=item $player_object->may ("access") 2235=item $player_object->may ("access")
2240 2236
2241Returns wether the given player is authorized to access resource "access" 2237Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2316 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2317 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2318 if $x <=0 && $y <= 0;
2323 2319
2324 $map->load; 2320 $map->load;
2325 $map->load_diag; 2321 $map->load_neighbours;
2326 2322
2327 return unless $self->contr->active; 2323 return unless $self->contr->active;
2328 $self->activate_recursive; 2324 $self->activate_recursive;
2329 2325
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2326 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2506sub cf::client::send_msg { 2502sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2503 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2504
2509 $msg = $self->pl->expand_cfpod ($msg); 2505 $msg = $self->pl->expand_cfpod ($msg);
2510 2506
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2507 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2508
2513 if (ref $channel) { 2509 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2510 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2511 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2512 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2513 $self->ext_msg (channel_info => $channel);
2518 } 2514 }
2519 2515
2520 $channel = $channel->{id}; 2516 $channel = $channel->{id};
2521 } 2517 }
2522 2518
2523 return unless @extra || length $msg; 2519 return unless @extra || length $msg;
2524 2520
2525 if ($self->can_msg) { 2521 if ($self->can_msg) {
2522 # default colour, mask it out
2523 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2524 if $color & cf::NDI_DEF;
2525
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2526 $self->send_packet ("msg " . $self->{json_coder}->encode (
2527 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2528 } 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) { 2529 if ($color >= 0) {
2530 # replace some tags by gcfclient-compatible ones
2531 for ($msg) {
2532 1 while
2533 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2534 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2535 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2536 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2537 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2538 }
2539
2540 $color &= cf::NDI_COLOR_MASK;
2541
2542 utf8::encode $msg;
2543
2539 if (0 && $msg =~ /\[/) { 2544 if (0 && $msg =~ /\[/) {
2545 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2546 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2547 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2549 $self->send_packet ("drawinfo $color $msg")
2544 } 2550 }
2545 } 2551 }
2546 } 2552 }
2547} 2553}
2548 2554
2549=item $client->ext_event ($type, %msg) 2555=item $client->ext_msg ($type, @msg)
2550 2556
2551Sends an ext event to the client. 2557Sends an ext event to the client.
2552 2558
2553=cut 2559=cut
2554 2560
2555sub cf::client::ext_event($$%) { 2561sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2562 my ($self, $type, @msg) = @_;
2557 2563
2558 return unless $self->extcmd; 2564 if ($self->extcmd == 2) {
2559 2565 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2566 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2567 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2568 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2569 }
2570}
2571
2572=item $client->ext_reply ($msgid, @msg)
2573
2574Sends an ext reply to the client.
2575
2576=cut
2577
2578sub cf::client::ext_reply($$@) {
2579 my ($self, $id, @msg) = @_;
2580
2581 if ($self->extcmd == 2) {
2582 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2583 } elsif ($self->extcmd == 1) {
2584 #TODO: version 1, remove
2585 unshift @msg, msgtype => "reply", msgid => $id;
2586 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2587 }
2562} 2588}
2563 2589
2564=item $success = $client->query ($flags, "text", \&cb) 2590=item $success = $client->query ($flags, "text", \&cb)
2565 2591
2566Queues a query to the client, calling the given callback with 2592Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2647 my ($ns, $buf) = @_;
2622 2648
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2649 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2650
2625 if (ref $msg) { 2651 if (ref $msg) {
2652 my ($type, $reply, @payload) =
2653 "ARRAY" eq ref $msg
2654 ? @$msg
2655 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2656
2657 my @reply;
2658
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2659 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2660 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2661 }
2662
2663 $ns->ext_reply ($reply, @reply)
2664 if $reply;
2665
2632 } else { 2666 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2667 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2668 }
2635 2669
2636 cf::override; 2670 cf::override;
… …
2683our $safe = new Safe "safe"; 2717our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2718our $safe_hole = new Safe::Hole;
2685 2719
2686$SIG{FPE} = 'IGNORE'; 2720$SIG{FPE} = 'IGNORE';
2687 2721
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2722$safe->permit_only (Opcode::opset qw(
2723 :base_core :base_mem :base_orig :base_math
2724 grepstart grepwhile mapstart mapwhile
2725 sort time
2726));
2689 2727
2690# here we export the classes and methods available to script code 2728# here we export the classes and methods available to script code
2691 2729
2692=pod 2730=pod
2693 2731
2694The following functions and methods are available within a safe environment: 2732The following functions and methods are available within a safe environment:
2695 2733
2696 cf::object 2734 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2735 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2736 insert remove name archname title slaying race decrease_ob_nr
2699 2737
2700 cf::object::player 2738 cf::object::player
2701 player 2739 player
2702 2740
2703 cf::player 2741 cf::player
… …
2708 2746
2709=cut 2747=cut
2710 2748
2711for ( 2749for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2750 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2751 insert remove inv name archname title slaying race
2713 insert remove)], 2752 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2753 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2754 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2755 ["cf::map" => qw(trigger)],
2717) { 2756) {
2718 no strict 'refs'; 2757 no strict 'refs';
… …
2794# the server's init and main functions 2833# the server's init and main functions
2795 2834
2796sub load_facedata($) { 2835sub load_facedata($) {
2797 my ($path) = @_; 2836 my ($path) = @_;
2798 2837
2838 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839
2799 warn "loading facedata from $path\n"; 2840 warn "loading facedata from $path\n";
2800 2841
2801 my $facedata; 2842 my $facedata;
2802 0 < aio_load $path, $facedata 2843 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2844 or die "$path: $!";
2804 2845
2805 $facedata = Coro::Storable::thaw $facedata; 2846 $facedata = Coro::Storable::thaw $facedata;
2806 2847
2807 $facedata->{version} == 2 2848 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 2849 or cf::cleanup "$path: version mismatch, cannot proceed.";
2850
2851 # patch in the exptable
2852 $facedata->{resource}{"res/exp_table"} = {
2853 type => FT_RSRC,
2854 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2855 };
2856 cf::cede_to_tick;
2809 2857
2810 { 2858 {
2811 my $faces = $facedata->{faceinfo}; 2859 my $faces = $facedata->{faceinfo};
2812 2860
2813 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2862 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 2863 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 2864 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 2867
2820 cf::cede_to_tick; 2868 cf::cede_to_tick;
2821 } 2869 }
2822 2870
2823 while (my ($face, $info) = each %$faces) { 2871 while (my ($face, $info) = each %$faces) {
… …
2848 2896
2849 { 2897 {
2850 # TODO: for gcfclient pleasure, we should give resources 2898 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 2899 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 2900 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 2901
2902 my $soundconf = delete $res->{"res/sound.conf"};
2854 2903
2855 while (my ($name, $info) = each %$res) { 2904 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; 2905 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data;
2863 2907
2864 if ($name =~ /\.jpg$/) { 2908 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2909 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2910
2911 my $meta = $enc->encode ({
2912 name => $name,
2913 %{ $info->{meta} || {} },
2914 });
2915
2916 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 2917 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 2918 $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 } 2919 }
2874 2920
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2875 cf::cede_to_tick; 2924 cf::cede_to_tick;
2876 } 2925 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2877 } 2944 }
2878 2945
2879 1 2946 1
2880} 2947}
2948
2949register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_;
2951
2952 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v);
2954 }
2955};
2881 2956
2882sub reload_regions { 2957sub reload_regions {
2883 load_resource_file "$MAPDIR/regions" 2958 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 2959 or die "unable to load regions file\n";
2885 2960
… …
2923 2998
2924sub init { 2999sub init {
2925 reload_resources; 3000 reload_resources;
2926} 3001}
2927 3002
2928sub cfg_load { 3003sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3004 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3005 or return;
2931 3006
2932 local $/; 3007 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3008 *CFG = YAML::Syck::Load <$fh>;
… …
2953 (async { 3028 (async {
2954 Event::one_event; 3029 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3030 })->prio (Coro::PRIO_MAX);
2956 }; 3031 };
2957 3032
2958 cfg_load; 3033 reload_config;
2959 db_init; 3034 db_init;
2960 load_extensions; 3035 load_extensions;
2961 3036
2962 $TICK_WATCHER->start; 3037 $TICK_WATCHER->start;
2963 Event::loop; 3038 Event::loop;
… …
3156 warn "reloading cf.pm"; 3231 warn "reloading cf.pm";
3157 require cf; 3232 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3234
3160 warn "loading config and database again"; 3235 warn "loading config and database again";
3161 cf::cfg_load; 3236 cf::reload_config;
3162 3237
3163 warn "loading extensions"; 3238 warn "loading extensions";
3164 cf::load_extensions; 3239 cf::load_extensions;
3165 3240
3166 warn "reattaching attachments to objects/players"; 3241 warn "reattaching attachments to objects/players";

Diff Legend

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