--- deliantra/server/lib/cf.pm	2006/07/11 14:24:15	1.18
+++ deliantra/server/lib/cf.pm	2006/08/24 17:29:30	1.38
@@ -3,17 +3,29 @@
 use Symbol;
 use List::Util;
 use Storable;
+use Opcode;
+use Safe;
+use Safe::Hole;
+
+use Time::HiRes;
 use Event;
+$Event::Eval = 1; # no idea why this is required, but it is
 
 use strict;
 
 our %COMMAND;
 our @EVENT;
+our @PLUGIN_EVENT;
 our %PROP_TYPE;
 our %PROP_IDX;
+our $LIBDIR = maps_directory "perl";
+
+our $TICK = MAX_TIME * 1e-6;
+our $TICK_WATCHER;
+our $NEXT_TICK;
 
 BEGIN {
-   @EVENT = map lc, @EVENT;
+   @PLUGIN_EVENT = map lc, @PLUGIN_EVENT;
 
    *CORE::GLOBAL::warn = sub {
       my $msg = join "", @_;
@@ -61,8 +73,15 @@
 
 # guessed hierarchies
 
-@cf::object::player::ISA = 'cf::object';
-@cf::object::map::ISA    = 'cf::object';
+@ext::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object';
+@ext::cf::object::map::ISA    = @cf::object::map::ISA    = 'cf::object';
+
+# we bless all objects into derived classes to force a method lookup
+# within the Safe compartment.
+for my $pkg (qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region cf::arch)) {
+   no strict 'refs';
+   @{"ext::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
+}
 
 $Event::DIED = sub {
    warn "error in event callback: @_";
@@ -125,9 +144,9 @@
 sub register {
    my ($base, $pkg) = @_;
 
-   for my $idx (0 .. $#EVENT) {
-      if (my $ref = $pkg->can ("on_$EVENT[$idx]")) {
-         #warn "registering $EVENT[$idx] hook to '$pkg'\n";
+   for my $idx (0 .. $#PLUGIN_EVENT) {
+      if (my $ref = $pkg->can ("on_$PLUGIN_EVENT[$idx]")) {
+         #warn "registering $PLUGIN_EVENT[$idx] hook to '$pkg'\n";
          $hook[$idx]{$base} = $ref;
       }
    }
@@ -160,7 +179,7 @@
    $ext_pkg{$base} = $pkg;
 
 #   no strict 'refs';
-#   @{"$pkg\::ISA"} = cf::ext::;
+#   @{"$pkg\::ISA"} = ext::;
 
    register $base, $pkg;
 }
@@ -171,7 +190,7 @@
    warn "removing extension $pkg\n";
 
    # remove hooks
-   for my $idx (0 .. $#EVENT) {
+   for my $idx (0 .. $#PLUGIN_EVENT) {
       delete $hook[$idx]{$pkg};
    }
 
@@ -193,6 +212,13 @@
       delete $extcmd{$name};
    }
 
+   if (my $cb = $pkg->can ("on_unload")) {
+      eval {
+         $cb->($pkg);
+         1
+      } or warn "$pkg unloaded, but with errors: $@";
+   }
+
    Symbol::delete_package $pkg;
 }
 
@@ -208,43 +234,113 @@
    }
 }
 
+sub _perl_reload(&) {
+   my ($msg) = @_;
+
+   $msg->("reloading...");
+
+   eval {
+      # 1. cancel all watchers
+      $_->cancel for Event::all_watchers;
+
+      # 2. unload all extensions
+      for (@exts) {
+         $msg->("unloading <$_>");
+         unload_extension $_;
+      }
+
+      # 3. unload all modules loaded from $LIBDIR
+      while (my ($k, $v) = each %INC) {
+         next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
+
+         $msg->("removing <$k>");
+         delete $INC{$k};
+
+         $k =~ s/\.pm$//;
+         $k =~ s/\//::/g;
+
+         if (my $cb = $k->can ("unload_module")) {
+            $cb->();
+         }
+
+         Symbol::delete_package $k;
+      }
+
+      # 4. get rid of ext::, as good as possible
+      Symbol::delete_package "ext::$_"
+         for qw(cf::object cf::object::map cf::object::player cf::player cf::map cf::party cf::region);
+
+      # 5. remove register_script_function callbacks
+      # TODO
+      
+      # 6. unload cf.pm "a bit"
+      delete $INC{"cf.pm"};
+
+      # don't, removes xs symbols, too
+      #Symbol::delete_package __PACKAGE__;
+
+      # 7. reload cf.pm
+      $msg->("reloading cf.pm");
+      require cf;
+   };
+   $msg->($@) if $@;
+
+   $msg->("reloaded");
+};
+
+sub perl_reload() {
+   _perl_reload {
+      warn $_[0];
+      print "$_[0]\n";
+   };
+}
+
 register_command "perl-reload", 0, sub {
    my ($who, $arg) = @_;
 
    if ($who->flag (FLAG_WIZ)) {
-      $who->message ("reloading...");
+      _perl_reload {
+         warn $_[0];
+         $who->message ($_[0]);
+      };
+   }
+};
 
-      warn "reloading...\n";
-      eval {
-         unload_extension $_ for @exts;
-         delete $INC{"cf.pm"};
+#############################################################################
+# utility functions
 
-         # don't, removes xs symbols, too
-         #Symbol::delete_package $pkg;
+use JSON::Syck (); # TODO# replace by JSON::PC once working
 
-         require cf;
-      };
-      warn $@ if $@;
-      $who->message ($@) if $@;
-      warn "reloaded\n";
+sub from_json($) {
+   $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
+   JSON::Syck::Load $_[0]
+}
 
-      $who->message ("reloaded");
-   } else {
-      $who->message ("Intruder Alert!");
-   }
-};
+sub to_json($) {
+   $JSON::Syck::ImplicitUnicode = 0;  # work around JSON::Syck bugs
+   JSON::Syck::Dump $_[0]
+}
 
 #############################################################################
