Merge branch '1.9.x' of https://github.com/appwrite/appwrite into fix/parallel-storage-chunk-upload

src/Appwrite/Advisor/Validator/CTAs.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Appwrite\Advisor\Validator;
+
+use Utopia\Validator;
+
+class CTAs extends Validator
+{
+    public const MAX_COUNT_DEFAULT = 16;
+
+    protected string $message = 'Value must be an array of CTA descriptors. Each entry must define `label`, `service`, `method`, and an optional `params` object.';
+    protected array $allowedServices;
+    protected array $allowedMethods;
+
+    public function __construct(
+        protected int $maxCount = self::MAX_COUNT_DEFAULT,
+        ?array $allowedServices = null,
+        ?array $allowedMethods = null,
+    ) {
+        $this->allowedServices = $allowedServices ?? ADVISOR_CTA_SERVICES;
+        $this->allowedMethods = $allowedMethods ?? ADVISOR_CTA_METHODS;
+    }
+
+    public function getDescription(): string
+    {
+        return $this->message;
+    }
+
+    public function isArray(): bool
+    {
+        return true;
+    }
+
+    public function getType(): string
+    {
+        return self::TYPE_ARRAY;
+    }
+
+    public function isValid($value): bool
+    {
+        if (!\is_array($value)) {
+            return false;
+        }
+
+        if (\count($value) > $this->maxCount) {
+            $this->message = "A maximum of {$this->maxCount} CTAs are allowed per insight.";
+            return false;
+        }
+
+        foreach ($value as $entry) {
+            if (!\is_array($entry)) {
+                return false;
+            }
+
+            $maxLengths = ['label' => 256, 'service' => 64, 'method' => 64];
+            foreach ($maxLengths as $required => $maxLength) {
+                if (!isset($entry[$required]) || !\is_string($entry[$required]) || $entry[$required] === '') {
+                    return false;
+                }
+                if (\strlen($entry[$required]) > $maxLength) {
+                    $this->message = "CTA `{$required}` must not exceed {$maxLength} characters.";
+                    return false;
+                }
+            }
+
+            if (!empty($this->allowedServices) && !\in_array($entry['service'], $this->allowedServices, true)) {
+                $this->message = "CTA `service` must be one of: " . \implode(', ', $this->allowedServices) . '.';
+                return false;
+            }
+
+            if (!empty($this->allowedMethods) && !\in_array($entry['method'], $this->allowedMethods, true)) {
+                $this->message = "CTA `method` must be one of: " . \implode(', ', $this->allowedMethods) . '.';
+                return false;
+            }
+
+            if (isset($entry['params']) && !\is_array($entry['params']) && !\is_object($entry['params'])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

src/Appwrite/Auth/OAuth2/Google.php

@@ -55,7 +55,7 @@ class Google extends OAuth2
             'state' => \json_encode($this->state),
             'response_type' => 'code',
             'access_type' => 'offline',
-            'prompt' => 'consent'
+            'prompt' => $this->getPrompt()
         ]);
     }
 
@@ -72,7 +72,7 @@ class Google extends OAuth2
                 'https://oauth2.googleapis.com/token?' . \http_build_query([
                     'code' => $code,
                     'client_id' => $this->appID,
-                    'client_secret' => $this->appSecret,
+                    'client_secret' => $this->getClientSecret(),
                     'redirect_uri' => $this->callback,
                     'scope' => null,
                     'grant_type' => 'authorization_code'
@@ -95,7 +95,7 @@ class Google extends OAuth2
             'https://oauth2.googleapis.com/token?' . \http_build_query([
                 'refresh_token' => $refreshToken,
                 'client_id' => $this->appID,
-                'client_secret' => $this->appSecret,
+                'client_secret' => $this->getClientSecret(),
                 'grant_type' => 'refresh_token'
             ])
         ), true);
@@ -177,4 +177,54 @@ class Google extends OAuth2
 
         return $this->user;
     }
+
+    /**
+     * Extracts the Client Secret from the JSON stored in appSecret
+     *
+     * @return string
+     */
+    protected function getClientSecret(): string
+    {
+        $secret = $this->getAppSecret();
+
+        return $secret['clientSecret'] ?? $this->appSecret;
+    }
+
+    /**
+     * Extracts the prompt values from the JSON stored in appSecret
+     *
+     * @return string
+     */
+    protected function getPrompt(): string
+    {
+        $secret = $this->getAppSecret();
+        $prompt = $secret['prompt'] ?? [];
+
+        if (empty($prompt)) {
+            $prompt = ['consent'];
+        }
+
+        return \implode(' ', $prompt);
+    }
+
+    /**
+     * Decode the JSON stored in appSecret.
+     * Falls back to treating the raw string as the client secret for backwards compatibility.
+     *
+     * @return array
+     */
+    protected function getAppSecret(): array
+    {
+        try {
+            $secret = \json_decode($this->appSecret, true, 512, JSON_THROW_ON_ERROR);
+        } catch (\Throwable $th) {
+            return ['clientSecret' => $this->appSecret];
+        }
+
+        if (!\is_array($secret)) {
+            return ['clientSecret' => $this->appSecret];
+        }
+
+        return $secret;
+    }
 }

src/Appwrite/Bus/Listeners/Log.php

@@ -8,7 +8,6 @@ use Appwrite\Event\Publisher\Execution as ExecutionPublisher;
 use Utopia\Bus\Listener;
 use Utopia\Database\Document;
 use Utopia\Span\Span;
-use Utopia\System\System;
 
 class Log extends Listener
 {
@@ -34,20 +33,13 @@ class Log extends Listener
     {
         $project = new Document($event->project);
         $execution = new Document($event->execution);
+
         if ($execution->getAttribute('resourceType', '') === 'functions') {
-            $traceProjectId = System::getEnv('_APP_TRACE_PROJECT_ID', '');
-            $traceFunctionId = System::getEnv('_APP_TRACE_FUNCTION_ID', '');
-            $resourceId = $execution->getAttribute('resourceId', '');
-            if ($traceProjectId !== '' && $traceFunctionId !== '' && $project->getId() === $traceProjectId && $resourceId === $traceFunctionId) {
-                Span::init('execution.trace.v1_executions_enqueue');
-                Span::add('datetime', gmdate('c'));
-                Span::add('projectId', $project->getId());
-                Span::add('functionId', $resourceId);
-                Span::add('executionId', $execution->getId());
-                Span::add('deploymentId', $execution->getAttribute('deploymentId', ''));
-                Span::add('status', $execution->getAttribute('status', ''));
-                Span::current()?->finish();
-            }
+            Span::add('project.id', $project->getId());
+            Span::add('function.id', $execution->getAttribute('resourceId', ''));
+            Span::add('execution.id', $execution->getId());
+            Span::add('deployment.id', $execution->getAttribute('deploymentId', ''));
+            Span::add('execution.status', $execution->getAttribute('status', ''));
         }
 
         $publisherForExecutions->enqueue(new ExecutionMessage(

src/Appwrite/Bus/Listeners/Mails.php

@@ -4,14 +4,14 @@ namespace Appwrite\Bus\Listeners;
 
 use Appwrite\Auth\MFA\Type;
 use Appwrite\Bus\Events\SessionCreated;
-use Appwrite\Event\Mail;
+use Appwrite\Event\Message\Mail as MailMessage;
+use Appwrite\Event\Publisher\Mail as MailPublisher;
 use Appwrite\Template\Template;
 use Utopia\Bus\Listener;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Locale\Locale;
-use Utopia\Queue\Publisher;
 use Utopia\Storage\Validator\FileName;
 use Utopia\System\System;
 
@@ -31,14 +31,14 @@ class Mails extends Listener
     {
         $this
             ->desc('Sends session alert emails')
-            ->inject('publisher')
+            ->inject('publisherForMails')
             ->inject('locale')
             ->inject('platform')
             ->inject('dbForProject')
             ->callback($this->handle(...));
     }
 
-    public function handle(SessionCreated $event, Publisher $publisher, Locale $locale, array $platform, Database $dbForProject): void
+    public function handle(SessionCreated $event, MailPublisher $publisherForMails, Locale $locale, array $platform, Database $dbForProject): void
     {
         $project = new Document($event->project);
 
@@ -124,34 +124,32 @@ class Mails extends Listener
             ];
         }
 
-        $queueForMails = new Mail($publisher);
-
+        $smtpConfig = [];
         if ($smtp['enabled'] ?? false) {
-            $queueForMails
-                ->setSmtpHost($smtp['host'] ?? '')
-                ->setSmtpPort($smtp['port'] ?? '')
-                ->setSmtpUsername($smtp['username'] ?? '')
-                ->setSmtpPassword($smtp['password'] ?? '')
-                ->setSmtpSecure($smtp['secure'] ?? '')
-                ->setSmtpReplyToEmail($customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '') // Includes backwards compatibility
-                ->setSmtpReplyToName($customTemplate['replyToName'] ?? $smtp['replyToName'] ?? '')
-                ->setSmtpSenderEmail($customTemplate['senderEmail'] ?? $smtp['senderEmail'] ?? System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM))
-                ->setSmtpSenderName($customTemplate['senderName'] ?? $smtp['senderName'] ?? System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
+            $smtpConfig = [
+                'host' => $smtp['host'] ?? '',
+                'port' => $smtp['port'] ?? '',
+                'username' => $smtp['username'] ?? '',
+                'password' => $smtp['password'] ?? '',
+                'secure' => $smtp['secure'] ?? '',
+                'replyToEmail' => $customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '', // Includes backwards compatibility
+                'replyToName' => $customTemplate['replyToName'] ?? $smtp['replyToName'] ?? '',
+                'senderEmail' => $customTemplate['senderEmail'] ?? $smtp['senderEmail'] ?? System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
+                'senderName' => $customTemplate['senderName'] ?? $smtp['senderName'] ?? System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'),
+            ];
         }
 
-        $queueForMails
-            ->setProject($project)
-            ->setSubject($subject)
-            ->setPreview($preview)
-            ->setBody($body)
-            ->setBodyTemplate(__DIR__ . '/../../../../app/config/locale/templates/' . $smtpBaseTemplate . '.tpl')
-            ->appendVariables($emailVariables)
-            ->setRecipient($event->user['email']);
-
-        if ($isBranded) {
-            $queueForMails->setSenderName($platform['emailSenderName']);
-        }
-
-        $queueForMails->trigger();
+        $publisherForMails->enqueue(new MailMessage(
+            project: $project,
+            recipient: $event->user['email'],
+            subject: $subject,
+            bodyTemplate: __DIR__ . '/../../../../app/config/locale/templates/' . $smtpBaseTemplate . '.tpl',
+            body: $body,
+            preview: $preview,
+            smtp: $smtpConfig,
+            variables: $emailVariables,
+            customMailOptions: $isBranded ? ['senderName' => $platform['emailSenderName']] : [],
+            platform: $platform,
+        ));
     }
 }

src/Appwrite/Event/Build.php

@@ -1,146 +0,0 @@
-<?php
-
-namespace Appwrite\Event;
-
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-use Utopia\Queue\Publisher;
-use Utopia\System\System;
-
-class Build extends Event
-{
-    protected string $type = '';
-    protected ?Document $resource = null;
-    protected ?Document $deployment = null;
-    protected ?Document $template = null;
-
-    public function __construct(protected Publisher $publisher)
-    {
-        parent::__construct($publisher);
-
-        $this
-            ->setQueue(System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME))
-            ->setClass(System::getEnv('_APP_BUILDS_CLASS_NAME', Event::BUILDS_CLASS_NAME));
-    }
-
-    /**
-     * Sets template for the build event.
-     *
-     * @param Document $template
-     * @return self
-     */
-    public function setTemplate(Document $template): self
-    {
-        $this->template = $template;
-
-        return $this;
-    }
-
-    /**
-     * Sets resource document for the build event.
-     *
-     * @param Document $resource
-     * @return self
-     */
-    public function setResource(Document $resource): self
-    {
-        $this->resource = $resource;
-
-        return $this;
-    }
-
-    /**
-     * Returns set resource document for the build event.
-     *
-     * @return null|Document
-     */
-    public function getResource(): ?Document
-    {
-        return $this->resource;
-    }
-
-    /**
-     * Sets deployment for the build event.
-     *
-     * @param Document $deployment
-     * @return self
-     */
-    public function setDeployment(Document $deployment): self
-    {
-        $this->deployment = $deployment;
-
-        return $this;
-    }
-
-    /**
-     * Returns set deployment for the build event.
-     *
-     * @return null|Document
-     */
-    public function getDeployment(): ?Document
-    {
-        return $this->deployment;
-    }
-
-    /**
-     * Sets type for the build event.
-     *
-     * @param string $type Can be `BUILD_TYPE_DEPLOYMENT` or `BUILD_TYPE_RETRY`.
-     * @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;
-    }
-
-    /**
-     * Prepare payload for queue.
-     *
-     * @return array
-     */
-    protected function preparePayload(): array
-    {
-        $platform = $this->platform;
-        if (empty($platform)) {
-            $platform = Config::getParam('platform', []);
-        }
-
-        return [
-            'project' => $this->project,
-            'resource' => $this->resource,
-            'deployment' => $this->deployment,
-            'type' => $this->type,
-            'template' => $this->template,
-            'platform' => $platform,
-        ];
-    }
-
-    /**
-     * Resets event.
-     *
-     * @return self
-     */
-    public function reset(): self
-    {
-        $this->type = '';
-        $this->resource = null;
-        $this->deployment = null;
-        $this->template = null;
-        $this->platform = [];
-        parent::reset();
-
-        return $this;
-    }
-}

src/Appwrite/Event/Mail.php

