Delete orphaned proxy rules on create

refactor: migrate delete queue publisher
2026-05-26 13:51:13 +00:00 · 2026-05-14 15:12:53 +05:30 · 2026-05-14 14:40:11 +05:30
45 changed files with 470 additions and 594 deletions
@@ -2,9 +2,9 @@

 require_once __DIR__ . '/init.php';

-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Publisher\Certificate as CertificatePublisher;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
@@ -285,9 +285,10 @@ $container->set('publisherForFunctions', fn (Publisher $publisher) => new Functi
    $publisher,
    new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
 ), ['publisher']);
-$container->set('queueForDeletes', function (Publisher $publisher) {
-    return new Delete($publisher);
-}, ['publisher']);
+$container->set('publisherForDeletes', fn (Publisher $publisher) => new DeletePublisher(
+    $publisher,
+    new Queue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
+), ['publisher']);
 $container->set('logError', function (Registry $register) {
    return function (Throwable $error, string $namespace, string $action) use ($register) {
        Console::error('[Error] Timestamp: ' . date('c', time()));
@@ -11,10 +11,11 @@ use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Bus\Events\SessionCreated;
 use Appwrite\Detector\Detector;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Delete as DeleteMessage;
 use Appwrite\Event\Message\Mail as MailMessage;
 use Appwrite\Event\Message\Messaging as MessagingMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Mail as MailPublisher;
 use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
 use Appwrite\Extend\Exception;
@@ -472,9 +473,9 @@ Http::delete('/v1/account')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('authorization')
-    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes, Authorization $authorization) {
+    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, DeletePublisher $publisherForDeletes, Authorization $authorization) {
        if ($user->isEmpty()) {
            throw new Exception(Exception::USER_NOT_FOUND);
        }
@@ -498,9 +499,11 @@ Http::delete('/v1/account')

        $dbForProject->deleteDocument('users', $user->getId());

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($user);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_DOCUMENT,
+            document: $user,
+        ));

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -582,12 +585,12 @@ Http::delete('/v1/account/sessions')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('store')
    ->inject('proofForToken')
    ->inject('domainVerification')
    ->inject('cookieDomain')
-    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, DeletePublisher $publisherForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {

        $protocol = $request->getProtocol();
        $sessions = $user->getAttribute('sessions', []);
@@ -617,10 +620,11 @@ Http::delete('/v1/account/sessions')
                $queueForEvents
                    ->setPayload($response->output($session, Response::MODEL_SESSION));

-                $queueForDeletes
-                    ->setType(DELETE_TYPE_SESSION_TARGETS)
-                    ->setDocument($session)
-                    ->trigger();
+                $publisherForDeletes->enqueue(new DeleteMessage(
+                    project: $queueForEvents->getProject(),
+                    type: DELETE_TYPE_SESSION_TARGETS,
+                    document: $session,
+                ));
            }
        }

@@ -714,12 +718,12 @@ Http::delete('/v1/account/sessions/:sessionId')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('queueForEvents')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('store')
    ->inject('proofForToken')
    ->inject('domainVerification')
    ->inject('cookieDomain')
-    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, DeletePublisher $publisherForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {

        $protocol = $request->getProtocol();
        $sessionId = ($sessionId === 'current')
@@ -761,10 +765,11 @@ Http::delete('/v1/account/sessions/:sessionId')
                ->setParam('sessionId', $session->getId())
                ->setPayload($response->output($session, Response::MODEL_SESSION));

-            $queueForDeletes
-                ->setType(DELETE_TYPE_SESSION_TARGETS)
-                ->setDocument($session)
-                ->trigger();
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $queueForEvents->getProject(),
+                type: DELETE_TYPE_SESSION_TARGETS,
+                document: $session,
+            ));

            $response->noContent();
            return;
