diff options
Diffstat (limited to 'lib/App/ImapNotify/ImapClient.pm')
-rw-r--r-- | lib/App/ImapNotify/ImapClient.pm | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/lib/App/ImapNotify/ImapClient.pm b/lib/App/ImapNotify/ImapClient.pm index 6e5e21b..ae91c78 100644 --- a/lib/App/ImapNotify/ImapClient.pm +++ b/lib/App/ImapNotify/ImapClient.pm @@ -53,27 +53,33 @@ method new_no_defaults($class: $config, $deps = {}) { $self->{keepalive_timeout} = $config->{keepalive_timeout}; $self->{line_buffer} = []; $self->{deps} = $deps; - $self->_connect(); - $self->_login($config->@{qw(username password)}); + $self->{config} = $config; return $self; } -method _connect() { - # wait for server greeting +method reconnect() { + $self->{command_counter} = 0; + $self->{deps}->{sock}->reconnect(); my $response = $self->readline_block(); + croak("Lost connection while waiting for server greeting") if not defined $response; + if ($response !~ m/^\* OK (.*)/) { - confess "Invalid server greeting. Got reply: $response"; + confess "Invalid server greeting. Got reply: '$response'"; } $self->{capabilities} = $1; + + $self->_login(); } -method _login($username, $password) { +method _login() { if ($self->{capabilities} !~ m/\bAUTH=PLAIN\b/) { croak "Server doesn't support AUTH=PLAIN"; } - my $response = $self->send_command("login $username $password"); + my $response = $self->send_command("login $self->{config}->{username} $self->{config}->{password}"); + return if not defined $response; + confess "No capabilities found in response: '".$response->[0]."'" unless $response->[0] =~ m/^OK \[(.*)\].*$/; $self->{capabilities} = $1; @@ -92,15 +98,10 @@ method select($mailbox) { method send_command($command) { - state $counter = 0; - - my $id = "CMD-".$counter++; + my $id = "CMD-".$self->{command_counter}++; chomp($command); - #print "Sending $command\n"; - #sleep (5) if $command eq "noop"; - $self->writeline("$id $command\r\n"); my @lines; @@ -125,8 +126,10 @@ method send_command($command) { if ($line =~ /^(.*\r\n)$/) { push @lines, $1; } - } + + croak("Lost connection while waiting for reply to command '$command'"); + return; } method get_uids($mailbox) { |