@@ -1,576 +0,0 @@
-<?php
-
-namespace Appwrite\Event;
-
-use Utopia\Config\Config;
-use Utopia\Queue\Publisher;
-use Utopia\System\System;
-
-class Mail extends Event
-{
-    protected string $recipient = '';
-    protected string $name = '';
-    protected string $subject = '';
-    protected string $body = '';
-    protected string $preview = '';
-    protected array $smtp = [];
-    protected array $variables = [];
-    protected string $bodyTemplate = '';
-    protected array $attachment = [];
-
-    protected array $customMailOptions = [];
-
-    public function __construct(protected Publisher $publisher)
-    {
-        parent::__construct($publisher);
-
-        $this
-            ->setQueue(System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME))
-            ->setClass(System::getEnv('_APP_MAILS_CLASS_NAME', Event::MAILS_CLASS_NAME));
-    }
-
-    /**
-     * Sets subject for the mail event.
-     *
-     * @param string $subject
-     * @return self
-     */
-    public function setSubject(string $subject): self
-    {
-        $this->subject = $subject;
-
-        return $this;
-    }
-
-    /**
-     * Returns subject for the mail event.
-     *
-     * @return string
-     */
-    public function getSubject(): string
-    {
-        return $this->subject;
-    }
-
-    /**
-     * Sets recipient for the mail event.
-     *
-     * @param string $recipient
-     * @return self
-     */
-    public function setRecipient(string $recipient): self
-    {
-        $this->recipient = $recipient;
-
-        return $this;
-    }
-
-    /**
-     * Returns set recipient for mail event.
-     *
-     * @return string
-     */
-    public function getRecipient(): string
-    {
-        return $this->recipient;
-    }
-
-    /**
-     * Sets body for the mail event.
-     *
-     * @param string $body
-     * @return self
-     */
-    public function setBody(string $body): self
-    {
-        $this->body = $body;
-
-        return $this;
-    }
-
-    /**
-     * Returns body for the mail event.
-     *
-     * @return string
-     */
-    public function getBody(): string
-    {
-        return $this->body;
-    }
-
-    /**
-     * Sets preview for the mail event.
-     *
-     * @return self
-     */
-    public function setPreview(string $preview): self
-    {
-        $this->preview = $preview;
-
-        return $this;
-    }
-
-    /**
-     * Returns preview for the mail event.
-     *
-     * @return string
-     */
-    public function getPreview(): string
-    {
-        return $this->preview;
-    }
-
-    /**
-     * Sets name for the mail event.
-     *
-     * @param string $name
-     * @return self
-     */
-    public function setName(string $name): self
-    {
-        $this->name = $name;
-
-        return $this;
-    }
-
-    /**
-     * Returns set name for the mail event.
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * Sets bodyTemplate for the mail event.
-     *
-     * @param string $bodyTemplate
-     * @return self
-     */
-    public function setBodyTemplate(string $bodyTemplate): self
-    {
-        $this->bodyTemplate = $bodyTemplate;
-
-        return $this;
-    }
-
-    /**
-     * Returns subject for the mail event.
-     *
-     * @return string
-     */
-    public function getBodyTemplate(): string
-    {
-        return $this->bodyTemplate;
-    }
-
-    /**
-     * Set SMTP Host
-     *
-     * @param string $host
-     * @return self
-     */
-    public function setSmtpHost(string $host): self
-    {
-        $this->smtp['host'] = $host;
-        return $this;
-    }
-
-    /**
-     * Set SMTP port
-     *
-     * @param int $port
-     * @return self
-     */
-    public function setSmtpPort(int $port): self
-    {
-        $this->smtp['port'] = $port;
-        return $this;
-    }
-
-    /**
-     * Set SMTP username
-     *
-     * @param string $username
-     * @return self
-     */
-    public function setSmtpUsername(string $username): self
-    {
-        $this->smtp['username'] = $username;
-        return $this;
-    }
-
-    /**
-     * Set SMTP password
-     *
-     * @param string $password
-     * @return self
-     */
-    public function setSmtpPassword(string $password): self
-    {
-        $this->smtp['password'] = $password;
-        return $this;
-    }
-
-    /**
-     * Set SMTP secure
-     *
-     * @param string $secure
-     * @return self
-     */
-    public function setSmtpSecure(string $secure): self
-    {
-        $this->smtp['secure'] = $secure;
-        return $this;
-    }
-
-    /**
-     * Set SMTP sender email
-     *
-     * @param string $senderEmail
-     * @return self
-     */
-    public function setSmtpSenderEmail(string $senderEmail): self
-    {
-        $this->smtp['senderEmail'] = $senderEmail;
-        return $this;
-    }
-
-    /**
-     * Set SMTP sender name
-     *
-     * @param string $senderName
-     * @return self
-     */
-    public function setSmtpSenderName(string $senderName): self
-    {
-        $this->smtp['senderName'] = $senderName;
-        return $this;
-    }
-
-    /**
-     * Set SMTP reply-to email
-     *
-     * @param string $email
-     * @return self
-     */
-    public function setSmtpReplyToEmail(string $email): self
-    {
-        $this->smtp['replyToEmail'] = $email;
-        return $this;
-    }
-
-    /**
-     * Set SMTP reply-to name
-     *
-     * @param string $name
-     * @return self
-     */
-    public function setSmtpReplyToName(string $name): self
-    {
-        $this->smtp['replyToName'] = $name;
-        return $this;
-    }
-
-    /**
-     * Get SMTP
-     *
-     * @return string
-     */
-    public function getSmtpHost(): string
-    {
-        return $this->smtp['host'] ?? '';
-    }
-
-    /**
-     * Get SMTP port
-     *
-     * @return integer
-     */
-    public function getSmtpPort(): int
-    {
-        return $this->smtp['port'] ?? 0;
-    }
-
-    /**
-     * Get SMTP username
-     *
-     * @return string
-     */
-    public function getSmtpUsername(): string
-    {
-        return $this->smtp['username'] ?? '';
-    }
-
-    /**
-     * Get SMTP password
-     *
-     * @return string
-     */
-    public function getSmtpPassword(): string
-    {
-        return $this->smtp['password'] ?? '';
-    }
-
-    /**
-     * Get SMTP secure
-     *
-     * @return string
-     */
-    public function getSmtpSecure(): string
-    {
-        return $this->smtp['secure'] ?? '';
-    }
-
-    /**
-     * Get SMTP sender email
-     *
-     * @return string
-     */
-    public function getSmtpSenderEmail(): string
-    {
-        return $this->smtp['senderEmail'] ?? '';
-    }
-
-    /**
-     * Get SMTP sender name
-     *
-     * @return string
-     */
-    public function getSmtpSenderName(): string
-    {
-        return $this->smtp['senderName'] ?? '';
-    }
-
-    /**
-     * Get SMTP reply-to email
-     *
-     * @return string
-     */
-    public function getSmtpReplyToEmail(): string
-    {
-        return $this->smtp['replyToEmail'] ?? '';
-    }
-
-    /**
-     * Get SMTP reply-to name
-     *
-     * @return string
-     */
-    public function getSmtpReplyToName(): string
-    {
-        return $this->smtp['replyToName'] ?? '';
-    }
-
-    /**
-     * Get Email Variables
-     *
-     * @return array
-     */
-    public function getVariables(): array
-    {
-        return $this->variables;
-    }
-
-    /**
-     * Set Email Variables
-     *
-     * @param array $variables
-     * @return self
-     */
-    public function setVariables(array $variables): self
-    {
-        $this->variables = $variables;
-        return $this;
-    }
-
-    /**
-     * Append variables to the email event.
-     *
-     * @param array $variables
-     * @return self
-     */
-    public function appendVariables(array $variables): self
-    {
-        $this->variables = \array_merge($this->variables, $variables);
-        return $this;
-    }
-
-    /**
-     * Set attachment
-     * @param string $content
-     * @param string $filename
-     * @param string $encoding
-     * @param string $type
-     * @return self
-     */
-    public function setAttachment(string $content, string $filename, string $encoding = 'base64', string $type = 'plain/text')
-    {
-        $this->attachment = [
-            'content' => base64_encode($content),
-            'filename' => $filename,
-            'encoding' => $encoding,
-            'type' => $type,
-        ];
-        return $this;
-    }
-
-    /**
-     * Get attachment
-     *
-     * @return array
-     */
-    public function getAttachment(): array
-    {
-        return $this->attachment;
-    }
-
-    /**
-     * Reset attachment
-     *
-     * @return self
-     */
-    public function resetAttachment(): self
-    {
-        $this->attachment = [];
-        return $this;
-    }
-
-    /**
-     * Set sender email
-     *
-     * @param string $email
-     * @return self
-     */
-    public function setSenderEmail(string $email): self
-    {
-        $this->customMailOptions['senderEmail'] = $email;
-        return $this;
-    }
-
-    /**
-     * Get sender email
-     *
-     * @return string
-     */
-    public function getSenderEmail(): string
-    {
-        return $this->customMailOptions['senderEmail'] ?? '';
-    }
-
-    /**
-     * Set sender name
-     *
-     * @param string $name
-     * @return self
-     */
-    public function setSenderName(string $name): self
-    {
-        $this->customMailOptions['senderName'] = $name;
-        return $this;
-    }
-
-    /**
-     * Get sender name
-     *
-     * @return string
-     */
-    public function getSenderName(): string
-    {
-        return $this->customMailOptions['senderName'] ?? '';
-    }
-
-    /**
-     * Set reply-to email
-     *
-     * @param string $email
-     * @return self
-     */
-    public function setReplyToEmail(string $email): self
-    {
-        $this->customMailOptions['replyToEmail'] = $email;
-        return $this;
-    }
-
-    /**
-     * Get reply-to email
-     *
-     * @return string
-     */
-    public function getReplyToEmail(): string
-    {
-        return $this->customMailOptions['replyToEmail'] ?? '';
-    }
-
-    /**
-     * Set reply-to name
-     *
-     * @param string $name
-     * @return self
-     */
-    public function setReplyToName(string $name): self
-    {
-        $this->customMailOptions['replyToName'] = $name;
-        return $this;
-    }
-
-    /**
-     * Get reply-to name
-     *
-     * @return string
-     */
-    public function getReplyToName(): string
-    {
-        return $this->customMailOptions['replyToName'] ?? '';
-    }
-
-    /**
-     * Reset
-     *
-     * @return self
-     */
-    public function reset(): self
-    {
-        $this->project = null;
-        $this->recipient = '';
-        $this->name = '';
-        $this->subject = '';
-        $this->body = '';
-        $this->variables = [];
-        $this->bodyTemplate = '';
-        $this->attachment = [];
-        $this->customMailOptions = [];
-        return $this;
-    }
-
-    /**
-     * Prepare the payload for the event
-     *
-     * @return array
-     */
-    protected function preparePayload(): array
-    {
-        $platform = $this->platform;
-        if (empty($platform)) {
-            $platform = Config::getParam('platform', []);
-        }
-
-        return [
-            'project' => $this->project,
-            'recipient' => $this->recipient,
-            'name' => $this->name,
-            'subject' => $this->subject,
-            'bodyTemplate' => $this->bodyTemplate,
-            'body' => $this->body,
-            'preview' => $this->preview,
-            'smtp' => $this->smtp,
-            'variables' => $this->variables,
-            'attachment' => $this->attachment,
-            'customMailOptions' => $this->customMailOptions,
-            'events' => Event::generateEvents($this->getEvent(), $this->getParams()),
-            'platform' => $platform,
-        ];
-    }
-}

src/Appwrite/Event/Message/Build.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Appwrite\Event\Message;
+
+use Utopia\Config\Config;
+use Utopia\Database\Document;
+
+final class Build extends Base
+{
+    public function __construct(
+        public readonly Document $project,
+        public readonly Document $resource,
+        public readonly Document $deployment,
+        public readonly string $type,
+        public readonly ?Document $template = null,
+        public readonly array $platform = [],
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        $platform = !empty($this->platform) ? $this->platform : Config::getParam('platform', []);
+
+        return [
+            'project' => $this->project->getArrayCopy(),
+            'resource' => $this->resource->getArrayCopy(),
+            'deployment' => $this->deployment->getArrayCopy(),
+            'type' => $this->type,
+            'template' => $this->template?->getArrayCopy(),
+            'platform' => $platform,
+        ];
+    }
+
+    public static function fromArray(array $data): static
+    {
+        return new self(
+            project: new Document($data['project'] ?? []),
+            resource: new Document($data['resource'] ?? []),
+            deployment: new Document($data['deployment'] ?? []),
+            type: $data['type'] ?? '',
+            template: !empty($data['template']) ? new Document($data['template']) : null,
+            platform: $data['platform'] ?? [],
+        );
+    }
+}

src/Appwrite/Event/Message/Database.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Appwrite\Event\Message;
+
+use Utopia\Database\Document;
+
+final class Database extends Base
+{
+    public function __construct(
+        public readonly ?Document $project = null,
+        public readonly ?Document $user = null,
+        public readonly string $type = '',
+        public readonly ?Document $table = null,
+        public readonly ?Document $row = null,
+        public readonly ?Document $collection = null,
+        public readonly ?Document $document = null,
+        public readonly ?Document $database = null,
+        public readonly array $events = [],
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'project' => $this->project?->getArrayCopy(),
+            'user' => $this->user?->getArrayCopy(),
+            'type' => $this->type,
+            'table' => $this->table?->getArrayCopy(),
+            'row' => $this->row?->getArrayCopy(),
+            'collection' => $this->collection?->getArrayCopy(),
+            'document' => $this->document?->getArrayCopy(),
+            'database' => $this->database?->getArrayCopy(),
+            'events' => $this->events,
+        ];
+    }
+
+    public static function fromArray(array $data): static
+    {
+        return new self(
+            project: !empty($data['project']) ? new Document($data['project']) : null,
+            user: !empty($data['user']) ? new Document($data['user']) : null,
+            type: $data['type'] ?? '',
+            table: !empty($data['table']) ? new Document($data['table']) : null,
+            row: !empty($data['row']) ? new Document($data['row']) : null,
+            collection: !empty($data['collection']) ? new Document($data['collection']) : null,
+            document: !empty($data['document']) ? new Document($data['document']) : null,
+            database: !empty($data['database']) ? new Document($data['database']) : null,
+            events: $data['events'] ?? [],
+        );
+    }
+}

src/Appwrite/Event/Message/Delete.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Appwrite\Event\Message;
+
+use Utopia\Database\Document;
+
+final class Delete extends Base
+{
+    public function __construct(
+        public readonly ?Document $project = null,
+        public readonly string $type = '',
+        public readonly ?Document $document = null,
+        public readonly ?string $resource = null,
+        public readonly ?string $resourceType = null,
+        public readonly ?string $datetime = null,
+        public readonly ?string $hourlyUsageRetentionDatetime = null,
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'project' => $this->project?->getArrayCopy(),
+            'type' => $this->type,
+            'document' => $this->document?->getArrayCopy(),
+            'resource' => $this->resource,
+            'resourceType' => $this->resourceType,
+            'datetime' => $this->datetime,
+            'hourlyUsageRetentionDatetime' => $this->hourlyUsageRetentionDatetime,
+        ];
+    }
+
+    public static function fromArray(array $data): static
+    {
+        return new self(
+            project: !empty($data['project']) ? new Document($data['project']) : null,
+            type: $data['type'] ?? '',
+            document: !empty($data['document']) ? new Document($data['document']) : null,
+            resource: $data['resource'] ?? null,
+            resourceType: $data['resourceType'] ?? null,
+            datetime: $data['datetime'] ?? null,
+            hourlyUsageRetentionDatetime: $data['hourlyUsageRetentionDatetime'] ?? null,
+        );
+    }
+}