@@ -4675,13 +4680,13 @@ Http::delete('/v1/account/targets/:targetId/push')
    ))
    ->param('targetId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Target ID.', false, ['dbForProject'])
    ->inject('queueForEvents')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('user')
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('authorization')
-    ->action(function (string $targetId, Event $queueForEvents, Delete $queueForDeletes, Document $user, Request $request, Response $response, Database $dbForProject, Authorization $authorization) {
+    ->action(function (string $targetId, Event $queueForEvents, DeletePublisher $publisherForDeletes, Document $user, Request $request, Response $response, Database $dbForProject, Authorization $authorization) {
        $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $targetId));

        if ($target->isEmpty()) {
@@ -4696,9 +4701,11 @@ Http::delete('/v1/account/targets/:targetId/push')

        $dbForProject->purgeCachedDocument('users', $user->getId());

-        $queueForDeletes
-            ->setType(DELETE_TYPE_TARGET)
-            ->setDocument($target);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_TARGET,
+            document: $target,
+        ));

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -3,9 +3,10 @@
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Delete as DeleteMessage;
 use Appwrite\Event\Message\Messaging as MessagingMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Messaging\Status as MessageStatus;
@@ -2728,9 +2729,9 @@ Http::delete('/v1/messaging/topics/:topicId')
    ->param('topicId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Topic ID.', false, ['dbForProject'])
    ->inject('queueForEvents')
    ->inject('dbForProject')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('response')
-    ->action(function (string $topicId, Event $queueForEvents, Database $dbForProject, Delete $queueForDeletes, Response $response) {
+    ->action(function (string $topicId, Event $queueForEvents, Database $dbForProject, DeletePublisher $publisherForDeletes, Response $response) {
        $topic = $dbForProject->getDocument('topics', $topicId);

        if ($topic->isEmpty()) {
@@ -2739,9 +2740,11 @@ Http::delete('/v1/messaging/topics/:topicId')

        $dbForProject->deleteDocument('topics', $topicId);

-        $queueForDeletes
-            ->setType(DELETE_TYPE_TOPIC)
-            ->setDocument($topic);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_TOPIC,
+            document: $topic,
+        ));

        $queueForEvents
            ->setParam('topicId', $topic->getId());
@@ -11,8 +11,9 @@ use Appwrite\Auth\Validator\Phone;
 use Appwrite\Deletes\Identities as DeleteIdentities;
 use Appwrite\Deletes\Targets as DeleteTargets;
 use Appwrite\Detector\Detector;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Delete as DeleteMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Extend\Exception;
 use Appwrite\Hooks\Hooks;
 use Appwrite\SDK\AuthType;
@@ -2592,8 +2593,8 @@ Http::delete('/v1/users/:userId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('queueForDeletes')
-    ->action(function (string $userId, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {
+    ->inject('publisherForDeletes')
+    ->action(function (string $userId, Response $response, Database $dbForProject, Event $queueForEvents, DeletePublisher $publisherForDeletes) {

        $user = $dbForProject->getDocument('users', $userId);

@@ -2608,9 +2609,11 @@ Http::delete('/v1/users/:userId')
        DeleteIdentities::delete($dbForProject, Query::equal('userInternalId', [$user->getSequence()]));
        DeleteTargets::delete($dbForProject, Query::equal('userInternalId', [$user->getSequence()]));

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($clone);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_DOCUMENT,
+            document: $clone,
+        ));

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -2643,10 +2646,10 @@ Http::delete('/v1/users/:userId/targets/:targetId')
    ->param('userId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'User ID.', false, ['dbForProject'])
    ->param('targetId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Target ID.', false, ['dbForProject'])
    ->inject('queueForEvents')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $userId, string $targetId, Event $queueForEvents, Delete $queueForDeletes, Response $response, Database $dbForProject) {
+    ->action(function (string $userId, string $targetId, Event $queueForEvents, DeletePublisher $publisherForDeletes, Response $response, Database $dbForProject) {
        $user = $dbForProject->getDocument('users', $userId);

        if ($user->isEmpty()) {
@@ -2666,9 +2669,11 @@ Http::delete('/v1/users/:userId/targets/:targetId')
        $dbForProject->deleteDocument('targets', $target->getId());
        $dbForProject->purgeCachedDocument('users', $user->getId());

-        $queueForDeletes
-            ->setType(DELETE_TYPE_TARGET)
-            ->setDocument($target);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_TARGET,
+            document: $target,
+        ));

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -7,9 +7,10 @@ use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
 use Appwrite\Bus\Events\ExecutionCompleted;
 use Appwrite\Bus\Events\RequestCompleted;
-use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+use Appwrite\Event\Message\Delete as DeleteMessage;
 use Appwrite\Event\Publisher\Certificate;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Cors;
 use Appwrite\Platform\Appwrite;
@@ -74,7 +75,7 @@ use Utopia\Validator\Text;

 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

-function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
+function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeletePublisher $publisherForDeletes, int $executionsRetentionCount)
 {
    $host = $request->getHostname();
    if (!empty($previewHostname)) {
@@ -790,12 +791,12 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                ? RESOURCE_TYPE_FUNCTIONS
                : RESOURCE_TYPE_SITES;

-            $queueForDeletes
-                ->setProject($project)
-                ->setResourceType($resourceType)
-                ->setResource($resource->getSequence())
-                ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
-                ->trigger();
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $project,
+                type: DELETE_TYPE_EXECUTIONS_LIMIT,
+                resource: (string) $resource->getSequence(),
+                resourceType: $resourceType,
+            ));
        }

        return true;
@@ -856,9 +857,9 @@ Http::init()
    ->inject('apiKey')
    ->inject('cors')
    ->inject('authorization')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Reader $geodb, Event $queueForEvents, Bus $bus, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Reader $geodb, Event $queueForEvents, Bus $bus, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
        /*
        * Appwrite Router
        */
@@ -866,7 +867,7 @@ Http::init()
        $platformHostnames = $platform['hostnames'] ?? [];
        // Only run Router when external domain
        if (!\in_array($hostname, $platformHostnames) || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1167,16 +1168,16 @@ Http::options()
    ->inject('apiKey')
    ->inject('cors')
    ->inject('authorization')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
        /*
        * Appwrite Router
        */
        $platformHostnames = $platform['hostnames'] ?? [];
        // Only run Router when external domain
        if (!in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1569,15 +1570,15 @@ Http::get('/robots.txt')
    ->inject('previewHostname')
    ->inject('apiKey')
    ->inject('authorization')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
        $platformHostnames = $platform['hostnames'] ?? [];
        if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1603,15 +1604,15 @@ Http::get('/humans.txt')
    ->inject('previewHostname')
    ->inject('apiKey')
    ->inject('authorization')
-    ->inject('queueForDeletes')
+    ->inject('publisherForDeletes')
    ->inject('executionsRetentionCount')
-    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeleteEvent $queueForDeletes, int $executionsRetentionCount) {
+    ->action(function (Http $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization, DeletePublisher $publisherForDeletes, int $executionsRetentionCount) {
        $platformHostnames = $platform['hostnames'] ?? [];
        if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $queueForDeletes, $executionsRetentionCount)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $bus, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey, $publisherForDeletes, $executionsRetentionCount)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -5,7 +5,6 @@ use Appwrite\Auth\MFA\Type\TOTP;
 use Appwrite\Bus\Events\RequestCompleted;
 use Appwrite\Event\Context\Audit as AuditContext;
 use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Message\Audit as AuditMessage;
 use Appwrite\Event\Message\Func as FunctionMessage;
@@ -565,7 +564,6 @@ Http::init()
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('auditContext')
-    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
    ->inject('usage')
    ->inject('publisherForFunctions')
@@ -578,7 +576,7 @@ Http::init()
    ->inject('platform')
    ->inject('authorization')
    ->inject('cacheControlForStorage')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Delete $queueForDeletes, EventDatabase $queueForDatabase, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, EventDatabase $queueForDatabase, Context $usage, FunctionPublisher $publisherForFunctions, Database $dbForProject, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Telemetry $telemetry, array $platform, Authorization $authorization, callable $cacheControlForStorage) {

        $response->setUser($user);
        $request->setUser($user);
@@ -625,7 +623,6 @@ Http::init()
        }

        /* Auto-set projects */
-        $queueForDeletes->setProject($project);
        $queueForDatabase->setProject($project);

        $useCache = $route->getLabel('cache', false);
@@ -818,7 +815,6 @@ Http::shutdown()
    ->inject('publisherForAudits')
    ->inject('usage')
    ->inject('publisherForUsage')
-    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
    ->inject('publisherForFunctions')
    ->inject('queueForWebhooks')
@@ -830,7 +826,7 @@ Http::shutdown()
    ->inject('bus')
    ->inject('apiKey')
    ->inject('mode')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Audit $publisherForAudits, Context $usage, UsagePublisher $publisherForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey, string $mode) use ($parseLabel) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Audit $publisherForAudits, Context $usage, UsagePublisher $publisherForUsage, EventDatabase $queueForDatabase, FunctionPublisher $publisherForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey, string $mode) use ($parseLabel) {

        $responsePayload = $response->getPayload();

@@ -977,10 +973,6 @@ Http::shutdown()
            $publisherForAudits->enqueue(AuditMessage::fromContext($auditContext));
        }

-        if (! empty($queueForDeletes->getType())) {
-            $queueForDeletes->trigger();
-        }
-
        if (! empty($queueForDatabase->getType())) {
            $queueForDatabase->trigger();
        }
@@ -4,6 +4,7 @@ use Appwrite\Event\Event;
 use Appwrite\Event\Publisher\Audit as AuditPublisher;
 use Appwrite\Event\Publisher\Build as BuildPublisher;
 use Appwrite\Event\Publisher\Certificate as CertificatePublisher;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Execution as ExecutionPublisher;
 use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Publisher\Mail as MailPublisher;
@@ -125,6 +126,10 @@ $container->set('publisherForBuilds', fn (Publisher $publisher) => new BuildPubl
    $publisher,
    new Queue(System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME))
 ), ['publisher']);
+$container->set('publisherForDeletes', fn (Publisher $publisher) => new DeletePublisher(
+    $publisher,
+    new Queue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
+), ['publisher']);
 $container->set('publisherForMails', fn (Publisher $publisher) => new MailPublisher(
    $publisher,
    new Queue(System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME))
@@ -6,9 +6,9 @@ use Appwrite\Auth\Key;
 use Appwrite\Databases\TransactionState;
 use Appwrite\Event\Context\Audit as AuditContext;
 use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Message\Func as FunctionMessage;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Webhook;
@@ -109,7 +109,6 @@ return function (Container $context): void {

    // Per-request queue resources (stateful, accumulate event data during request)
    $context->set('queueForDatabase', fn (Publisher $publisher) => new EventDatabase($publisher), ['publisher']);
-    $context->set('queueForDeletes', fn (Publisher $publisher) => new Delete($publisher), ['publisher']);
    $context->set('queueForEvents', fn (Publisher $publisher) => new Event($publisher), ['publisher']);
    $context->set('queueForWebhooks', fn (Publisher $publisher) => new Webhook($publisher), ['publisher']);
    $context->set('queueForRealtime', fn () => new Realtime(), []);
@@ -119,6 +118,10 @@ return function (Container $context): void {
        $publisher,
        new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
    ), ['publisher']);
+    $context->set('publisherForDeletes', fn (Publisher $publisher) => new DeletePublisher(
+        $publisher,
+        new Queue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
+    ), ['publisher']);
    $context->set('eventProcessor', fn () => new EventProcessor(), []);
    $context->set('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
        $adapter = new DatabasePool($pools->get('console'));
@@ -1,8 +1,8 @@
 <?php

 use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Webhook;
@@ -332,10 +332,6 @@ return function (Container $container): void {
        return new EventDatabase($publisher);
    }, ['publisher']);

-    $container->set('queueForDeletes', function (Publisher $publisher) {
-        return new Delete($publisher);
-    }, ['publisher']);
-
    $container->set('queueForEvents', function (Publisher $publisher) {
        return new Event($publisher);
    }, ['publisher']);
@@ -348,6 +344,10 @@ return function (Container $container): void {
        $publisher,
        new Queue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME), 'utopia-queue', Event::FUNCTIONS_QUEUE_TTL)
    ), ['publisher']);
+    $container->set('publisherForDeletes', fn (Publisher $publisher) => new DeletePublisher(
+        $publisher,
+        new Queue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
+    ), ['publisher']);

    $container->set('queueForRealtime', function () {
        return new Realtime();
@@ -74,7 +74,7 @@
        "utopia-php/locale": "0.8.*",
        "utopia-php/logger": "0.8.*",
        "utopia-php/messaging": "0.22.*",
-        "utopia-php/migration": "dev-add-project-variable-migration as 1.12.0",
+        "utopia-php/migration": "1.*",
        "utopia-php/platform": "^1.0@RC",
        "utopia-php/pools": "1.*",
        "utopia-php/span": "1.1.*",
@@ -112,17 +112,11 @@
        "ext-phpiredis": "*"
    },
    "config": {
-        "platform": {},
+        "platform": {
+        },
        "allow-plugins": {
            "php-http/discovery": true,
            "tbachert/spi": true
        }
-    },
-    "repositories": [
-        {
-            "name": "migration",
-            "type": "vcs",
-            "url": "https://github.com/utopia-php/migration"
-        }
-    ]
+    }
 }
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "5bf93473859f86fbf9438b17cb660331",
+    "content-hash": "9377e1b56bca8dbaf213ee3572ca15c0",
    "packages": [
        {
            "name": "adhocore/jwt",
@@ -4606,16 +4606,16 @@
        },
        {
            "name": "utopia-php/migration",
-            "version": "dev-add-project-variable-migration",
+            "version": "1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/migration.git",
-                "reference": "3376bed6f797a8d48f0107e9a0d8e40745d6914b"
+                "reference": "0fca44f40ad07bf2d56e9396afa6fa6d9b098ef1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/3376bed6f797a8d48f0107e9a0d8e40745d6914b",
-                "reference": "3376bed6f797a8d48f0107e9a0d8e40745d6914b",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/0fca44f40ad07bf2d56e9396afa6fa6d9b098ef1",
+                "reference": "0fca44f40ad07bf2d56e9396afa6fa6d9b098ef1",
                "shasum": ""
            },
            "require": {
@@ -4641,25 +4641,7 @@
                    "Utopia\\Migration\\": "src/Migration"
                }
            },
-            "autoload-dev": {
-                "psr-4": {
-                    "Utopia\\Tests\\": "tests/Migration"
-                }
-            },
-            "scripts": {
-                "test": [
-                    "./vendor/bin/phpunit"
-                ],
-                "lint": [
-                    "./vendor/bin/pint --test"
-                ],
-                "format": [
-                    "./vendor/bin/pint"
-                ],
-                "check": [
-                    "./vendor/bin/phpstan analyse --level 3 src tests --memory-limit 2G"
-                ]
-            },
+            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "MIT"
            ],
@@ -4672,10 +4654,10 @@
                "utopia"
            ],
            "support": {
-                "source": "https://github.com/utopia-php/migration/tree/add-project-variable-migration",
-                "issues": "https://github.com/utopia-php/migration/issues"
+                "issues": "https://github.com/utopia-php/migration/issues",
+                "source": "https://github.com/utopia-php/migration/tree/1.11.0"
            },
