[ViewVC] Diff of: cvs/deliantra/server/ext/login.ext

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.57 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC

 # login handling
 use Fcntl;
 use Coro::AIO;
-use List::Util qw(min max);
-our %EXT_SETUP;
+our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
 # paranoia function to overwrite a string-in-place
 sub nuke_str {
    substr $_[0], 0, (length $_[0]), "x" x length $_[0]
 }
 sub query {
    my ($ns, $flags, $text) = @_;
-   my $current = $Coro::current;
+   $ns->query ($flags, $text, Coro::rouse_cb);
-   $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
+   Coro::rouse_wait
-   Coro::schedule while ref $current;
-   $current
 }
 sub can_cleanup {
    my ($pl, $mtime) = @_;
    return unless cf::player::find_active $user;
    $ns->send_drawinfo (
       "That player is already logged in on this server. "
     . "If you want to create a new player, choose another name. "
-    . "If you are already a registered player, make sure nobody "
+    . "If you have already a registered, make sure nobody "
-    . "else is using your account at this time. If you lost your conenction "
+    . "else is using your account at this time. If you lost your connection "
     . "then the server will likely timeout within a minute. If you still "
     . "cannot log-in after a minute, you are still logged in. Make sure "
     . "you do not have another client running. If you use windows, reboot, "
     . "this will fix anything.",
       cf::NDI_RED
    );
    1
 }
