Merge remote-tracking branch 'origin/1.7.x' into chore-upgrade-utopia-queue

2026-05-23 00:49:02 +00:00 · 2025-06-25 18:58:08 -04:00 · 2025-06-25 18:58:08 -04:00 · 921b2bcc5d
commit 921b2bcc5d
parent b646eb7758 e8982e6b11
102 changed files with 264 additions and 140 deletions
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@ -65,7 +65,7 @@ jobs:
          sudo apt update
          sudo apt install oha
      - name: Benchmark PR
-        run: 'oha -z 180s  http://localhost/v1/health/version -j > benchmark.json'
+        run: 'oha -z 180s  http://localhost/v1/health/version --output-format json > benchmark.json'
      - name: Cleaning
        run: docker compose down -v
      - name: Installing latest version
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@ -56,7 +56,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
 {
    $host = $request->getHostname() ?? '';
    if (!empty($previewHostname)) {
@ -118,6 +118,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $project->setAttribute('accessedAt', DateTime::now());
            Authorization::skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
        }
+
+        /**
+         * Set projectId to update the Error hook logger, since x-appwrite-project is not available when executing custom domain function
+         */
+        $log->addTag('projectId', $project->getId());
    }

    if (array_key_exists('proxy', $project->getAttribute('services', []))) {
@ -787,6 +792,7 @@ App::init()
    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
+    ->inject('log')
    ->inject('console')
    ->inject('project')
    ->inject('dbForPlatform')
@ -804,7 +810,7 @@ App::init()
    ->inject('previewHostname')
    ->inject('devKey')
    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, Executor $executor, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, Executor $executor, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey) {
        /*
        * Appwrite Router
        */
@ -812,7 +818,7 @@ App::init()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@ -1094,7 +1100,7 @@ App::options()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@ -1267,7 +1273,12 @@ App::error()
            $log->addTag('url', $request->getURI());
            $log->addTag('verboseType', get_class($error));
            $log->addTag('code', $error->getCode());
-            $log->addTag('projectId', $project->getId());
+
+            $tags = $log->getTags();
+            if (!isset($tags['projectId'])) {
+                $log->addTag('projectId', $project->getId());
+            }
+
            $log->addTag('hostname', $request->getHostname());
            $log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));

@ -1403,7 +1414,7 @@ App::get('/robots.txt')
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@ -1435,7 +1446,7 @@ App::get('/humans.txt')
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@ -22,6 +22,7 @@ use Utopia\Abuse\Abuse;
 use Utopia\App;
 use Utopia\Cache\Adapter\Filesystem;
 use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@ -797,6 +798,12 @@ App::shutdown()
        }

        if (!empty($queueForDatabase->getType())) {
+            Console::info("Triggering database event: \n" .  \json_encode([
+                'projectId' => $project->getId(),
+                'databaseId' => $queueForDatabase->getDatabase()?->getId(),
+                'collectionId' => $queueForDatabase->getCollection()?->getId(),
+                'documentId' => $queueForDatabase->getDocument()?->getId(),
+            ]));
            $queueForDatabase->trigger();
        }

--- a/composer.lock
+++ b/composer.lock
@ -1206,16 +1206,16 @@
        },
        {
            "name": "open-telemetry/api",
-            "version": "1.3.0",
+            "version": "1.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/opentelemetry-php/api.git",
-                "reference": "4e3bb38e069876fb73c2ce85c89583bf2b28cd86"
+                "reference": "b3a9286f9c1c8247c83493c5b1fa475cd0cec7f7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/4e3bb38e069876fb73c2ce85c89583bf2b28cd86",
-                "reference": "4e3bb38e069876fb73c2ce85c89583bf2b28cd86",
+                "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/b3a9286f9c1c8247c83493c5b1fa475cd0cec7f7",
+                "reference": "b3a9286f9c1c8247c83493c5b1fa475cd0cec7f7",
                "shasum": ""
            },
            "require": {
@ -1235,7 +1235,7 @@
                    ]
                },
                "branch-alias": {
-                    "dev-main": "1.1.x-dev"
+                    "dev-main": "1.4.x-dev"
                }
            },
            "autoload": {
@ -1272,7 +1272,7 @@
                "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                "source": "https://github.com/open-telemetry/opentelemetry-php"
            },