-            "time": "2026-05-14T19:00:51+00:00"
+            "time": "2026-05-11T08:13:06+00:00"
        },
        {
            "name": "utopia-php/mongo",
@@ -8582,18 +8564,10 @@
            "time": "2024-11-07T12:36:22+00:00"
        }
    ],
-    "aliases": [
-        {
-            "package": "utopia-php/migration",
-            "version": "dev-add-project-variable-migration",
-            "alias": "1.12.0",
-            "alias_normalized": "1.12.0.0"
-        }
-    ],
+    "aliases": [],
    "minimum-stability": "dev",
    "stability-flags": {
        "utopia-php/http": 5,
-        "utopia-php/migration": 20,
        "utopia-php/platform": 5
    },
    "prefer-stable": true,
@@ -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,
+        );
+    }
+}
@@ -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);
+    }
+}
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Advisor\Http\Reports;

-use Appwrite\Event\Delete as DeleteEvent;
 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;
@@ -58,7 +59,7 @@ class Delete extends Action
            ->inject('response')
            ->inject('project')
            ->inject('dbForPlatform')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->callback($this->action(...));
    }
@@ -68,7 +69,7 @@ class Delete extends Action
        Response $response,
        Document $project,
        Database $dbForPlatform,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents
    ): void {
        $report = $dbForPlatform->skipFilters(
@@ -84,9 +85,11 @@ class Delete extends Action
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove report from DB');
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_REPORT)
-            ->setDocument($report);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_REPORT,
+            document: $report,
+        ));

        $queueForEvents
            ->setParam('reportId', $report->getId())
@@ -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();
    }
@@ -3,9 +3,10 @@
 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;
@@ -75,7 +76,7 @@ class Update extends Action
            ->inject('getDatabasesDB')
            ->inject('user')
            ->inject('transactionState')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('usage')
            ->inject('queueForRealtime')
@@ -95,7 +96,7 @@ 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
@@ -110,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, FunctionPublisher $publisherForFunctions, 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');
@@ -156,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)
@@ -295,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',
@@ -501,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
@@ -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(...));
    }
 }
@@ -56,7 +56,7 @@ class Update extends TransactionsUpdate
            ->inject('getDatabasesDB')
            ->inject('user')
            ->inject('transactionState')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('usage')
            ->inject('queueForRealtime')
@@ -50,7 +50,8 @@ class Delete extends TransactionsDelete
            ->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(...));
    }
 }
@@ -57,7 +57,7 @@ class Update extends TransactionsUpdate
            ->inject('getDatabasesDB')
            ->inject('user')
            ->inject('transactionState')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('usage')
            ->inject('queueForRealtime')
@@ -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(...));
    }
 }
@@ -56,7 +56,7 @@ class Update extends TransactionsUpdate
            ->inject('getDatabasesDB')
            ->inject('user')
            ->inject('transactionState')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('usage')
            ->inject('queueForRealtime')
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Functions\Http\Deployments;

-use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+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;
@@ -59,7 +60,7 @@ class Delete extends Action
            ->param('deploymentId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Deployment ID.', false, ['dbForProject'])
            ->inject('response')
            ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('deviceForFunctions')
            ->callback($this->action(...));