-# extcmd framework, basically convert ext <id> <pkg> arg1 args
+# extcmd framework, basically convert ext <msg>
 # into pkg::->on_extcmd_arg1 (...) while shortcutting a few
 
 sub on_extcmd {
    my ($pl, $buf) = @_;
 
-   my ($type) = $buf =~ s/^(\S+) // ? $1 : "";
+   my $msg = eval { from_json $buf };
 
-   $extcmd{$type}[0]->($pl, $buf)
-      if $extcmd{$type};
+   if (ref $msg) {
+      if (my $cb = $extcmd{$msg->{msgtype}}) {
+         if (my %reply = $cb->[0]->($pl, $msg)) {
+            $pl->ext_reply ($msg->{msgid}, %reply);
+         }
+      }
+   } else {
+      warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
+   }
+
+   1
 }
 
 #############################################################################
@@ -307,23 +403,14 @@
 #############################################################################
 # load/save perl data associated with player->ob objects
 
+sub all_objects(@) {
+   @_, map all_objects ($_->inv), @_
+}
+
 *on_player_load = sub {
    my ($ob, $path) = @_;
 
-   if (open my $fh, "<:raw", "$path.cfperl") {
-
-      #d##TODO#remove
-
-      my $data = Storable::thaw do { local $/; <$fh> };
-
-      $data->{version} <= 1
-         or return; # too new
-
-      %$ob = %{$data->{ob}};
-      return;
-   }
-
-   for my $o ($ob, $ob->inv) {
+   for my $o (all_objects $ob) {
       if (my $value = $o->get_ob_key_value ("_perl_data")) {
          $o->set_ob_key_value ("_perl_data");
 
@@ -336,16 +423,147 @@
    my ($ob, $path) = @_;
 
    $_->set_ob_key_value (_perl_data => unpack "H*", Storable::nfreeze $_)
-      for grep %$_, $ob, $ob->inv;
-
-   unlink "$path.cfperl";#d##TODO#remove
+      for grep %$_, all_objects $ob;
 };
 
+#############################################################################
+# core extensions - in perl
+
+=item cf::player::exists $login
+
+Returns true when the given account exists.
+
+=cut
+
+sub cf::player::exists($) {
+   cf::player::find $_[0]
+      or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2;
+}
+
+=item $player->reply ($npc, $msg[, $flags])
+
+Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
+can be C<undef>. Does the right thing when the player is currently in a
+dialogue with the given NPC character.
+
+=cut
+
+# rough implementation of a future "reply" method that works
+# with dialog boxes.
+sub cf::object::player::reply($$$;$) {
+   my ($self, $npc, $msg, $flags) = @_;
+
+   $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
+
+   if ($self->{record_replies}) {
+      push @{ $self->{record_replies} }, [$npc, $msg, $flags];
+   } else {
+      $msg = $npc->name . " says: $msg" if $npc;
+      $self->message ($msg, $flags);
+   }
+}
+
+=item $player->ext_reply ($msgid, $msgtype, %msg)
+
+Sends an ext reply to the player.
+
+=cut
+
+sub cf::player::ext_reply($$$%) {
+   my ($self, $id, %msg) = @_;
+
+   $msg{msgid} = $id;
+
+   $self->send ("ext " . to_json \%msg);
+}
+
+#############################################################################
+# map scripting support
+
+our $safe = new Safe "ext";
+our $safe_hole = new Safe::Hole;
+
+$SIG{FPE} = 'IGNORE';
+
+$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time));
+
+# here we export the classes and methods available to script code
+
+for (
+   ["cf::object"         => qw(contr pay_amount pay_player)],
+   ["cf::object::player" => qw(player)],
+   ["cf::player"         => qw(peaceful)],
+) {
+   no strict 'refs';
+   my ($pkg, @funs) = @$_;
+   *{"ext::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
+      for @funs;
+}
+
+sub safe_eval($;@) {
+   my ($code, %vars) = @_;
+
+   my $qcode = $code;
+   $qcode =~ s/"/‟/g; # not allowed in #line filenames
+   $qcode =~ s/\n/\\n/g;
+
+   local $_;
+   local @ext::cf::_safe_eval_args = values %vars;
+
+   $code =
+      "do {\n"
+      . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
+      . "#line 0 \"{$qcode}\"\n"
+      . $code
+      . "\n}"
+   ;
+
+   sub_generation_inc;
+   my @res = wantarray ? $safe->reval ($code) : scalar $safe->reval ($code);
+   sub_generation_inc;
+
+   wantarray ? @res : $res[0]
+}
+
+sub register_script_function {
+   my ($fun, $cb) = @_;
+
+   no strict 'refs';
+   *{"ext::$fun"} = $safe_hole->wrap ($cb);
+}
+
+#############################################################################
+# the server's main()
+
+sub run {
+   Event::loop;
+}
+
+#############################################################################
+# initialisation
+
 register "<global>", __PACKAGE__;
 
-unshift @INC, maps_directory "perl";
+unshift @INC, $LIBDIR;
 
 load_extensions;
 
+$TICK_WATCHER = Event->timer (
+   prio => 1,
+   at   => $NEXT_TICK || 1,
+   cb   => sub {
+      cf::server_tick; # one server iteration
+
+      my $NOW = Event::time;
+      $NEXT_TICK += $TICK;
+
+      # if we are delayed by four ticks, skip them all
+      $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
+
+      $TICK_WATCHER->at ($NEXT_TICK);
+      $TICK_WATCHER->start;
+   },
+);
+
 1