-            "time": "2025-05-07T12:32:21+00:00"
+            "time": "2025-06-19T23:36:51+00:00"
        },
        {
            "name": "open-telemetry/context",
@ -1335,16 +1335,16 @@
        },
        {
            "name": "open-telemetry/exporter-otlp",
-            "version": "1.3.1",
+            "version": "1.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/opentelemetry-php/exporter-otlp.git",
-                "reference": "8b3ca1f86d01429c73b407bf1a2075d9c187001e"
+                "reference": "196f3a1dbce3b2c0f8110d164232c11ac00ddbb2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/8b3ca1f86d01429c73b407bf1a2075d9c187001e",
-                "reference": "8b3ca1f86d01429c73b407bf1a2075d9c187001e",
+                "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/196f3a1dbce3b2c0f8110d164232c11ac00ddbb2",
+                "reference": "196f3a1dbce3b2c0f8110d164232c11ac00ddbb2",
                "shasum": ""
            },
            "require": {
@ -1395,7 +1395,7 @@
                "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                "source": "https://github.com/open-telemetry/opentelemetry-php"
            },
-            "time": "2025-05-21T12:02:20+00:00"
+            "time": "2025-06-16T00:24:51+00:00"
        },
        {
            "name": "open-telemetry/gen-otlp-protobuf",
@ -1462,22 +1462,22 @@
        },
        {
            "name": "open-telemetry/sdk",
-            "version": "1.5.0",
+            "version": "1.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/opentelemetry-php/sdk.git",
-                "reference": "cd0d7367599717fc29e04eb8838ec061e6c2c657"
+                "reference": "1c0371794e4c0700afd4a9d4d8511cb5e3f78e6a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/cd0d7367599717fc29e04eb8838ec061e6c2c657",
-                "reference": "cd0d7367599717fc29e04eb8838ec061e6c2c657",
+                "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/1c0371794e4c0700afd4a9d4d8511cb5e3f78e6a",
+                "reference": "1c0371794e4c0700afd4a9d4d8511cb5e3f78e6a",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "nyholm/psr7-server": "^1.1",
-                "open-telemetry/api": "~1.0 || ~1.1",
+                "open-telemetry/api": "~1.4.0",
                "open-telemetry/context": "^1.0",
                "open-telemetry/sem-conv": "^1.0",
                "php": "^8.1",
@ -1500,6 +1500,10 @@
            "type": "library",
            "extra": {
                "spi": {
+                    "OpenTelemetry\\API\\Configuration\\ConfigEnv\\EnvComponentLoader": [
+                        "OpenTelemetry\\API\\Instrumentation\\Configuration\\General\\ConfigEnv\\EnvComponentLoaderHttpConfig",
+                        "OpenTelemetry\\API\\Instrumentation\\Configuration\\General\\ConfigEnv\\EnvComponentLoaderPeerConfig"
+                    ],
                    "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [
                        "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager"
                    ]
@ -1548,7 +1552,7 @@
                "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                "source": "https://github.com/open-telemetry/opentelemetry-php"
            },
-            "time": "2025-05-22T02:33:34+00:00"
+            "time": "2025-06-19T23:36:51+00:00"
        },
        {
            "name": "open-telemetry/sem-conv",
@ -5159,16 +5163,16 @@
        },
        {
            "name": "matthiasmullie/minify",
-            "version": "1.3.74",
+            "version": "1.3.75",
            "source": {
                "type": "git",
                "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "a2593286a4135d03c6a6a9e9aeded5d41e931ce4"
+                "reference": "76ba4a5f555fd7bf4aa408af608e991569076671"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/a2593286a4135d03c6a6a9e9aeded5d41e931ce4",
-                "reference": "a2593286a4135d03c6a6a9e9aeded5d41e931ce4",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/76ba4a5f555fd7bf4aa408af608e991569076671",
+                "reference": "76ba4a5f555fd7bf4aa408af608e991569076671",
                "shasum": ""
            },
            "require": {
@ -5217,7 +5221,7 @@
            ],
            "support": {
                "issues": "https://github.com/matthiasmullie/minify/issues",
-                "source": "https://github.com/matthiasmullie/minify/tree/1.3.74"
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.75"
            },
            "funding": [
                {
@ -5225,7 +5229,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-06-12T08:06:04+00:00"
+            "time": "2025-06-25T09:56:19+00:00"
        },
        {
            "name": "matthiasmullie/path-converter",
--- a/src/Appwrite/Event/Database.php
+++ b/src/Appwrite/Event/Database.php
@ -54,6 +54,16 @@ class Database extends Event
        return $this;
    }

+    /**
+     * Returns set database for this event.
+     *
+     * @return null|Document
+     */
+    public function getDatabase(): ?Document
+    {
+        return $this->database;
+    }
+
    /**
     * Set the collection for this database event.
     *
--- a/src/Appwrite/Platform/Modules/Compute/Base.php
+++ b/src/Appwrite/Platform/Modules/Compute/Base.php
@ -6,6 +6,7 @@ use Appwrite\Event\Build;
 use Appwrite\Extend\Exception;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@ -226,6 +227,73 @@ class Base extends Action
            ]))
        );

+        if (!empty($commitDetails['commitHash'])) {
+            $domain = "commit-" . substr($commitDetails['commitHash'], 0, 16) . ".{$sitesDomain}";
+            $ruleId = md5($domain);
+            try {
+                Authorization::skip(
+                    fn () => $dbForPlatform->createDocument('rules', new Document([
+                        '$id' => $ruleId,
+                        'projectId' => $project->getId(),
+                        'projectInternalId' => $project->getInternalId(),
+                        'domain' => $domain,
+                        'type' => 'deployment',
+                        'trigger' => 'deployment',
+                        'deploymentId' => $deployment->getId(),
+                        'deploymentInternalId' => $deployment->getInternalId(),
+                        'deploymentResourceType' => 'site',
+                        'deploymentResourceId' => $site->getId(),
+                        'deploymentResourceInternalId' => $site->getInternalId(),
+                        'deploymentVcsProviderBranch' => $providerBranch,
+                        'status' => 'verified',
+                        'certificateId' => '',
+                        'search' => implode(' ', [$ruleId, $domain]),
+                        'owner' => 'Appwrite',
+                        'region' => $project->getAttribute('region')
+                    ]))
+                );
+            } catch (Duplicate $err) {
+                // Ignore, rule already exists; will be updated by builds worker
+            }
+        }
+
+        // VCS branch preview
+        if (!empty($providerBranch)) {
+            $branchPrefix = substr($providerBranch, 0, 16);
+            if (strlen($providerBranch) > 16) {
+                $remainingChars = substr($providerBranch, 16);
+                $branchPrefix .= '-' . substr(hash('sha256', $remainingChars), 0, 7);
+            }
+            $resourceProjectHash = substr(hash('sha256', $site->getId() . $project->getId()), 0, 7);
+            $domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
+            $ruleId = md5($domain);
+            try {
+                Authorization::skip(
+                    fn () => $dbForPlatform->createDocument('rules', new Document([
+                        '$id' => $ruleId,
+                        'projectId' => $project->getId(),
+                        'projectInternalId' => $project->getInternalId(),
+                        'domain' => $domain,
+                        'type' => 'deployment',
+                        'trigger' => 'deployment',
+                        'deploymentId' => $deployment->getId(),
+                        'deploymentInternalId' => $deployment->getInternalId(),
+                        'deploymentResourceType' => 'site',
+                        'deploymentResourceId' => $site->getId(),
+                        'deploymentResourceInternalId' => $site->getInternalId(),
+                        'deploymentVcsProviderBranch' => $providerBranch,
+                        'status' => 'verified',
+                        'certificateId' => '',
+                        'search' => implode(' ', [$ruleId, $domain]),
+                        'owner' => 'Appwrite',
+                        'region' => $project->getAttribute('region')
+                    ]))
+                );
+            } catch (Duplicate $err) {
+                // Ignore, rule already exists; will be updated by builds worker
+            }
+        }
+
        $queueForBuilds
            ->setType(BUILD_TYPE_DEPLOYMENT)
            ->setResource($site)
--- a/src/Appwrite/Platform/Modules/Console/Http/Resources/Get.php
+++ b/src/Appwrite/Platform/Modules/Console/Http/Resources/Get.php
@ -57,7 +57,7 @@ class Get extends Action
            ->param('type', '', new WhiteList(['rules']), 'Resource type.')
            ->inject('response')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php
@ -87,7 +87,7 @@ class Create extends Action
            ->inject('deviceForLocal')
            ->inject('queueForBuilds')
            ->inject('plan')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Delete.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Delete.php
@ -62,7 +62,7 @@ class Delete extends Action
            ->inject('queueForDeletes')
            ->inject('queueForEvents')
            ->inject('deviceForFunctions')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php
@ -61,7 +61,7 @@ class Get extends Action
            ->inject('dbForProject')
            ->inject('deviceForFunctions')
            ->inject('deviceForBuilds')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
@ -62,7 +62,7 @@ class Create extends Action
            ->inject('queueForEvents')
            ->inject('queueForBuilds')
            ->inject('deviceForFunctions')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Get.php
@ -49,7 +49,7 @@ class Get extends Action
            ->param('deploymentId', '', new UID(), 'Deployment ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Status/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Status/Update.php
@ -59,7 +59,7 @@ class Update extends Action
            ->inject('project')
            ->inject('queueForEvents')
            ->inject('executor')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
@ -75,7 +75,7 @@ class Create extends Base
            ->inject('project')
            ->inject('queueForBuilds')
            ->inject('gitHub')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php
@ -72,7 +72,7 @@ class Create extends Base
            ->inject('queueForEvents')
            ->inject('queueForBuilds')
            ->inject('gitHub')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/XList.php
@ -57,7 +57,7 @@ class XList extends Action
            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
@ -94,7 +94,7 @@ class Create extends Base
            ->inject('queueForFunctions')
            ->inject('geodb')
            ->inject('executor')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Delete.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Delete.php
@ -62,7 +62,7 @@ class Delete extends Base
            ->inject('dbForProject')
            ->inject('dbForPlatform')
            ->inject('queueForEvents')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Get.php
@ -52,7 +52,7 @@ class Get extends Base
            ->param('executionId', '', new UID(), 'Execution ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/XList.php
@ -58,7 +58,7 @@ class XList extends Base
            ->param('queries', [], new Executions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
@ -114,7 +114,7 @@ class Create extends Base
            ->inject('dbForPlatform')
            ->inject('request')
            ->inject('gitHub')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php
@ -61,7 +61,7 @@ class Delete extends Base
            ->inject('queueForDeletes')
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
@ -62,7 +62,7 @@ class Update extends Base
            ->inject('dbForProject')
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Get.php
@ -49,7 +49,7 @@ class Get extends Base
            ->param('functionId', '', new UID(), 'Function ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
@ -104,7 +104,7 @@ class Update extends Base
            ->inject('dbForPlatform')
            ->inject('gitHub')
            ->inject('executor')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/XList.php
@ -56,7 +56,7 @@ class XList extends Base
            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Runtimes/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Runtimes/XList.php
@ -47,7 +47,7 @@ class XList extends Base
                ]
            ))
            ->inject('response')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Response $response)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php
@ -48,7 +48,7 @@ class XList extends Base
            ))
            ->inject('response')
            ->inject('plan')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Response $response, array $plan)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Templates/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Templates/Get.php
@ -49,7 +49,7 @@ class Get extends Base
            ))
            ->param('templateId', '', new Text(128), 'Template ID.')
            ->inject('response')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $templateId, Response $response)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Templates/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Templates/XList.php
@ -53,7 +53,7 @@ class XList extends Base
            ->param('limit', 25, new Range(1, 5000), 'Limit the number of templates returned in the response. Default limit is 25, and maximum limit is 5000.', true)
            ->param('offset', 0, new Range(0, 5000), 'Offset the list of returned templates. Maximum offset is 5000.', true)
            ->inject('response')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(array $runtimes, array $usecases, int $limit, int $offset, Response $response)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php
@ -55,7 +55,7 @@ class Get extends Base
            ->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $functionId, string $range, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php
@ -52,7 +52,7 @@ class XList extends Base
            ->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $range, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Variables/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Variables/Create.php
@ -65,7 +65,7 @@ class Create extends Base
            ->inject('dbForProject')
            ->inject('dbForPlatform')
            ->inject('project')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Variables/Delete.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Variables/Delete.php
@ -57,7 +57,7 @@ class Delete extends Base
            ->inject('response')
            ->inject('dbForProject')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Variables/Get.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Variables/Get.php
@ -53,7 +53,7 @@ class Get extends Base
            ->param('variableId', '', new UID(), 'Variable unique ID.', false)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $functionId, string $variableId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Functions/Http/Variables/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Variables/Update.php
@ -61,7 +61,7 @@ class Update extends Base
            ->inject('response')
            ->inject('dbForProject')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Functions/Http/Variables/XList.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Variables/XList.php
@ -53,7 +53,7 @@ class XList extends Base
            ->param('functionId', '', new UID(), 'Function unique ID.', false)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $functionId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@ -75,7 +75,7 @@ class Builds extends Action
            ->inject('log')
            ->inject('executor')
            ->inject('plan')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
@ -209,6 +209,9 @@ class Builds extends Action
        Executor $executor,
        array $plan
    ): void {
+        $startTime = DateTime::now();
+        $durationStart = \microtime(true);
+
        $resourceKey = match ($resource->getCollection()) {
            'functions' => 'functionId',
            'sites' => 'siteId',
@ -260,9 +263,6 @@ class Builds extends Action
            ->setParam($resourceKey, $resource->getId())
            ->setParam('deploymentId', $deployment->getId());

-        $startTime = DateTime::now();
-        $durationStart = \microtime(true);
-
        if ($deployment->getAttribute('status') === 'canceled') {
            Console::info('Build has been canceled');
            return;
@ -810,9 +810,6 @@ class Builds extends Action
                throw $err;
            }

-            $endTime = DateTime::now();
-            $durationEnd = \microtime(true);
-
            $buildSizeLimit = (int)System::getEnv('_APP_COMPUTE_BUILD_SIZE_LIMIT', '2000000000');
            if (isset($plan['buildSize'])) {
                $buildSizeLimit = $plan['buildSize'] * 1000 * 1000;
@ -821,10 +818,6 @@ class Builds extends Action
                throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / (1000 * 1000), 2) . ' MBs.');
            }

-            /** Update the build document */
-            $deployment->setAttribute('buildStartedAt', DateTime::format((new \DateTime())->setTimestamp(floor($response['startTime']))));
-            $deployment->setAttribute('buildEndedAt', $endTime);
-            $deployment->setAttribute('buildDuration', \intval(\ceil($durationEnd - $durationStart)));
            $deployment->setAttribute('buildPath', $response['path']);
            $deployment->setAttribute('buildSize', $response['size']);
            $deployment->setAttribute('totalSize', $deployment->getAttribute('buildSize', 0) + $deployment->getAttribute('sourceSize', 0));
@ -1191,6 +1184,15 @@ class Builds extends Action
                }
            }