+sub safe_spot($) {
+   my ($pl) = @_;
+   my $ob = $pl->ob;
+   my $m = $ob->map
+      or return;
+   my $x = $ob->x;
+   my $y = $ob->y;
+#   return 0;#d#
+#   warn join ":", $m->at ($x, $y);#d#
+#   warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
+#   return 0;
+   scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
+}
 sub enter_map {
    my ($pl) = @_;
+   warn $pl->ob->name, ": enter map 1\n";#d#
+   my $ob = $pl->ob;
    my ($map, $x, $y)
-      = $pl->ob->{_link_pos}
+      = $ob->{_link_pos}
-        ? @{delete $pl->ob->{_link_pos}}
+        ? @{delete $ob->{_link_pos}}
-        : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
+        : ($pl->maplevel, $ob->x, $ob->y);
+   warn $pl->ob->name, ": enter map 2\n";#d#
-   $pl->ob->enter_link;
+   $ob->enter_link;
+   warn $pl->ob->name, ": enter map 3\n";#d#
+   my $m = cf::map::find $map;
-   if (my $time = delete $pl->{unclean_save}) {
+   my $time = delete $pl->{unclean_save};
-      if (my $m = cf::map::find $map) {
+   warn $pl->ob->name, ": enter map 4\n";#d#
+   if ($time && $m) {
-         if ($time < $m->{instantiate_time}) {
+      if ($time < $m->{instantiate_time}) {
-            # the map was reset in the meantime
+         # the map was reset in the meantime
-            my $age = $cf::RUNTIME - $time;
+         my $age = $cf::RUNTIME - $time;
-            warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
+         warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
-            # for now, just go back to savebed
+         if ($age >= $MAX_DISCONNECT_TIME) {
+            $ob->message (
+               "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
+             . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
+             . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
+             . "H<You disconnected too long without having used a savebed.>",
+               cf::NDI_RED
+            );
+            # kill them.
+            # reminds me of the famous badness 10000 syndrome...
+            $ob->stats->hp (-10000); #] if they survive this they deserved to live
+            my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
+         } else {
             ($map, $x, $y) = $pl->savebed;
-            $pl->ns->send_drawinfo (
+            $ob->message (
                "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
              . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
-             . "Better use a savebed next time, much worse things could have happened...",
+             . "Better use a savebed next time, much worse things could have happened... "
+             . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
                cf::NDI_RED
             );
+         }
-         } else {
+      } else {
-            $pl->ns->send_drawinfo (
+         $ob->message (
-               "You didn't use a bed to reality to leave this realm. This is very dangerous, "
+            "You didn't use a bed to reality to leave this realm. This is very dangerous, "
-             . "as lots of things could happen when you leave by other means, such as cave-ins, "
+          . "as lots of things could happen when you leave by other means, such as cave-ins, "
-             . "or monsters suddenly snapping your body. Better use a savebed next time.",
+          . "or monsters suddenly snapping your body. Better use a savebed next time. "
+          . "H<Always apply a bed of reality to disconnect from the server.>",
-               cf::NDI_RED
+            cf::NDI_RED
-            );
+         );
-         }
       }
    }
+   warn $pl->ob->name, ": enter map 5\n";#d#
-   $pl->ob->goto ($map, $x, $y);
+   #$ob->goto ($map, $x, $y);
+   $ob->goto ($map, $x, $y, sub {
+      warn $pl->ob->name, ": enter map check\n";#d#
+      $_[0]
+   }, sub {
+      warn $pl->ob->name, ": enter map done\n";#d#
+   });
+   warn $pl->ob->name, ": enter map 6\n";#d#
 }
 # delete a player directory, be non-blocking AND synchronous...
-# (thats hard, so we crap out and fork).
+# (that's hard, so we crap out and fork).
 sub nuke_playerdir {
    my ($user) = @_;
-   aio_stat "$PLAYERDIR/$user";
+   my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
-   system "cd \Q$PLAYERDIR\E "
-        . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
-        . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
-}
-sub send_capabilities {
+   cf::fork_call {
+      rename "$PLAYERDIR/$user", $temp;
+      system "rm", "-rf", $temp;
+   };
+}
+cf::client->attach (on_addme => sub {
    my ($ns) = @_;
-   return unless $ns->extcmd;
-   $ns->ext_event (capabilities =>
-      # id, name, flags (1 == 2d), edge length
-      tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
-   );
-}
-sub setup {
-   my ($ns, $args) = @_;
-   # run through the cmds of setup
-   # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
-   #
-   # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
-   # The client then must sort this out
-   my %setup = split / +/, $args;
-   while (my ($k, $v) = each %setup) {
-      if ($k eq "sound") {
-         $ns->sound ($v);
-      } elsif ($k eq "exp64") {
-         $setup{$k} = 1;
-      } elsif ($k eq "spellmon") {
-         $ns->monitor_spells ($v);
-      } elsif ($k eq "darkness") {
-         $ns->darkness ($v);
-      } elsif ($k eq "map1cmd") {
-         $ns->mapmode (cf::Map1Cmd) if $v > 0;
-      } elsif ($k eq "map1acmd") {
-         $ns->mapmode (cf::Map1aCmd) if $v > 0;
-      } elsif ($k eq "map2cmd") {
-         # gcfclient bug, map1acmd is sent too late
-         $ns->mapmode (cf::Map1aCmd);
-         $setup{$k} = "FALSE";
-      } elsif ($k eq "newmapcmd") {
-         $ns->newmapcmd ($v);
-      } elsif ($k eq "mapinfocmd") {
-         $ns->mapinfocmd ($v);
-      } elsif ($k eq "extcmd") {
-         $ns->extcmd ($v > 0);
-         send_capabilities $ns;
-      } elsif ($k eq "extmap") {
-         $ns->extmap ($v);
-      } elsif ($k eq "facecache") {
-         if (!$v) {
-            $v = 1;
-            $setup{$k} = $v;
-            $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
-         }
-         $ns->facecache ($v);
-      } elsif ($k eq "faceset") {
-         $ns->faceset (0);
-         $setup{$k} = 0;
-         # $ns->image2 (1)
-      } elsif ($k eq "tileset") {
-         $setup{$k} = $ns->faceset ($v & 1);
-      } elsif ($k eq "itemcmd") {
-         # Version of the item protocol command to use.  Currently,
-         # only supported versions are 1 and 2.  Using a numeric
-         # value will make it very easy to extend this in the future.
-         $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
-         $setup{$k} = $ns->itemcmd;
-      } elsif ($k eq "mapsize") {
-         my ($x, $y) = split /x/, $v;
-         $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
-         $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
-         $setup{$k} = "${x}x${y}";
-      } elsif ($k eq "extendedMapInfos") {
-         $ns->ext_mapinfos ($v);
-      } elsif ($k eq "extendedTextInfos") {
-         $ns->has_readable_type ($v);
-      } elsif ($k eq "smoothing") { # cfplus-style smoothing
-         $ns->smoothing ($v);
-      } elsif ($k eq "fxix") {
-         $ns->fxix ($v);
-      } elsif ($k eq "msg") {
-         $ns->can_msg ($v >= 2);
-         $setup{$k} = $ns->can_msg;
-      } elsif ($k eq "xwidget") {
-         # eXperimental server-side widgets
-         $ns->{can_widget} = 1;
-      } elsif ($k eq "excmd") {
-         # we support it
-      } else {
-         # other commands:
-         # sexp: no idea, probably for oudated servers
-         # tick: more stupidity, server should send a tick per tick
-         $setup{$k} = "FALSE";
-      }
-    }
-  $ns->send_packet (join " ", setup => %setup);
-  cf::datalog setup =>
-     request => $args,
-     reply   => \%setup,
-     client  => $ns->version,
-  ;
-}
-sub addme {
-   my ($ns) = @_;
-  if (!$ns->facecache)
+   if (!$ns->facecache)
-    {
+     {
-      $ns->send_drawinfo (<<EOF, cf::NDI_RED);
+       $ns->send_drawinfo (<<EOF, cf::NDI_RED);
 ***
 *** WARNING:
 *** Your client does not support face/image caching,
 *** or it has been disabled. Face caching is mandatory
 *** so please enable it or use a newer client.
 ***
 *** Look at your client preferences:
 ***
-*** CFPlus: all known versions automatically enable the facecache.
+*** deliantra: all known versions automatically enable the facecache.
 *** cfclient: use the -cache commandline option.
 *** cfclient: map will not redraw automatically (bug).
 *** gcfclient: use -cache commandline option, or enable
-*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
+*** gcfclient: Client => Configure => Map & Image => Cache Images.
-*** jcrossclient: your client is broken, use CFPlus or gcfclient.
+*** jcrossclient: your client is broken, use deliantra or gcfclient.
 ***
 ***
 EOF
       if ($ns->version =~ /jcrossclient/) {
          # let them, for now
    }
    $ns->pl and return $ns->destroy;
    $ns->async (sub {
+      $Coro::current->{desc} = "addme init";
       my ($user, $pass);
       $ns->send_packet ("addme_success");
       for (;;) {
             cf::NDI_BLUE
          );
          # read username
          while () {
-            $user = query $ns, 0, "What is your name?\n:";
+            $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
             if ($cf::LOGIN_LOCK{$user}) {
                $ns->send_drawinfo (
                   "That username is currently used in another login session. "
                 . "Chose another, or wait till the other session has ended.",
                   cf::NDI_RED
                );
-            } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
+            } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
                last;
             } else {
                $ns->send_drawinfo (
                   "Your username contains illegal characters "
                 . "(only a-z, A-Z and 0-9 are allowed), "
-                . "or is not between 3 and 18 characters in length.",
+                . "or is not between 3 and 20 characters in length.",
                   cf::NDI_RED
                );
             }
+            Coro::Timer::sleep 0.4;
          }
          check_playing $ns, $user and next;
+         $Coro::current->{desc} = "addme($user) pass";
          $ns->send_drawinfo (
             "Welcome $user, please enter your password now. "
           . "New users should now choose a password. "
           . "Anything your client lets you enter is fine.",
             $ns->send_drawinfo (
                "Try to use at least three characters as your password please, "
              . "that cannot be too much to ask for :)",
                cf::NDI_RED
             );
+            Coro::Timer::sleep 0.4;
          }
          # lock this username for the remainder of this login session
          if ($cf::LOGIN_LOCK{$user}) {
             $ns->send_drawinfo (
          }
          local $cf::LOGIN_LOCK{$user} = 1;
          check_playing $ns, $user and next;
+         $Coro::current->{desc} = "addme($user) check";
          # try to read the user file and check the password
          if (my $pl = cf::player::find $user) {
             aio_stat $pl->path and next;
             my $mtime = (stat _)[9];
             my $hash = $pl->password;
             if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
                nuke_str $pass;
                # password matches, wonderful
                my $pl = cf::player::find $user or next;
                $pl->connect ($ns);
+               $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
                enter_map $pl;
                last;
             } elsif (can_cleanup $pl, $mtime) {
                Coro::Timer::sleep 1;
                next;
             }
          }
          # the rest of this function is character creation
+         $Coro::current->{desc} = "addme($user) chargen";
          # just to make sure nothing is left over
          nuke_playerdir $user;
          my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
             nuke_str $pass2;
             $ns->send_drawinfo (
                "The passwords do not match, please try again.",
                cf::NDI_RED
             );
+            Coro::Timer::sleep 0.5;
             next;
          }
          nuke_str $pass2;
                   $ob->swap_stats ($res - 1, $swap - 1);
                }
             } else {
                $ob->roll_stats;
             }
+            Coro::Timer::sleep 0.05;
          }
          $ob->set_animation (2);
          $ob->add_statbonus;
          while () {
-            $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
+            $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
             my $msg = $ob->msg;
             $msg =~ s/(?<=\S)\n(?=\S)/ /g;
-            $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
+            $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
             my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
                          "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
             last if $res =~ /[dD]/;
             $pl->chargen_race_next;
+            Coro::Timer::sleep 0.2;
          }
+         # create the playerdir, if necessary, as chargen_race_done did it before
+         # presumably because of unique maps
+         aio_mkdir playerdir $pl, 0770;
          $pl->chargen_race_done;
          while () {
             my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
                          "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
                last;
             } elsif ($res =~ /^[mM]/) {
                $pl->gender (0);
                last;
             }
+            Coro::Timer::sleep 0.2;
          }
-         $ob->reply (undef, "Welcome to Crossfire!");
+         $ob->reply (undef, "Welcome to Deliantra!");
+         # XXX: Workaround for delayed client ext protocol handshake
+         $pl->esrv_new_player;
          delete $pl->{deny_save};
          last;
       }
    });
