removes internal provider

src/Appwrite/Event/Messaging.php

@@ -9,7 +9,11 @@ use Utopia\Queue\Client;
 class Messaging extends Event
 {
     protected ?string $messageId = null;
-    private ?string $deliveryTime = null;
+    protected ?Document $message = null;
+    protected ?array $recipients = null;
+    protected ?string $deliveryTime = null;
+    protected ?string $providerType = null;
+    
 
     public function __construct(protected Connection $connection)
     {
@@ -20,6 +24,52 @@ class Messaging extends Event
             ->setClass(Event::MESSAGING_CLASS_NAME);
     }
 
+    /**
+     * Sets recipient for the messaging event.
+     *
+     * @param string[] $recipients
+     * @return self
+     */
+    public function setRecipients(array $recipients): self
+    {
+        $this->recipients = $recipients;
+
+        return $this;
+    }
+
+    /**
+     * Returns set recipient for messaging event.
+     *
+     * @return string[]
+     */
+    public function getRecipient(): array
+    {
+        return $this->recipients;
+    }
+
+    /**
+     * Sets message document for the messaging event.
+     *
+     * @param Document $message
+     * @return self
+     */
+    public function setMessage(Document $message): self
+    {
+        $this->message = $message;
+
+        return $this;
+    }
+
+    /**
+     * Returns message document for the messaging event.
+     *
+     * @return string
+     */
+    public function getMessage(): Document
+    {
+        return $this->message;
+    }
+
     /**
      * Sets message ID for the messaging event.
      *
@@ -43,6 +93,29 @@ class Messaging extends Event
         return $this->messageId;
     }
 
+    /**
+     * Sets provider type for the messaging event.
+     *
+     * @param string $providerType
+     * @return self
+     */
+    public function setProviderType(string $providerType): self
+    {
+        $this->providerType = $providerType;
+
+        return $this;
+    }
+
+    /**
+     * Returns set provider type for the messaging event.
+     *
+     * @return string
+     */
+    public function getProviderType(): string
+    {
+        return $this->providerType;
+    }
+
     /**
      * Sets Delivery time for the messaging event.
      *
@@ -92,6 +165,9 @@ class Messaging extends Event
             'project' => $this->project,
             'user' => $this->user,
             'messageId' => $this->messageId,
+            'message' => $this->message,
+            'recipients' => $this->recipients,
+            'providerType' => $this->providerType,
         ]);
     }
-}
+}

src/Appwrite/Platform/Workers/Messaging.php

@@ -3,7 +3,10 @@
 namespace Appwrite\Platform\Workers;
 
 use Appwrite\Extend\Exception;
+use Utopia\App;
 use Utopia\CLI\Console;
+use Utopia\Database\Helpers\ID;
+use Utopia\DSN\DSN;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
 use Utopia\Database\Database;
@@ -63,11 +66,19 @@ class Messaging extends Action
             return;
         }
 
-        $message = $dbForProject->getDocument('messages', $payload['messageId']);
+        if (!\is_null($payload['message']) && !\is_null($payload['recipients'])) {
+            if ($payload['providerType'] === 'SMS') {
+                $this->processInternalSMSMessage(new Document($payload['message']), $payload['recipients']);
+            }
+        } else {
+            $message = $dbForProject->getDocument('messages', $payload['messageId']);
 
-        $this->processMessage($dbForProject, $message);
+            $this->processMessage($dbForProject, $message);
+        }
     }
 
+    
+
     private function processMessage(Database $dbForProject, Document $message): void
     {
         $topicsId = $message->getAttribute('topics', []);
@@ -99,7 +110,7 @@ class Messaging extends Action
         }
 
         $internalProvider = $dbForProject->findOne('providers', [
-            Query::equal('internal', [true]),
+            Query::equal('enabled', [true]),
             Query::equal('type', [$recipients[0]->getAttribute('providerType')]),
         ]);
 
@@ -215,6 +226,74 @@ class Messaging extends Action
         $dbForProject->updateDocument('messages', $message->getId(), $message);
     }
 
+    private function processInternalSMSMessage(Document $message, array $recipients): void
+    {
+        if(empty(App::getEnv('_APP_SMS_PROVIDER')) || empty(App::getEnv('_APP_SMS_FROM'))) {
+            Console::info('Skipped SMS processing. No Phone configuration has been set.');
+            return;
+        }
+
+        $smsDSN = new DSN(App::getEnv('_APP_SMS_PROVIDER'));
+        $host = $smsDSN->getHost();
+        $password = $smsDSN->getPassword();
+        $user = $smsDSN->getUser();
+
+        $from = App::getEnv('_APP_SMS_FROM');
+
+        $provider = new Document([
+            '$id' => ID::unique(),
+            'provider' => $host,
+            'type' => 'sms',
+            'name' => 'Internal SMS',
+            'enabled' => true,
+            'credentials' => match ($host) {
+                'twilio' => [
+                    'accountSid' => $user,
+                    'authToken' => $password
+                ],
+                'textmagic' => [
+                    'username' => $user,
+                    'apiKey' => $password
+                ],
+                'telesign' => [
+                    'username' => $user,
+                    'password' => $password
+                ],
+                'msg91' => [
+                    'senderId' => $user,
+                    'authKey' => $password
+                ],
+                'vonage' => [
+                    'apiKey' => $user,
+                    'apiSecret' => $password
+                ],
+                default => null
+            },
+            'options' => [
+                'from' => $from
+            ]
+        ]);
+        $adapter = $this->sms($provider);
+
+        $maxBatchSize = $adapter->getMaxMessagesPerRequest();
+        $batches = \array_chunk($recipients, $maxBatchSize);
+        $batchIndex = 0;
+
+        batch(\array_map(function ($batch) use ($message, $provider, $adapter, $batchIndex) {
+            return function () use ($batch, $message, $provider, $adapter, $batchIndex) {
+                $message->setAttribute('to', $batch);
+
+                $data = $this->buildSMSMessage($message, $provider);
+
+                try {
+                    $adapter->send($data);
+                } catch (\Exception $e) {
+                    Console::error('Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage());
+                }
+            };
+        }, $batches));
+    }
+
     public function shutdown(): void
     {
     }
@@ -225,7 +304,7 @@ class Messaging extends Action
         return match ($provider->getAttribute('provider')) {
             'mock' => new Mock('username', 'password'),
             'twilio' => new Twilio($credentials['accountSid'], $credentials['authToken']),
-            'text-magic' => new TextMagic($credentials['username'], $credentials['apiKey']),
+            'textmagic' => new TextMagic($credentials['username'], $credentials['apiKey']),
             'telesign' => new Telesign($credentials['username'], $credentials['password']),
             'msg91' => new Msg91($credentials['senderId'], $credentials['authKey']),
             'vonage' => new Vonage($credentials['apiKey'], $credentials['apiSecret']),

src/Appwrite/Utopia/Database/Validator/Queries/Providers.php

@@ -8,7 +8,6 @@ class Providers extends Base
         'name',
         'provider',
         'type',
-        'internal',
         'enabled',
     ];
 

src/Appwrite/Utopia/Response/Model/Provider.php

@@ -40,12 +40,6 @@ class Provider extends Model
                 'default' => '',
                 'example' => 'mailgun',
             ])
-            ->addRule('internal', [
-                'type' => self::TYPE_BOOLEAN,
-                'description' => 'Is this a pre-configured provider instance?',
-                'default' => false,
-                'example' => true,
-            ])
             ->addRule('enabled', [
                 'type' => self::TYPE_BOOLEAN,
                 'description' => 'Is provider enabled?',