+            $endTime = DateTime::now();
+            $durationEnd = \microtime(true);
+            $deployment->setAttribute('buildEndedAt', $endTime);
+            $deployment->setAttribute('buildDuration', \intval(\ceil($durationEnd - $durationStart)));
+            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
+            $queueForRealtime
+                ->setPayload($deployment->getArrayCopy())
+                ->trigger();
+
            if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') {
                Console::info('Build has been canceled');
                return;
@ -1234,7 +1236,7 @@ class Builds extends Action

            // Combine with previous logs if deployment got past build process
            $previousLogs = '';
-            if (!empty($deployment->getAttribute('buildEndedAt', ''))) {
+            if (!is_null($deployment->getAttribute('buildSize', null))) {
                $previousLogs = $deployment->getAttribute('buildLogs', '');
                if (!empty($previousLogs)) {
                    $message = $previousLogs . "\n" . $message;
--- a/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Create.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Create.php
@ -57,7 +57,7 @@ class Create extends Action
            ->inject('user')
            ->inject('response')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $projectId, string $name, ?string $expire, Document $user, Response $response, Database $dbForPlatform)
--- a/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Delete.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Delete.php
@ -49,7 +49,7 @@ class Delete extends Action
            ->param('keyId', '', new UID(), 'Key unique ID.')
            ->inject('response')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $projectId, string $keyId, Response $response, Database $dbForPlatform)
--- a/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Get.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Get.php
@ -49,7 +49,7 @@ class Get extends Action
            ->param('keyId', '', new UID(), 'Key unique ID.')
            ->inject('response')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $projectId, string $keyId, Response $response, Database $dbForPlatform)
