--- deliantra/server/lib/cf.pm	2012/10/29 23:12:37	1.583
+++ deliantra/server/lib/cf.pm	2012/11/09 01:59:33	1.593
@@ -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;
@@ -222,9 +226,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 +342,7 @@
 }
 
 $EV::DIED = sub {
-   Carp::cluck "error in event callback: @_";
+   warn "error in event callback: $@";
 };
 
 #############################################################################
@@ -1429,7 +1433,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 +1449,7 @@
    push @{ $COMMAND{$name} }, [$caller, $cb];
 }
 
-=item cf::register_extcmd $name => \&callback($pl,$packet);
+=item cf::register_extcmd $name => \&callback($pl,$packet)
 
 Register a callback for execution when the client sends an (synchronous)
 extcmd packet. Ext commands will be processed in the order they are
@@ -1456,7 +1460,7 @@
 If the callback returns something, it is sent back as if reply was being
 called.
 
-=item cf::register_exticmd $name => \&callback($ns,$packet);
+=item cf::register_exticmd $name => \&callback($ns,$packet)
 
 Register a callback for execution when the client sends an (asynchronous)
 exticmd packet. Exti commands are processed by the server as soon as they
@@ -1510,7 +1514,7 @@
             @reply = $cb->($pl, @payload);
          }
 
-         $pl->ext_reply ($reply, @reply)
+         $pl->ext_msg ("reply-$reply", @reply)
             if $reply;
 
       } else {
@@ -1908,18 +1912,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 +3225,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)
@@ -3325,7 +3298,7 @@
             @reply = $cb->($ns, @payload);
          }
 
-         $ns->ext_reply ($reply, @reply)
+         $ns->ext_msg ("reply-$reply", @reply)
             if $reply;
 
       } else {
@@ -3505,6 +3478,30 @@
 #############################################################################
 # the server's init and main functions
 
+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) = @_;
 
@@ -3521,19 +3518,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};
@@ -3541,6 +3532,7 @@
          cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
          cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
          cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
+         $FACEHASH{$info->{hash64}} = $idx;#d#
 
          cf::cede_to_tick;
       }
@@ -3581,9 +3573,10 @@
             # 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 {
 #            $RESOURCE{$name} = $info; # unused
          }
@@ -3615,6 +3608,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?)
@@ -3637,6 +3643,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 {
@@ -3664,16 +3679,79 @@
    }
 }
 
+#d# move docstuff to help or so
+our %DOCSTRING;
+
+sub reload_pod {
+   trace "loading pods $PODDIR\n";
+
+   %DOCSTRING = ();
+   my @command_list;
+
+   for (
+      [0, "command_help"],
+      [1, "emote_help"],
+      [2, "dmcommand_help"],
+   ) {
+      my ($type, $path) = @$_;
+
+      my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
+         or die "unable to load $path";
+
+      my $level = 1e9;
+      my $rpar;
+
+      for my $par (@$paragraphs) {
+         if ($par->{type} eq "head2") {
+            # this code taken almost verbatim from DC/Protocol.pm
+
+            if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
+               my $cmd = $1;
+               my @args = split /\|/, $2;
+               @args = (".*") unless @args;
+
+               $_ = $_ eq ".*" ? "" : " $_"
+                  for @args;
+
+               my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
+
+               $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
+
+               push @command_list, [$type, \@variants];
+               $level = $par->{level};
+            } else {
+               error "$par->{markup}: unparsable command heading";
+            }
+         } elsif ($par->{level} > $level) {
+            $$rpar .= &cf::pod::as_cfpod ([$par]);
+         }
+
+         cf::cede_to_tick;
+      }
+   }
+
+   @command_list = sort {
+      $a->[0] <=> $b->[0]
+         or $a->[1] cmp $b->[1]
+   } @command_list;
+
+   cf::cede_to_tick;
+
+   add_face "res/command_list" => FT_RSRC,
+            JSON::XS->new->utf8->encode (\@command_list);
+}
+
 sub reload_resources {
    trace "reloading resource files...\n";
 
-   reload_exp_table;
    reload_materials;
    reload_facedata;
+   reload_exp_table;
    reload_sound;
    reload_archetypes;
    reload_regions;
    reload_treasures;
+   reload_pod;
 
    trace "finished reloading resource files\n";
 }
@@ -3738,7 +3816,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";
@@ -3751,6 +3829,8 @@
    cf::sync_job {
       cf::incloader::init ();
 
+      db_init;
+
       cf::init_anim;
       cf::init_attackmess;
       cf::init_dynamic;
@@ -3759,7 +3839,6 @@
 
       reload_resources;
       reload_config;
-      db_init;
 
       cf::init_uuid;
       cf::init_signals;
@@ -4194,6 +4273,7 @@
 
 {
    # configure BDB
+   info "initialising database";
 
    BDB::min_parallel 16;
    BDB::max_poll_reqs $TICK * 0.1;
@@ -4232,14 +4312,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;