src/Appwrite/Event/Message/Func.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Appwrite\Event\Message;
+
+use Appwrite\Event\Event;
+use Utopia\Config\Config;
+use Utopia\Database\Document;
+
+final class Func extends Base
+{
+    public function __construct(
+        public readonly ?Document $project = null,
+        public readonly ?Document $user = null,
+        public readonly ?string $userId = null,
+        public readonly ?Document $function = null,
+        public readonly ?string $functionId = null,
+        public readonly ?Document $execution = null,
+        public readonly string $type = '',
+        public readonly string $jwt = '',
+        public readonly array $payload = [],
+        public readonly array $events = [],
+        public readonly string $body = '',
+        public readonly string $path = '',
+        public readonly array $headers = [],
+        public readonly string $method = '',
+        public readonly array $platform = [],
+    ) {
+    }
+
+    public static function fromEvent(
+        string $event,
+        array $params,
+        ?Document $project = null,
+        ?Document $user = null,
+        ?string $userId = null,
+        array $payload = [],
+        array $platform = [],
+    ): static {
+        return new self(
+            project: $project,
+            user: $user,
+            userId: $userId,
+            payload: $payload,
+            events: $event !== '' ? Event::generateEvents($event, $params) : [],
+            platform: $platform,
+        );
+    }
+
+    public function toArray(): array
+    {
+        $platform = !empty($this->platform) ? $this->platform : Config::getParam('platform', []);
+
+        return [
+            'project' => $this->project?->getArrayCopy(),
+            'user' => $this->user?->getArrayCopy(),
+            'userId' => $this->userId,
+            'function' => $this->function?->getArrayCopy(),
+            'functionId' => $this->functionId,
+            'execution' => $this->execution?->getArrayCopy(),
+            'type' => $this->type,
+            'jwt' => $this->jwt,
+            'payload' => $this->payload,
+            'events' => $this->events,
+            'body' => $this->body,
+            'path' => $this->path,
+            'headers' => $this->headers,
+            'method' => $this->method,
+            'platform' => $platform,
+        ];
+    }
+
+    public static function fromArray(array $data): static
+    {
+        return new self(
+            project: !empty($data['project']) ? new Document($data['project']) : null,
+            user: !empty($data['user']) ? new Document($data['user']) : null,
+            userId: $data['userId'] ?? null,
+            function: !empty($data['function']) ? new Document($data['function']) : null,
+            functionId: $data['functionId'] ?? null,
+            execution: !empty($data['execution']) ? new Document($data['execution']) : null,
+            type: $data['type'] ?? '',
+            jwt: $data['jwt'] ?? '',
+            payload: $data['payload'] ?? [],
+            events: $data['events'] ?? [],
+            body: $data['body'] ?? '',
+            path: $data['path'] ?? '',
+            headers: $data['headers'] ?? [],
+            method: $data['method'] ?? '',
+            platform: $data['platform'] ?? [],
+        );
+    }
+}

src/Appwrite/Event/Message/Mail.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Appwrite\Event\Message;
+
+use Utopia\Config\Config;
+use Utopia\Database\Document;
+
+final class Mail extends Base
+{
+    public function __construct(
+        public readonly ?Document $project = null,
+        public readonly string $recipient = '',
+        public readonly string $name = '',
+        public readonly string $subject = '',
+        public readonly string $bodyTemplate = '',
+        public readonly string $body = '',
+        public readonly string $preview = '',
+        public readonly array $smtp = [],
+        public readonly array $variables = [],
+        public readonly array $attachment = [],
+        public readonly array $customMailOptions = [],
+        public readonly array $events = [],
+        public readonly array $platform = [],
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        $platform = !empty($this->platform) ? $this->platform : Config::getParam('platform', []);
+
+        return [
+            'project' => $this->project?->getArrayCopy(),
+            'recipient' => $this->recipient,
+            'name' => $this->name,
+            'subject' => $this->subject,
+            'bodyTemplate' => $this->bodyTemplate,
+            'body' => $this->body,
+            'preview' => $this->preview,
+            'smtp' => $this->smtp,
+            'variables' => $this->variables,
+            'attachment' => $this->attachment,
+            'customMailOptions' => $this->customMailOptions,
+            'events' => $this->events,
+            'platform' => $platform,
+        ];
+    }
+
+    public static function fromArray(array $data): static
+    {
+        return new self(
+            project: !empty($data['project']) ? new Document($data['project']) : null,
+            recipient: $data['recipient'] ?? '',
+            name: $data['name'] ?? '',
+            subject: $data['subject'] ?? '',
+            bodyTemplate: $data['bodyTemplate'] ?? '',
+            body: $data['body'] ?? '',
+            preview: $data['preview'] ?? '',
+            smtp: $data['smtp'] ?? [],
+            variables: $data['variables'] ?? [],
+            attachment: $data['attachment'] ?? [],
+            customMailOptions: $data['customMailOptions'] ?? [],
+            events: $data['events'] ?? [],
+            platform: $data['platform'] ?? [],
+        );
+    }
+}

src/Appwrite/Event/Message/Messaging.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Appwrite\Event\Message;
+
+use Utopia\Database\Document;
+
+final class Messaging extends Base
+{
+    public function __construct(
+        public readonly string $type,
+        public readonly Document $project,
+        public readonly ?Document $user = null,
+        public readonly ?string $messageId = null,
+        public readonly ?Document $message = null,
+        public readonly ?array $recipients = null,
+        public readonly ?string $providerType = null,
+    ) {
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'type' => $this->type,
+            'project' => $this->project->getArrayCopy(),
+            'user' => $this->user?->getArrayCopy(),
+            'messageId' => $this->messageId,
+            'message' => $this->message?->getArrayCopy(),
+            'recipients' => $this->recipients,
+            'providerType' => $this->providerType,
+        ];
+    }
+
+    public static function fromArray(array $data): static
+    {
+        return new self(
+            type: $data['type'] ?? '',
+            project: new Document($data['project'] ?? []),
+            user: !empty($data['user']) ? new Document($data['user']) : null,
+            messageId: $data['messageId'] ?? null,
+            message: !empty($data['message']) ? new Document($data['message']) : null,
+            recipients: $data['recipients'] ?? null,
+            providerType: $data['providerType'] ?? null,
+        );
+    }
+}

src/Appwrite/Event/Messaging.php

@@ -1,182 +0,0 @@
-<?php
-
-namespace Appwrite\Event;
-
-use Utopia\Database\Document;
-use Utopia\Queue\Publisher;
-use Utopia\System\System;
-
-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 Publisher $publisher)
-    {
-        parent::__construct($publisher);
-
-        $this
-            ->setQueue(System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME))
-            ->setClass(System::getEnv('_APP_MESSAGING_CLASS_NAME', Event::MESSAGING_CLASS_NAME));
-    }
-
-    /**
-     * Sets type for the build event.
-     *
-     * @param string $type Can be `MESSAGE_SEND_TYPE_INTERNAL` or `MESSAGE_SEND_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.
-     *
-     * @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 Document
-     */
-    public function getMessage(): Document
-    {
-        return $this->message;
-    }
-
-    /**
-     * Sets message ID for the messaging event.
-     *
-     * @param string $messageId
-     * @return self
-     */
-    public function setMessageId(string $messageId): self
-    {
-        $this->messageId = $messageId;
-
-        return $this;
-    }
-
-    /**
-     * Returns set message ID for the messaging event.
-     *
-     * @return string
-     */
-    public function getMessageId(): string
-    {
-        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 Scheduled delivery time for the messaging event.
-     *
-     * @param string $scheduledAt
-     * @return self
-     */
-    public function setScheduledAt(string $scheduledAt): self
-    {
-        $this->scheduledAt = $scheduledAt;
-
-        return $this;
-    }
-
-    /**
-     * Returns set Delivery Time for the messaging event.
-     *
-     * @return string
-     */
-    public function getScheduledAt(): string
-    {
-        return $this->scheduledAt;
-    }
-
-    /**
-     * Prepare the payload for the event
-     *
-     * @return array
-     */
-    protected function preparePayload(): array
-    {
-        return [
-            'type' => $this->type,
-            'project' => $this->project,
-            'user' => $this->user,
-            'messageId' => $this->messageId,
-            'message' => $this->message,
-            'recipients' => $this->recipients,
-            'providerType' => $this->providerType,
-        ];
-    }
-}

src/Appwrite/Event/Publisher/Build.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Event\Publisher;
+
+use Appwrite\Event\Message\Build as BuildMessage;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
+
+readonly class Build extends Base
+{
+    public function __construct(
+        Publisher $publisher,
+        protected Queue $queue
+    ) {
+        parent::__construct($publisher);
+    }
+
+    public function enqueue(BuildMessage $message, ?Queue $queue = null): string|bool
+    {
+        return $this->publish($queue ?? $this->queue, $message);
+    }
+
+    public function getSize(bool $failed = false, ?Queue $queue = null): int
+    {
+        return $this->getQueueSize($queue ?? $this->queue, $failed);
+    }
+}

src/Appwrite/Event/Publisher/Database.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Appwrite\Event\Publisher;
+
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Utopia\Database\Document;
+use Utopia\DSN\DSN;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
+
+readonly class Database extends Base
+{
+    public function __construct(
+        Publisher $publisher,
+        protected Queue $queue,
+    ) {
+        parent::__construct($publisher);
+    }
+
+    public function enqueue(DatabaseMessage $message, ?Queue $queue = null): string|bool
+    {
+        return $this->publish($queue ?? $this->getQueueFromProject($message->project), $message);
+    }
+
+    public function getSize(bool $failed = false, ?Queue $queue = null): int
+    {
+        return $this->getQueueSize($queue ?? $this->queue, $failed);
+    }
+
+    private function getQueueFromProject(?Document $project): Queue
+    {
+        $database = $project?->getAttribute('database', '');
+        if (empty($database)) {
+            return $this->queue;
+        }
+
+        try {
+            $dsn = new DSN($database);
+        } catch (\InvalidArgumentException) {
+            $dsn = new DSN('mysql://' . $database);
+        }
+
+        return new Queue($dsn->getHost());
+    }
+}

src/Appwrite/Event/Publisher/Delete.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Event\Publisher;
+
+use Appwrite\Event\Message\Delete as DeleteMessage;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
+
+readonly class Delete extends Base
+{
+    public function __construct(
+        Publisher $publisher,
+        protected Queue $queue,
+    ) {
+        parent::__construct($publisher);
+    }
+
+    public function enqueue(DeleteMessage $message, ?Queue $queue = null): string|bool
+    {
+        return $this->publish($queue ?? $this->queue, $message);
+    }
+
+    public function getSize(bool $failed = false, ?Queue $queue = null): int
+    {
+        return $this->getQueueSize($queue ?? $this->queue, $failed);
+    }
+}

src/Appwrite/Event/Publisher/Func.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Event\Publisher;
+
+use Appwrite\Event\Message\Func as FunctionMessage;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
+
+readonly class Func extends Base
+{
+    public function __construct(
+        Publisher $publisher,
+        protected Queue $queue,
+    ) {
+        parent::__construct($publisher);
+    }
+
+    public function enqueue(FunctionMessage $message, ?Queue $queue = null): string|bool
+    {
+        return $this->publish($queue ?? $this->queue, $message);
+    }
+
+    public function getSize(bool $failed = false, ?Queue $queue = null): int
+    {
+        return $this->getQueueSize($queue ?? $this->queue, $failed);
+    }
+}

src/Appwrite/Event/Publisher/Mail.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Event\Publisher;
+
+use Appwrite\Event\Message\Mail as MailMessage;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
+
+readonly class Mail extends Base
+{
+    public function __construct(
+        Publisher $publisher,
+        protected Queue $queue
+    ) {
+        parent::__construct($publisher);
+    }
+
+    public function enqueue(MailMessage $message, ?Queue $queue = null): string|bool
+    {
+        return $this->publish($queue ?? $this->queue, $message);
+    }
+
+    public function getSize(bool $failed = false, ?Queue $queue = null): int
+    {
+        return $this->getQueueSize($queue ?? $this->queue, $failed);
+    }
+}

src/Appwrite/Event/Publisher/Messaging.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Appwrite\Event\Publisher;
+
+use Appwrite\Event\Message\Messaging as MessagingMessage;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
+
+readonly class Messaging extends Base
+{
+    public function __construct(
+        Publisher $publisher,
+        protected Queue $queue
+    ) {
+        parent::__construct($publisher);
+    }
+
+    public function enqueue(MessagingMessage $message, ?Queue $queue = null): string|bool
+    {
+        return $this->publish($queue ?? $this->queue, $message);
+    }
+
+    public function getSize(bool $failed = false, ?Queue $queue = null): int
+    {
+        return $this->getQueueSize($queue ?? $this->queue, $failed);
+    }
+}

src/Appwrite/Extend/Exception.php

@@ -178,6 +178,7 @@ class Exception extends \Exception
     public const string FUNCTION_RUNTIME_UNSUPPORTED = 'function_runtime_unsupported';
     public const string FUNCTION_ENTRYPOINT_MISSING = 'function_entrypoint_missing';
     public const string FUNCTION_SYNCHRONOUS_TIMEOUT = 'function_synchronous_timeout';
+    public const string FUNCTION_ASYNCHRONOUS_TIMEOUT = 'function_asynchronous_timeout';
     public const string FUNCTION_TEMPLATE_NOT_FOUND = 'function_template_not_found';
     public const string FUNCTION_RUNTIME_NOT_DETECTED = 'function_runtime_not_detected';
     public const string FUNCTION_EXECUTE_PERMISSION_MISSING = 'function_execute_permission_missing';
@@ -192,6 +193,7 @@ class Exception extends \Exception
     public const string BUILD_ALREADY_COMPLETED = 'build_already_completed';
     public const string BUILD_CANCELED = 'build_canceled';
     public const string BUILD_FAILED = 'build_failed';
+    public const string BUILD_TIMEOUT = 'build_timeout';
 
     /** Execution */
     public const string EXECUTION_NOT_FOUND = 'execution_not_found';
@@ -346,6 +348,10 @@ class Exception extends \Exception
     public const string MIGRATION_IN_PROGRESS = 'migration_in_progress';
     public const string MIGRATION_PROVIDER_ERROR = 'migration_provider_error';
     public const string MIGRATION_DATABASE_TYPE_UNSUPPORTED = 'migration_database_type_unsupported';
+    public const string MIGRATION_SOURCE_PROJECT_ID_REQUIRED = 'migration_source_project_id_required';
+    public const string MIGRATION_SOURCE_PROJECT_NOT_FOUND = 'migration_source_project_not_found';
+    public const string MIGRATION_SOURCE_TYPE_INVALID = 'migration_source_type_invalid';
+    public const string MIGRATION_DESTINATION_TYPE_INVALID = 'migration_destination_type_invalid';
 
     /** Realtime */
     public const string REALTIME_MESSAGE_FORMAT_INVALID = 'realtime_message_format_invalid';
@@ -400,6 +406,14 @@ class Exception extends \Exception
     public const string TOKEN_EXPIRED = 'token_expired';
     public const string TOKEN_RESOURCE_TYPE_INVALID = 'token_resource_type_invalid';
 
+    /** Advisor */
+    public const string INSIGHT_NOT_FOUND = 'insight_not_found';
+    public const string INSIGHT_ALREADY_EXISTS = 'insight_already_exists';
+
+    /** Reports */
+    public const string REPORT_NOT_FOUND = 'report_not_found';
+    public const string REPORT_ALREADY_EXISTS = 'report_already_exists';
+
     protected string $type = '';
     protected array $errors = [];
     protected bool $publish;

src/Appwrite/GraphQL/Resolvers.php

@@ -6,7 +6,6 @@ use Appwrite\GraphQL\Exception as GQLException;
 use Appwrite\Promises\Swoole;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Utopia\DI\Container;
 use Utopia\Http\Exception;
 use Utopia\Http\Http;
 use Utopia\Http\Route;
@@ -53,22 +52,6 @@ class Resolvers
         }
     }
 
