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.349 by root, Fri Aug 31 04:10:43 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
… …
1517sub hintmode { 1502sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1503 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1504 $_[0]{hintmode}
1520} 1505}
1521 1506
1522=item $player->ext_reply ($msgid, %msg) 1507=item $player->ext_reply ($msgid, @msg)
1523 1508
1524Sends an ext reply to the player. 1509Sends an ext reply to the player.
1525 1510
1526=cut 1511=cut
1527 1512
1528sub ext_reply($$%) { 1513sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1514 my ($self, $id, @msg) = @_;
1530 1515
1531 $msg{msgid} = $id; 1516 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1517}
1534 1518
1535=item $player->ext_event ($type, %msg) 1519=item $player->ext_msg ($type, @msg)
1536 1520
1537Sends an ext event to the client. 1521Sends an ext event to the client.
1538 1522
1539=cut 1523=cut
1540 1524
1541sub ext_event($$%) { 1525sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1526 my ($self, $type, @msg) = @_;
1543 1527
1544 $self->ns->ext_event ($type, %msg); 1528 $self->ns->ext_msg ($type, @msg);
1545} 1529}
1546 1530
1547=head3 cf::region 1531=head3 cf::region
1548 1532
1549=over 4 1533=over 4
… …
1868 local $self->{deny_reset} = 1; # loading can take a long time 1852 local $self->{deny_reset} = 1; # loading can take a long time
1869 1853
1870 my $path = $self->{path}; 1854 my $path = $self->{path};
1871 1855
1872 { 1856 {
1857 my $guard1 = cf::lock_acquire "map_data:$path";
1873 my $guard = cf::lock_acquire "map_load:$path"; 1858 my $guard2 = cf::lock_acquire "map_load:$path";
1874 1859
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1860 return if $self->in_memory != cf::MAP_SWAPPED;
1876 1861
1877 $self->in_memory (cf::MAP_LOADING); 1862 $self->in_memory (cf::MAP_LOADING);
1878 1863
1879 $self->alloc; 1864 $self->alloc;
1880 1865
1881 $self->pre_load; 1866 $self->pre_load;
1882 Coro::cede; 1867 cf::cede_to_tick;
1883 1868
1884 $self->_load_objects ($self->{load_path}, 1) 1869 $self->_load_objects ($self->{load_path}, 1)
1885 or return; 1870 or return;
1886 1871
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1872 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
… …
1893 $self->clear_unique_items; 1878 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 1879 $self->_load_objects ($uniq, 0);
1895 } 1880 }
1896 } 1881 }
1897 1882
1898 Coro::cede; 1883 cf::cede_to_tick;
1899 # now do the right thing for maps 1884 # now do the right thing for maps
1900 $self->link_multipart_objects; 1885 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 1886 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 1887 unless $self->difficulty;
1903 Coro::cede; 1888 cf::cede_to_tick;
1904 1889
1905 unless ($self->{deny_activate}) { 1890 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 1891 $self->decay_objects;
1907 $self->fix_auto_apply; 1892 $self->fix_auto_apply;
1908 $self->update_buttons; 1893 $self->update_buttons;
1909 Coro::cede; 1894 cf::cede_to_tick;
1910 $self->set_darkness_map; 1895 $self->set_darkness_map;
1911 Coro::cede; 1896 cf::cede_to_tick;
1912 $self->activate; 1897 $self->activate;
1913 } 1898 }
1899
1900 $self->{last_save} = $cf::RUNTIME;
1901 $self->last_access ($cf::RUNTIME);
1914 1902
1915 $self->in_memory (cf::MAP_IN_MEMORY); 1903 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 1904 }
1917 1905
1918 $self->post_load; 1906 $self->post_load;
… …
1929 1917
1930 $self 1918 $self
1931} 1919}
1932 1920
1933# find and load all maps in the 3x3 area around a map 1921# find and load all maps in the 3x3 area around a map
1934sub load_diag { 1922sub load_neighbours {
1935 my ($map) = @_; 1923 my ($map) = @_;
1936 1924
1937 my @diag; # diagonal neighbours 1925 my @neigh; # diagonal neighbours
1938 1926
1939 for (0 .. 3) { 1927 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 1928 my $neigh = $map->tile_path ($_)
1941 or next; 1929 or next;
1942 $neigh = find $neigh, $map 1930 $neigh = find $neigh, $map
1943 or next; 1931 or next;
1944 $neigh->load; 1932 $neigh->load;
1945 1933
1934 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1935 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1936 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 1937 }
1949 1938
1950 for (@diag) { 1939 for (grep defined $_->[0], @neigh) {
1940 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 1941 my $neigh = find $path, $origin
1952 or next; 1942 or next;
1953 $neigh->load; 1943 $neigh->load;
1954 } 1944 }
1955} 1945}
1956 1946
… …
1961} 1951}
1962 1952
1963sub do_load_sync { 1953sub do_load_sync {
1964 my ($map) = @_; 1954 my ($map) = @_;
1965 1955
1956 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1957 if $Coro::current == $Coro::main;
1958
1966 cf::sync_job { $map->load }; 1959 cf::sync_job { $map->load };
1967} 1960}
1968 1961
1969our %MAP_PREFETCH; 1962our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 1963our $MAP_PREFETCHER = undef;
1971 1964
1972sub find_async { 1965sub find_async {
1973 my ($path, $origin) = @_; 1966 my ($path, $origin, $load) = @_;
1974 1967
1975 $path = normalise $path, $origin && $origin->{path}; 1968 $path = normalise $path, $origin && $origin->{path};
1976 1969
1977 if (my $map = $cf::MAP{$path}) { 1970 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1971 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 1972 }
1980 1973
1981 undef $MAP_PREFETCH{$path}; 1974 $MAP_PREFETCH{$path} |= $load;
1975
1982 $MAP_PREFETCHER ||= cf::async { 1976 $MAP_PREFETCHER ||= cf::async {
1983 while (%MAP_PREFETCH) { 1977 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 1978 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 1979 if (my $map = find $k) {
1986 $map->load; 1980 $map->load if $v;
1987 } 1981 }
1988 1982
1989 delete $MAP_PREFETCH{$path}; 1983 delete $MAP_PREFETCH{$k};
1990 } 1984 }
1991 } 1985 }
1992 undef $MAP_PREFETCHER; 1986 undef $MAP_PREFETCHER;
1993 }; 1987 };
1994 $MAP_PREFETCHER->prio (6); 1988 $MAP_PREFETCHER->prio (6);
… …
1997} 1991}
1998 1992
1999sub save { 1993sub save {
2000 my ($self) = @_; 1994 my ($self) = @_;
2001 1995
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 1996 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 1997
2004 $self->{last_save} = $cf::RUNTIME; 1998 $self->{last_save} = $cf::RUNTIME;
2005 1999
2006 return unless $self->dirty; 2000 return unless $self->dirty;
2007 2001
… …
2030 my ($self) = @_; 2024 my ($self) = @_;
2031 2025
2032 # save first because save cedes 2026 # save first because save cedes
2033 $self->save; 2027 $self->save;
2034 2028
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2029 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2030
2037 return if $self->players; 2031 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2032 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2033 return if $self->{deny_save};
2040 2034
… …
2092my $nuke_counter = "aaaa"; 2086my $nuke_counter = "aaaa";
2093 2087
2094sub nuke { 2088sub nuke {
2095 my ($self) = @_; 2089 my ($self) = @_;
2096 2090
2091 {
2092 my $lock = cf::lock_acquire "map_data:$self->{path}";
2093
2097 delete $cf::MAP{$self->path}; 2094 delete $cf::MAP{$self->path};
2098 2095
2099 $self->unlink_save;
2100
2101 bless $self, "cf::map"; 2096 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2097 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2098 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2099 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2100 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2101
2102 $self->unlink_save;
2103
2107 $cf::MAP{$self->path} = $self; 2104 $cf::MAP{$self->path} = $self;
2105 }
2108 2106
2109 $self->reset; # polite request, might not happen 2107 $self->reset; # polite request, might not happen
2110} 2108}
2111 2109
2112=item $maps = cf::map::tmp_maps 2110=item $maps = cf::map::tmp_maps
… …
2219 2217
2220 } else { 2218 } else {
2221 my $pl = $self->contr; 2219 my $pl = $self->contr;
2222 2220
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2221 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2222 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2223 $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 2224
2232 } else { 2225 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2226 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2227 $self->message ($msg, $flags);
2235 } 2228 }
2236 } 2229 }
2230}
2231
2232=item $object->send_msg ($channel, $msg, $color, [extra...])
2233
2234=cut
2235
2236sub cf::object::send_msg {
2237 my $pl = shift->contr
2238 or return;
2239 $pl->send_msg (@_);
2237} 2240}
2238 2241
2239=item $player_object->may ("access") 2242=item $player_object->may ("access")
2240 2243
2241Returns wether the given player is authorized to access resource "access" 2244Returns wether the given player is authorized to access resource "access"
… …
2320 # use -1 or undef as default coordinates, not 0, 0 2323 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2324 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2325 if $x <=0 && $y <= 0;
2323 2326
2324 $map->load; 2327 $map->load;
2325 $map->load_diag; 2328 $map->load_neighbours;
2326 2329
2327 return unless $self->contr->active; 2330 return unless $self->contr->active;
2328 $self->activate_recursive; 2331 $self->activate_recursive;
2329 2332
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2333 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2506sub cf::client::send_msg { 2509sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2510 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2511
2509 $msg = $self->pl->expand_cfpod ($msg); 2512 $msg = $self->pl->expand_cfpod ($msg);
2510 2513
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2514 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2515
2513 if (ref $channel) { 2516 if (ref $channel) {
2514 # send meta info to client, if not yet sent 2517 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2518 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2519 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2520 $self->ext_msg (channel_info => $channel);
2518 } 2521 }
2519 2522
2520 $channel = $channel->{id}; 2523 $channel = $channel->{id};
2521 } 2524 }
2522 2525
2523 return unless @extra || length $msg; 2526 return unless @extra || length $msg;
2524 2527
2525 if ($self->can_msg) { 2528 if ($self->can_msg) {
2529 # default colour, mask it out
2530 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2531 if $color & cf::NDI_DEF;
2532
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2533 $self->send_packet ("msg " . $self->{json_coder}->encode (
2534 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2535 } 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) { 2536 if ($color >= 0) {
2537 # replace some tags by gcfclient-compatible ones
2538 for ($msg) {
2539 1 while
2540 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2541 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2542 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2543 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2544 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2545 }
2546
2547 $color &= cf::NDI_COLOR_MASK;
2548
2549 utf8::encode $msg;
2550
2539 if (0 && $msg =~ /\[/) { 2551 if (0 && $msg =~ /\[/) {
2552 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2553 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2554 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2556 $self->send_packet ("drawinfo $color $msg")
2544 } 2557 }
2545 } 2558 }
2546 } 2559 }
2547} 2560}
2548 2561
2549=item $client->ext_event ($type, %msg) 2562=item $client->ext_msg ($type, @msg)
2550 2563
2551Sends an ext event to the client. 2564Sends an ext event to the client.
2552 2565
2553=cut 2566=cut
2554 2567
2555sub cf::client::ext_event($$%) { 2568sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2569 my ($self, $type, @msg) = @_;
2557 2570
2558 return unless $self->extcmd; 2571 if ($self->extcmd == 2) {
2559 2572 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2573 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2574 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2575 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2576 }
2577}
2578
2579=item $client->ext_reply ($msgid, @msg)
2580
2581Sends an ext reply to the client.
2582
2583=cut
2584
2585sub cf::client::ext_reply($$@) {
2586 my ($self, $id, @msg) = @_;
2587
2588 if ($self->extcmd == 2) {
2589 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2590 } elsif ($self->extcmd == 1) {
2591 #TODO: version 1, remove
2592 unshift @msg, msgtype => "reply", msgid => $id;
2593 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2594 }
2562} 2595}
2563 2596
2564=item $success = $client->query ($flags, "text", \&cb) 2597=item $success = $client->query ($flags, "text", \&cb)
2565 2598
2566Queues a query to the client, calling the given callback with 2599Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 2654 my ($ns, $buf) = @_;
2622 2655
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2656 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2657
2625 if (ref $msg) { 2658 if (ref $msg) {
2659 my ($type, $reply, @payload) =
2660 "ARRAY" eq ref $msg
2661 ? @$msg
2662 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2663
2664 my @reply;
2665
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2666 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2667 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2668 }
2669
2670 $ns->ext_reply ($reply, @reply)
2671 if $reply;
2672
2632 } else { 2673 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2674 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2675 }
2635 2676
2636 cf::override; 2677 cf::override;
… …
2683our $safe = new Safe "safe"; 2724our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 2725our $safe_hole = new Safe::Hole;
2685 2726
2686$SIG{FPE} = 'IGNORE'; 2727$SIG{FPE} = 'IGNORE';
2687 2728
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2729$safe->permit_only (Opcode::opset qw(
2730 :base_core :base_mem :base_orig :base_math
2731 grepstart grepwhile mapstart mapwhile
2732 sort time
2733));
2689 2734
2690# here we export the classes and methods available to script code 2735# here we export the classes and methods available to script code
2691 2736
2692=pod 2737=pod
2693 2738
2694The following functions and methods are available within a safe environment: 2739The following functions and methods are available within a safe environment:
2695 2740
2696 cf::object 2741 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 2742 contr pay_amount pay_player map x y force_find force_add
2698 insert remove 2743 insert remove name archname title slaying race decrease_ob_nr
2699 2744
2700 cf::object::player 2745 cf::object::player
2701 player 2746 player
2702 2747
2703 cf::player 2748 cf::player
… …
2708 2753
2709=cut 2754=cut
2710 2755
2711for ( 2756for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2757 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2758 insert remove inv name archname title slaying race
2713 insert remove)], 2759 decrease_ob_nr)],
2714 ["cf::object::player" => qw(player)], 2760 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 2761 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 2762 ["cf::map" => qw(trigger)],
2717) { 2763) {
2718 no strict 'refs'; 2764 no strict 'refs';
… …
2794# the server's init and main functions 2840# the server's init and main functions
2795 2841
2796sub load_facedata($) { 2842sub load_facedata($) {
2797 my ($path) = @_; 2843 my ($path) = @_;
2798 2844
2845 # HACK to clear player env face cache, we need some signal framework
2846 # for this (global event?)
2847 %ext::player_env::MUSIC_FACE_CACHE = ();
2848
2849 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2850
2799 warn "loading facedata from $path\n"; 2851 warn "loading facedata from $path\n";
2800 2852
2801 my $facedata; 2853 my $facedata;
2802 0 < aio_load $path, $facedata 2854 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 2855 or die "$path: $!";
2804 2856
2805 $facedata = Coro::Storable::thaw $facedata; 2857 $facedata = Coro::Storable::thaw $facedata;
2806 2858
2807 $facedata->{version} == 2 2859 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 2860 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861
2862 # patch in the exptable
2863 $facedata->{resource}{"res/exp_table"} = {
2864 type => FT_RSRC,
2865 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2866 };
2867 cf::cede_to_tick;
2809 2868
2810 { 2869 {
2811 my $faces = $facedata->{faceinfo}; 2870 my $faces = $facedata->{faceinfo};
2812 2871
2813 while (my ($face, $info) = each %$faces) { 2872 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2873 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2815 cf::face::set_visibility $idx, $info->{visibility}; 2874 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 2875 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2876 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2877 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 2878
2820 cf::cede_to_tick; 2879 cf::cede_to_tick;
2821 } 2880 }
2822 2881
2823 while (my ($face, $info) = each %$faces) { 2882 while (my ($face, $info) = each %$faces) {
… …
2848 2907
2849 { 2908 {
2850 # TODO: for gcfclient pleasure, we should give resources 2909 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 2910 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 2911 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical; 2912
2913 my $soundconf = delete $res->{"res/sound.conf"};
2854 2914
2855 while (my ($name, $info) = each %$res) { 2915 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; 2916 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2917 my $data;
2863 2918
2864 if ($name =~ /\.jpg$/) { 2919 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2920 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2921
2922 my $meta = $enc->encode ({
2923 name => $name,
2924 %{ $info->{meta} || {} },
2925 });
2926
2927 $data = pack "(w/a*)*", $meta, $info->{data};
2867 } else { 2928 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 2929 $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 } 2930 }
2874 2931
2932 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2933 cf::face::set_type $idx, $info->{type};
2934
2875 cf::cede_to_tick; 2935 cf::cede_to_tick;
2876 } 2936 }
2937
2938 if ($soundconf) {
2939 $soundconf = $enc->decode (delete $soundconf->{data});
2940
2941 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2942 my $sound = $soundconf->{compat}[$_]
2943 or next;
2944
2945 my $face = cf::face::find "sound/$sound->[1]";
2946 cf::sound::set $sound->[0] => $face;
2947 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2948 }
2949
2950 while (my ($k, $v) = each %{$soundconf->{event}}) {
2951 my $face = cf::face::find "sound/$v";
2952 cf::sound::set $k => $face;
2953 }
2954 }
2877 } 2955 }
2878 2956
2879 1 2957 1
2880} 2958}
2881 2959
2960register_exticmd fx_want => sub {
2961 my ($ns, $want) = @_;
2962
2963 while (my ($k, $v) = each %$want) {
2964 $ns->fx_want ($k, $v);
2965 }
2966};
2967
2882sub reload_regions { 2968sub reload_regions {
2969 # HACK to clear player env face cache, we need some signal framework
2970 # for this (global event?)
2971 %ext::player_env::MUSIC_FACE_CACHE = ();
2972
2883 load_resource_file "$MAPDIR/regions" 2973 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 2974 or die "unable to load regions file\n";
2885 2975
2886 for (cf::region::list) { 2976 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 2977 $_->{match} = qr/$_->{match}/
… …
2923 3013
2924sub init { 3014sub init {
2925 reload_resources; 3015 reload_resources;
2926} 3016}
2927 3017
2928sub cfg_load { 3018sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3019 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3020 or return;
2931 3021
2932 local $/; 3022 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3023 *CFG = YAML::Syck::Load <$fh>;
… …
2953 (async { 3043 (async {
2954 Event::one_event; 3044 Event::one_event;
2955 })->prio (Coro::PRIO_MAX); 3045 })->prio (Coro::PRIO_MAX);
2956 }; 3046 };
2957 3047
2958 cfg_load; 3048 reload_config;
2959 db_init; 3049 db_init;
2960 load_extensions; 3050 load_extensions;
2961 3051
2962 $TICK_WATCHER->start; 3052 $TICK_WATCHER->start;
2963 Event::loop; 3053 Event::loop;
… …
3156 warn "reloading cf.pm"; 3246 warn "reloading cf.pm";
3157 require cf; 3247 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3248 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3249
3160 warn "loading config and database again"; 3250 warn "loading config and database again";
3161 cf::cfg_load; 3251 cf::reload_config;
3162 3252
3163 warn "loading extensions"; 3253 warn "loading extensions";
3164 cf::load_extensions; 3254 cf::load_extensions;
3165 3255
3166 warn "reattaching attachments to objects/players"; 3256 warn "reattaching attachments to objects/players";

Diff Legend

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