-}
+});
 cf::register_command quit => sub {
    my ($ob, $arg) = @_;
-   $ob->reply (undef,
+   $ob->send_msg (undef,
-               "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
+                  "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
-               . "If you are sure you want to do this, then use the quit_character command instead of quit.",
+                  . "If you are sure you want to do this, then use the quit_character command instead of quit.",
-               cf::NDI_UNIQUE | cf::NDI_RED);
+                  cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
 };
 cf::register_command quit_character => sub {
    my ($ob, $arg) = @_;
    my $pl = $ob->contr;
    $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
       if ($_[0] !~ /^[yY]/) {
-         $ob->reply (undef,
+         $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-                     "Ok, not not quitting then.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
       } else {
-         $ob->reply (undef,
+         $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
-                     "Ok, quitting, hope to see you again.",
-                     cf::NDI_UNIQUE | cf::NDI_RED);
          $pl->ns->flush;
          cf::async { $pl->quit_character };
       }
    });
 };
       # update respawn position
       $pl->savebed ($bed->map->path, $bed->x, $bed->y);
       cf::async { $pl->save };
-      $pl->killer ("left");
+      my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
       $ob->check_score;
-      $ob->reply (undef, "In the future, you will wake up here when you die.");
+      $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
       $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
          if ($_[0] !~ /^[yY]/) {
             $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
             $pl->deactivate;
       if ($cleanly) {
          $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
       } else {
          $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
-         $pl->{unclean_save} = $cf::RUNTIME;
+         $pl->{unclean_save} = $cf::RUNTIME
+            unless safe_spot $pl;
       }
    },
 );