--- a/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Update.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Update.php
@ -52,7 +52,7 @@ class Update extends Action
            ->param('expire', null, new DatetimeValidator(), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format.')
            ->inject('response')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }
    public function action(string $projectId, string $keyId, string $name, ?string $expire, Response $response, Database $dbForPlatform)
    {
--- a/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/XList.php
+++ b/src/Appwrite/Platform/Modules/Projects/Http/DevKeys/XList.php
@ -53,7 +53,7 @@ class XList extends Action
            ->param('queries', [], new DevKeys(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', DevKeys::ALLOWED_ATTRIBUTES), true)
            ->inject('response')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $projectId, ?array $queries, Response $response, Database $dbForPlatform)
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
@ -66,7 +66,7 @@ class Create extends Action
            ->inject('queueForCertificates')
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $domain, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform)
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
@ -71,7 +71,7 @@ class Create extends Action
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $domain, string $functionId, string $branch, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
@ -74,7 +74,7 @@ class Create extends Action
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $domain, string $url, int $statusCode, string $resourceId, string $resourceType, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
@ -71,7 +71,7 @@ class Create extends Action
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $domain, string $siteId, string $branch, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php
@ -86,7 +86,7 @@ class Create extends Action
            ->inject('deviceForLocal')
            ->inject('queueForBuilds')
            ->inject('plan')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Delete.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Delete.php
@ -62,7 +62,7 @@ class Delete extends Action
            ->inject('queueForDeletes')
            ->inject('queueForEvents')
            ->inject('deviceForSites')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php
@ -60,7 +60,7 @@ class Get extends Action
            ->inject('dbForProject')
            ->inject('deviceForSites')
            ->inject('deviceForBuilds')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
@ -65,7 +65,7 @@ class Create extends Action
            ->inject('queueForEvents')
            ->inject('queueForBuilds')
            ->inject('deviceForSites')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Get.php
@ -49,7 +49,7 @@ class Get extends Action
            ->param('deploymentId', '', new UID(), 'Deployment ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, string $deploymentId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Status/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Status/Update.php
@ -57,7 +57,7 @@ class Update extends Action
            ->inject('project')
            ->inject('queueForEvents')
            ->inject('executor')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
@ -77,7 +77,7 @@ class Create extends Base
            ->inject('queueForEvents')
            ->inject('queueForBuilds')
            ->inject('gitHub')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Vcs/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Vcs/Create.php
@ -72,7 +72,7 @@ class Create extends Base
            ->inject('queueForEvents')
            ->inject('queueForBuilds')
            ->inject('gitHub')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/XList.php
@ -57,7 +57,7 @@ class XList extends Action
            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, array $queries, string $search, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Frameworks/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Frameworks/XList.php
@ -46,7 +46,7 @@ class XList extends Base
                ]
            ))
            ->inject('response')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Response $response)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Logs/Delete.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Logs/Delete.php