@@ -70,7 +71,7 @@ class Delete extends Action
        string $deploymentId,
        Response $response,
        Database $dbForProject,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents,
        Device $deviceForFunctions
    ) {
@@ -128,9 +129,11 @@ class Delete extends Action
            ->setParam('functionId', $function->getId())
            ->setParam('deploymentId', $deployment->getId());

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($deployment);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_DOCUMENT,
+            document: $deployment,
+        ));

        $response->noContent();
    }
@@ -3,9 +3,10 @@
 namespace Appwrite\Platform\Modules\Functions\Http\Executions;

 use Ahc\Jwt\JWT;
-use Appwrite\Event\Delete as DeleteEvent;
 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\Extend\Exception as AppwriteException;
@@ -103,7 +104,7 @@ class Create extends Base
            ->inject('executor')
            ->inject('platform')
            ->inject('authorization')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('executionsRetentionCount')
            ->callback($this->action(...));
    }
@@ -131,7 +132,7 @@ class Create extends Base
        Executor $executor,
        array $platform,
        Authorization $authorization,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        int $executionsRetentionCount,
    ) {
        $async = \strval($async) === 'true' || \strval($async) === '1';
@@ -338,12 +339,12 @@ class Create extends Base
            }

            if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
-                $queueForDeletes
-                    ->setProject($project)
-                    ->setResource($function->getSequence())
-                    ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
-                    ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
-                    ->trigger();
+                $publisherForDeletes->enqueue(new DeleteMessage(
+                    project: $project,
+                    type: DELETE_TYPE_EXECUTIONS_LIMIT,
+                    resource: (string) $function->getSequence(),
+                    resourceType: RESOURCE_TYPE_FUNCTIONS,
+                ));
            }

            $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
@@ -529,12 +530,12 @@ class Create extends Base
        }

        if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
-            $queueForDeletes
-                ->setProject($project)
-                ->setResource($function->getSequence())
-                ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
-                ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
-                ->trigger();
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $project,
+                type: DELETE_TYPE_EXECUTIONS_LIMIT,
+                resource: (string) $function->getSequence(),
+                resourceType: RESOURCE_TYPE_FUNCTIONS,
+            ));
        }

        $response
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Functions\Http\Functions;

-use Appwrite\Event\Delete as DeleteEvent;
 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\Modules\Compute\Base;
 use Appwrite\SDK\AuthType;
@@ -59,7 +60,7 @@ class Delete extends Base
            ->param('functionId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Function ID.', false, ['dbForProject'])
            ->inject('response')
            ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
            ->inject('authorization')
@@ -70,7 +71,7 @@ class Delete extends Base
        string $functionId,
        Response $response,
        Database $dbForProject,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents,
        Database $dbForPlatform,
        Authorization $authorization
@@ -97,9 +98,11 @@ class Delete extends Base
            ])));
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($function);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_DOCUMENT,
+            document: $function,
+        ));

        $queueForEvents->setParam('functionId', $function->getId());

@@ -2,7 +2,7 @@

 namespace Appwrite\Platform\Modules\Health\Http\Health\Queue\Deletes;

-use Appwrite\Event\Delete;
+use Appwrite\Event\Publisher\Delete;
 use Appwrite\Platform\Modules\Health\Http\Health\Queue\Base;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
@@ -42,16 +42,16 @@ class Get extends Base
                contentType: ContentType::JSON
            ))
            ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('response')
            ->callback($this->action(...));
    }

-    public function action(int|string $threshold, Delete $queueForDeletes, Response $response): void
+    public function action(int|string $threshold, Delete $publisherForDeletes, Response $response): void
    {
        $threshold = (int) $threshold;

-        $size = $queueForDeletes->getSize();
+        $size = $publisherForDeletes->getSize();

        $this->assertQueueThreshold($size, $threshold);

@@ -3,11 +3,11 @@
 namespace Appwrite\Platform\Modules\Health\Http\Health\Queue\Failed;

 use Appwrite\Event\Database;
-use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Publisher\Audit;
 use Appwrite\Event\Publisher\Build as BuildPublisher;
 use Appwrite\Event\Publisher\Certificate;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use Appwrite\Event\Publisher\Func as FunctionPublisher;
 use Appwrite\Event\Publisher\Mail as MailPublisher;
 use Appwrite\Event\Publisher\Messaging as MessagingPublisher;
@@ -75,7 +75,7 @@ class Get extends Base
            ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
            ->inject('response')
            ->inject('queueForDatabase')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('publisherForAudits')
            ->inject('publisherForMails')
            ->inject('publisherForFunctions')
@@ -95,7 +95,7 @@ class Get extends Base
        int|string $threshold,
        Response $response,
        Database $queueForDatabase,
-        Delete $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Audit $publisherForAudits,
        MailPublisher $publisherForMails,
        FunctionPublisher $publisherForFunctions,
@@ -112,7 +112,7 @@ class Get extends Base

        $queue = match ($name) {
            System::getEnv('_APP_DATABASE_QUEUE_NAME', Event::DATABASE_QUEUE_NAME) => $queueForDatabase,
-            System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME) => $queueForDeletes,
+            System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME) => $publisherForDeletes,
            System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME) => $publisherForAudits,
            System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME) => $publisherForMails,
            System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME) => $publisherForFunctions,
@@ -2,7 +2,8 @@

 namespace Appwrite\Platform\Modules\Project\Http\Project;

-use Appwrite\Event\Delete as DeleteQueue;
+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;
@@ -53,7 +54,7 @@ class Delete extends Action
            ))
            ->inject('response')
            ->inject('dbForPlatform')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('authorization')
            ->inject('project')
            ->callback($this->action(...));
@@ -62,19 +63,20 @@ class Delete extends Action
    public function action(
        Response $response,
        Database $dbForPlatform,
-        DeleteQueue $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Authorization $authorization,
        Document $project,
    ) {
-        $queueForDeletes
-            ->setProject($project)
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($project);
-
        if (!$authorization->skip(fn () => $dbForPlatform->deleteDocument('projects', $project->getId()))) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove project from DB');
        }

+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_DOCUMENT,
+            document: $project,
+        ));
+
        $response->noContent();
    }
 }
@@ -5,7 +5,11 @@ namespace Appwrite\Platform\Modules\Proxy;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\DNS as ValidatorDNS;
 use Appwrite\Platform\Action as PlatformAction;
+use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\DNS\Message\Record;
 use Utopia\Domains\Domain;
 use Utopia\Logger\Log;
@@ -20,6 +24,54 @@ class Action extends PlatformAction
    {
    }