-    /**
-     * Get the current request container.
-     */
-    private static function getResolverContainer(Http $utopia): Container
-    {
-        $container = $utopia->getResource('container');
-
-        if ($container instanceof Container || (\is_object($container) && \method_exists($container, 'get') && \method_exists($container, 'set'))) {
-            /** @var Container $container */
-            return $container;
-        }
-
-        /** @var callable(): Container $container */
-        return $container();
-    }
-
     /**
      * Get the request-scoped lock shared by GraphQL resolver coroutines
      * for the current HTTP request.
@@ -95,9 +78,9 @@ class Resolvers
         ?Route $route,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $route, $args) {
-            $utopia = $utopia->getResource('utopia:graphql');
-            $request = $utopia->getResource('request');
-            $response = $utopia->getResource('response');
+            $utopia = $utopia->context()->get('utopia:graphql');
+            $request = $utopia->context()->get('request');
+            $response = $utopia->context()->get('response');
 
             self::resolve(
                 $utopia,
@@ -167,9 +150,9 @@ class Resolvers
         callable $url,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
-            $utopia = $utopia->getResource('utopia:graphql');
-            $request = $utopia->getResource('request');
-            $response = $utopia->getResource('response');
+            $utopia = $utopia->context()->get('utopia:graphql');
+            $request = $utopia->context()->get('request');
+            $response = $utopia->context()->get('response');
 
             self::resolve(
                 $utopia,
@@ -203,9 +186,9 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
-            $utopia = $utopia->getResource('utopia:graphql');
-            $request = $utopia->getResource('request');
-            $response = $utopia->getResource('response');
+            $utopia = $utopia->context()->get('utopia:graphql');
+            $request = $utopia->context()->get('request');
+            $response = $utopia->context()->get('response');
 
             $beforeResolve = function ($payload) {
                 return $payload['documents'];
@@ -245,9 +228,9 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
-            $utopia = $utopia->getResource('utopia:graphql');
-            $request = $utopia->getResource('request');
-            $response = $utopia->getResource('response');
+            $utopia = $utopia->context()->get('utopia:graphql');
+            $request = $utopia->context()->get('request');
+            $response = $utopia->context()->get('response');
 
             self::resolve(
                 $utopia,
@@ -282,9 +265,9 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
-            $utopia = $utopia->getResource('utopia:graphql');
-            $request = $utopia->getResource('request');
-            $response = $utopia->getResource('response');
+            $utopia = $utopia->context()->get('utopia:graphql');
+            $request = $utopia->context()->get('request');
+            $response = $utopia->context()->get('response');
 
             self::resolve(
                 $utopia,
@@ -317,9 +300,9 @@ class Resolvers
         callable $url,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
-            $utopia = $utopia->getResource('utopia:graphql');
-            $request = $utopia->getResource('request');
-            $response = $utopia->getResource('response');
+            $utopia = $utopia->context()->get('utopia:graphql');
+            $request = $utopia->context()->get('request');
+            $response = $utopia->context()->get('response');
 
             self::resolve(
                 $utopia,
@@ -373,10 +356,9 @@ class Resolvers
             }
 
             /** @var Response $resolverResponse */
-            $resolverResponse = clone $utopia->getResource('response');
-            $container = self::getResolverContainer($utopia);
-            $container->set('request', static fn () => $request);
-            $container->set('response', static fn () => $resolverResponse);
+            $resolverResponse = clone $utopia->context()->get('response');
+            $utopia->context()->set('request', static fn () => $request);
+            $utopia->context()->set('response', static fn () => $resolverResponse);
             $resolverResponse->setContentType(Response::CONTENT_TYPE_NULL);
             $resolverResponse->setSent(false);
 

src/Appwrite/GraphQL/Schema.php

@@ -84,7 +84,7 @@ class Schema
     protected static function api(Http $utopia, callable $complexity): array
     {
         Mapper::init($utopia
-            ->getResource('response')
+            ->context()->get('response')
             ->getModels());
 
         $queries = [];

src/Appwrite/GraphQL/Types/Mapper.php

@@ -254,7 +254,7 @@ class Mapper
         array $injections
     ): Type {
         $validator = \is_callable($validator)
-            ? \call_user_func_array($validator, $utopia->getResources($injections))
+            ? \call_user_func_array($validator, \array_map($utopia->context()->get(...), $injections))
             : $validator;
 
         $isNullable = $validator instanceof Nullable;

src/Appwrite/Messaging/Adapter/Realtime.php

@@ -774,6 +774,21 @@ class Realtime extends MessagingAdapter
                     $roles = [Role::team($project->getAttribute('teamId'))->toString()];
                 }
                 break;
+            case 'reports':
+                // Plain report event: `reports.{reportId}.{action}`
+                $channels[] = 'reports';
+                if (isset($parts[1])) {
+                    $channels[] = 'reports.' . $parts[1];
+                }
+                // Nested insight event: `reports.{reportId}.insights.{insightId}.{action}`
+                if (isset($parts[2]) && $parts[2] === 'insights') {
+                    $channels[] = 'reports.' . $parts[1] . '.insights';
+                    if (isset($parts[3])) {
+                        $channels[] = 'reports.' . $parts[1] . '.insights.' . $parts[3];
+                    }
+                }
+                $roles = [Role::team($project->getAttribute('teamId'))->toString()];
+                break;
         }
 
         // Action is the last segment for plain CRUD events (e.g. `documents.X.create`),

src/Appwrite/Migration/Migration.php

@@ -96,6 +96,8 @@ abstract class Migration
         '1.9.1' => 'V24',
         '1.9.2' => 'V24',
         '1.9.3' => 'V24',