@ -55,7 +55,7 @@ class Delete extends Base
            ->inject('response')
            ->inject('dbForProject')
            ->inject('queueForEvents')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, string $logId, Response $response, Database $dbForProject, Event $queueForEvents)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Logs/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Logs/Get.php
@ -50,7 +50,7 @@ class Get extends Base
            ->param('logId', '', new UID(), 'Log ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, string $logId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Logs/XList.php
@ -57,7 +57,7 @@ class XList extends Base
            ->param('queries', [], new Logs(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, array $queries, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php
@ -89,7 +89,7 @@ class Create extends Base
            ->inject('project')
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Delete.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Delete.php
@ -58,7 +58,7 @@ class Delete extends Base
            ->inject('dbForProject')
            ->inject('queueForDeletes')
            ->inject('queueForEvents')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
@ -60,7 +60,7 @@ class Update extends Base
            ->inject('dbForProject')
            ->inject('queueForEvents')
            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Get.php
@ -49,7 +49,7 @@ class Get extends Base
            ->param('siteId', '', new UID(), 'Site ID.')
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
@ -97,7 +97,7 @@ class Update extends Base
            ->inject('dbForPlatform')
            ->inject('gitHub')
            ->inject('executor')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/XList.php
@ -56,7 +56,7 @@ class XList extends Base
            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(array $queries, string $search, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php
@ -48,7 +48,7 @@ class XList extends Base
            ))
            ->inject('response')
            ->inject('plan')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Response $response, array $plan)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php
@ -49,7 +49,7 @@ class Get extends Base
            ))
            ->param('templateId', '', new Text(128), 'Template ID.')
            ->inject('response')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $templateId, Response $response)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php