+    protected function createRule(Document $rule, Database $dbForPlatform, Authorization $authorization): Document
+    {
+        try {
+            return $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
+        } catch (Duplicate) {
+            if (!$this->deleteOrphanedRule($rule, $dbForPlatform, $authorization)) {
+                throw new Exception(Exception::RULE_ALREADY_EXISTS);
+            }
+        }
+
+        try {
+            return $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
+        } catch (Duplicate) {
+            throw new Exception(Exception::RULE_ALREADY_EXISTS);
+        }
+    }
+
+    private function deleteOrphanedRule(Document $rule, Database $dbForPlatform, Authorization $authorization): bool
+    {
+        $existingRule = $authorization->skip(function () use ($rule, $dbForPlatform) {
+            $existingRule = $dbForPlatform->findOne('rules', [
+                Query::equal('domain', [$rule->getAttribute('domain', '')]),
+            ]);
+
+            if (!$existingRule->isEmpty()) {
+                return $existingRule;
+            }
+
+            return $dbForPlatform->getDocument('rules', $rule->getId());
+        });
+
+        if ($existingRule->isEmpty()) {
+            return false;
+        }
+
+        $project = $authorization->skip(
+            fn () => $dbForPlatform->getDocument('projects', $existingRule->getAttribute('projectId', ''))
+        );
+
+        if (!$project->isEmpty()) {
+            return false;
+        }
+
+        $authorization->skip(fn () => $dbForPlatform->deleteDocument('rules', $existingRule->getId()));
+
+        return true;
+    }
+
    /**
     * Ensures domain is not in the deny list and is a valid domain
     *
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Logger\Log;
@@ -120,11 +119,7 @@ class Create extends Action
            }
        }

-        try {
-            $rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
-        } catch (Duplicate $e) {
-            throw new Exception(Exception::RULE_ALREADY_EXISTS);
-        }
+        $rule = $this->createRule($rule, $dbForPlatform, $authorization);

        if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
            $publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Proxy\Http\Rules;

-use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+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;
@@ -57,7 +58,7 @@ class Delete extends Action
            ->inject('response')
            ->inject('project')
            ->inject('dbForPlatform')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('authorization')
            ->callback($this->action(...));
@@ -68,7 +69,7 @@ class Delete extends Action
        Response $response,
        Document $project,
        Database $dbForPlatform,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents,
        Authorization $authorization,
    ) {
@@ -80,9 +81,11 @@ class Delete extends Action

        $authorization->skip(fn () => $dbForPlatform->deleteDocument('rules', $rule->getId()));

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($rule);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_DOCUMENT,
+            document: $rule,
+        ));

        $queueForEvents->setParam('ruleId', $rule->getId());

@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
@@ -142,11 +141,7 @@ class Create extends Action
            }
        }

-        try {
-            $rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
-        } catch (Duplicate $e) {
-            throw new Exception(Exception::RULE_ALREADY_EXISTS);
-        }
+        $rule = $this->createRule($rule, $dbForPlatform, $authorization);

        if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
            $publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
@@ -149,11 +148,7 @@ class Create extends Action
            }
        }

-        try {
-            $rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
-        } catch (Duplicate $e) {
-            throw new Exception(Exception::RULE_ALREADY_EXISTS);
-        }
+        $rule = $this->createRule($rule, $dbForPlatform, $authorization);

        if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
            $publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
@@ -12,7 +12,6 @@ use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
@@ -142,11 +141,7 @@ class Create extends Action
            }
        }

-        try {
-            $rule = $authorization->skip(fn () => $dbForPlatform->createDocument('rules', $rule));
-        } catch (Duplicate $e) {
-            throw new Exception(Exception::RULE_ALREADY_EXISTS);
-        }
+        $rule = $this->createRule($rule, $dbForPlatform, $authorization);

        if ($rule->getAttribute('status', '') === RULE_STATUS_CERTIFICATE_GENERATING) {
            $publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Sites\Http\Deployments;

-use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+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;
@@ -59,7 +60,7 @@ class Delete extends Action
            ->param('deploymentId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Deployment ID.', false, ['dbForProject'])
            ->inject('response')
            ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('deviceForSites')
            ->callback($this->action(...));
@@ -70,7 +71,7 @@ class Delete extends Action
        string $deploymentId,
        Response $response,
        Database $dbForProject,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents,
        Device $deviceForSites
    ) {
@@ -130,9 +131,11 @@ class Delete extends Action
            ->setParam('siteId', $site->getId())
            ->setParam('deploymentId', $deployment->getId());

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($deployment);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_DOCUMENT,
+            document: $deployment,
+        ));

        $response->noContent();
    }
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Sites\Http\Sites;

-use Appwrite\Event\Delete as DeleteEvent;
 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\Modules\Compute\Base;
 use Appwrite\SDK\AuthType;
@@ -56,7 +57,7 @@ class Delete extends Base
            ->param('siteId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Site ID.', false, ['dbForProject'])
            ->inject('response')
            ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->callback($this->action(...));
    }
@@ -65,7 +66,7 @@ class Delete extends Base
        string $siteId,
        Response $response,
        Database $dbForProject,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents
    ) {
        $site = $dbForProject->getDocument('sites', $siteId);
@@ -78,9 +79,11 @@ class Delete extends Base
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove site from DB');
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($site);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_DOCUMENT,
+            document: $site,
+        ));

        $queueForEvents->setParam('siteId', $site->getId());

@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Storage\Http\Buckets;

-use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+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;
@@ -53,7 +54,7 @@ class Delete extends Action
            ->param('bucketId', '', new UID(), 'Bucket unique ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->callback($this->action(...));
    }
@@ -62,7 +63,7 @@ class Delete extends Action
        string $bucketId,
        Response $response,
        Database $dbForProject,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Event $queueForEvents
    ) {
        $bucket = $dbForProject->getDocument('buckets', $bucketId);
@@ -75,9 +76,11 @@ class Delete extends Action
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove bucket from DB');
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($bucket);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $queueForEvents->getProject(),
+            type: DELETE_TYPE_DOCUMENT,
+            document: $bucket,
+        ));

        $queueForEvents
            ->setParam('bucketId', $bucket->getId())
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Storage\Http\Buckets\Files;

-use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
+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;
@@ -64,7 +65,7 @@ class Delete extends Action
            ->inject('dbForProject')
            ->inject('queueForEvents')
            ->inject('deviceForFiles')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('authorization')
            ->inject('user')
            ->callback($this->action(...));
@@ -77,7 +78,7 @@ class Delete extends Action
        Database $dbForProject,
        Event $queueForEvents,
        Device $deviceForFiles,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        Authorization $authorization,
        User $user,
    ) {
@@ -126,11 +127,12 @@ class Delete extends Action
        }

        if ($deviceDeleted) {
-            $queueForDeletes
-                ->setType(DELETE_TYPE_CACHE_BY_RESOURCE)
-                ->setResourceType('bucket/' . $bucket->getId())
-                ->setResource('file/' . $fileId)
-            ;
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $queueForEvents->getProject(),
+                type: DELETE_TYPE_CACHE_BY_RESOURCE,
+                resource: 'file/' . $fileId,
+                resourceType: 'bucket/' . $bucket->getId(),
+            ));

            try {
                if ($fileSecurity && !$valid) {
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Modules\Teams\Http\Teams;

-use Appwrite\Event\Delete as DeleteEvent;
 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\Platform\Workers\Deletes;
@@ -55,13 +56,13 @@ class Delete extends Action
            ->inject('response')
            ->inject('getProjectDB')
            ->inject('dbForProject')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('queueForEvents')
            ->inject('project')
            ->callback($this->action(...));
    }

-    public function action(string $teamId, Response $response, callable $getProjectDB, Database $dbForProject, DeleteEvent $queueForDeletes, Event $queueForEvents, Document $project)
+    public function action(string $teamId, Response $response, callable $getProjectDB, Database $dbForProject, DeletePublisher $publisherForDeletes, Event $queueForEvents, Document $project)
    {
        $team = $dbForProject->getDocument('teams', $teamId);

@@ -79,15 +80,18 @@ class Delete extends Action

        // Async delete
        if ($project->getId() === 'console') {
-            $queueForDeletes
-                ->setType(DELETE_TYPE_TEAM_PROJECTS)
-                ->setDocument($team)
-                ->trigger();
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $project,
+                type: DELETE_TYPE_TEAM_PROJECTS,
+                document: $team,
+            ));
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($team);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_DOCUMENT,
+            document: $team,
+        ));

        $queueForEvents
            ->setParam('teamId', $team->getId())
@@ -2,7 +2,8 @@

 namespace Appwrite\Platform\Modules\VCS\Http\Installations;

-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\Platform\Action;
 use Appwrite\SDK\AuthType;
@@ -11,6 +12,7 @@ use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Platform\Scope\HTTP;
 use Utopia\Validator\Text;

@@ -49,7 +51,8 @@ class Delete extends Action
            ->param('installationId', '', new Text(256), 'Installation Id')
            ->inject('response')
            ->inject('dbForPlatform')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
+            ->inject('project')
            ->callback($this->action(...));
    }

@@ -57,7 +60,8 @@ class Delete extends Action
        string $installationId,
        Response $response,
        Database $dbForPlatform,
-        DeleteEvent $queueForDeletes
+        DeletePublisher $publisherForDeletes,
+        Document $project,
    ) {
        $installation = $dbForPlatform->getDocument('installations', $installationId);

@@ -69,9 +73,11 @@ class Delete extends Action
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove installation from DB');
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($installation);
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            project: $project,
+            type: DELETE_TYPE_DOCUMENT,
+            document: $installation,
+        ));

        $response->noContent();
    }
@@ -2,8 +2,9 @@

 namespace Appwrite\Platform\Tasks;

-use Appwrite\Event\Delete;
+use Appwrite\Event\Message\Delete as DeleteMessage;
 use Appwrite\Event\Publisher\Certificate;
+use Appwrite\Event\Publisher\Delete as DeletePublisher;
 use DateInterval;
 use DateTime;
 use Utopia\Console;
@@ -30,11 +31,11 @@ class Maintenance extends Action
            ->inject('dbForPlatform')
            ->inject('console')
            ->inject('publisherForCertificates')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->callback($this->action(...));
    }

-    public function action(string $type, Database $dbForPlatform, Document $console, Certificate $publisherForCertificates, Delete $queueForDeletes): void
+    public function action(string $type, Database $dbForPlatform, Document $console, Certificate $publisherForCertificates, DeletePublisher $publisherForDeletes): void
    {
        Console::title('Maintenance V1');
        Console::success(APP_NAME . ' maintenance process v1 has started');
@@ -59,7 +60,7 @@ class Maintenance extends Action
            $delay = $next->getTimestamp() - $now->getTimestamp();
        }

-        $action = function () use ($interval, $cacheRetention, $schedulesDeletionRetention, $usageStatsRetentionHourly, $dbForPlatform, $console, $queueForDeletes, $publisherForCertificates) {
+        $action = function () use ($interval, $cacheRetention, $schedulesDeletionRetention, $usageStatsRetentionHourly, $dbForPlatform, $console, $publisherForDeletes, $publisherForCertificates) {
            $time = DatabaseDateTime::now();

            Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
@@ -70,12 +71,12 @@ class Maintenance extends Action

            $dbForPlatform->foreach(
                'projects',
-                function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
-                    $queueForDeletes
-                        ->setType(DELETE_TYPE_MAINTENANCE)
-                        ->setProject($project)
-                        ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
-                        ->trigger();
+                function (Document $project) use ($publisherForDeletes, $usageStatsRetentionHourly) {
+                    $publisherForDeletes->enqueue(new DeleteMessage(
+                        project: $project,
+                        type: DELETE_TYPE_MAINTENANCE,
+                        hourlyUsageRetentionDatetime: DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly),
+                    ));
                },
                [
                    Query::equal('region', [System::getEnv('_APP_REGION', 'default')]),
@@ -85,17 +86,17 @@ class Maintenance extends Action
                ]
            );

-            $queueForDeletes
-                ->setType(DELETE_TYPE_MAINTENANCE)
-                ->setProject($console)
-                ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
-                ->trigger();
+            $publisherForDeletes->enqueue(new DeleteMessage(
+                project: $console,
+                type: DELETE_TYPE_MAINTENANCE,
+                hourlyUsageRetentionDatetime: DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly),
+            ));

-            $this->notifyDeleteConnections($queueForDeletes);
+            $this->notifyDeleteConnections($publisherForDeletes);
            $this->renewCertificates($dbForPlatform, $publisherForCertificates);
-            $this->notifyDeleteCache($cacheRetention, $queueForDeletes);
-            $this->notifyDeleteSchedules($schedulesDeletionRetention, $queueForDeletes);
-            $this->notifyDeleteCSVExports($queueForDeletes);
+            $this->notifyDeleteCache($cacheRetention, $publisherForDeletes);
+            $this->notifyDeleteSchedules($schedulesDeletionRetention, $publisherForDeletes);
+            $this->notifyDeleteCSVExports($publisherForDeletes);
        };

        if ($type === 'loop') {
@@ -109,19 +110,17 @@ class Maintenance extends Action
        }
    }

-    private function notifyDeleteConnections(Delete $queueForDeletes): void
+    private function notifyDeleteConnections(DeletePublisher $publisherForDeletes): void
    {
-        $queueForDeletes
-            ->setType(DELETE_TYPE_REALTIME)
-            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -60))
-            ->trigger();
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            type: DELETE_TYPE_REALTIME,
+            datetime: DatabaseDateTime::addSeconds(new \DateTime(), -60),
+        ));
    }

-    private function notifyDeleteCSVExports(Delete $queueForDeletes): void
+    private function notifyDeleteCSVExports(DeletePublisher $publisherForDeletes): void
    {
-        $queueForDeletes
-            ->setType(DELETE_TYPE_CSV_EXPORTS)
-            ->trigger();
+        $publisherForDeletes->enqueue(new DeleteMessage(type: DELETE_TYPE_CSV_EXPORTS));
    }

    private function renewCertificates(Database $dbForPlatform, Certificate $publisherForCertificate): void
@@ -172,19 +171,19 @@ class Maintenance extends Action
        }
    }

-    private function notifyDeleteCache($interval, Delete $queueForDeletes): void
+    private function notifyDeleteCache($interval, DeletePublisher $publisherForDeletes): void
    {
-        $queueForDeletes
-            ->setType(DELETE_TYPE_CACHE_BY_TIMESTAMP)
-            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
-            ->trigger();
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            type: DELETE_TYPE_CACHE_BY_TIMESTAMP,
+            datetime: DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval),
+        ));
    }

-    private function notifyDeleteSchedules($interval, Delete $queueForDeletes): void
+    private function notifyDeleteSchedules($interval, DeletePublisher $publisherForDeletes): void
    {
-        $queueForDeletes
-            ->setType(DELETE_TYPE_SCHEDULES)
-            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
-            ->trigger();
+        $publisherForDeletes->enqueue(new DeleteMessage(
+            type: DELETE_TYPE_SCHEDULES,
+            datetime: DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval),
+        ));
    }
 }
@@ -5,7 +5,8 @@ namespace Appwrite\Platform\Workers;
 use Appwrite\Certificates\Adapter as CertificatesAdapter;
 use Appwrite\Deletes\Identities;
 use Appwrite\Deletes\Targets;
-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 Executor\Executor;
 use Throwable;
@@ -66,7 +67,7 @@ class Deletes extends Action
            ->inject('executionsRetentionCount')
            ->inject('auditRetention')
            ->inject('log')
-            ->inject('queueForDeletes')
+            ->inject('publisherForDeletes')
            ->inject('getAudit')
            ->callback($this->action(...));
    }
@@ -93,7 +94,7 @@ class Deletes extends Action
        int $executionsRetentionCount,
        string $auditRetention,
        Log $log,
-        DeleteEvent $queueForDeletes,
+        DeletePublisher $publisherForDeletes,
        callable $getAudit,
    ): void {
        $payload = $message->getPayload();
@@ -102,12 +103,13 @@ class Deletes extends Action
            throw new Exception('Missing payload');
        }

-        $type = $payload['type'] ?? '';
-        $datetime = $payload['datetime'] ?? null;
-        $hourlyUsageRetentionDatetime = $payload['hourlyUsageRetentionDatetime'] ?? null;
-        $resource = $payload['resource'] ?? null;
-        $resourceType = $payload['resourceType'] ?? null;
-        $document = new Document($payload['document'] ?? []);
+        $deleteMessage = DeleteMessage::fromArray($payload);
+        $type = $deleteMessage->type;
+        $datetime = $deleteMessage->datetime;
+        $hourlyUsageRetentionDatetime = $deleteMessage->hourlyUsageRetentionDatetime;
+        $resource = $deleteMessage->resource;
+        $resourceType = $deleteMessage->resourceType;
+        $document = $deleteMessage->document ?? new Document();

        $log->addTag('projectId', $project->getId());
        $log->addTag('type', $type);
@@ -214,7 +216,7 @@ class Deletes extends Action
                $this->deleteUsageStats($project, $getProjectDB, $getLogsDB, $hourlyUsageRetentionDatetime);
                $this->deleteExpiredSessions($project, $getProjectDB);
                $this->deleteExpiredTransactions($project, $getProjectDB);
-                $this->deleteOldDeployments($queueForDeletes, $project, $getProjectDB);
+                $this->deleteOldDeployments($publisherForDeletes, $project, $getProjectDB);
                break;
            case DELETE_TYPE_REPORT:
                $this->deleteReport($dbForPlatform, $project, $document);
@@ -390,12 +392,12 @@ class Deletes extends Action
        Targets::delete($getProjectDB($project), Query::equal('sessionInternalId', [$session->getSequence()]));
    }

-    private function deleteOldDeployments(DeleteEvent $queueForDeletes, Document $project, callable $getProjectDB): void
+    private function deleteOldDeployments(DeletePublisher $publisherForDeletes, Document $project, callable $getProjectDB): void
    {
        /** @var Database $dbForProject */
        $dbForProject = $getProjectDB($project);

