--- deliantra/server/lib/cf.pm	2012/10/30 17:07:50	1.584
+++ deliantra/server/lib/cf.pm	2012/11/09 16:27:55	1.595
@@ -34,7 +34,10 @@
 use Storable ();
 use Carp ();
 
-use Guard ();
+use AnyEvent ();
+use AnyEvent::IO ();
+use AnyEvent::DNS ();
+
 use Coro ();
 use Coro::State;
 use Coro::Handle;
@@ -50,6 +53,7 @@
 use Coro::Storable;
 use Coro::Util ();
 
+use Guard ();
 use JSON::XS 2.01 ();
 use BDB ();
 use Data::Dumper;
@@ -85,7 +89,9 @@
 
 our @EXTS         = (); # list of extension package names
 our %EXTCMD       = ();
+our %EXTACMD      = ();
 our %EXTICMD      = ();
+our %EXTIACMD     = ();
 our %EXT_CORO     = (); # coroutines bound to extensions
 our %EXT_MAP      = (); # pluggable maps
 
@@ -222,9 +228,9 @@
 The time this server has run, starts at 0 and is increased by $cf::TICK on
 every server tick.
 
-=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR  $cf::PODDIR   
+=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR  $cf::PODDIR
 $cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
-$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR   
+$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
 
 Various directories - "/etc", read-only install directory, perl-library
 directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
@@ -338,7 +344,7 @@
 }
 
 $EV::DIED = sub {
-   Carp::cluck "error in event callback: @_";
+   warn "error in event callback: $@";
 };
 
 #############################################################################
@@ -1429,7 +1435,7 @@
 #############################################################################
 # command handling &c
 
-=item cf::register_command $name => \&callback($ob,$args);
+=item cf::register_command $name => \&callback($ob,$args)
 
 Register a callback for execution when the client sends the user command
 $name.
@@ -1445,7 +1451,7 @@
    push @{ $COMMAND{$name} }, [$caller, $cb];
 }
 
-=item cf::register_extcmd $name => \&callback($pl,$packet);
+=item cf::register_extcmd $name => \&callback($pl,@args)
 
 Register a callback for execution when the client sends an (synchronous)
 extcmd packet. Ext commands will be processed in the order they are
@@ -1453,10 +1459,14 @@
 the logged-in player. Ext commands can only be processed after a player
 has logged in successfully.
 
-If the callback returns something, it is sent back as if reply was being
-called.
+The values will be sent back to the client.
+
+=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
+
+Same as C<cf::register_extcmd>, but instead of returning values, the
+callback needs to clal the C<$reply> function.
 
-=item cf::register_exticmd $name => \&callback($ns,$packet);
+=item cf::register_exticmd $name => \&callback($ns,@args)
 
 Register a callback for execution when the client sends an (asynchronous)
 exticmd packet. Exti commands are processed by the server as soon as they
@@ -1464,23 +1474,39 @@
 is a client socket. Exti commands can be received anytime, even before
 log-in.
 
-If the callback returns something, it is sent back as if reply was being
-called.
+The values will be sent back to the client.
+
+=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
+
+Same as C<cf::register_extcmd>, but instead of returning values, the
+callback needs to clal the C<$reply> function.
 
 =cut
 
