3 files changed, 68 insertions, 27 deletions

diff --git a/lib/App/ImapNotify.pm b/lib/App/ImapNotify.pm
index e7aba6f..b7b1cf7 100644
--- a/lib/App/ImapNotify.pm
+++ b/lib/App/ImapNotify.pm
@@ -11,6 +11,7 @@ use App::ImapNotify::Notifier;
 use Carp;
 use Function::Parameters;
 use Log::Any qw($log);
+use Syntax::Keyword::Try;
 
 =encoding utf-8
 
@@ -55,10 +56,47 @@ method new_no_defaults($class: $config, $deps = {}) {
 	return $self;
 }
 
+=head3 loop_reconnect
+
+ $app->loop_reconnect();
+
+Same as loop(), but automatcally calls loop() again if the connection is lost.
+
+=cut
+
+method loop_reconnect() {
+	my $holdoff_time = 10;
+	my $holdoff_repeat = 0;
+	my $holdoff_limit = 300;
+
+	while (1) {
+		my $last_time = time;
+		try {
+			$self->loop();
+		} catch {
+			die $@ unless $@ =~ m/^Lost connection while .*/;
+		}
+		$holdoff_repeat = 0 if (time - $last_time) > $holdoff_limit;
+		sleep($holdoff_time * $holdoff_repeat++);
+	}
+}
+
+=head3 loop
+
+ $app->loop();
+
+Open a connection and wait for NOTIFY notifications. When a NOTIFY notification
+arrives, show a notification to the user.
+
+This method throws an exception when the connection to the server is lost. If
+you want to continue waiting for new notifications, you may call this method
+again. Also look at loop_reconnect().
+
+=cut
+
 method loop() {
-	#my $imap = $self->{deps}->{imap_client}->connect($self->{config}->@{qw(host port log_id)});
-	#$imap->login($self->{config}->@{qw(username password)});
 	my $imap = $self->{deps}->{imap_client};
+	$imap->reconnect();
 	$imap->select($self->{config}->{mailboxes}->@[0]);
 
 	$imap->send_command("notify set (selected (MessageExpunge MessageNew (uid body.peek[header.fields (from to subject)]))) (mailboxes (".join(' ', $self->{config}->{mailboxes}->@*).") (MessageNew MessageExpunge MailboxName))");
@@ -75,8 +113,6 @@ method loop() {
 			my $mailbox = $+{mailbox};
 			my $uid = $+{uidnext} - 1;
 			$log->debugf("Got status change: '%s'", $line =~ s/\r\n$//r);
-			#$imap2->select($mailbox);
-			#my $message = $imap2->send_command("uid fetch $uid (body.peek[header.fields (from to subject)])");
 			$imap->select($mailbox);
 			my $message = $imap->send_command("uid fetch $uid (body.peek[header.fields (from to subject)])");
 			pop @{$message};
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) {
diff --git a/lib/App/ImapNotify/Socket/SSL.pm b/lib/App/ImapNotify/Socket/SSL.pm
index 18d7ffa..2654cdc 100644
--- a/lib/App/ImapNotify/Socket/SSL.pm
+++ b/lib/App/ImapNotify/Socket/SSL.pm
@@ -8,24 +8,26 @@ use Function::Parameters;
 use IO::Socket::SSL;
 use Log::Any qw($log);
 
-method new($class: $host, $port, $deps = {}) {
-	$deps->{sock} //= IO::Socket::SSL->new("$host:$port");
-	return $class->new_no_defaults($deps);
-}
-
-method new_no_defaults($class: $deps = {}) {
+method new($class: $host, $port) {
 	my $self = {};
+	$self->{config} = {
+		host => $host,
+		port => $port,
+	};
 	bless $self, $class;
-	$self->{deps} = $deps;
 	return $self;
 }
 
+method reconnect() {
+	$self->{sock} = IO::Socket::SSL->new("$self->{config}->{host}:$self->{config}->{port}");
+}
+
 method readline() {
-	return CORE::readline $self->{deps}->{sock};
+	return CORE::readline $self->{sock};
 }
 
 method writeline($line) {
-	print {$self->{deps}->{sock}} $line;
+	print {$self->{sock}} $line;
 }