-        $removalCallback = function (Document $resource) use ($dbForProject, $queueForDeletes, $project) {
+        $removalCallback = function (Document $resource) use ($dbForProject, $publisherForDeletes, $project) {
            $retention = $resource->getAttribute('deploymentRetention', 0);

            // 0 means unlimited - never delete
@@ -420,12 +422,12 @@ class Deletes extends Action
                'deployments',
                $queries,
                $dbForProject,
-                function (Document $deployment) use ($queueForDeletes, $project) {
-                    $queueForDeletes
-                        ->setType(DELETE_TYPE_DOCUMENT)
-                        ->setDocument($deployment)
-                        ->setProject($project)
-                        ->trigger();
+                function (Document $deployment) use ($publisherForDeletes, $project) {
+                    $publisherForDeletes->enqueue(new DeleteMessage(
+                        project: $project,
+                        type: DELETE_TYPE_DOCUMENT,
+                        document: $deployment,
+                    ));
                }
            );
        };
@@ -293,8 +293,6 @@ class Migrations extends Action
                $this->dbForProject,
                $this->getDatabasesDB,
                Config::getParam('collections', [])['databases']['collections'],
-                $this->dbForPlatform,
-                $this->project->getSequence(),
                OnDuplicate::tryFrom($options['onDuplicate'] ?? '') ?? OnDuplicate::Fail,
                $this->resolveDestinationDatabaseDsn(...),
            ),