-sub register_extcmd {
+sub register_extcmd($$) {
    my ($name, $cb) = @_;
 
    $EXTCMD{$name} = $cb;
 }
 
-sub register_exticmd {
+sub register_async_extcmd($$) {
+   my ($name, $cb) = @_;
+
+   $EXTACMD{$name} = $cb;
+}
+
+sub register_exticmd($$) {
    my ($name, $cb) = @_;
 
    $EXTICMD{$name} = $cb;
 }
 
+sub register_async_exticmd($$) {
+   my ($name, $cb) = @_;
+
+   $EXTIACMD{$name} = $cb;
+}
+
 use File::Glob ();
 
 cf::player->attach (
@@ -1504,14 +1530,25 @@
       if (ref $msg) {
          my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
 
-         my @reply;
+         if (my $cb = $EXTACMD{$type}) {
+            $cb->(
+               $pl,
+               sub {
+                  $pl->ext_msg ("reply-$reply", @_)
+                     if $reply;
+               },
+               @payload
+            );
+         } else {
+            my @reply;
 
-         if (my $cb = $EXTCMD{$type}) {
-            @reply = $cb->($pl, @payload);
-         }
+            if (my $cb = $EXTCMD{$type}) {
+               @reply = $cb->($pl, @payload);
+            }
 
-         $pl->ext_reply ($reply, @reply)
-            if $reply;
+            $pl->ext_msg ("reply-$reply", @reply)
+               if $reply;
+         }
 
       } else {
          error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
@@ -1908,18 +1945,6 @@
 
 Expand deliantra pod fragments into protocol xml.
 
-=item $player->ext_reply ($msgid, @msg)
-
-Sends an ext reply to the player.
-
-=cut
-
-sub ext_reply($$@) {
-   my ($self, $id, @msg) = @_;
-
-   $self->ns->ext_reply ($id, @msg)
-}
-
 =item $player->ext_msg ($type, @msg)
 
 Sends an ext event to the client.
@@ -3233,26 +3258,7 @@
 sub cf::client::ext_msg($$@) {
    my ($self, $type, @msg) = @_;
 
-   if ($self->extcmd == 2) {
-      $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
-   } elsif ($self->extcmd == 1) { # TODO: remove
-      push @msg, msgtype => "event_$type";
-      $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
-   }
-}
-
-=item $client->ext_reply ($msgid, @msg)
-
-Sends an ext reply to the client.
-
-=cut
-
-sub cf::client::ext_reply($$@) {
-   my ($self, $id, @msg) = @_;
-
-   return unless $self->extcmd == 2;
-
-   $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
+   $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
 }
 
 =item $success = $client->query ($flags, "text", \&cb)
@@ -3319,15 +3325,25 @@
       if (ref $msg) {
          my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
 
-         my @reply;
-
-         if (my $cb = $EXTICMD{$type}) {
-            @reply = $cb->($ns, @payload);
-         }
+         if (my $cb = $EXTIACMD{$type}) {
+            $cb->(
+               $ns,
+               sub {
+                  $ns->ext_msg ("reply-$reply", @_)
+                     if $reply;
+               },
+               @payload
+            );
+         } else {
+            my @reply;
 
-         $ns->ext_reply ($reply, @reply)
-            if $reply;
+            if (my $cb = $EXTICMD{$type}) {
+               @reply = $cb->($ns, @payload);
+            }
 
+            $ns->ext_msg ("reply-$reply", @reply)
+               if $reply;
+         }
       } else {
          error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
       }
@@ -3507,6 +3523,28 @@
 
 our %FACEHASH; # hash => idx, #d# HACK for http server
 
+# internal api, not fianlised
+sub add_face {
+   my ($name, $type, $data) = @_;
+
+   my $idx = cf::face::find $name;
+
+   if ($idx) {
+      delete $FACEHASH{cf::face::get_chksum $idx};
+   } else {
+      $idx = cf::face::alloc $name;
+   }
+
+   my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
+
+   cf::face::set_type $idx, $type;
+   cf::face::set_data $idx, 0, $data, $hash;
+   cf::face::set_meta $idx, $type & 1 ? undef : undef;
+   $FACEHASH{$hash} = $idx;#d#
+
+   $idx
+}
+
 sub load_facedata($) {
    my ($path) = @_;
 
@@ -3523,19 +3561,13 @@
    $facedata->{version} == 2
       or cf::cleanup "$path: version mismatch, cannot proceed.";
 
-   # patch in the exptable
-   my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
-   $facedata->{resource}{"res/exp_table"} = {
-      type => FT_RSRC,
-      data => $exp_table,
-      hash => (Digest::MD5::md5 $exp_table),
-   };
    cf::cede_to_tick;
 
    {
       my $faces = $facedata->{faceinfo};
 
-      while (my ($face, $info) = each %$faces) {
+      for my $face (sort keys %$faces) {
+         my $info = $faces->{$face};
          my $idx = (cf::face::find $face) || cf::face::alloc $face;
 
          cf::face::set_visibility $idx, $info->{visibility};
@@ -3584,8 +3616,8 @@
             # TODO: different hash - must free and use new index, or cache ixface data queue
             my $idx = (cf::face::find $name) || cf::face::alloc $name;
 
-            cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
             cf::face::set_type $idx, $type;
+            cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
             cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
             $FACEHASH{$info->{hash}} = $idx;#d#
          } else {
@@ -3619,6 +3651,19 @@
    $status
 }
 
+sub reload_exp_table {
+   _reload_exp_table;
+
+   add_face "res/exp_table" => FT_RSRC,
+            JSON::XS->new->utf8->canonical->encode (
+               [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
+            );
+}
+
+sub reload_materials {
+   _reload_materials;
+}
+
 sub reload_regions {
    # HACK to clear player env face cache, we need some signal framework
    # for this (global event?)
@@ -3641,6 +3686,15 @@
 sub reload_archetypes {
    load_resource_file "$DATADIR/archetypes"
       or die "unable to load archetypes\n";
+
+   add_face "res/skill_info" => FT_RSRC,
+            JSON::XS->new->utf8->canonical->encode (
+               [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
+            );
+   add_face "res/spell_paths" => FT_RSRC,
+            JSON::XS->new->utf8->canonical->encode (
+               [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
+            );
 }
 
 sub reload_treasures {
@@ -3671,9 +3725,9 @@
 sub reload_resources {
    trace "reloading resource files...\n";
 
-   reload_exp_table;
    reload_materials;
    reload_facedata;
+   reload_exp_table;
    reload_sound;
    reload_archetypes;
    reload_regions;
@@ -3742,7 +3796,7 @@
    $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
 
    # we must not ever block the main coroutine
-   local $Coro::idle = sub {
+   $Coro::idle = sub {
       Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
       (async {
          $Coro::current->{desc} = "IDLE BUG HANDLER";
@@ -3755,6 +3809,8 @@
    cf::sync_job {
       cf::incloader::init ();
 
+      db_init;
+
       cf::init_anim;
       cf::init_attackmess;
       cf::init_dynamic;
@@ -3763,7 +3819,6 @@
 
       reload_resources;
       reload_config;
-      db_init;
 
       cf::init_uuid;
       cf::init_signals;
@@ -4198,6 +4253,7 @@
 
 {
    # configure BDB
+   info "initialising database";
 
    BDB::min_parallel 16;
    BDB::max_poll_reqs $TICK * 0.1;
@@ -4236,14 +4292,18 @@
    $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
       BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
    };
+
+   info "database initialised";
 }
 
 {
    # configure IO::AIO
 
+   info "initialising aio";
    IO::AIO::min_parallel 8;
    IO::AIO::max_poll_time $TICK * 0.1;
    undef $AnyEvent::AIO::WATCHER;
+   info "aio initialised";
 }
 
 our $_log_backtrace;