@ -53,7 +53,7 @@ class XList extends Base
            ->param('limit', 25, new Range(1, 5000), 'Limit the number of templates returned in the response. Default limit is 25, and maximum limit is 5000.', true)
            ->param('offset', 0, new Range(0, 5000), 'Offset the list of returned templates. Maximum offset is 5000.', true)
            ->inject('response')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Usage/Get.php
@ -55,7 +55,7 @@ class Get extends Base
            ->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Usage/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Usage/XList.php
@ -52,7 +52,7 @@ class XList extends Base
            ->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $range, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Variables/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Variables/Create.php
@ -62,7 +62,7 @@ class Create extends Base
            ->inject('response')
            ->inject('dbForProject')
            ->inject('project')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, string $key, string $value, bool $secret, Response $response, Database $dbForProject, Document $project)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Variables/Delete.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Variables/Delete.php
@ -54,7 +54,7 @@ class Delete extends Base
            ->param('variableId', '', new UID(), 'Variable unique ID.', false)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, string $variableId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Variables/Get.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Variables/Get.php
@ -53,7 +53,7 @@ class Get extends Base
            ->param('variableId', '', new UID(), 'Variable unique ID.', false)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $siteId, string $variableId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Sites/Http/Variables/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Variables/Update.php
@ -58,7 +58,7 @@ class Update extends Base
            ->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only sites can read them during build and runtime.', true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Sites/Http/Variables/XList.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Variables/XList.php
@ -53,7 +53,7 @@ class XList extends Base
            ->param('siteId', '', new UID(), 'Site unique ID.', false)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Create.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Create.php
