--- deliantra/server/ext/login.ext 2007/04/10 09:35:23 1.38 +++ deliantra/server/ext/login.ext 2008/09/16 16:03:02 1.90 @@ -1,12 +1,11 @@ -#! perl # MANDATORY +#! perl # mandatory # login handling use Fcntl; use Coro::AIO; -use List::Util qw(min max); -my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; +our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600; # paranoia function to overwrite a string-in-place sub nuke_str { @@ -43,8 +42,8 @@ $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 " - . "else is using your account at this time. If you lost your conenction " + . "If you have already a registered, make sure nobody " + . "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, " @@ -55,152 +54,115 @@ 1 } -sub check_clean_save { +sub safe_spot($) { my ($pl) = @_; + + my $ob = $pl->ob; - if (my $time = delete $pl->{unclean_save}) { - $pl->ns->send_drawinfo ( - "You didn't use a savebed to leave this realm. This is very dangerous, " - . "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.", - cf::NDI_RED - ); - #d#TODO - } -} + 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; -# delete a player directory, be non-blocking AND synchronous... -# (thats hard, so we crap out and fork). -sub nuke_playerdir { - my ($user) = @_; - - aio_stat "$PLAYERDIR/$user"; - system "cd \Q$PLAYERDIR\E " - . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " - . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; + scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y) } -sub send_capabilities { - 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 ... - # - # 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") { - $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}"; +sub enter_map { + my ($pl) = @_; - } elsif ($k eq "extendedMapInfos") { - $ns->ext_mapinfos ($v); + warn $pl->ob->name, ": enter map 1\n";#d# + my $ob = $pl->ob; - } elsif ($k eq "extendedTextInfos") { - $ns->has_readable_type ($v); + my ($map, $x, $y) + = $ob->{_link_pos} + ? @{delete $ob->{_link_pos}} + : ($pl->maplevel, $ob->x, $ob->y); + + warn $pl->ob->name, ": enter map 2\n";#d# + $ob->enter_link; + warn $pl->ob->name, ": enter map 3\n";#d# + + my $m = cf::map::find $map; + my $time = delete $pl->{unclean_save}; + warn $pl->ob->name, ": enter map 4\n";#d# + + if ($time && $m) { + if ($time < $m->{instantiate_time}) { + # the map was reset in the meantime + my $age = $cf::RUNTIME - $time; + + warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# + + 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", + 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; - } elsif ($k eq "smoothing") { # cfplus-style smoothing - $ns->smoothing ($v); + $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... " + . "H", + cf::NDI_RED + ); + } + } else { + $ob->message ( + "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, " + . "or monsters suddenly snapping your body. Better use a savebed next time. " + . "H", + cf::NDI_RED + ); + } + } - } elsif ($k eq "fxix") { - $ns->fxix ($v); + warn $pl->ob->name, ": enter map 5\n";#d# + #$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# - } else { - # other commands: - # sexp: no idea, probably for oudated servers - # tick: more stupidity, server should sned a tick per tick +} - $setup{$k} = "FALSE"; - } - } +# delete a player directory, be non-blocking AND synchronous... +# (thats hard, so we crap out and fork). +sub nuke_playerdir { + my ($user) = @_; - $ns->send_packet (join " ", setup => %setup); + my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; - cf::datalog setup => - request => $args, - reply => \%setup, - client => $ns->version, - ; + cf::fork_call { + rename "$PLAYERDIR/$user", $temp; + system "rm", "-rf", $temp; + }; } -sub addme { +cf::client->attach (on_addme => sub { my ($ns) = @_; - if (!$ns->facecache) - { - $ns->send_drawinfo (<facecache) + { + $ns->send_drawinfo (<Configure=>Map & Image=>Cache Images. -*** jcrossclient: your client is broken, use CFPlus or gcfclient. +*** gcfclient: Client => Configure => Map & Image => Cache Images. +*** jcrossclient: your client is broken, use deliantra or gcfclient. *** *** EOF @@ -246,6 +208,8 @@ $ns->pl and return $ns->destroy; $ns->async (sub { + $Coro::current->{desc} = "addme init"; + my ($user, $pass); $ns->send_packet ("addme_success"); @@ -260,7 +224,7 @@ # 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 ( @@ -278,10 +242,13 @@ 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. " @@ -298,6 +265,7 @@ . "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 @@ -313,6 +281,8 @@ 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; @@ -324,7 +294,8 @@ # password matches, wonderful my $pl = cf::player::find $user or next; $pl->connect ($ns); - check_clean_save $pl; + $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp + enter_map $pl; last; } elsif (can_cleanup $pl, $mtime) { Coro::Timer::sleep 1; @@ -375,6 +346,7 @@ } # 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; @@ -388,6 +360,7 @@ "The passwords do not match, please try again.", cf::NDI_RED ); + Coro::Timer::sleep 0.5; next; } @@ -397,9 +370,10 @@ $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); nuke_str $pass; $pl->connect ($ns); - my $ob = $pl->ob; + $ob->goto ($pl->maplevel, $ob->x, $ob->y); + while () { $ob->update_stats; $pl->save_stats; @@ -418,22 +392,55 @@ } else { $ob->roll_stats; } + + Coro::Timer::sleep 0.05; } $ob->set_animation (2); $ob->add_statbonus; - $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); - $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, - "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); + while () { + $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1); + my $msg = $ob->msg; + $msg =~ s/(?<=\S)\n(?=\S)/ /g; + $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"; + + if ($res =~ /^[fF]/) { + $pl->gender (1); + last; + } elsif ($res =~ /^[mM]/) { + $pl->gender (0); + last; + } + Coro::Timer::sleep 0.2; + } - $ns->state (cf::ST_CHANGE_CLASS); - delete $pl->{deny_save};#d# too early + $ob->reply (undef, "Welcome to Deliantra!"); + + delete $pl->{deny_save}; last; } }); -} +}); cf::register_command quit => sub { my ($ob, $arg) = @_; @@ -477,7 +484,7 @@ $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."); @@ -509,25 +516,22 @@ $_->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 $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs +our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds our $SCHEDULER = cf::async_ext { - my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); + $Coro::current->{desc} = "player scheduler"; + while () { - $schedule_interval->next; + Coro::EV::timer_once $SCHEDULE_INTERVAL; # this weird form of iteration over values is used because # the hash changes underneath us frequently, and for @@ -541,38 +545,36 @@ eval { if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { - $cf::WAIT_FOR_TICK_ONE->wait; $pl->save; - unless ($pl->active) { + unless ($pl->active || $pl->ns) { # check refcounts, this is tricky and needs to be adjusted to fit server internals my $ob = $pl->ob; - Scalar::Util::weaken $pl; - Scalar::Util::weaken $ob; - my $a_ = $pl->refcnt;#d# - my $b_ = $ob->refcnt;#d# + my $pl_ref = $pl->refcnt_cnt; my $ob_ref = $ob->refcnt_cnt; - ## pl_ref == one from object + one from cf::PLAYER - ## ob_ref == one from simply being an object - if ($pl_ref == 2 && $ob_ref == 1) { + ## 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; - $ob->destroy; - $pl->destroy; + $pl->destroy; # destroys $ob } else { - warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# + my $a_ = $pl->refcnt;#d# + my $b_ = $ob->refcnt;#d# + + warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d# } } } }; warn $@ if $@; - Coro::cede; + cf::cede_to_tick; }; } };