Auto trigger messaging events

src/Appwrite/Event/Messaging.php

@@ -8,13 +8,13 @@ use Utopia\Queue\Client;
 
 class Messaging extends Event
 {
+    protected string $type = '';
     protected ?string $messageId = null;
     protected ?Document $message = null;
     protected ?array $recipients = null;
     protected ?string $scheduledAt = null;
     protected ?string $providerType = null;
 
-
     public function __construct(protected Connection $connection)
     {
         parent::__construct($connection);
@@ -24,6 +24,29 @@ class Messaging extends Event
             ->setClass(Event::MESSAGING_CLASS_NAME);
     }
 
+    /**
+     * Sets type for the build event.
+     *
+     * @param string $type Can be `MESSAGE_TYPE_INTERNAL` or `MESSAGE_TYPE_EXTERNAL`.
+     * @return self
+     */
+    public function setType(string $type): self
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Returns set type for the function event.
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
     /**
      * Sets recipient for the messaging event.
      *

src/Appwrite/Platform/Tasks/ScheduleMessages.php

@@ -50,6 +50,7 @@ class ScheduleMessages extends ScheduleBase
                 $queueForMessaging = new Messaging($connection);
 
                 $queueForMessaging
+                    ->setType(MESSAGE_SEND_TYPE_EXTERNAL)
                     ->setMessageId($schedule['resourceId'])
                     ->setProject($schedule['project'])
                     ->trigger();

src/Appwrite/Platform/Workers/Messaging.php

@@ -44,7 +44,7 @@ class Messaging extends Action
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function __construct()
     {
@@ -63,7 +63,7 @@ class Messaging extends Action
      * @param Database $dbForProject
      * @param Usage $queueForUsage
      * @return void
-     * @throws Exception
+     * @throws \Exception
      */
     public function action(Message $message, Log $log, Database $dbForProject, Usage $queueForUsage): void
     {
@@ -73,28 +73,27 @@ class Messaging extends Action
             throw new Exception('Missing payload');
         }
 
+        $type = $payload['type'] ?? '';
+        $project = new Document($payload['project'] ?? []);
 
-        if (
-            !\is_null($payload['message'])
-            && !\is_null($payload['recipients'])
-            && $payload['providerType'] === MESSAGE_TYPE_SMS
-        ) {
-            // Message was triggered internally
-            $this->processInternalSMSMessage(
-                new Document($payload['message']),
-                new Document($payload['project'] ?? []),
-                $payload['recipients'],
-                $queueForUsage,
-                $log,
-            );
-        } else {
-            $message = $dbForProject->getDocument('messages', $payload['messageId']);
+        switch ($type) {
+            case MESSAGE_SEND_TYPE_INTERNAL:
+                $message = new Document($payload['message'] ?? []);
+                $recipients = $payload['recipients'] ?? [];
 
-            $this->processMessage($dbForProject, $message);
+                $this->sendInternalSMSMessage($message, $project, $recipients, $queueForUsage, $log);
+                break;
+            case MESSAGE_SEND_TYPE_EXTERNAL:
+                $message = $dbForProject->getDocument('messages', $payload['messageId']);
+
+                $this->sendExternalMessage($dbForProject, $message);
+                break;
+            default:
+                throw new Exception('Unknown message type: ' . $type);
         }
     }
 
-    private function processMessage(Database $dbForProject, Document $message): void
+    private function sendExternalMessage(Database $dbForProject, Document $message): void
     {
         $topicIds = $message->getAttribute('topics', []);
         $targetIds = $message->getAttribute('targets', []);
@@ -216,9 +215,9 @@ class Messaging extends Action
                 $identifiers = $identifiers[$providerId];
 
                 $adapter = match ($provider->getAttribute('type')) {
-                    MESSAGE_TYPE_SMS => $this->sms($provider),
-                    MESSAGE_TYPE_PUSH => $this->push($provider),
-                    MESSAGE_TYPE_EMAIL => $this->email($provider),
+                    MESSAGE_TYPE_SMS => $this->getSmsAdapter($provider),
+                    MESSAGE_TYPE_PUSH => $this->getPushAdapter($provider),
+                    MESSAGE_TYPE_EMAIL => $this->getEmailAdapter($provider),
                     default => throw new Exception(Exception::PROVIDER_INCORRECT_TYPE)
                 };
 
@@ -234,7 +233,7 @@ class Messaging extends Action
                         $messageData->setAttribute('to', $batch);
 
                         $data = match ($provider->getAttribute('type')) {
-                            MESSAGE_TYPE_SMS => $this->buildSMSMessage($messageData, $provider),
+                            MESSAGE_TYPE_SMS => $this->buildSmsMessage($messageData, $provider),
                             MESSAGE_TYPE_PUSH => $this->buildPushMessage($messageData),
                             MESSAGE_TYPE_EMAIL => $this->buildEmailMessage($dbForProject, $messageData, $provider),
                             default => throw new Exception(Exception::PROVIDER_INCORRECT_TYPE)
@@ -312,7 +311,7 @@ class Messaging extends Action
         $dbForProject->updateDocument('messages', $message->getId(), $message);
     }
 
-    private function processInternalSMSMessage(Document $message, Document $project, array $recipients, Usage $queueForUsage, Log $log): void
+    private function sendInternalSMSMessage(Document $message, Document $project, array $recipients, Usage $queueForUsage, Log $log): void
     {
         if (empty(App::getEnv('_APP_SMS_PROVIDER')) || empty(App::getEnv('_APP_SMS_FROM'))) {
             throw new \Exception('Skipped SMS processing. Missing "_APP_SMS_PROVIDER" or "_APP_SMS_FROM" environment variables.');
@@ -375,7 +374,7 @@ class Messaging extends Action
             ]
         ]);
 
-        $adapter = $this->sms($provider);
+        $adapter = $this->getSmsAdapter($provider);
 
         $maxBatchSize = $adapter->getMaxMessagesPerRequest();
         $batches = \array_chunk($recipients, $maxBatchSize);
@@ -385,7 +384,7 @@ class Messaging extends Action
             return function () use ($batch, $message, $provider, $adapter, $batchIndex, $project, $queueForUsage) {
                 $message->setAttribute('to', $batch);
 
-                $data = $this->buildSMSMessage($message, $provider);
+                $data = $this->buildSmsMessage($message, $provider);
 
                 try {
                     $adapter->send($data);
@@ -401,11 +400,7 @@ class Messaging extends Action
         }, $batches));
     }
 
-    public function shutdown(): void
-    {
-    }
-
-    private function sms(Document $provider): ?SMSAdapter
+    private function getSmsAdapter(Document $provider): ?SMSAdapter
     {
         $credentials = $provider->getAttribute('credentials');
 
@@ -420,7 +415,7 @@ class Messaging extends Action
         };
     }
 
-    private function push(Document $provider): ?PushAdapter
+    private function getPushAdapter(Document $provider): ?PushAdapter
     {
         $credentials = $provider->getAttribute('credentials');
 
@@ -437,7 +432,7 @@ class Messaging extends Action
         };
     }
 
-    private function email(Document $provider): ?EmailAdapter
+    private function getEmailAdapter(Document $provider): ?EmailAdapter
     {
         $credentials = $provider->getAttribute('credentials', []);
         $options = $provider->getAttribute('options', []);
@@ -503,7 +498,7 @@ class Messaging extends Action
         return new Email($to, $subject, $content, $fromName, $fromEmail, $replyToName, $replyToEmail, $cc, $bcc, null, $html);
     }
 
-    private function buildSMSMessage(Document $message, Document $provider): SMS
+    private function buildSmsMessage(Document $message, Document $provider): SMS
     {
         $to = $message['to'];
         $content = $message['data']['content'];