@ -65,7 +65,7 @@ class Create extends Action
        ->inject('response')
        ->inject('dbForProject')
        ->inject('queueForEvents')
-        ->callback([$this, 'action']);
+        ->callback($this->action(...));
    }

    public function action(string $bucketId, string $fileId, ?string $expire, Response $response, Database $dbForProject, Event $queueForEvents): void
--- a/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/XList.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/XList.php
@ -55,7 +55,7 @@ class XList extends Action
            ->param('queries', [], new FileTokens(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', FileTokens::ALLOWED_ATTRIBUTES), true)
            ->inject('response')
            ->inject('dbForProject')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $bucketId, string $fileId, array $queries, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Delete.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Delete.php
@ -58,7 +58,7 @@ class Delete extends Action
        ->inject('response')
        ->inject('dbForProject')
        ->inject('queueForEvents')
-        ->callback([$this, 'action']);
+        ->callback($this->action(...));
    }

    public function action(string $tokenId, Response $response, Database $dbForProject, Event $queueForEvents)
--- a/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Get.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Get.php
@ -50,7 +50,7 @@ class Get extends Action
        ->param('tokenId', '', new UID(), 'Token ID.')
        ->inject('response')
        ->inject('dbForProject')
-        ->callback([$this, 'action']);
+        ->callback($this->action(...));
    }

    public function action(string $tokenId, Response $response, Database $dbForProject)
--- a/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Update.php
+++ b/src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Update.php
@ -61,7 +61,7 @@ class Update extends Action
        ->inject('response')
        ->inject('dbForProject')
        ->inject('queueForEvents')
-        ->callback([$this, 'action']);
+        ->callback($this->action(...));
    }

    public function action(string $tokenId, ?string $expire, Response $response, Database $dbForProject, Event $queueForEvents)
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@ -34,7 +34,7 @@ class Doctor extends Action
        $this
            ->desc('Validate server health')
            ->inject('register')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Registry $register): void
--- a/src/Appwrite/Platform/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@ -31,7 +31,7 @@ class Install extends Action
            ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
            ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
            ->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive, bool $noStart): void
--- a/src/Appwrite/Platform/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@ -29,7 +29,7 @@ class Maintenance extends Action
            ->inject('console')
            ->inject('queueForCertificates')
            ->inject('queueForDeletes')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Database $dbForPlatform, Document $console, Certificate $queueForCertificates, Delete $queueForDeletes): void
--- a/src/Appwrite/Platform/Tasks/QueueRetry.php
+++ b/src/Appwrite/Platform/Tasks/QueueRetry.php
@ -24,7 +24,7 @@ class QueueRetry extends Action
            ->param('name', '', new Text(100), 'Queue name')
            ->param('limit', 0, new Wildcard(), 'jobs limit', true)
            ->inject('publisher')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@ -46,7 +46,7 @@ class SDKs extends Action
            ->param('git', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we use git push?', optional: true)
            ->param('production', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we push to production?', optional: true)
            ->param('message', null, new Nullable(new Text(256)), 'Commit Message', optional: true)
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(?string $selectedPlatform, ?string $selectedSDK, ?string $version, ?string $git, ?string $production, ?string $message): void
--- a/src/Appwrite/Platform/Tasks/SSL.php
+++ b/src/Appwrite/Platform/Tasks/SSL.php
@ -24,7 +24,7 @@ class SSL extends Action
            ->param('domain', System::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
            ->param('skip-check', true, new Boolean(true), 'If DNS and renew check should be skipped. Defaults to true, and when true, all jobs will result in certificate generation attempt.', true)
            ->inject('queueForCertificates')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $domain, bool|string $skipCheck, Certificate $queueForCertificates): void
--- a/src/Appwrite/Platform/Tasks/Screenshot.php
+++ b/src/Appwrite/Platform/Tasks/Screenshot.php
@ -21,7 +21,7 @@ class Screenshot extends Action
        $this
            ->desc('Create Site template screenshot')
            ->param('templateId', '', new Text(128), 'Template ID.')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $templateId): void
--- a/src/Appwrite/Platform/Tasks/StatsResources.php
+++ b/src/Appwrite/Platform/Tasks/StatsResources.php
@ -45,7 +45,7 @@ class StatsResources extends Action
            ->inject('dbForPlatform')
            ->inject('logError')
            ->inject('queueForStatsResources')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(Database $dbForPlatform, callable $logError, EventStatsResources $queue): void
--- a/src/Appwrite/Platform/Tasks/Upgrade.php
+++ b/src/Appwrite/Platform/Tasks/Upgrade.php
@ -23,7 +23,7 @@ class Upgrade extends Install
            ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
            ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
            ->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive, bool $noStart): void
