Merge pull request #37 from Superbition/fix/email-sending

Fix email SMTP & STARTTLS transmission fatal error

Author: embluk

src/Email/EmailManager.class.php

@@ -2,6 +2,7 @@
 
 namespace Polyel\Email;
 
+use Polyel;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
@@ -91,6 +92,6 @@ public function send(string $to, string $from, array $ccs, array $bccs, Email $e
 
         $mailer->Body = $email->message;
 
-        $mailer->send();
+        Polyel::task($mailer);
     }
-}
+}

src/Http/Server.class.php

@@ -80,9 +80,12 @@ public function boot()
             SWOOLE_PROCESS
         );
 
+        Polyel::setServer($this->server);
+
         echo "Setting up the HTTP server configuration\n";
         $this->server->set([
             'worker_num' => swoole_cpu_num(),
+            'task_worker_num' => 1,
             'package_max_length' => config("server.maxUploadSize"),
             'document_root' => config("server.publicRoot"),
             'enable_static_handler' => true,
@@ -132,6 +135,19 @@ public function registerReactors()
             $response->send($HttpResponse);
         });
 
+        /*
+         * Currently the Swoole task worker system is only used
+         * to offload email transmission because SMTP connections that
+         * use STARTTLS do not work under coroutines and the TCP hook.
+         *
+         * So this is the workaround for now until further releases.
+         */
+        $this->server->on('Task', function($server, $taskId, $reactorId, $email)
+        {
+            // Task system is only used to send emails...
+            $email->send();
+        });
+
         $this->server->on("WorkerStop", function($server, $workerId)
         {
             $this->databaseManager->closeWorkerPool();
@@ -163,4 +179,4 @@ private function setDefaultResponseHeaders($response)
         $response->header("X-Powered-By", "Polyel-PHP");
         $response->header("Content-Type", "text/html; charset=utf-8");
     }
-}
+}

src/Polyel.class.php

@@ -6,13 +6,26 @@ class Polyel
 {
     private const version = '0.8.1';
 
+    // Used to access the HTTP server object
+    private static $server;
+
     private static Polyel\Container\Container $container;
 
     public static function version()
     {
         return self::version;
     }
 
+    public static function setServer($server)
+    {
+        self::$server = $server;
+    }
+
+    public static function task(&$data)
+    {
+        self::$server->task($data);
+    }
+
     public static function createContainer($baseClass)
     {
         self::$container = new Container($baseClass);