+        '1.9.4' => 'V24',
+        '1.9.5' => 'V24',
     ];
 
     /**

src/Appwrite/Platform/Appwrite.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Platform;
 
 use Appwrite\Platform\Modules\Account;
+use Appwrite\Platform\Modules\Advisor;
 use Appwrite\Platform\Modules\Avatars;
 use Appwrite\Platform\Modules\Console;
 use Appwrite\Platform\Modules\Core;
@@ -42,5 +43,6 @@ class Appwrite extends Platform
         $this->addModule(new Webhooks\Module());
         $this->addModule(new Migrations\Module());
         $this->addModule(new Project\Module());
+        $this->addModule(new Advisor\Module());
     }
 }

src/Appwrite/Platform/Installer/Server.php

@@ -154,7 +154,7 @@ class Server
 
         $nativeServer = $adapter->getNativeServer();
 
-        $container = $adapter->getContainer();
+        $container = $adapter->resources();
         $container->set('installerState', fn () => $state);
         $container->set('installerConfig', fn () => $config);
         $container->set('installerPaths', fn () => $paths);

src/Appwrite/Platform/Modules/Account/Http/Account/MFA/Challenges/Create.php

@@ -5,8 +5,10 @@ namespace Appwrite\Platform\Modules\Account\Http\Account\MFA\Challenges;
 use Appwrite\Auth\MFA\Type;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Event;
-use Appwrite\Event\Mail;
-use Appwrite\Event\Messaging;
+use Appwrite\Event\Message\Mail as MailMessage;
+use Appwrite\Event\Message\Messaging as MessagingMessage;
+use Appwrite\Event\Publisher\Mail as MailPublisher;
+use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -101,8 +103,8 @@ class Create extends Action
             ->inject('platform')
             ->inject('request')
             ->inject('queueForEvents')
-            ->inject('queueForMessaging')
-            ->inject('queueForMails')
+            ->inject('publisherForMessaging')
+            ->inject('publisherForMails')
             ->inject('timelimit')
             ->inject('usage')
             ->inject('plan')
@@ -121,8 +123,8 @@ class Create extends Action
         array $platform,
         Request $request,
         Event $queueForEvents,
-        Messaging $queueForMessaging,
-        Mail $queueForMails,
+        MessagingPublisher $publisherForMessaging,
+        MailPublisher $publisherForMails,
         callable $timelimit,
         Context $usage,
         array $plan,
@@ -180,16 +182,18 @@ class Create extends Action
                 $message = $message->render();
 
                 $phone = $user->getAttribute('phone');
-                $queueForMessaging
-                    ->setType(MESSAGE_SEND_TYPE_INTERNAL)
-                    ->setMessage(new Document([
+                $publisherForMessaging->enqueue(new MessagingMessage(
+                    type: MESSAGE_SEND_TYPE_INTERNAL,
+                    project: $project,
+                    message: new Document([
                         '$id' => $challenge->getId(),
                         'data' => [
                             'content' => $code,
                         ],
-                    ]))
-                    ->setRecipients([$phone])
-                    ->setProviderType(MESSAGE_TYPE_SMS);
+                    ]),
+                    recipients: [$phone],
+                    providerType: MESSAGE_TYPE_SMS,
+                ));
 
                 $helper = PhoneNumberUtil::getInstance();
                 try {
@@ -252,6 +256,7 @@ class Create extends Action
                 $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
                 $replyToEmail = '';
                 $replyToName = '';
+                $smtpConfig = [];
 
                 if ($smtpEnabled) {
                     if (!empty($smtp['senderEmail'])) {
@@ -269,13 +274,6 @@ class Create extends Action
                         $replyToName = $smtp['replyToName'];
                     }
 
-                    $queueForMails
-                        ->setSmtpHost($smtp['host'] ?? '')
-                        ->setSmtpPort($smtp['port'] ?? '')
-                        ->setSmtpUsername($smtp['username'] ?? '')
-                        ->setSmtpPassword($smtp['password'] ?? '')
-                        ->setSmtpSecure($smtp['secure'] ?? '');
-
                     if (!empty($customTemplate)) {
                         if (!empty($customTemplate['senderEmail'])) {
                             $senderEmail = $customTemplate['senderEmail'];
@@ -296,11 +294,17 @@ class Create extends Action
                         $subject = $customTemplate['subject'] ?? $subject;
                     }
 
-                    $queueForMails
-                        ->setSmtpReplyToEmail($replyToEmail)
-                        ->setSmtpReplyToName($replyToName)
-                        ->setSmtpSenderEmail($senderEmail)
-                        ->setSmtpSenderName($senderName);
+                    $smtpConfig = [
+                        'host' => $smtp['host'] ?? '',
+                        'port' => $smtp['port'] ?? '',
+                        'username' => $smtp['username'] ?? '',
+                        'password' => $smtp['password'] ?? '',
+                        'secure' => $smtp['secure'] ?? '',
+                        'replyToEmail' => $replyToEmail,
+                        'replyToName' => $replyToName,
+                        'senderEmail' => $senderEmail,
+                        'senderName' => $senderName,
+                    ];
                 }
 
                 $emailVariables = [
@@ -327,20 +331,18 @@ class Create extends Action
                     ]);
                 }
 
-                $queueForMails
-                    ->setSubject($subject)
-                    ->setPreview($preview)
-                    ->setBody($body)
-                    ->setBodyTemplate($bodyTemplate)
-                    ->appendVariables($emailVariables)
-                    ->setRecipient($user->getAttribute('email'));
-
-                // since this is console project, set email sender name!
-                if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
-                    $queueForMails->setSenderName($platform['emailSenderName']);
-                }
-
-                $queueForMails->trigger();
+                $publisherForMails->enqueue(new MailMessage(
+                    project: $project,
+                    recipient: $user->getAttribute('email'),
+                    subject: $subject,
+                    bodyTemplate: $bodyTemplate,
+                    body: $body,
+                    preview: $preview,
+                    smtp: $smtpConfig,
+                    variables: $emailVariables,
+                    customMailOptions: $smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE ? ['senderName' => $platform['emailSenderName']] : [],
+                    platform: $platform,
+                ));
                 break;
         }
 

src/Appwrite/Platform/Modules/Advisor/Enums/InsightCTAMethod.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Enums;
+
+enum InsightCTAMethod: string
+{
+    case CREATE_INDEX = 'createIndex';
+}

src/Appwrite/Platform/Modules/Advisor/Enums/InsightCTAService.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Enums;
+
+enum InsightCTAService: string
+{
+    case DATABASES = 'databases';
+    case TABLES_DB = 'tablesDB';
+    case DOCUMENTS_DB = 'documentsDB';
+    case VECTORS_DB = 'vectorsDB';
+}

src/Appwrite/Platform/Modules/Advisor/Enums/InsightSeverity.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Enums;
+
+enum InsightSeverity: string
+{
+    case INFO = 'info';
+    case WARNING = 'warning';
+    case CRITICAL = 'critical';
+}

src/Appwrite/Platform/Modules/Advisor/Enums/InsightStatus.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Enums;
+
+enum InsightStatus: string
+{
+    case ACTIVE = 'active';
+    case DISMISSED = 'dismissed';
+}

src/Appwrite/Platform/Modules/Advisor/Enums/InsightType.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Enums;
+
+enum InsightType: string
+{
+    case DATABASE_INDEX = 'databaseIndex';
+    case TABLES_DB_INDEX = 'tablesDBIndex';
+    case DOCUMENTS_DB_INDEX = 'documentsDBIndex';
+    case VECTORS_DB_INDEX = 'vectorsDBIndex';
+    case DATABASE_PERFORMANCE = 'databasePerformance';
+    case SITE_PERFORMANCE = 'sitePerformance';
+    case SITE_ACCESSIBILITY = 'siteAccessibility';
+    case SITE_SEO = 'siteSeo';
+    case FUNCTION_PERFORMANCE = 'functionPerformance';
+}

src/Appwrite/Platform/Modules/Advisor/Enums/ReportType.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Enums;
+
+enum ReportType: string
+{
+    case LIGHTHOUSE = 'lighthouse';
+    case AUDIT = 'audit';
+    case DATABASE_ANALYZER = 'databaseAnalyzer';
+}

src/Appwrite/Platform/Modules/Advisor/Http/Insights/Get.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Http\Insights;
+
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\UID;
+use Utopia\Platform\Scope\HTTP;
+
+class Get extends Action
+{
+    use HTTP;
+
+    public static function getName()
+    {
+        return 'getInsight';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/reports/:reportId/insights/:insightId')
+            ->desc('Get insight')
+            ->groups(['api', 'advisor'])
+            ->label('scope', 'insights.read')
+            ->label('resourceType', RESOURCE_TYPE_INSIGHTS)
+            ->label('sdk', new Method(
+                namespace: 'advisor',
+                group: 'insights',
+                name: 'getInsight',
+                description: '/docs/references/advisor/get-insight.md',
+                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_OK,
+                        model: Response::MODEL_INSIGHT,
+                    ),
+                ]
+            ))
+            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Parent report ID.', false, ['dbForPlatform'])
+            ->param('insightId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Insight ID.', false, ['dbForPlatform'])
+            ->inject('response')
+            ->inject('project')
+            ->inject('dbForPlatform')
+            ->callback($this->action(...));
+    }
+
+    public function action(
+        string $reportId,
+        string $insightId,
+        Response $response,
+        Document $project,
+        Database $dbForPlatform
+    ) {
+        // Skip the insights subquery — we only need ownership metadata.
+        $report = $dbForPlatform->skipFilters(
+            fn () => $dbForPlatform->getDocument('reports', $reportId),
+            ['subQueryReportInsights'],
+        );
+
+        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
+            throw new Exception(Exception::REPORT_NOT_FOUND);
+        }
+
+        $insight = $dbForPlatform->getDocument('insights', $insightId);
+
+        if (
+            $insight->isEmpty()
+            || $insight->getAttribute('projectInternalId') !== $project->getSequence()
+            || $insight->getAttribute('reportInternalId') !== $report->getSequence()
+        ) {
+            throw new Exception(Exception::INSIGHT_NOT_FOUND);
+        }
+
+        $response->dynamic($insight, Response::MODEL_INSIGHT);
+    }
+}

src/Appwrite/Platform/Modules/Advisor/Http/Insights/XList.php

@@ -0,0 +1,126 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Http\Insights;
+
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Insights;
+use Appwrite\Utopia\Response;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Exception\Order as OrderException;
+use Utopia\Database\Exception\Query as QueryException;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Query\Cursor;
+use Utopia\Database\Validator\UID;
+use Utopia\Platform\Scope\HTTP;
+use Utopia\Validator\Boolean;
+
+class XList extends Action
+{
+    use HTTP;
+
+    public static function getName()
+    {
+        return 'listInsights';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/reports/:reportId/insights')
+            ->desc('List insights')
+            ->groups(['api', 'advisor'])
+            ->label('scope', 'insights.read')
+            ->label('resourceType', RESOURCE_TYPE_INSIGHTS)
+            ->label('sdk', new Method(
+                namespace: 'advisor',
+                group: 'insights',
+                name: 'listInsights',
+                description: '/docs/references/advisor/list-insights.md',
+                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_OK,
+                        model: Response::MODEL_INSIGHT_LIST,
+                    ),
+                ]
+            ))
+            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Parent report ID.', false, ['dbForPlatform'])
+            ->param('queries', [], new Insights(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Insights::ALLOWED_ATTRIBUTES), true)
+            ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
+            ->inject('response')
+            ->inject('project')
+            ->inject('dbForPlatform')
+            ->callback($this->action(...));
+    }
+
+    public function action(
+        string $reportId,
+        array $queries,
+        bool $includeTotal,
+        Response $response,
+        Document $project,
+        Database $dbForPlatform
+    ) {
+        // Skip the insights subquery — we're about to fetch a filtered, paginated slice ourselves.
+        $report = $dbForPlatform->skipFilters(
+            fn () => $dbForPlatform->getDocument('reports', $reportId),
+            ['subQueryReportInsights'],
+        );
+
+        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
+            throw new Exception(Exception::REPORT_NOT_FOUND);
+        }
+
+        try {
+            $queries = Query::parseQueries($queries);
+        } catch (QueryException $e) {
+            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
+        }
+
+        $queries[] = Query::equal('projectInternalId', [$project->getSequence()]);
+        $queries[] = Query::equal('reportInternalId', [$report->getSequence()]);
+
+        $cursor = Query::getCursorQueries($queries, false);
+        $cursor = \reset($cursor);
+
+        if ($cursor !== false) {
+            $validator = new Cursor();
+            if (!$validator->isValid($cursor)) {
+                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+            }
+
+            $insightId = $cursor->getValue();
+            $cursorDocument = $dbForPlatform->getDocument('insights', $insightId);
+
+            if (
+                $cursorDocument->isEmpty()
+                || $cursorDocument->getAttribute('projectInternalId') !== $project->getSequence()
+                || $cursorDocument->getAttribute('reportInternalId') !== $report->getSequence()
+            ) {
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Insight '{$insightId}' for the 'cursor' value not found.");
+            }
+
+            $cursor->setValue($cursorDocument);
+        }
+
+        $filterQueries = Query::groupByType($queries)['filters'];
+
+        try {
+            $insights = $dbForPlatform->find('insights', $queries);
+            $total = $includeTotal ? $dbForPlatform->count('insights', $filterQueries, APP_LIMIT_COUNT) : 0;
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
+
+        $response->dynamic(new Document([
+            'insights' => $insights,
+            'total' => $total,
+        ]), Response::MODEL_INSIGHT_LIST);
+    }
+}

src/Appwrite/Platform/Modules/Advisor/Http/Reports/Delete.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Http\Reports;
+
+use Appwrite\Event\Event;
+use Appwrite\Event\Message\Delete as DeleteMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\UID;
+use Utopia\Platform\Scope\HTTP;
+
+class Delete extends Action
+{
+    use HTTP;
+
+    public static function getName(): string
+    {
+        return 'deleteReport';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE)
+            ->setHttpPath('/v1/reports/:reportId')
+            ->desc('Delete report')
+            ->groups(['api', 'advisor'])
+            ->label('scope', 'reports.write')
+            ->label('event', 'reports.[reportId].delete')
+            ->label('resourceType', RESOURCE_TYPE_REPORTS)
+            ->label('audits.event', 'report.delete')
+            ->label('audits.resource', 'report/{request.reportId}')
+            ->label('abuse-key', 'projectId:{projectId},userId:{userId}')
+            ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
+            ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
+            ->label('sdk', new Method(
+                namespace: 'advisor',
+                group: 'reports',
+                name: 'deleteReport',
+                description: '/docs/references/advisor/delete-report.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_NOCONTENT,
+                        model: Response::MODEL_NONE,
+                    ),
+                ],
+                contentType: ContentType::NONE
+            ))
+            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Report ID.', false, ['dbForPlatform'])
+            ->inject('response')
+            ->inject('project')
+            ->inject('dbForPlatform')
+            ->inject('publisherForDeletes')
+            ->inject('queueForEvents')
+            ->callback($this->action(...));
+    }
+
+    public function action(
+        string $reportId,
+        Response $response,
+        Document $project,
+        Database $dbForPlatform,
+        DeletePublisher $publisherForDeletes,
+        Event $queueForEvents
+    ): void {
+        $report = $dbForPlatform->skipFilters(
+            fn () => $dbForPlatform->getDocument('reports', $reportId),
+            ['subQueryReportInsights'],
+        );
+
+        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
+            throw new Exception(Exception::REPORT_NOT_FOUND);
+        }
+
+        if (!$dbForPlatform->deleteDocument('reports', $report->getId())) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove report from DB');
+        }
+
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_REPORT,
+            document: $report,
+        ));
+
+        $queueForEvents
+            ->setParam('reportId', $report->getId())
+            ->setPayload($response->output($report, Response::MODEL_REPORT));
+
+        $response->noContent();
+    }
+}

src/Appwrite/Platform/Modules/Advisor/Http/Reports/Get.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Http\Reports;
+
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\UID;
+use Utopia\Platform\Scope\HTTP;
+
+class Get extends Action
+{
+    use HTTP;
+
+    public static function getName()
+    {
+        return 'getReport';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/reports/:reportId')
+            ->desc('Get report')
+            ->groups(['api', 'advisor'])
+            ->label('scope', 'reports.read')
+            ->label('resourceType', RESOURCE_TYPE_REPORTS)
+            ->label('sdk', new Method(
+                namespace: 'advisor',
+                group: 'reports',
+                name: 'getReport',
+                description: '/docs/references/advisor/get-report.md',
+                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_OK,
+                        model: Response::MODEL_REPORT,
+                    ),
+                ]
+            ))
+            ->param('reportId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Report ID.', false, ['dbForPlatform'])
+            ->inject('response')
+            ->inject('project')
+            ->inject('dbForPlatform')
+            ->callback($this->action(...));
+    }
+
+    public function action(
+        string $reportId,
+        Response $response,
+        Document $project,
+        Database $dbForPlatform
+    ) {
+        $report = $dbForPlatform->skipFilters(
+            fn () => $dbForPlatform->getDocument('reports', $reportId),
+            ['subQueryReportInsights'],
+        );
+
+        if ($report->isEmpty() || $report->getAttribute('projectInternalId') !== $project->getSequence()) {
+            throw new Exception(Exception::REPORT_NOT_FOUND);
+        }
+
+        $insights = $dbForPlatform->find('insights', [
+            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('reportInternalId', [$report->getSequence()]),
+            Query::limit(APP_LIMIT_SUBQUERY),
+        ]);
+
+        $report->setAttribute('insights', $insights);
+
+        $response->dynamic($report, Response::MODEL_REPORT);
+    }
+}

src/Appwrite/Platform/Modules/Advisor/Http/Reports/XList.php

@@ -0,0 +1,133 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Http\Reports;
+
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Reports;
+use Appwrite\Utopia\Response;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Exception\Order as OrderException;
+use Utopia\Database\Exception\Query as QueryException;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Query\Cursor;
+use Utopia\Platform\Scope\HTTP;
+use Utopia\Validator\Boolean;
+
+class XList extends Action
+{
+    use HTTP;
+
+    public static function getName()
+    {
+        return 'listReports';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/reports')
+            ->desc('List reports')
+            ->groups(['api', 'advisor'])
+            ->label('scope', 'reports.read')
+            ->label('resourceType', RESOURCE_TYPE_REPORTS)
+            ->label('sdk', new Method(
+                namespace: 'advisor',
+                group: 'reports',
+                name: 'listReports',
+                description: '/docs/references/advisor/list-reports.md',
+                auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_OK,
+                        model: Response::MODEL_REPORT_LIST,
+                    ),
+                ]
+            ))
+            ->param('queries', [], new Reports(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Reports::ALLOWED_ATTRIBUTES), true)
+            ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
+            ->inject('response')
+            ->inject('project')
+            ->inject('dbForPlatform')
+            ->callback($this->action(...));
+    }
+
+    public function action(
+        array $queries,
+        bool $includeTotal,
+        Response $response,
+        Document $project,
+        Database $dbForPlatform
+    ) {
+        try {
+            $queries = Query::parseQueries($queries);
+        } catch (QueryException $e) {
+            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
+        }
+
+        $queries[] = Query::equal('projectInternalId', [$project->getSequence()]);
+
+        $cursor = Query::getCursorQueries($queries, false);
+        $cursor = \reset($cursor);
+
+        if ($cursor !== false) {
+            $validator = new Cursor();
+            if (!$validator->isValid($cursor)) {
+                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+            }
+
+            $reportId = $cursor->getValue();
+            $cursorDocument = $dbForPlatform->skipFilters(
+                fn () => $dbForPlatform->getDocument('reports', $reportId),
+                ['subQueryReportInsights'],
+            );
+
+            if ($cursorDocument->isEmpty() || $cursorDocument->getAttribute('projectInternalId') !== $project->getSequence()) {
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Report '{$reportId}' for the 'cursor' value not found.");
+            }
+
+            $cursor->setValue($cursorDocument);
+        }
+
+        $filterQueries = Query::groupByType($queries)['filters'];
+
+        try {
+            $reports = $dbForPlatform->skipFilters(
+                fn () => $dbForPlatform->find('reports', $queries),
+                ['subQueryReportInsights'],
+            );
+            $total = $includeTotal ? $dbForPlatform->count('reports', $filterQueries, APP_LIMIT_COUNT) : 0;
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
+
+        if (!empty($reports)) {
+            $reportSequences = \array_map(fn (Document $r) => $r->getSequence(), $reports);
+
+            $insights = $dbForPlatform->find('insights', [
+                Query::equal('projectInternalId', [$project->getSequence()]),
+                Query::equal('reportInternalId', $reportSequences),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+
+            $insightsByReport = [];
+            foreach ($insights as $insight) {
+                $insightsByReport[$insight->getAttribute('reportInternalId')][] = $insight;
+            }
+
+            foreach ($reports as $report) {
+                $report->setAttribute('insights', $insightsByReport[$report->getSequence()] ?? []);
+            }
+        }
+
+        $response->dynamic(new Document([
+            'reports' => $reports,
+            'total' => $total,
+        ]), Response::MODEL_REPORT_LIST);
+    }
+}

src/Appwrite/Platform/Modules/Advisor/Module.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor;
+
+use Appwrite\Platform\Modules\Advisor\Services\Http;
+use Utopia\Platform;
+
+class Module extends Platform\Module
+{
+    public function __construct()
+    {
+        $this->addService('http', new Http());
+    }
+}

src/Appwrite/Platform/Modules/Advisor/Services/Http.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Advisor\Services;
+
+use Appwrite\Platform\Modules\Advisor\Http\Insights\Get as GetInsight;
+use Appwrite\Platform\Modules\Advisor\Http\Insights\XList as ListInsights;
+use Appwrite\Platform\Modules\Advisor\Http\Reports\Delete as DeleteReport;
+use Appwrite\Platform\Modules\Advisor\Http\Reports\Get as GetReport;
+use Appwrite\Platform\Modules\Advisor\Http\Reports\XList as ListReports;
+use Utopia\Platform\Service;
+
+class Http extends Service
+{
+    public function __construct()
+    {
+        $this->type = Service::TYPE_HTTP;
+
+        $this->addAction(GetReport::getName(), new GetReport());
+        $this->addAction(ListReports::getName(), new ListReports());
+        $this->addAction(DeleteReport::getName(), new DeleteReport());
+
+        $this->addAction(GetInsight::getName(), new GetInsight());
+        $this->addAction(ListInsights::getName(), new ListInsights());
+    }
+}

src/Appwrite/Platform/Modules/Compute/Base.php

@@ -2,7 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Compute;
 
-use Appwrite\Event\Build;
+use Appwrite\Event\Message\Build as BuildMessage;
+use Appwrite\Event\Publisher\Build as BuildPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Filter\BranchDomain as BranchDomainFilter;
 use Appwrite\Platform\Action;
@@ -57,7 +58,7 @@ class Base extends Action
         return $allowedSpecifications[0] ?? APP_COMPUTE_SPECIFICATION_DEFAULT;
     }
 
-    public function redeployVcsFunction(Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, string $referenceType = 'branch', string $reference = ''): Document
+    public function redeployVcsFunction(Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, BuildPublisher $publisherForBuilds, Document $template, GitHub $github, bool $activate, array $platform = [], string $referenceType = 'branch', string $reference = ''): Document
     {
         $deploymentId = ID::unique();
         $entrypoint = $function->getAttribute('entrypoint', '');
@@ -150,16 +151,19 @@ class Base extends Action
             'latestDeploymentStatus' => $deployment->getAttribute('status', ''),
         ]));
 
-        $queueForBuilds
-            ->setType(BUILD_TYPE_DEPLOYMENT)
-            ->setResource($function)
-            ->setDeployment($deployment)
-            ->setTemplate($template);
+        $publisherForBuilds->enqueue(new BuildMessage(
+            project: $project,
+            resource: $function,
+            deployment: $deployment,
+            type: BUILD_TYPE_DEPLOYMENT,
+            template: $template,
+            platform: $platform,
+        ));
 
         return $deployment;
     }
 
-    public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, Authorization $authorization, array $platform, string $referenceType = 'branch', string $reference = ''): Document
+    public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, BuildPublisher $publisherForBuilds, Document $template, GitHub $github, bool $activate, Authorization $authorization, array $platform, string $referenceType = 'branch', string $reference = ''): Document
     {
         $deploymentId = ID::unique();
         $providerInstallationId = $installation->getAttribute('providerInstallationId', '');
@@ -358,11 +362,14 @@ class Base extends Action
 
         $this->updateEmptyManualRule($project, $site, $deployment, $dbForPlatform, $authorization);
 
-        $queueForBuilds
-            ->setType(BUILD_TYPE_DEPLOYMENT)
-            ->setResource($site)
-            ->setDeployment($deployment)
-            ->setTemplate($template);
+        $publisherForBuilds->enqueue(new BuildMessage(
+            project: $project,
+            resource: $site,
+            deployment: $deployment,
+            type: BUILD_TYPE_DEPLOYMENT,
+            template: $template,
+            platform: $platform,
+        ));
 
         return $deployment;
     }

src/Appwrite/Platform/Modules/Console/Http/Scopes/Organization/XList.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Console\Http\Scopes\Organization;
+
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response;
+use Utopia\Config\Config;
+use Utopia\Database\Document;
+use Utopia\Platform\Action;
+use Utopia\Platform\Scope\HTTP;
+
+class XList extends Action
+{
+    use HTTP;
+
+    public static function getName(): string
+    {
+        return 'listConsoleOrganizationScopes';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/console/scopes/organization')
+            ->desc('List organization scopes')
+            ->groups(['api'])
+            ->label('scope', 'public')
+            ->label('sdk', new Method(
+                namespace: 'console',
+                group: 'console',
+                name: 'listOrganizationScopes',
+                description: 'List all scopes available for organization API keys, along with a description for each scope.',
+                auth: [AuthType::ADMIN],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_OK,
+                        model: Response::MODEL_CONSOLE_KEY_SCOPE_LIST,
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->inject('response')
+            ->callback($this->action(...));
+    }
+
+    public function action(Response $response): void
+    {
+        $scopesConfig = Config::getParam('organizationScopes', []);
+
+        $scopes = [];
+        foreach ($scopesConfig as $scopeId => $scope) {
+            $scopes[] = new Document([
+                '$id' => $scopeId,
+                'description' => $scope['description'] ?? '',
+                'category' => $scope['category'] ?? '',
+                'deprecated' => $scope['deprecated'] ?? false,
+            ]);
+        }
+
+        $response->dynamic(new Document([
+            'total' => \count($scopes),
+            'scopes' => $scopes,
+        ]), Response::MODEL_CONSOLE_KEY_SCOPE_LIST);
+    }
+}

src/Appwrite/Platform/Modules/Console/Http/Scopes/Project/XList.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Console\Http\Scopes\Key;
+namespace Appwrite\Platform\Modules\Console\Http\Scopes\Project;
 
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;

src/Appwrite/Platform/Modules/Console/Services/Http.php

@@ -15,7 +15,8 @@ use Appwrite\Platform\Modules\Console\Http\Redirects\Recover\Get as RedirectReco
 use Appwrite\Platform\Modules\Console\Http\Redirects\Register\Get as RedirectRegister;
 use Appwrite\Platform\Modules\Console\Http\Redirects\Root\Get as RedirectRoot;
 use Appwrite\Platform\Modules\Console\Http\Resources\Get as GetResourceAvailability;
-use Appwrite\Platform\Modules\Console\Http\Scopes\Key\XList as ListKeyScopes;
+use Appwrite\Platform\Modules\Console\Http\Scopes\Organization\XList as ListOrganizationScopes;
+use Appwrite\Platform\Modules\Console\Http\Scopes\Project\XList as ListKeyScopes;
 use Appwrite\Platform\Modules\Console\Http\Variables\Get as GetVariables;
 use Utopia\Platform\Service;
 
@@ -32,6 +33,7 @@ class Http extends Service
         $this->addAction(GetVariables::getName(), new GetVariables());
         $this->addAction(ListOAuth2Providers::getName(), new ListOAuth2Providers());
         $this->addAction(ListKeyScopes::getName(), new ListKeyScopes());
+        $this->addAction(ListOrganizationScopes::getName(), new ListOrganizationScopes());
         $this->addAction(CreateAssistantQuery::getName(), new CreateAssistantQuery());
         $this->addAction(GetResourceAvailability::getName(), new GetResourceAvailability());
 

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php

@@ -2,8 +2,9 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response as UtopiaResponse;
@@ -241,6 +242,10 @@ abstract class Action extends UtopiaAction
                 ? UtopiaResponse::MODEL_ATTRIBUTE_INTEGER
                 : UtopiaResponse::MODEL_COLUMN_INTEGER,
 
+            Database::VAR_BIGINT => $isCollections
+                ? UtopiaResponse::MODEL_ATTRIBUTE_BIGINT
+                : UtopiaResponse::MODEL_COLUMN_BIGINT,
+
             Database::VAR_FLOAT => $isCollections
                 ? UtopiaResponse::MODEL_ATTRIBUTE_FLOAT
                 : UtopiaResponse::MODEL_COLUMN_FLOAT,
@@ -308,7 +313,7 @@ abstract class Action extends UtopiaAction
         };
     }
 
-    protected function createAttribute(string $databaseId, string $collectionId, Document $attribute, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): Document
+    protected function createAttribute(string $databaseId, string $collectionId, Document $attribute, Response $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): Document
     {
         $key = $attribute->getAttribute('key');
         $type = $attribute->getAttribute('type', '');
@@ -460,20 +465,6 @@ abstract class Action extends UtopiaAction
             $dbForProject->purgeCachedCollection('database_' . $db->getSequence() . '_collection_' . $relatedCollection->getSequence());
         }
 
-        $queueForDatabase
-            ->setType(DATABASE_TYPE_CREATE_ATTRIBUTE)
-            ->setDatabase($db);
-
-        if ($this->isCollectionsAPI()) {
-            $queueForDatabase
-                ->setDocument($attribute)
-                ->setCollection($collection);
-        } else {
-            $queueForDatabase
-                ->setRow($attribute)
-                ->setTable($collection);
-        }
-
         $queueForEvents
             ->setContext('database', $db)
             ->setParam('databaseId', $databaseId)
@@ -483,6 +474,18 @@ abstract class Action extends UtopiaAction
             ->setParam('columnId', $attribute->getId())
             ->setContext($this->getCollectionsEventsContext(), $collection);
 
+        $publisherForDatabase->enqueue(new DatabaseMessage(
+            project: $queueForEvents->getProject(),
+            user: $queueForEvents->getUser(),
+            type: DATABASE_TYPE_CREATE_ATTRIBUTE,
+            database: $db,
+            collection: $this->isCollectionsAPI() ? $collection : null,
+            document: $this->isCollectionsAPI() ? $attribute : null,
+            table: $this->isCollectionsAPI() ? null : $collection,
+            row: $this->isCollectionsAPI() ? null : $attribute,
+            events: Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams()),
+        ));
+
         $response->setStatusCode(SwooleResponse::STATUS_CODE_CREATED);
 
         return $attribute;
@@ -540,6 +543,7 @@ abstract class Action extends UtopiaAction
 
         switch ($attribute->getAttribute('format')) {
             case APP_DATABASE_ATTRIBUTE_INT_RANGE:
+            case APP_DATABASE_ATTRIBUTE_BIGINT_RANGE:
             case APP_DATABASE_ATTRIBUTE_FLOAT_RANGE:
                 $min ??= $attribute->getAttribute('formatOptions')['min'];
                 $max ??= $attribute->getAttribute('formatOptions')['max'];
@@ -548,14 +552,15 @@ abstract class Action extends UtopiaAction
                     throw new Exception($this->getInvalidValueException(), 'Minimum value must be lesser than maximum value');
                 }
 
-                if ($attribute->getAttribute('format') === APP_DATABASE_ATTRIBUTE_INT_RANGE) {
-                    $validator = new Range($min, $max, Database::VAR_INTEGER);
-                } else {
+                if ($attribute->getAttribute('format') === APP_DATABASE_ATTRIBUTE_FLOAT_RANGE) {
                     $validator = new Range($min, $max, Database::VAR_FLOAT);
 
                     if (!is_null($default)) {
                         $default = \floatval($default);
                     }
+                } else {
+                    // intRange and bigintRange share the same integer range semantics
+                    $validator = new Range($min, $max, Range::TYPE_INTEGER);
                 }
 
                 if (!is_null($default) && !$validator->isValid($default)) {

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/BigInt/Create.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt;
+
+use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
+use Appwrite\Extend\Exception;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Deprecated;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+use Utopia\Validator\Range;
+
+class Create extends Action
+{
+    public static function getName(): string
+    {
+        return 'createBigIntAttribute';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_ATTRIBUTE_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
+            ->setHttpPath('/v1/databases/:databaseId/collections/:collectionId/attributes/bigint')
+            ->desc('Create bigint attribute')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', 'collections.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
+            ->label('audits.event', 'attribute.create')
+            ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/databases/create-bigint-attribute.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_ACCEPTED,
+                        model: $this->getResponseModel(),
+                    )
+                ],
+                deprecated: new Deprecated(
+                    since: '1.8.0',
+                    replaceWith: 'tablesDB.createBigIntColumn',
+                ),
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('collectionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Collection ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Attribute Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is attribute required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when attribute is required.', true)
+            ->param('array', false, new Boolean(), 'Is attribute an array?', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('publisherForDatabase')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
+    {
+        $min ??= \PHP_INT_MIN;
+        $max ??= \PHP_INT_MAX;
+
+        if ($min > $max) {
+            throw new Exception($this->getInvalidValueException(), 'Minimum value must be lesser than maximum value');
+        }
+
+        $validator = new Range($min, $max, Range::TYPE_INTEGER);
+        if (!\is_null($default) && !$validator->isValid($default)) {
+            throw new Exception($this->getInvalidValueException(), $validator->getDescription());
+        }
+
+        $attribute = $this->createAttribute($databaseId, $collectionId, new Document([
+            'key' => $key,
+            'type' => Database::VAR_BIGINT,
+            'size' => 8,
+            'required' => $required,
+            'default' => $default,
+            'array' => $array,
+            'format' => APP_DATABASE_ATTRIBUTE_BIGINT_RANGE,
+            'formatOptions' => ['min' => $min, 'max' => $max],
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
+
+        $formatOptions = $attribute->getAttribute('formatOptions', []);
+        if (!empty($formatOptions)) {
+            $attribute->setAttribute('min', \intval($formatOptions['min']));
+            $attribute->setAttribute('max', \intval($formatOptions['max']));
+        }
+
+        $response
+            ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, $this->getResponseModel());
+    }
+}

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/BigInt/Update.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt;
+
+use Appwrite\Event\Event;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Deprecated;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+
+class Update extends Action
+{
+    public static function getName(): string
+    {
+        return 'updateBigIntAttribute';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_ATTRIBUTE_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
+            ->setHttpPath('/v1/databases/:databaseId/collections/:collectionId/attributes/bigint/:key')
+            ->desc('Update bigint attribute')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', 'collections.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
+            ->label('audits.event', 'attribute.update')
+            ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/databases/update-bigint-attribute.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: $this->getResponseModel(),
+                    )
+                ],
+                contentType: ContentType::JSON,
+                deprecated: new Deprecated(
+                    since: '1.8.0',
+                    replaceWith: 'tablesDB.updateBigIntColumn',
+                ),
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('collectionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Collection ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Attribute Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is attribute required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when attribute is required.')
+            ->param('newKey', null, fn (Database $dbForProject) => new Nullable(new Key(false, $dbForProject->getAdapter()->getMaxUIDLength())), 'New Attribute Key.', true, ['dbForProject'])
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, ?string $newKey, UtopiaResponse $response, Database $dbForProject, Event $queueForEvents, Authorization $authorization): void
+    {
+        $attribute = $this->updateAttribute(
+            databaseId: $databaseId,
+            collectionId: $collectionId,
+            key: $key,
+            dbForProject: $dbForProject,
+            queueForEvents: $queueForEvents,
+            authorization: $authorization,
+            type: Database::VAR_BIGINT,
+            default: $default,
+            required: $required,
+            min: $min,
+            max: $max,
+            newKey: $newKey
+        );
+
+        $formatOptions = $attribute->getAttribute('formatOptions', []);
+        if (!empty($formatOptions)) {
+            $attribute->setAttribute('min', \intval($formatOptions['min']));
+            $attribute->setAttribute('max', \intval($formatOptions['max']));
+        }
+
+        $response
+            ->setStatusCode(SwooleResponse::STATUS_CODE_OK)
+            ->dynamic($attribute, $this->getResponseModel());
+    }
+}

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Deprecated;
@@ -68,13 +68,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?bool $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $attribute = $this->createAttribute($databaseId, $collectionId, new Document([
             'key' => $key,
@@ -83,7 +83,7 @@ class Create extends Action
             'required' => $required,
             'default' => $default,
             'array' => $array,
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $response
             ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Deprecated;
@@ -69,13 +69,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $attribute = $this->createAttribute(
             $databaseId,
@@ -91,7 +91,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php

@@ -2,8 +2,9 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -66,13 +67,13 @@ class Delete extends Action
             ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Attribute Key.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $db = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
         if ($db->isEmpty()) {
@@ -129,20 +130,6 @@ class Delete extends Action
             }
         }
 
-        $queueForDatabase
-            ->setDatabase($db)
-            ->setType(DATABASE_TYPE_DELETE_ATTRIBUTE);
-
-        if ($this->isCollectionsAPI()) {
-            $queueForDatabase
-                ->setRow($attribute)
-                ->setTable($collection);
-        } else {
-            $queueForDatabase
-                ->setDocument($attribute)
-                ->setCollection($collection);
-        }
-
         $type = $attribute->getAttribute('type');
         $format = $attribute->getAttribute('format');
 
@@ -158,6 +145,18 @@ class Delete extends Action
             ->setPayload($response->output($attribute, $model))
             ->setContext($this->getCollectionsEventsContext(), $collection);
 
+        $publisherForDatabase->enqueue(new DatabaseMessage(
+            project: $queueForEvents->getProject(),
+            user: $queueForEvents->getUser(),
+            type: DATABASE_TYPE_DELETE_ATTRIBUTE,
+            database: $db,
+            collection: $this->isCollectionsAPI() ? null : $collection,
+            document: $this->isCollectionsAPI() ? null : $attribute,
+            table: $this->isCollectionsAPI() ? $collection : null,
+            row: $this->isCollectionsAPI() ? $attribute : null,
+            events: Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams()),
+        ));
+
         $response->noContent();
     }
 }

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Deprecated;
@@ -69,13 +69,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $attribute = $this->createAttribute(
             $databaseId,
@@ -91,7 +91,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -72,13 +72,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, array $elements, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, array $elements, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         if (!is_null($default) && !\in_array($default, $elements, true)) {
             throw new Exception($this->getInvalidValueException(), 'Default value not found in elements');
@@ -99,7 +99,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -73,13 +73,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $min ??= -PHP_FLOAT_MAX;
         $max ??= PHP_FLOAT_MAX;
@@ -102,7 +102,7 @@ class Create extends Action
             'array' => $array,
             'format' => APP_DATABASE_ATTRIBUTE_FLOAT_RANGE,
             'formatOptions' => ['min' => $min, 'max' => $max],
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $formatOptions = $attribute->getAttribute('formatOptions', []);
         if (!empty($formatOptions)) {

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Deprecated;
@@ -69,13 +69,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?string $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $attribute = $this->createAttribute(
             $databaseId,
@@ -91,7 +91,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -73,13 +73,13 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $min ??= \PHP_INT_MIN;
         $max ??= \PHP_INT_MAX;
@@ -104,7 +104,7 @@ class Create extends Action
             'array' => $array,
             'format' => APP_DATABASE_ATTRIBUTE_INT_RANGE,
             'formatOptions' => ['min' => $min, 'max' => $max],
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $formatOptions = $attribute->getAttribute('formatOptions', []);
         if (!empty($formatOptions)) {

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Line;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -69,13 +69,13 @@ class Create extends Action
             ->param('default', null, new Nullable(new Spatial(Database::VAR_LINESTRING)), 'Default value for attribute when not provided, two-dimensional array of coordinate pairs, [[longitude, latitude], [longitude, latitude], …], listing the vertices of the line in order. Cannot be set when attribute is required.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?array $default, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?array $default, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         if (!$dbForProject->getAdapter()->getSupportForSpatialAttributes()) {
             throw new Exception(Exception::GENERAL_FEATURE_UNSUPPORTED, 'Spatial columns are not supported by this database.');
@@ -86,7 +86,7 @@ class Create extends Action
             'type' => Database::VAR_LINESTRING,
             'required' => $required,
             'default' => $default
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $response
             ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Longtext/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Longtext;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -67,7 +67,7 @@ class Create extends Action
             ->param('encrypt', false, new Boolean(), 'Toggle encryption for the attribute. Encryption enhances security by not storing any plain text values in the database. However, encrypted attributes cannot be queried.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('plan')
             ->inject('authorization')
@@ -84,7 +84,7 @@ class Create extends Action
         bool           $encrypt,
         UtopiaResponse $response,
         Database       $dbForProject,
-        EventDatabase  $queueForDatabase,
+        DatabasePublisher  $publisherForDatabase,
         Event          $queueForEvents,
         array $plan,
         Authorization $authorization
@@ -112,7 +112,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Mediumtext/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Mediumtext;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -67,7 +67,7 @@ class Create extends Action
             ->param('encrypt', false, new Boolean(), 'Toggle encryption for the attribute. Encryption enhances security by not storing any plain text values in the database. However, encrypted attributes cannot be queried.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('plan')
             ->inject('authorization')
@@ -84,7 +84,7 @@ class Create extends Action
         bool           $encrypt,
         UtopiaResponse $response,
         Database       $dbForProject,
-        EventDatabase  $queueForDatabase,
+        DatabasePublisher  $publisherForDatabase,
         Event          $queueForEvents,
         array $plan,
         Authorization $authorization
@@ -112,7 +112,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Point;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -69,13 +69,13 @@ class Create extends Action
             ->param('default', null, new Nullable(new Spatial(Database::VAR_POINT)), 'Default value for attribute when not provided, array of two numbers [longitude, latitude], representing a single coordinate. Cannot be set when attribute is required.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?array $default, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?array $default, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         if (!$dbForProject->getAdapter()->getSupportForSpatialAttributes()) {
             throw new Exception(Exception::GENERAL_FEATURE_UNSUPPORTED, 'Spatial columns are not supported by this database.');
@@ -86,7 +86,7 @@ class Create extends Action
             'type' => Database::VAR_POINT,
             'required' => $required,
             'default' => $default,
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $response
             ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Polygon;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -69,13 +69,13 @@ class Create extends Action
             ->param('default', null, new Nullable(new Spatial(Database::VAR_POLYGON)), 'Default value for attribute when not provided, three-dimensional array where the outer array holds one or more linear rings, [[[longitude, latitude], …], …], the first ring is the exterior boundary, any additional rings are interior holes, and each ring must start and end with the same coordinate pair. Cannot be set when attribute is required.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?array $default, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, ?bool $required, ?array $default, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         if (!$dbForProject->getAdapter()->getSupportForSpatialAttributes()) {
             throw new Exception(Exception::GENERAL_FEATURE_UNSUPPORTED, 'Spatial columns are not supported by this database.');
@@ -86,7 +86,7 @@ class Create extends Action
             'type' => Database::VAR_POLYGON,
             'required' => $required,
             'default' => $default,
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $response
             ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -81,13 +81,13 @@ class Create extends Action
             ], true), 'Constraints option', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $relatedCollectionId, string $type, bool $twoWay, ?string $key, ?string $twoWayKey, string $onDelete, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $relatedCollectionId, string $type, bool $twoWay, ?string $key, ?string $twoWayKey, string $onDelete, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         if (!$dbForProject->getAdapter()->getSupportForRelationships()) {
             throw new Exception(Exception::GENERAL_FEATURE_UNSUPPORTED, 'Relationships are not supported by this database.');
@@ -159,7 +159,7 @@ class Create extends Action
                 'twoWayKey' => $twoWayKey,
                 'onDelete' => $onDelete,
             ]
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         foreach ($attribute->getAttribute('options', []) as $k => $option) {
             $attribute->setAttribute($k, $option);

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -75,7 +75,7 @@ class Create extends Action
             ->param('encrypt', false, new Boolean(), 'Toggle encryption for the attribute. Encryption enhances security by not storing any plain text values in the database. However, encrypted attributes cannot be queried.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('plan')
             ->inject('authorization')
@@ -93,7 +93,7 @@ class Create extends Action
         bool           $encrypt,
         UtopiaResponse $response,
         Database       $dbForProject,
-        EventDatabase  $queueForDatabase,
+        DatabasePublisher  $publisherForDatabase,
         Event          $queueForEvents,
         array $plan,
         Authorization $authorization
@@ -134,7 +134,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Text/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Text;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -67,7 +67,7 @@ class Create extends Action
             ->param('encrypt', false, new Boolean(), 'Toggle encryption for the attribute. Encryption enhances security by not storing any plain text values in the database. However, encrypted attributes cannot be queried.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('plan')
             ->inject('authorization')
@@ -84,7 +84,7 @@ class Create extends Action
         bool           $encrypt,
         UtopiaResponse $response,
         Database       $dbForProject,
-        EventDatabase  $queueForDatabase,
+        DatabasePublisher  $publisherForDatabase,
         Event          $queueForEvents,
         array $plan,
         Authorization $authorization
@@ -112,7 +112,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Deprecated;
@@ -69,7 +69,7 @@ class Create extends Action
             ->param('array', false, new Boolean(), 'Is attribute an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
@@ -84,7 +84,7 @@ class Create extends Action
         bool           $array,
         UtopiaResponse $response,
         Database       $dbForProject,
-        EventDatabase  $queueForDatabase,
+        DatabasePublisher  $publisherForDatabase,
         Event          $queueForEvents,
         Authorization $authorization
     ): void {
@@ -96,7 +96,7 @@ class Create extends Action
             'default' => $default,
             'array' => $array,
             'format' => APP_DATABASE_ATTRIBUTE_URL,
-        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents, $authorization);
+        ]), $response, $dbForProject, $publisherForDatabase, $queueForEvents, $authorization);
 
         $response
             ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Varchar/Create.php

@@ -2,8 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Varchar;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Action;
 use Appwrite\SDK\AuthType;
@@ -70,7 +70,7 @@ class Create extends Action
             ->param('encrypt', false, new Boolean(), 'Toggle encryption for the attribute. Encryption enhances security by not storing any plain text values in the database. However, encrypted attributes cannot be queried.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('plan')
             ->inject('authorization')
@@ -88,7 +88,7 @@ class Create extends Action
         bool           $encrypt,
         UtopiaResponse $response,
         Database       $dbForProject,
-        EventDatabase  $queueForDatabase,
+        DatabasePublisher  $publisherForDatabase,
         Event          $queueForEvents,
         array $plan,
         Authorization $authorization
@@ -129,7 +129,7 @@ class Create extends Action
             ]),
             $response,
             $dbForProject,
-            $queueForDatabase,
+            $publisherForDatabase,
             $queueForEvents,
             $authorization
         );

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php

@@ -290,13 +290,15 @@ class Create extends Action
         }
 
         if (isset($attribute['min']) || isset($attribute['max'])) {
-            $format = $type === Database::VAR_INTEGER
-                ? APP_DATABASE_ATTRIBUTE_INT_RANGE
-                : APP_DATABASE_ATTRIBUTE_FLOAT_RANGE;
+            $format = match($type) {
+                Database::VAR_INTEGER => APP_DATABASE_ATTRIBUTE_INT_RANGE,
+                Database::VAR_BIGINT => APP_DATABASE_ATTRIBUTE_BIGINT_RANGE,
+                default => APP_DATABASE_ATTRIBUTE_FLOAT_RANGE,
+            };
 
             $formatOptions = [
-                'min' => $attribute['min'] ?? ($type === Database::VAR_INTEGER ? \PHP_INT_MIN : -\PHP_FLOAT_MAX),
-                'max' => $attribute['max'] ?? ($type === Database::VAR_INTEGER ? \PHP_INT_MAX : \PHP_FLOAT_MAX),
+                'min' => $attribute['min'] ?? ($type === Database::VAR_INTEGER || $type === Database::VAR_BIGINT ? \PHP_INT_MIN : -\PHP_FLOAT_MAX),
+                'max' => $attribute['max'] ?? ($type === Database::VAR_INTEGER || $type === Database::VAR_BIGINT ? \PHP_INT_MAX : \PHP_FLOAT_MAX),
             ];
         }
 

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php

@@ -2,8 +2,9 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -63,13 +64,13 @@ class Delete extends Action
             ->inject('response')
             ->inject('dbForProject')
             ->inject('getDatabasesDB')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
         if ($database->isEmpty()) {
@@ -89,22 +90,22 @@ class Delete extends Action
         $dbForDatabases = $getDatabasesDB($database);
         $dbForDatabases->purgeCachedCollection('database_' . $database->getSequence() . '_collection_' . $collection->getSequence());
 
-        $queueForDatabase
-            ->setType(DATABASE_TYPE_DELETE_COLLECTION)
-            ->setDatabase($database);
-
-        if ($this->isCollectionsAPI()) {
-            $queueForDatabase->setCollection($collection);
-        } else {
-            $queueForDatabase->setTable($collection);
-        }
-
         $queueForEvents
             ->setParam('databaseId', $databaseId)
             ->setContext('database', $database)
             ->setParam($this->getEventsParamKey(), $collection->getId())
             ->setPayload($response->output($collection, $this->getResponseModel()));
 
+        $publisherForDatabase->enqueue(new DatabaseMessage(
+            project: $queueForEvents->getProject(),
+            user: $queueForEvents->getUser(),
+            type: DATABASE_TYPE_DELETE_COLLECTION,
+            database: $database,
+            collection: $this->isCollectionsAPI() ? $collection : null,
+            table: $this->isCollectionsAPI() ? null : $collection,
+            events: Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams()),
+        ));
+
         $response->noContent();
     }
 }

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php

@@ -3,6 +3,8 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Func as FunctionMessage;
+use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Action as DatabasesAction;
@@ -421,7 +423,7 @@ abstract class Action extends DatabasesAction
      * @param Document[] $documents
      * @param Event $queueForEvents
      * @param Event $queueForRealtime
-     * @param Event $queueForFunctions
+     * @param FunctionPublisher $publisherForFunctions
      * @param Event $queueForWebhooks
      * @param Database $dbForProject
      * @param EventProcessor $eventProcessor
@@ -434,7 +436,7 @@ abstract class Action extends DatabasesAction
         array $documents,
         Event $queueForEvents,
         Event $queueForRealtime,
-        Event $queueForFunctions,
+        FunctionPublisher $publisherForFunctions,
         Event $queueForWebhooks,
         Database $dbForProject,
         EventProcessor $eventProcessor
@@ -472,9 +474,15 @@ abstract class Action extends DatabasesAction
             if (!empty($functionsEvents)) {
                 foreach ($generatedEvents as $event) {
                     if (isset($functionsEvents[$event])) {
-                        $queueForFunctions
-                            ->from($queueForEvents)
-                            ->trigger();
+                        $publisherForFunctions->enqueue(FunctionMessage::fromEvent(
+                            event: $queueForEvents->getEvent(),
+                            params: $queueForEvents->getParams(),
+                            project: $queueForEvents->getProject(),
+                            user: $queueForEvents->getUser(),
+                            userId: $queueForEvents->getUserId(),
+                            payload: $queueForEvents->getPayload(),
+                            platform: $queueForEvents->getPlatform(),
+                        ));
                         break;
                     }
                 }
@@ -494,7 +502,6 @@ abstract class Action extends DatabasesAction
 
         $queueForEvents->reset();
         $queueForRealtime->reset();
-        $queueForFunctions->reset();
         $queueForWebhooks->reset();
     }
 }

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Bulk;
 
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Action;
@@ -80,14 +81,14 @@ class Delete extends Action
             ->inject('usage')
             ->inject('queueForEvents')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('eventProcessor')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, array $queries, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Context $usage, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan, EventProcessor $eventProcessor): void
+    public function action(string $databaseId, string $collectionId, array $queries, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Context $usage, Event $queueForEvents, Event $queueForRealtime, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, array $plan, EventProcessor $eventProcessor): void
     {
         $database = $dbForProject->getDocument('databases', $databaseId);
         if ($database->isEmpty()) {
@@ -206,7 +207,7 @@ class Delete extends Action
             $documents,
             $queueForEvents,
             $queueForRealtime,
-            $queueForFunctions,
+            $publisherForFunctions,
             $queueForWebhooks,
             $dbForProject,
             $eventProcessor

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Bulk;
 
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Action;
@@ -84,14 +85,14 @@ class Update extends Action
             ->inject('usage')
             ->inject('queueForEvents')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('eventProcessor')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string|array $data, array $queries, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Context $usage, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan, EventProcessor $eventProcessor): void
+    public function action(string $databaseId, string $collectionId, string|array $data, array $queries, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Context $usage, Event $queueForEvents, Event $queueForRealtime, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, array $plan, EventProcessor $eventProcessor): void
     {
         $data = \is_string($data)
             ? \json_decode($data, true)
@@ -237,7 +238,7 @@ class Update extends Action
             $documents,
             $queueForEvents,
             $queueForRealtime,
-            $queueForFunctions,
+            $publisherForFunctions,
             $queueForWebhooks,
             $dbForProject,
             $eventProcessor

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Bulk;
 
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Action;
@@ -82,14 +83,14 @@ class Upsert extends Action
             ->inject('usage')
             ->inject('queueForEvents')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('eventProcessor')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, array $documents, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Context $usage, Event $queueForEvents, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan, EventProcessor $eventProcessor): void
+    public function action(string $databaseId, string $collectionId, array $documents, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, Context $usage, Event $queueForEvents, Event $queueForRealtime, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, array $plan, EventProcessor $eventProcessor): void
     {
         $database = $dbForProject->getDocument('databases', $databaseId);
         if ($database->isEmpty()) {
@@ -212,7 +213,7 @@ class Upsert extends Action
             $upserted,
             $queueForEvents,
             $queueForRealtime,
-            $queueForFunctions,
+            $publisherForFunctions,
             $queueForWebhooks,
             $dbForProject,
             $eventProcessor

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php

@@ -3,6 +3,7 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents;
 
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\SDK\AuthType;
@@ -137,7 +138,7 @@ class Create extends Action
             ->inject('queueForEvents')
             ->inject('usage')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('authorization')
@@ -145,7 +146,7 @@ class Create extends Action
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, ?array $documents, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, Event $queueForEvents, Context $usage, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, array $plan, Authorization $authorization, EventProcessor $eventProcessor): void
+    public function action(string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, ?array $documents, ?string $transactionId, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, Event $queueForEvents, Context $usage, Event $queueForRealtime, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, array $plan, Authorization $authorization, EventProcessor $eventProcessor): void
     {
         $data = \is_string($data)
             ? \json_decode($data, true)
@@ -517,7 +518,7 @@ class Create extends Action
                 $created,
                 $queueForEvents,
                 $queueForRealtime,
-                $queueForFunctions,
+                $publisherForFunctions,
                 $queueForWebhooks,
                 $dbForProject,
                 $eventProcessor

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php

@@ -2,8 +2,9 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Indexes;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -78,13 +79,13 @@ class Create extends Action
             ->inject('response')
             ->inject('dbForProject')
             ->inject('getDatabasesDB')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, string $type, array $attributes, array $orders, array $lengths, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, string $type, array $attributes, array $orders, array $lengths, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $db = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -228,20 +229,6 @@ class Create extends Action
 
         $dbForProject->purgeCachedDocument('database_' . $db->getSequence(), $collectionId);
 
-        $queueForDatabase
-            ->setType(DATABASE_TYPE_CREATE_INDEX)
-            ->setDatabase($db);
-
-        if ($this->isCollectionsAPI()) {
-            $queueForDatabase
-                ->setCollection($collection)
-                ->setDocument($index);
-        } else {
-            $queueForDatabase
-                ->setTable($collection)
-                ->setRow($index);
-        }
-
         $queueForEvents
             ->setContext('database', $db)
             ->setParam('databaseId', $databaseId)
@@ -250,6 +237,18 @@ class Create extends Action
             ->setParam('tableId', $collection->getId())
             ->setContext($this->getCollectionsEventsContext(), $collection);
 
+        $publisherForDatabase->enqueue(new DatabaseMessage(
+            project: $queueForEvents->getProject(),
+            user: $queueForEvents->getUser(),
+            type: DATABASE_TYPE_CREATE_INDEX,
+            database: $db,
+            collection: $this->isCollectionsAPI() ? $collection : null,
+            document: $this->isCollectionsAPI() ? $index : null,
+            table: $this->isCollectionsAPI() ? null : $collection,
+            row: $this->isCollectionsAPI() ? null : $index,
+            events: Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams()),
+        ));
+
         $response
             ->setStatusCode(SwooleResponse::STATUS_CODE_ACCEPTED)
             ->dynamic($index, $this->getResponseModel());

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php

@@ -2,8 +2,9 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Indexes;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -69,13 +70,13 @@ class Delete extends Action
             ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Index Key.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, string $collectionId, string $key, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Authorization $authorization): void
+    public function action(string $databaseId, string $collectionId, string $key, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents, Authorization $authorization): void
     {
         $db = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
 
@@ -103,20 +104,6 @@ class Delete extends Action
 
         $dbForProject->purgeCachedDocument('database_' . $db->getSequence(), $collectionId);
 
-        $queueForDatabase
-            ->setType(DATABASE_TYPE_DELETE_INDEX)
-            ->setDatabase($db);
-
-        if ($this->isCollectionsAPI()) {
-            $queueForDatabase
-                ->setCollection($collection)
-                ->setDocument($index);
-        } else {
-            $queueForDatabase
-                ->setTable($collection)
-                ->setRow($index);
-        }
-
         $queueForEvents
             ->setContext('database', $db)
             ->setParam('databaseId', $databaseId)
@@ -126,6 +113,18 @@ class Delete extends Action
             ->setContext($this->getCollectionsEventsContext(), $collection)
             ->setPayload($response->output($index, $this->getResponseModel()));
 
+        $publisherForDatabase->enqueue(new DatabaseMessage(
+            project: $queueForEvents->getProject(),
+            user: $queueForEvents->getUser(),
+            type: DATABASE_TYPE_DELETE_INDEX,
+            database: $db,
+            collection: $this->isCollectionsAPI() ? $collection : null,
+            document: $this->isCollectionsAPI() ? $index : null,
+            table: $this->isCollectionsAPI() ? null : $collection,
+            row: $this->isCollectionsAPI() ? null : $index,
+            events: Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams()),
+        ));
+
         $response->noContent();
     }
 }

src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php

@@ -2,8 +2,9 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases;
 
-use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Database as DatabaseMessage;
+use Appwrite\Event\Publisher\Database as DatabasePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -58,12 +59,12 @@ class Delete extends Action
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->callback($this->action(...));
     }
 
-    public function action(string $databaseId, UtopiaResponse $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents): void
+    public function action(string $databaseId, UtopiaResponse $response, Database $dbForProject, DatabasePublisher $publisherForDatabase, Event $queueForEvents): void
     {
         $database = $dbForProject->getDocument('databases', $databaseId);
 
@@ -78,14 +79,18 @@ class Delete extends Action
         $dbForProject->purgeCachedDocument('databases', $database->getId());
         $dbForProject->purgeCachedCollection('databases_' . $database->getSequence());
 
-        $queueForDatabase
-            ->setType(DATABASE_TYPE_DELETE_DATABASE)
-            ->setDatabase($database);
-
         $queueForEvents
             ->setParam('databaseId', $database->getId())
             ->setPayload($response->output($database, UtopiaResponse::MODEL_DATABASE));
 
+        $publisherForDatabase->enqueue(new DatabaseMessage(
+            project: $queueForEvents->getProject(),
+            user: $queueForEvents->getUser(),
+            type: DATABASE_TYPE_DELETE_DATABASE,
+            database: $database,
+            events: Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams()),
+        ));
+
         $response->noContent();
     }
 }

src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Delete.php

@@ -2,7 +2,8 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
-use Appwrite\Event\Delete as DeleteEvent;
+use Appwrite\Event\Message\Delete as DeleteMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -10,6 +11,7 @@ use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response as UtopiaResponse;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Database\Validator\UID;
 use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
 
@@ -51,11 +53,12 @@ class Delete extends Action
             ->param('transactionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Transaction ID.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
+            ->inject('project')
             ->callback($this->action(...));
     }
 
-    public function action(string $transactionId, UtopiaResponse $response, Database $dbForProject, DeleteEvent $queueForDeletes): void
+    public function action(string $transactionId, UtopiaResponse $response, Database $dbForProject, DeletePublisher $publisherForDeletes, Document $project): void
     {
         $transaction = $dbForProject->getDocument('transactions', $transactionId);
 
@@ -65,9 +68,11 @@ class Delete extends Action
 
         $dbForProject->deleteDocument('transactions', $transactionId);
 
-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($transaction);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_DOCUMENT,
+            document: $transaction,
+        ));
 
         $response->noContent();
     }

src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php

@@ -3,8 +3,11 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
 use Appwrite\Databases\TransactionState;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Delete as DeleteMessage;
+use Appwrite\Event\Message\Func as FunctionMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
+use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Functions\EventProcessor;
 use Appwrite\SDK\AuthType;
@@ -73,11 +76,11 @@ class Update extends Action
             ->inject('getDatabasesDB')
             ->inject('user')
             ->inject('transactionState')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
             ->inject('queueForEvents')
             ->inject('usage')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('authorization')
             ->inject('eventProcessor')
@@ -93,11 +96,11 @@ class Update extends Action
      * @param callable $getDatabasesDB
      * @param User $user
      * @param TransactionState $transactionState
-     * @param Delete $queueForDeletes
+     * @param DeletePublisher $publisherForDeletes
      * @param Event $queueForEvents
      * @param Context $usage
      * @param Event $queueForRealtime
-     * @param Event $queueForFunctions
+     * @param FunctionPublisher $publisherForFunctions
      * @param Event $queueForWebhooks
      * @param EventProcessor $eventProcessor
      * @return void
@@ -108,7 +111,7 @@ class Update extends Action
      * @throws StructureException
      * @throws \Utopia\Http\Exception
      */
-    public function action(string $transactionId, bool $commit, bool $rollback, Document $project, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, TransactionState $transactionState, Delete $queueForDeletes, Event $queueForEvents, Context $usage, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, Authorization $authorization, EventProcessor $eventProcessor): void
+    public function action(string $transactionId, bool $commit, bool $rollback, Document $project, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, TransactionState $transactionState, DeletePublisher $publisherForDeletes, Event $queueForEvents, Context $usage, Event $queueForRealtime, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, Authorization $authorization, EventProcessor $eventProcessor): void
     {
         if (!$commit && !$rollback) {
             throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Either commit or rollback must be true');
@@ -154,9 +157,11 @@ class Update extends Action
                     new Document(['status' => 'committed'])
                 ));
 
-                $queueForDeletes
-                    ->setType(DELETE_TYPE_DOCUMENT)
-                    ->setDocument($transaction);
+                $publisherForDeletes->enqueue(new DeleteMessage(
+                    project: $project,
+                    type: DELETE_TYPE_DOCUMENT,
+                    document: $transaction,
+                ));
 
                 $response
                     ->setStatusCode(SwooleResponse::STATUS_CODE_OK)
@@ -293,9 +298,11 @@ class Update extends Action
                     new Document(['status' => 'committed'])
                 ));
 