--- a/src/Appwrite/Platform/Tasks/Vars.php
+++ b/src/Appwrite/Platform/Tasks/Vars.php
@ -18,7 +18,7 @@ class Vars extends Action
    {
        $this
            ->desc('List all the server environment variables')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(): void
--- a/src/Appwrite/Platform/Workers/Audits.php
+++ b/src/Appwrite/Platform/Workers/Audits.php
@ -45,7 +45,7 @@ class Audits extends Action
            ->inject('message')
            ->inject('getProjectDB')
            ->inject('project')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));

        $this->lastTriggeredTime = time();
    }
--- a/src/Appwrite/Platform/Workers/Databases.php
+++ b/src/Appwrite/Platform/Workers/Databases.php
@ -38,7 +38,7 @@ class Databases extends Action
            ->inject('dbForProject')
            ->inject('queueForRealtime')
            ->inject('log')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
@ -64,6 +64,14 @@ class Databases extends Action
        $document = new Document($payload['document'] ?? []);
        $database = new Document($payload['database'] ?? []);

+        Console::info("Processing database operation: \n" . \json_encode([
+            'type' => $type,
+            'projectId' => $project->getId(),
+            'databaseId' => $database->getId(),
+            'collectionId' => $collection->getId(),
+            'documentId' => $document->getId(),
+        ], JSON_PRETTY_PRINT));
+
        $log->addTag('projectId', $project->getId());
        $log->addTag('type', $type);

@ -82,6 +90,14 @@ class Databases extends Action
            DATABASE_TYPE_DELETE_INDEX => $this->deleteIndex($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $queueForRealtime),
            default => throw new Exception('No database operation for type: ' . \strval($type)),
        };
+
+        Console::info("Finished processing database operation: \n" . \json_encode([
+            'type' => $type,
+            'projectId' => $project->getId(),
+            'databaseId' => $database->getId(),
+            'collectionId' => $collection->getId(),
+            'documentId' => $document->getId(),
+        ], JSON_PRETTY_PRINT));
    }

    /**
@ -116,6 +132,7 @@ class Databases extends Action

        $projectId = $project->getId();
        $event = "databases.[databaseId].collections.[collectionId].attributes.[attributeId].update";
+
        /**
         * TODO @christyjacob4 verify if this is still the case
         * Fetch attribute from the database, since with Resque float values are loosing informations.
--- a/src/Appwrite/Platform/Workers/Functions.php
+++ b/src/Appwrite/Platform/Workers/Functions.php
@ -53,7 +53,7 @@ class Functions extends Action
            ->inject('log')
            ->inject('executor')
            ->inject('isResourceBlocked')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    public function action(
--- a/src/Appwrite/Platform/Workers/Mails.php
+++ b/src/Appwrite/Platform/Workers/Mails.php
@ -29,7 +29,7 @@ class Mails extends Action
            ->inject('message')
            ->inject('register')
            ->inject('log')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@ -72,7 +72,7 @@ class Messaging extends Action
            ->inject('dbForProject')
            ->inject('deviceForFiles')
            ->inject('queueForStatsUsage')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
--- a/src/Appwrite/Platform/Workers/Migrations.php
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@ -69,7 +69,7 @@ class Migrations extends Action
            ->inject('logError')
            ->inject('queueForRealtime')
            ->inject('deviceForImports')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
--- a/src/Appwrite/Platform/Workers/StatsResources.php
+++ b/src/Appwrite/Platform/Workers/StatsResources.php
@ -49,7 +49,7 @@ class StatsResources extends Action
            ->inject('getLogsDB')
            ->inject('dbForPlatform')
            ->inject('logError')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
--- a/src/Appwrite/Platform/Workers/StatsUsage.php
+++ b/src/Appwrite/Platform/Workers/StatsUsage.php
@ -119,7 +119,7 @@ class StatsUsage extends Action
            ->inject('getProjectDB')
            ->inject('getLogsDB')
            ->inject('register')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));

        $this->lastTriggeredTime = time();
    }
--- a/src/Appwrite/Platform/Workers/Webhooks.php
+++ b/src/Appwrite/Platform/Workers/Webhooks.php
@ -38,7 +38,7 @@ class Webhooks extends Action
            ->inject('queueForStatsUsage')
            ->inject('log')
            ->inject('plan')
-            ->callback([$this, 'action']);
+            ->callback($this->action(...));
    }

    /**
--- a/Show more
+++ b/Show more