Fix infinite loop potential and fire event when attempts exceeded

Author: stevebauman

src/Commands/HandleMessageReceived.php

@@ -12,7 +12,9 @@ class HandleMessageReceived
      * Constructor.
      */
     public function __construct(
-        protected WatchMailbox $command
+        protected WatchMailbox $command,
+        protected int &$attempts,
+        protected ?int &$lastReceivedAt = null,
     ) {}
 
     /**
@@ -24,6 +26,10 @@ public function __invoke(MessageInterface $message): void
             "Message received: [{$message->uid()}]"
         );
 
+        $this->attempts = 0;
+
+        $this->lastReceivedAt = time();
+
         Event::dispatch(new MessageReceived($message));
     }
 }

src/Commands/WatchMailbox.php

@@ -3,12 +3,14 @@
 namespace DirectoryTree\ImapEngine\Laravel\Commands;
 
 use DirectoryTree\ImapEngine\FolderInterface;
+use DirectoryTree\ImapEngine\Laravel\Events\MailboxWatchAttemptsExceeded;
 use DirectoryTree\ImapEngine\Laravel\Facades\Imap;
 use DirectoryTree\ImapEngine\Laravel\Support\LoopInterface;
 use DirectoryTree\ImapEngine\MailboxInterface;
 use DirectoryTree\ImapEngine\Message;
 use Exception;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 
 class WatchMailbox extends Command
@@ -40,14 +42,14 @@ public function handle(LoopInterface $loop): void
 
         $attempts = 0;
 
-        $loop->run(function () use ($mailbox, $with, &$attempts) {
+        $lastReceivedAt = null;
+
+        $loop->run(function () use ($mailbox, $name, $with, &$attempts, &$lastReceivedAt) {
             try {
                 $folder = $this->folder($mailbox);
 
-                $attempts = 0;
-
                 $folder->idle(
-                    new HandleMessageReceived($this),
+                    new HandleMessageReceived($this, $attempts, $lastReceivedAt),
                     new ConfigureIdleQuery($with),
                     $this->option('timeout')
                 );
@@ -65,6 +67,8 @@ public function handle(LoopInterface $loop): void
                 if ($attempts >= $this->option('attempts')) {
                     $this->info("Exception: {$e->getMessage()}");
 
+                    Event::dispatch(new MailboxWatchAttemptsExceeded($name, $e, $lastReceivedAt));
+
                     throw $e;
                 }
 

src/Events/MailboxWatchAttemptsExceeded.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace DirectoryTree\ImapEngine\Laravel\Events;
+
+use Carbon\Carbon;
+use Exception;
+
+class MailboxWatchAttemptsExceeded
+{
+    /**
+     * Constructor.
+     */
+    public function __construct(
+        public string $mailbox,
+        public Exception $exception,
+        public ?Carbon $lastReceivedAt = null,
+    ) {}
+}