-                $queueForDeletes
-                    ->setType(DELETE_TYPE_DOCUMENT)
-                    ->setDocument($transaction);
+                $publisherForDeletes->enqueue(new DeleteMessage(
+                    project: $project,
+                    type: DELETE_TYPE_DOCUMENT,
+                    document: $transaction,
+                ));
             } catch (NotFoundException $e) {
                 $authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
                     'status' => 'failed',
@@ -461,7 +468,15 @@ class Update extends Action
                     if (!empty($functionsEvents)) {
                         foreach ($generatedEvents as $event) {
                             if (isset($functionsEvents[$event])) {
-                                $queueForFunctions->from($queueForEvents)->trigger();
+                                $publisherForFunctions->enqueue(FunctionMessage::fromEvent(
+                                    event: $queueForEvents->getEvent(),
+                                    params: $queueForEvents->getParams(),
+                                    project: $queueForEvents->getProject(),
+                                    user: $queueForEvents->getUser(),
+                                    userId: $queueForEvents->getUserId(),
+                                    payload: $queueForEvents->getPayload(),
+                                    platform: $queueForEvents->getPlatform(),
+                                ));
                                 break;
                             }
                         }
@@ -480,7 +495,6 @@ class Update extends Action
 
                 $queueForEvents->reset();
                 $queueForRealtime->reset();
-                $queueForFunctions->reset();
                 $queueForWebhooks->reset();
             }
         }