-cf::client->attach (
-   on_addme => \&addme,
-   on_setup => \&setup,
-);
-#############################################################################
-our $SCHEDULE_INTERVAL  =  10; # time the player scheduler sleeps between runs
-our $SAVE_TIMEOUT       =  20; # save players every n seconds
-our $SCHEDULER = cf::async_ext {
-   my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
-   while () {
-      $schedule_interval->next;
-      # this weird form of iteration over values is used because
-      # the hash changes underneath us frequently, and for
-      # keeps a direct reference to the value without (in 5.8 perls)
-      # keeping a reference, so this is prone to crashes or worse.
-      my @players = keys %cf::PLAYER;
-      for (@players) {
-         my $pl = $cf::PLAYER{$_}
-            or next;
-         $pl->valid or next;
-         eval {
-            if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
-               cf::wait_for_tick_begin;
-               $pl->save;
-               unless ($pl->active || $pl->ns) {
-                  # check refcounts, this is tricky and needs to be adjusted to fit server internals
-                  my $ob = $pl->ob;
-                  my $pl_ref = $pl->refcnt_cnt;
-                  my $ob_ref = $ob->refcnt_cnt;
-                  ## pl_ref == $pl + ob->contr   + %cf::PLAYER
-                  ## ob_ref == $ob + pl->observe + simply being an object
-                  if ($pl_ref == 3 && $ob_ref == 3) {
-                     warn "player-scheduler destroy ", $ob->name;#d#
-                     # remove from sight and get fresh "copies"
-                     $pl = delete $cf::PLAYER{$ob->name};
-                     $ob = $pl->ob;
-                     $pl->destroy; # destroys $ob
-                  } else {
-                     my $a_ = $pl->refcnt;#d#
-                     my $b_ = $ob->refcnt;#d#
-                     warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
-                  }
-               }
-            }
-         };
-         warn $@ if $@;
-         Coro::cede;
-      };
-   }
-};
-$SCHEDULER->prio (1);

Diff Legend

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

Comparing deliantra/server/ext/login.ext (file contents): Revision 1.57 by root, Mon Jun 25 05:43:45 2007 UTC vs. Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC

Diff Legend

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.57 by root, Mon Jun 25 05:43:45 2007 UTC vs.
Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC