feat: support multiple emails in one connection

buggregator · Jan 19, 2025 · c022a54 · c022a54
1 parent 40849c5
commit c022a54
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 9 deletions.
diff --git a/src/Traffic/Dispatcher/Smtp.php b/src/Traffic/Dispatcher/Smtp.php
@@ -31,7 +31,6 @@ public function dispatch(StreamClient $stream): iterable
     {
         $stream->sendData($this->createResponse(self::READY, 'mailamie'));
         $protocol = [];
-
         $message = null;
         while (!$stream->isFinished()) {
             $response = $stream->fetchLine();
@@ -47,20 +46,14 @@ public function dispatch(StreamClient $stream): iterable
                 $stream->sendData($this->createResponse(self::OK));
             } elseif (\str_starts_with($response, 'QUIT')) {
                 $stream->sendData($this->createResponse(self::CLOSING));
-                $stream->disconnect();
+                yield new Frame\Smtp($message, $stream->getCreatedAt());
+                $protocol = [];
             } elseif (\str_starts_with($response, 'DATA')) {
                 $stream->sendData($this->createResponse(self::START_MAIL_INPUT));
-
                 $message = $this->parser->parseStream($protocol, $stream);
                 $stream->sendData($this->createResponse(self::OK));
             }
         }
-
-        if ($message === null) {
-            return;
-        }
-
-        yield new Frame\Smtp($message, $stream->getCreatedAt());
     }
 
     public function detect(string $data, \DateTimeImmutable $createdAt): ?bool

diff --git a/tests/Unit/Traffic/Dispatcher/SmtpTest.php b/tests/Unit/Traffic/Dispatcher/SmtpTest.php
@@ -31,6 +31,33 @@ public function testDispatchOneMail(): void
         });
     }
 
+    public function testDispatchMultipleMails(): void
+    {
+        $stream = StreamClientMock::createFromGenerator((static function (\Generator ...$generators) {
+            foreach ($generators as $generator) {
+                yield from $generator;
+            }
+        })(
+            $this->mailMe('Test email 1'),
+            $this->mailMe('Test email 2'),
+            $this->mailMe('Test email 3'),
+        ));
+
+        $this->runInFiber(static function () use ($stream) {
+            $i = 1;
+            foreach ((new Smtp())->dispatch($stream) as $frame) {
+                self::assertInstanceOf(SmtpFrame::class, $frame);
+                self::assertSame("Test email $i", $frame->message->getSubject());
+
+                if (++$i === 3) {
+                    return;
+                }
+            }
+
+            self::fail('No frame was yielded.');
+        });
+    }
+
     private function mailMe(string $subject = 'Test email'): \Generator
     {
         yield "EHLO\r\n";