@@ -492,9 +506,11 @@ class Update extends Action
                 new Document(['status' => 'failed'])
             ));
 
-            $queueForDeletes
-                ->setType(DELETE_TYPE_DOCUMENT)
-                ->setDocument($transaction);
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $project,
+                type: DELETE_TYPE_DOCUMENT,
+                document: $transaction,
+            ));
         }
 
         $response

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Delete.php

@@ -54,7 +54,7 @@ class Delete extends CollectionDelete
             ->inject('response')
             ->inject('dbForProject')
             ->inject('getDatabasesDB')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Documents/Bulk/Delete.php

@@ -63,7 +63,7 @@ class Delete extends DocumentsDelete
             ->inject('usage')
             ->inject('queueForEvents')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('eventProcessor')

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Documents/Bulk/Update.php

@@ -65,7 +65,7 @@ class Update extends DocumentsUpdate
             ->inject('usage')
             ->inject('queueForEvents')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('eventProcessor')

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Documents/Bulk/Upsert.php

@@ -65,7 +65,7 @@ class Upsert extends DocumentsUpsert
             ->inject('usage')
             ->inject('queueForEvents')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('eventProcessor')

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Documents/Create.php

@@ -112,7 +112,7 @@ class Create extends DocumentCreate
             ->inject('queueForEvents')
             ->inject('usage')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('plan')
             ->inject('authorization')

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Indexes/Create.php

@@ -65,7 +65,7 @@ class Create extends IndexCreate
             ->inject('response')
             ->inject('dbForProject')
             ->inject('getDatabasesDB')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Collections/Indexes/Delete.php

@@ -59,7 +59,7 @@ class Delete extends IndexDelete
             ->param('key', '', new Key(), 'Index Key.')
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Delete.php

@@ -48,7 +48,7 @@ class Delete extends DatabaseDelete
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('usage')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Transactions/Delete.php

@@ -49,7 +49,8 @@ class Delete extends TransactionsDelete
             ->param('transactionId', '', new UID(), 'Transaction ID.')
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
+            ->inject('project')
             ->callback($this->action(...));
     }
 }

src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Transactions/Update.php

@@ -56,11 +56,11 @@ class Update extends TransactionsUpdate
             ->inject('getDatabasesDB')
             ->inject('user')
             ->inject('transactionState')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
             ->inject('queueForEvents')
             ->inject('usage')
             ->inject('queueForRealtime')
-            ->inject('queueForFunctions')
+            ->inject('publisherForFunctions')
             ->inject('queueForWebhooks')
             ->inject('authorization')
             ->inject('eventProcessor')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Delete.php

@@ -48,7 +48,7 @@ class Delete extends DatabaseDelete
             ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->callback($this->action(...));
     }

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/BigInt/Create.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\BigInt;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt\Create as BigIntCreate;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+
+class Create extends BigIntCreate
+{
+    public static function getName(): string
+    {
+        return 'createBigIntColumn';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_COLUMN_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/bigint')
+            ->desc('Create bigint column')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
+            ->label('audits.event', 'column.create')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/tablesdb/create-bigint-column.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_ACCEPTED,
+                        model: $this->getResponseModel(),
+                    )
+                ]
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('tableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Table ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Column Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is column required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when column is required.', true)
+            ->param('array', false, new Boolean(), 'Is column an array?', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('publisherForDatabase')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+}

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/BigInt/Update.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\BigInt;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\BigInt\Update as BigIntUpdate;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
+use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Nullable;
+
+class Update extends BigIntUpdate
+{
+    public static function getName(): string
+    {
+        return 'updateBigIntColumn';
+    }
+
+    protected function getResponseModel(): string|array
+    {
+        return UtopiaResponse::MODEL_COLUMN_BIGINT;
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/bigint/:key')
+            ->desc('Update bigint column')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', ['tables.write', 'collections.write', 'columns.write', 'attributes.write'])
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
+            ->label('audits.event', 'column.update')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
+            ->label('sdk', new Method(
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
+                name: self::getName(),
+                description: '/docs/references/tablesdb/update-bigint-column.md',
+                auth: [AuthType::ADMIN, AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: $this->getResponseModel(),
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->param('databaseId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Database ID.', false, ['dbForProject'])
+            ->param('tableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Table ID.', false, ['dbForProject'])
+            ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Column Key.', false, ['dbForProject'])
+            ->param('required', null, new Boolean(), 'Is column required?')
+            ->param('min', null, new Nullable(new Integer(false, 64)), 'Minimum value', true)
+            ->param('max', null, new Nullable(new Integer(false, 64)), 'Maximum value', true)
+            ->param('default', null, new Nullable(new Integer(false, 64)), 'Default value. Cannot be set when column is required.')
+            ->param('newKey', null, fn (Database $dbForProject) => new Nullable(new Key(false, $dbForProject->getAdapter()->getMaxUIDLength())), 'New Column Key.', true, ['dbForProject'])
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForEvents')
+            ->inject('authorization')
+            ->callback($this->action(...));
+    }
+}

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php

@@ -59,7 +59,7 @@ class Create extends BooleanCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php

@@ -60,7 +60,7 @@ class Create extends DatetimeCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php

@@ -57,7 +57,7 @@ class Delete extends AttributesDelete
             ->param('key', '', fn (Database $dbForProject) => new Key(false, $dbForProject->getAdapter()->getMaxUIDLength()), 'Column Key.', false, ['dbForProject'])
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php

@@ -60,7 +60,7 @@ class Create extends EmailCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php

@@ -62,7 +62,7 @@ class Create extends EnumCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php

@@ -62,7 +62,7 @@ class Create extends FloatCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php

@@ -60,7 +60,7 @@ class Create extends IPCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php

@@ -62,7 +62,7 @@ class Create extends IntegerCreate
             ->param('array', false, new Boolean(), 'Is column an array?', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Create.php

@@ -59,7 +59,7 @@ class Create extends LineCreate
             ->param('default', null, new Nullable(new Spatial(Database::VAR_LINESTRING)), 'Default value for column when not provided, two-dimensional array of coordinate pairs, [[longitude, latitude], [longitude, latitude], …], listing the vertices of the line in order. Cannot be set when column is required.', true)
             ->inject('response')
             ->inject('dbForProject')
-            ->inject('queueForDatabase')
+            ->inject('publisherForDatabase')
             ->inject('queueForEvents')
             ->inject('authorization')
             ->callback($this->action(...));