@@ -53,24 +53,6 @@ class MigrationReport extends Model
                'default' => 0,
                'example' => 20,
            ])
-            ->addRule(Resource::TYPE_PLATFORM, [
-                'type' => self::TYPE_INTEGER,
-                'description' => 'Number of platforms to be migrated.',
-                'default' => 0,
-                'example' => 5,
-            ])
-            ->addRule(Resource::TYPE_API_KEY, [
-                'type' => self::TYPE_INTEGER,
-                'description' => 'Number of API keys to be migrated.',
-                'default' => 0,
-                'example' => 5,
-            ])
-            ->addRule(Resource::TYPE_PROJECT_VARIABLE, [
-                'type' => self::TYPE_INTEGER,
-                'description' => 'Number of project variables to be migrated.',
-                'default' => 0,
-                'example' => 5,
-            ])
            ->addRule(Resource::TYPE_SITE, [
                'type' => self::TYPE_INTEGER,
                'description' => 'Number of sites to be migrated.',
@@ -2463,251 +2463,6 @@ trait MigrationsBase
        return new CURLFile($tarPath, 'application/x-gzip', \basename($tarPath));
    }

-    /**
-     * Integrations
-     */
-    public function testAppwriteMigrationPlatform(): void
-    {
-        $sourceHeaders = [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey'],
-        ];
-
-        $destinationHeaders = [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getDestinationProject()['$id'],
-            'x-appwrite-key' => $this->getDestinationProject()['apiKey'],
-        ];
-
-        // Create platform on source project
-        $response = $this->client->call(Client::METHOD_POST, '/project/platforms/web', $sourceHeaders, [
-            'platformId' => ID::unique(),
-            'name' => 'Test Platform',
-            'hostname' => 'localhost',
-        ]);
-
-        $this->assertEquals(201, $response['headers']['status-code']);
-        $this->assertNotEmpty($response['body']);
-        $this->assertNotEmpty($response['body']['$id']);
-
-        $platform = $response['body'];
-
-        $result = $this->performMigrationSync([
-            'resources' => [
-                Resource::TYPE_PLATFORM,
-            ],
-            'endpoint' => $this->webEndpoint,
-            'projectId' => $this->getProject()['$id'],
-            'apiKey' => $this->getProject()['apiKey'],
-        ]);
-
-        $this->assertEquals('completed', $result['status']);
-        $this->assertEquals([Resource::TYPE_PLATFORM], $result['resources']);
-        $this->assertArrayHasKey(Resource::TYPE_PLATFORM, $result['statusCounters']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PLATFORM]['error']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PLATFORM]['pending']);
-        $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_PLATFORM]['success']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PLATFORM]['processing']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PLATFORM]['warning']);
-
-        // Verify platform on destination project using the project's API key
-        $response = $this->client->call(Client::METHOD_GET, '/project/platforms', $destinationHeaders);
-
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertNotEmpty($response['body']);
-        $this->assertGreaterThan(0, $response['body']['total']);
-
-        $foundPlatform = null;
-
-        foreach ($response['body']['platforms'] as $p) {
-            if ($p['name'] === 'Test Platform' && $p['type'] === 'web') {
-                $foundPlatform = $p;
-
-                break;
-            }
-        }
-
-        $this->assertNotNull($foundPlatform);
-        $this->assertEquals('web', $foundPlatform['type']);
-        $this->assertEquals('Test Platform', $foundPlatform['name']);
-        $this->assertEquals('localhost', $foundPlatform['hostname']);
-
-        // Cleanup on destination
-        $this->client->call(Client::METHOD_DELETE, '/project/platforms/' . $foundPlatform['$id'], $destinationHeaders);
-
-        // Cleanup on source
-        $this->client->call(Client::METHOD_DELETE, '/project/platforms/' . $platform['$id'], $sourceHeaders);
-    }
-
-    public function testAppwriteMigrationApiKey(): void
-    {
-        $sourceHeaders = [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey'],
-        ];
-
-        $destinationHeaders = [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getDestinationProject()['$id'],
-            'x-appwrite-key' => $this->getDestinationProject()['apiKey'],
-        ];
-
-        // Create API key on source project
-        $response = $this->client->call(Client::METHOD_POST, '/project/keys', $sourceHeaders, [
-            'keyId' => ID::unique(),
-            'name' => 'Test API Key',
-            'scopes' => ['databases.read', 'databases.write'],
-            'expire' => null,
-        ]);
-
-        $this->assertEquals(201, $response['headers']['status-code']);
-        $this->assertNotEmpty($response['body']);
-        $this->assertNotEmpty($response['body']['$id']);
-
-        $apiKey = $response['body'];
-
-        $result = $this->performMigrationSync([
-            'resources' => [
-                Resource::TYPE_API_KEY,
-            ],
-            'endpoint' => $this->webEndpoint,
-            'projectId' => $this->getProject()['$id'],
-            'apiKey' => $this->getProject()['apiKey'],
-        ]);
-
-        $this->assertEquals('completed', $result['status']);
-        $this->assertEquals([Resource::TYPE_API_KEY], $result['resources']);
-        $this->assertArrayHasKey(Resource::TYPE_API_KEY, $result['statusCounters']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_API_KEY]['error']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_API_KEY]['pending']);
-        $this->assertGreaterThanOrEqual(1, $result['statusCounters'][Resource::TYPE_API_KEY]['success']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_API_KEY]['processing']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_API_KEY]['warning']);
-
-        // Verify API key on destination project using the project's API key
-        $response = $this->client->call(Client::METHOD_GET, '/project/keys', $destinationHeaders);
-
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertNotEmpty($response['body']);
-        $this->assertGreaterThan(0, $response['body']['total']);
-
-        $foundKey = null;
-
-        foreach ($response['body']['keys'] as $k) {
-            if ($k['name'] === 'Test API Key') {
-                $foundKey = $k;
-
-                break;
-            }
-        }
-
-        $this->assertNotNull($foundKey);
-        $this->assertEquals('Test API Key', $foundKey['name']);
-        $this->assertEqualsCanonicalizing(['databases.read', 'databases.write'], $foundKey['scopes']);
-        $this->assertEmpty($foundKey['expire']);
-        $this->assertNotEquals($apiKey['secret'], $foundKey['secret']);
-
-        // Cleanup on destination
-        $this->client->call(Client::METHOD_DELETE, '/project/keys/' . $foundKey['$id'], $destinationHeaders);
-
-        // Cleanup on source
-        $this->client->call(Client::METHOD_DELETE, '/project/keys/' . $apiKey['$id'], $sourceHeaders);
-    }
-
-    public function testAppwriteMigrationProjectVariable(): void
-    {
-        $sourceHeaders = [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey'],
-        ];
-
-        $destinationHeaders = [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getDestinationProject()['$id'],
-            'x-appwrite-key' => $this->getDestinationProject()['apiKey'],
-        ];
-
-        // Source-side variable IDs and keys are uniquified so re-runs and parallel suites
-        // can't trip the source-side findOne('variables', [key=...]) skip path.
-        $plainKey = 'TEST_PLAIN_' . \strtoupper(ID::unique());
-        $secretKey = 'TEST_SECRET_' . \strtoupper(ID::unique());
-
-        // Non-secret variable: value should round-trip exactly.
-        $plainResp = $this->client->call(Client::METHOD_POST, '/project/variables', $sourceHeaders, [
-            'variableId' => ID::unique(),
-            'key' => $plainKey,
-            'value' => 'plain-value',
-            'secret' => false,
-        ]);
-        $this->assertEquals(201, $plainResp['headers']['status-code']);
-        $plainVariable = $plainResp['body'];
-
-        // Secret variable: SDK strips `value` on subsequent reads, so the migration
-        // source sees empty and the destination writes empty. Test asserts that.
-        $secretResp = $this->client->call(Client::METHOD_POST, '/project/variables', $sourceHeaders, [
-            'variableId' => ID::unique(),
-            'key' => $secretKey,
-            'value' => 'real-secret-value',
-            'secret' => true,
-        ]);
-        $this->assertEquals(201, $secretResp['headers']['status-code']);
-        $secretVariable = $secretResp['body'];
-
-        $result = $this->performMigrationSync([
-            'resources' => [
-                Resource::TYPE_PROJECT_VARIABLE,
-            ],
-            'endpoint' => $this->webEndpoint,
-            'projectId' => $this->getProject()['$id'],
-            'apiKey' => $this->getProject()['apiKey'],
-        ]);
-
-        $this->assertEquals('completed', $result['status']);
-        $this->assertEquals([Resource::TYPE_PROJECT_VARIABLE], $result['resources']);
-        $this->assertArrayHasKey(Resource::TYPE_PROJECT_VARIABLE, $result['statusCounters']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PROJECT_VARIABLE]['error']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PROJECT_VARIABLE]['pending']);
-        $this->assertGreaterThanOrEqual(2, $result['statusCounters'][Resource::TYPE_PROJECT_VARIABLE]['success']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PROJECT_VARIABLE]['processing']);
-        $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_PROJECT_VARIABLE]['warning']);
-
-        $response = $this->client->call(Client::METHOD_GET, '/project/variables', $destinationHeaders);
-        $this->assertEquals(200, $response['headers']['status-code']);
-
-        $foundPlain = null;
-        $foundSecret = null;
-        foreach ($response['body']['variables'] as $v) {
-            if ($v['key'] === $plainKey) {
-                $foundPlain = $v;
-            } elseif ($v['key'] === $secretKey) {
-                $foundSecret = $v;
-            }
-        }
-
-        $this->assertNotNull($foundPlain, 'Plain variable not found on destination');
-        $this->assertEquals($plainKey, $foundPlain['key']);
-        $this->assertEquals('plain-value', $foundPlain['value']);
-        $this->assertFalse($foundPlain['secret']);
-
-        $this->assertNotNull($foundSecret, 'Secret variable not found on destination');
-        $this->assertEquals($secretKey, $foundSecret['key']);
-        // Secret variables: source SDK never returned the real value, so the destination
-        // also stores empty. The original 'real-secret-value' must not have leaked.
-        $this->assertNotEquals('real-secret-value', $foundSecret['value']);
-        $this->assertTrue($foundSecret['secret']);
-
-        // Cleanup on destination
-        $this->client->call(Client::METHOD_DELETE, '/project/variables/' . $foundPlain['$id'], $destinationHeaders);
-        $this->client->call(Client::METHOD_DELETE, '/project/variables/' . $foundSecret['$id'], $destinationHeaders);
-
-        // Cleanup on source
-        $this->client->call(Client::METHOD_DELETE, '/project/variables/' . $plainVariable['$id'], $sourceHeaders);
-        $this->client->call(Client::METHOD_DELETE, '/project/variables/' . $secretVariable['$id'], $sourceHeaders);
-    }
-
    /**
     * Import documents from a CSV file.
     */
Author	SHA1	Message	Date
Chirag Aggarwal	0d32a2e623	Delete orphaned proxy rules on create	2026-05-14 15:12:53 +05:30
Chirag Aggarwal	65d1e58e34	refactor: migrate delete queue publisher	2026-05-14 14:40:11 +05:30