Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into refactor-move-cli-scripts

Conflicts: src/Appwrite/Platform/Services/Tasks.php
cleanup
2026-05-26 13:51:13 +00:00 · 2024-01-30 20:37:24 +02:00 · 2024-01-30 17:50:25 +02:00 · 2024-01-30 17:47:13 +02:00 · 2024-01-30 17:43:31 +02:00 · 2024-01-30 17:37:31 +02:00
265 changed files with 1282 additions and 2067 deletions
@@ -73,12 +73,11 @@ _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_USAGE_AGGREGATION_INTERVAL=20
+_APP_USAGE_AGGREGATION_INTERVAL=60000
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled
@@ -17,12 +17,6 @@ jobs:
        fetch-depth: 2
        submodules: recursive

-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-
    - name: Login to Docker Hub
      uses: docker/login-action@v2
      with:
@@ -41,11 +35,11 @@ jobs:
      uses: docker/build-push-action@v4
      with:
        context: .
-        platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
        build-args: |
          VERSION=${{ steps.meta.outputs.version }}
          VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
          VITE_GA_PROJECT=G-L7G2B6PLDS
          VITE_CONSOLE_MODE=cloud
        push: true
-        tags: ${{ steps.meta.outputs.tags }}
+        tags: ${{ steps.meta.outputs.tags }}
@@ -98,8 +98,8 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/worker-messaging && \
    chmod +x /usr/local/bin/worker-webhooks && \
    chmod +x /usr/local/bin/worker-migrations && \
-    chmod +x /usr/local/bin/worker-usage && \
-    chmod +x /usr/local/bin/worker-usage-dump
+    chmod +x /usr/local/bin/worker-usage
+

 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
@@ -1,4 +1,4 @@
-> Our Appwrite Init event has concluded. You can check out all the new and upcoming features [on our Init website](https://appwrite.io/init) 🚀
+> Great news! Appwrite Cloud is now in public beta! Sign up at [cloud.appwrite.io](https://cloud.appwrite.io) for a hassle-free, hosted experience. Join us in the Cloud today! ☁️🎉

 <br />
 <p align="center">
@@ -131,6 +131,9 @@ CLI::setResource('queue', function (Group $pools) {
 CLI::setResource('queueForFunctions', function (Connection $queue) {
    return new Func($queue);
 }, ['queue']);
+CLI::setResource('queueForHamster', function (Connection $queue) {
+    return new Hamster($queue);
+}, ['queue']);
 CLI::setResource('queueForDeletes', function (Connection $queue) {
    return new Delete($queue);
 }, ['queue']);
@@ -31,7 +31,7 @@ return [
    Exception::GENERAL_SERVICE_DISABLED => [
        'name' => Exception::GENERAL_SERVICE_DISABLED,
        'description' => 'The requested service is disabled. You can enable the service from the Appwrite console.',
-        'code' => 403,
+        'code' => 503,
    ],
    Exception::GENERAL_UNAUTHORIZED_SCOPE => [
        'name' => Exception::GENERAL_UNAUTHORIZED_SCOPE,
@@ -103,11 +103,6 @@ return [
        'description' => 'This method was not fully implemented yet. If you believe this is a mistake, please upgrade your Appwrite server version.',
        'code' => 405,
    ],
-    Exception::GENERAL_BAD_REQUEST => [
-        'name' => Exception::GENERAL_BAD_REQUEST,
-        'description' => 'There was an error processing your request. Please check the inputs and try again.',
-        'code' => 400,
-    ],

    /** User Errors */
    Exception::USER_COUNT_EXCEEDED => [
@@ -256,11 +251,6 @@ return [
        'description' => 'User phone is already verified',
        'code' => 409
    ],
-    Exception::USER_DELETION_PROHIBITED => [
-        'name' => Exception::USER_DELETION_PROHIBITED,
-        'description' => 'User deletion is not allowed for users with active memberships. Please delete all confirmed memberships before deleting the account.',
-        'code' => 400
-    ],

    /** Teams */
    Exception::TEAM_NOT_FOUND => [
@@ -778,22 +768,10 @@ return [
    ],

    /** Health */
-    Exception::HEALTH_QUEUE_SIZE_EXCEEDED => [
-        'name' => Exception::HEALTH_QUEUE_SIZE_EXCEEDED,
+    Exception::QUEUE_SIZE_EXCEEDED => [
+        'name' => Exception::QUEUE_SIZE_EXCEEDED,
        'description' => 'Queue size threshold hit.',
        'code' => 503,
        'publish' => false
    ],
-
-    Exception::HEALTH_CERTIFICATE_EXPIRED => [
-        'name' => Exception::HEALTH_CERTIFICATE_EXPIRED,
-        'description' => 'The SSL certificate for the specified domain has expired and is no longer valid.',
-        'code' => 404,
-    ],
-
-    Exception::HEALTH_INVALID_HOST => [
-        'name' => Exception::HEALTH_INVALID_HOST,
-        'description' => 'Failed to establish a connection to the specified domain. Please verify the domain name and ensure that the server is running and accessible.',
-        'code' => 404,
-    ],
 ];
@@ -303,7 +303,7 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '10.1.1',
+                'version' => '10.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@@ -408,7 +408,7 @@ return [
            ],
            [
                'name' => '_APP_SMTP_SECURE',
-                'description' => 'SMTP secure connection protocol. Empty by default, change to \'tls\' or \'ssl\' if running on a secure connection.',
+                'description' => 'SMTP secure connection protocol. Empty by default, change to \'tls\' if running on a secure connection.',
                'introduction' => '',
                'default' => '',
                'required' => false,
@@ -948,15 +948,6 @@ return [
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_MAINTENANCE_DELAY',
-                'description' => 'Delay value containing the number of seconds that the Appwrite maintenance process should wait before executing system cleanups and optimizations. The default value is 0 seconds.',
-                'introduction' => '1.5.0',
-                'default' => '0',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_CACHE',
                'description' => 'The maximum duration (in seconds) upto which to retain cached files. The default value is 2592000 seconds (30 days).',
@@ -110,7 +110,7 @@ App::post('/v1/account')
            Query::equal('providerEmail', [$email]),
        ]);
        if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
        }

        if ($project->getAttribute('auths', [])['personalDataCheck'] ?? false) {
@@ -555,7 +555,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')

            $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                Query::equal('providerEmail', [$email]),
-                Query::notEqual('userInternalId', $user->getInternalId()),
+                Query::notEqual('userId', $userId),
            ]);
            if (!empty($identityWithMatchingEmail)) {
                throw new Exception(Exception::USER_ALREADY_EXISTS);
@@ -637,7 +637,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                    Query::equal('providerEmail', [$email]),
                ]);
                if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
-                    throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                    throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
                }

                try {
@@ -695,7 +695,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                Query::notEqual('userId', $user->getId()),
            ]);
            if (!empty($identitiesWithMatchingEmail)) {
-                throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
            }

            $dbForProject->createDocument('identities', new Document([
@@ -944,7 +944,7 @@ App::post('/v1/account/sessions/magic-url')
                Query::equal('providerEmail', [$email]),
            ]);
            if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
-                throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
            }

            $userId = $userId === 'unique()' ? ID::unique() : $userId;
@@ -1336,6 +1336,8 @@ App::post('/v1/account/sessions/phone')
        $message = $message->setParam('{{token}}', $secret);
        $message = $message->render();

+        var_dump($request->getIP());
+        var_dump($project->getId());
        $queueForMessaging
            ->setRecipient($phone)
            ->setMessage($message)
@@ -1985,10 +1987,10 @@ App::patch('/v1/account/email')
        // Makes sure this email is not already used in another identity
        $identityWithMatchingEmail = $dbForProject->findOne('identities', [
            Query::equal('providerEmail', [$email]),
-            Query::notEqual('userInternalId', $user->getInternalId()),
+            Query::notEqual('userId', $user->getId()),
        ]);
        if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
        }

        $user
@@ -2007,7 +2009,7 @@ App::patch('/v1/account/email')
        try {
            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
        } catch (Duplicate) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
        }

        $queueForEvents->setParam('userId', $user->getId());
@@ -2526,7 +2528,7 @@ App::post('/v1/account/recovery')

        $queueForMails
            ->setRecipient($profile->getAttribute('email', ''))
-            ->setName($profile->getAttribute('name', ''))
+            ->setName($profile->getAttribute('name'))
            ->setBody($body)
            ->setVariables($emailVariables)
            ->setSubject($subject)
@@ -2937,6 +2939,8 @@ App::post('/v1/account/verification/phone')
        $message = $message->setParam('{{token}}', $secret);
        $message = $message->render();

+        var_dump($request->getIP());
+        var_dump($project->getId());
        $queueForMessaging
            ->setRecipient($user->getAttribute('phone'))
            ->setMessage($message)
@@ -3034,27 +3038,15 @@ App::delete('/v1/account')
    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
    ->label('sdk.response.model', Response::MODEL_NONE)
    ->inject('user')
-    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
    ->inject('queueForDeletes')
-    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {
+    ->action(function (Document $user, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {
        if ($user->isEmpty()) {
            throw new Exception(Exception::USER_NOT_FOUND);
        }

-        if ($project->getId() === 'console') {
-            // get all memberships
-            $memberships = $user->getAttribute('memberships', []);
-            foreach ($memberships as $membership) {
-                // prevent deletion if at least one active membership
-                if ($membership->getAttribute('confirm', false)) {
-                    throw new Exception(Exception::USER_DELETION_PROHIBITED);
-                }
-            }
-        }
-
        $dbForProject->deleteDocument('users', $user->getId());

        $queueForDeletes
@@ -23,7 +23,6 @@ use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
-use Utopia\Fetch\Client;

 $avatarCallback = function (string $type, string $code, int $width, int $height, int $quality, Response $response) {

@@ -284,21 +283,14 @@ App::get('/v1/avatars/image')
            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
        }

-        $client = new Client();
-        try {
-            $res = $client
-                ->setAllowRedirects(false)
-                ->fetch($url);
-        } catch (\Throwable) {
-            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
-        }
+        $fetch = @\file_get_contents($url);

-        if ($res->getStatusCode() !== 200) {
+        if (!$fetch) {
            throw new Exception(Exception::AVATAR_IMAGE_NOT_FOUND);
        }

        try {
-            $image = new Image($res->getBody());
+            $image = new Image($fetch);
        } catch (\Exception $exception) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Unable to parse image');
        }
@@ -347,27 +339,31 @@ App::get('/v1/avatars/favicon')
            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
        }

-        $client = new Client();
-        try {
-            $res = $client
-                ->setAllowRedirects(false)
-                ->setUserAgent(\sprintf(
-                    APP_USERAGENT,
-                    App::getEnv('_APP_VERSION', 'UNKNOWN'),
-                    App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY)
-                ))
-                ->fetch($url);
-        } catch (\Throwable) {
-            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
-        }
+        $curl = \curl_init();

-        if ($res->getStatusCode() !== 200) {
+        \curl_setopt_array($curl, [
+            CURLOPT_RETURNTRANSFER => 1,
+            CURLOPT_FOLLOWLOCATION => true,
+            CURLOPT_MAXREDIRS => 3,
+            CURLOPT_URL => $url,
+            CURLOPT_USERAGENT => \sprintf(
+                APP_USERAGENT,
+                App::getEnv('_APP_VERSION', 'UNKNOWN'),
+                App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY)
+            ),
+        ]);
+
+        $html = \curl_exec($curl);
+
+        \curl_close($curl);
+
+        if (!$html) {
            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
        }

        $doc = new DOMDocument();
        $doc->strictErrorChecking = false;
-        @$doc->loadHTML($res->getBody());
+        @$doc->loadHTML($html);

        $links = $doc->getElementsByTagName('link');
        $outputHref = '';
@@ -422,22 +418,9 @@ App::get('/v1/avatars/favicon')
            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
        }

-        $client = new Client();
-        try {
-            $res = $client
-                ->setAllowRedirects(false)
-                ->fetch($outputHref);
-        } catch (\Throwable) {
-            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
-        }
-
-        if ($res->getStatusCode() !== 200) {
-            throw new Exception(Exception::AVATAR_ICON_NOT_FOUND);
-        }
-
-        $data = $res->getBody();
-
        if ('ico' == $outputExt) { // Skip crop, Imagick isn\'t supporting icon files
+            $data = @\file_get_contents($outputHref, false);
+
            if (empty($data) || (\mb_substr($data, 0, 5) === '<html') || \mb_substr($data, 0, 5) === '<!doc') {
                throw new Exception(Exception::AVATAR_ICON_NOT_FOUND, 'Favicon not found');
            }
@@ -447,7 +430,13 @@ App::get('/v1/avatars/favicon')
                ->file($data);
        }

-        $image = new Image($data);
+        $fetch = @\file_get_contents($outputHref, false);
+
+        if (!$fetch) {
+            throw new Exception(Exception::AVATAR_ICON_NOT_FOUND);
+        }
+
+        $image = new Image($fetch);
        $image->crop((int) $width, (int) $height);
        $output = (empty($output)) ? $type : $output;
        $data = $image->output($output, $quality);
@@ -19,13 +19,16 @@ use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
+use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Conflict as ConflictException;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\Limit as LimitException;
+use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Exception\Restricted as RestrictedException;
 use Utopia\Database\Exception\Structure as StructureException;
+use Utopia\Database\Exception\Timeout as TimeoutException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@@ -654,10 +657,16 @@ App::put('/v1/databases/:databaseId')
            throw new Exception(Exception::DATABASE_NOT_FOUND);
        }

-        $database = $dbForProject->updateDocument('databases', $databaseId, $database
-            ->setAttribute('name', $name)
-            ->setAttribute('enabled', $enabled)
-            ->setAttribute('search', implode(' ', [$databaseId, $name])));
+        try {
+            $database = $dbForProject->updateDocument('databases', $databaseId, $database
+                ->setAttribute('name', $name)
+                ->setAttribute('enabled', $enabled)
+                ->setAttribute('search', implode(' ', [$databaseId, $name])));
+        } catch (AuthorizationException) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
+        } catch (StructureException $exception) {
+            throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, 'Bad structure. ' . $exception->getMessage());
+        }

        $queueForEvents->setParam('databaseId', $database->getId());

@@ -1006,14 +1015,19 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')

        $enabled ??= $collection->getAttribute('enabled', true);

-        $collection = $dbForProject->updateDocument('database_' . $database->getInternalId(), $collectionId, $collection
-            ->setAttribute('name', $name)
-            ->setAttribute('$permissions', $permissions)
-            ->setAttribute('documentSecurity', $documentSecurity)
-            ->setAttribute('enabled', $enabled)
-            ->setAttribute('search', implode(' ', [$collectionId, $name])));
-
-        $dbForProject->updateCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $permissions, $documentSecurity);
+        try {
+            $collection = $dbForProject->updateDocument('database_' . $database->getInternalId(), $collectionId, $collection
+                ->setAttribute('name', $name)
+                ->setAttribute('$permissions', $permissions)
+                ->setAttribute('documentSecurity', $documentSecurity)
+                ->setAttribute('enabled', $enabled)
+                ->setAttribute('search', implode(' ', [$collectionId, $name])));
+            $dbForProject->updateCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $permissions, $documentSecurity);
+        } catch (AuthorizationException) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
+        } catch (StructureException $exception) {
+            throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, 'Bad structure. ' . $exception->getMessage());
+        }

        $queueForEvents
            ->setContext('database', $database)
@@ -2808,7 +2822,13 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')

        $checkPermissions($collection, $document, Database::PERMISSION_CREATE);

+    try {
        $document = $dbForProject->createDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $document);
+    } catch (StructureException $exception) {
+        throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
+    } catch (DuplicateException $exception) {
+        throw new Exception(Exception::DOCUMENT_ALREADY_EXISTS);
+    }

        // Add $collectionId and $databaseId for all documents
        $processDocument = function (Document $collection, Document $document) use (&$processDocument, $dbForProject, $database) {
@@ -2916,8 +2936,14 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')

        $filters = Query::groupByType($queries)['filters'];

-        $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
-        $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filters, APP_LIMIT_COUNT);
+        try {
+            $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
+            $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $filters, APP_LIMIT_COUNT);
+        } catch (AuthorizationException) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
+        } catch (QueryException $e) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $e->getMessage());
+        }

        // Add $collectionId and $databaseId for all documents
        $processDocument = (function (Document $collection, Document $document) use (&$processDocument, $dbForProject, $database): bool {
@@ -2971,33 +2997,6 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
            $processDocument($collection, $document);
        }

-        $select = \array_reduce($queries, function ($result, $query) {
-            return $result || ($query->getMethod() === Query::TYPE_SELECT);
-        }, false);
-
-        // Check if the SELECT query includes $databaseId and $collectionId
-        $hasDatabaseId = false;
-        $hasCollectionId = false;
-        if ($select) {
-            $hasDatabaseId = \array_reduce($queries, function ($result, $query) {
-                return $result || ($query->getMethod() === Query::TYPE_SELECT && \in_array('$databaseId', $query->getValues()));
-            }, false);
-            $hasCollectionId = \array_reduce($queries, function ($result, $query) {
-                return $result || ($query->getMethod() === Query::TYPE_SELECT && \in_array('$collectionId', $query->getValues()));
-            }, false);
-        }
-
-        if ($select) {
-            foreach ($documents as $document) {
-                if (!$hasDatabaseId) {
-                    $document->removeAttribute('$databaseId');
-                }
-                if (!$hasCollectionId) {
-                    $document->removeAttribute('$collectionId');
-                }
-            }
-        }
-
        $response->dynamic(new Document([
            'total' => $total,
            'documents' => $documents,
@@ -3043,7 +3042,13 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen

        $queries = Query::parseQueries($queries);

-        $document = $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $documentId, $queries);
+        try {
+            $document = $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $documentId, $queries);
+        } catch (AuthorizationException) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
+        } catch (QueryException $e) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $e->getMessage());
+        }

        if ($document->isEmpty()) {
            throw new Exception(Exception::DOCUMENT_NOT_FOUND);
@@ -3355,14 +3360,22 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum

        $setCollection($collection, $newDocument);

-        $document = $dbForProject->withRequestTimestamp(
-            $requestTimestamp,
-            fn() => $dbForProject->updateDocument(
-                'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
-                $document->getId(),
-                $newDocument
-            )
-        );
+        try {
+            $document = $dbForProject->withRequestTimestamp(
+                $requestTimestamp,
+                fn() => $dbForProject->updateDocument(
+                    'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
+                    $document->getId(),
+                    $newDocument
+                )
+            );
+        } catch (AuthorizationException) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
+        } catch (DuplicateException) {
+            throw new Exception(Exception::DOCUMENT_ALREADY_EXISTS);
+        } catch (StructureException $exception) {
+            throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
+        }

        // Add $collectionId and $databaseId for all documents
        $processDocument = function (Document $collection, Document $document) use (&$processDocument, $dbForProject, $database) {
@@ -3462,10 +3475,16 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
        }

        $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $database, $collection, $documentId) {
-            $dbForProject->deleteDocument(
-                'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
-                $documentId
-            );
+            try {
+                $dbForProject->deleteDocument(
+                    'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
+                    $documentId
+                );
+            } catch (AuthorizationException) {
+                throw new Exception(Exception::USER_UNAUTHORIZED);
+            } catch (RestrictedException) {
+                throw new Exception(Exception::DOCUMENT_DELETE_RESTRICTED);
+            }
        });

        // Add $collectionId and $databaseId for all documents
@@ -7,7 +7,6 @@ use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\Database\Document;
-use Utopia\Domains\Validator\PublicDomain;
 use Utopia\Pools\Group;
 use Utopia\Queue\Client;
 use Utopia\Queue\Connection;
@@ -15,9 +14,7 @@ use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
-use Utopia\Validator\Domain;
 use Utopia\Validator\Integer;
-use Utopia\Validator\Multiple;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;

@@ -359,7 +356,7 @@ App::get('/v1/health/queue/webhooks')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -386,62 +383,12 @@ App::get('/v1/health/queue/logs')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/certificate')
-    ->desc('Get the SSL certificate for a domain')
-    ->groups(['api', 'health'])
-    ->label('scope', 'health.read')
-    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
-    ->label('sdk.namespace', 'health')
-    ->label('sdk.method', 'getCertificate')
-    ->label('sdk.description', '/docs/references/health/get-certificate.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_HEALTH_CERTIFICATE)
-    ->param('domain', null, new Multiple([new Domain(), new PublicDomain()]), Multiple::TYPE_STRING, 'Domain name')
-    ->inject('response')
-    ->action(function (string $domain, Response $response) {
-        if (filter_var($domain, FILTER_VALIDATE_URL)) {
-            $domain = parse_url($domain, PHP_URL_HOST);
-        }
-
-        $sslContext = stream_context_create([
-            "ssl" => [
-                "capture_peer_cert" => true
-            ]
-        ]);
-        $sslSocket = stream_socket_client("ssl://" . $domain . ":443", $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $sslContext);
-        if (!$sslSocket) {
-            throw new Exception(Exception::HEALTH_INVALID_HOST);
-        }
-
-        $streamContextParams = stream_context_get_params($sslSocket);
-        $peerCertificate = $streamContextParams['options']['ssl']['peer_certificate'];
-        $certificatePayload = openssl_x509_parse($peerCertificate);
-
-
-        $sslExpiration = $certificatePayload['validTo_time_t'];
-        $status = $sslExpiration < time() ? 'fail' : 'pass';
-
-        if ($status === 'fail') {
-            throw new Exception(Exception::HEALTH_CERTIFICATE_EXPIRED);
-        }
-
-        $response->dynamic(new Document([
-            'name' => $certificatePayload['name'],
-            'subjectSN' => $certificatePayload['subject']['CN'],
-            'issuerOrganisation' => $certificatePayload['issuer']['O'],
-            'validFrom' => $certificatePayload['validFrom_time_t'],
-            'validTo' => $certificatePayload['validTo_time_t'],
-            'signatureTypeSN' => $certificatePayload['signatureTypeSN'],
-        ]), Response::MODEL_HEALTH_CERTIFICATE);
-    }, ['response']);
-
 App::get('/v1/health/queue/certificates')
    ->desc('Get certificates queue')
    ->groups(['api', 'health'])
@@ -463,7 +410,7 @@ App::get('/v1/health/queue/certificates')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -490,7 +437,7 @@ App::get('/v1/health/queue/builds')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -518,7 +465,7 @@ App::get('/v1/health/queue/databases')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -545,7 +492,7 @@ App::get('/v1/health/queue/deletes')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -572,7 +519,7 @@ App::get('/v1/health/queue/mails')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -599,7 +546,7 @@ App::get('/v1/health/queue/messaging')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -626,7 +573,7 @@ App::get('/v1/health/queue/migrations')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -653,7 +600,7 @@ App::get('/v1/health/queue/functions')
        $size = $client->getQueueSize();

        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
@@ -702,47 +649,6 @@ App::get('/v1/health/storage/local')
        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
    });

-App::get('/v1/health/storage')
-    ->desc('Get storage')
-    ->groups(['api', 'health'])
-    ->label('scope', 'health.read')
-    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
-    ->label('sdk.namespace', 'health')
-    ->label('sdk.method', 'getStorage')
-    ->label('sdk.description', '/docs/references/health/get-storage.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
-    ->inject('response')
-    ->inject('deviceFiles')
-    ->inject('deviceFunctions')
-    ->inject('deviceBuilds')
-    ->action(function (Response $response, Device $deviceFiles, Device $deviceFunctions, Device $deviceBuilds) {
-        $devices = [$deviceFiles, $deviceFunctions, $deviceBuilds];
-        $checkStart = \microtime(true);
-
-        foreach ($devices as $device) {
-            if (!$device->write($device->getPath('health.txt'), 'test', 'text/plain')) {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed writing test file to ' . $device->getRoot());
-            }
-
-            if ($device->read($device->getPath('health.txt')) !== 'test') {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed reading test file from ' . $device->getRoot());
-            }
-
-            if (!$device->delete($device->getPath('health.txt'))) {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed deleting test file from ' . $device->getRoot());
-            }
-        }
-
-        $output = [
-            'status' => 'pass',
-            'ping' => \round((\microtime(true) - $checkStart) / 1000)
-        ];
-
-        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
-    });
-
 App::get('/v1/health/anti-virus')
    ->desc('Get antivirus')
    ->groups(['api', 'health'])
@@ -789,19 +695,19 @@ App::get('/v1/health/queue/failed/:name')
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'health')
    ->label('sdk.method', 'getFailedJobs')
-    ->param('name', '', new WhiteList([
+    ->param('queueName', '', new WhiteList([
        Event::DATABASE_QUEUE_NAME,
        Event::DELETE_QUEUE_NAME,
        Event::AUDITS_QUEUE_NAME,
        Event::MAILS_QUEUE_NAME,
        Event::FUNCTIONS_QUEUE_NAME,
        Event::USAGE_QUEUE_NAME,
-        Event::USAGE_DUMP_QUEUE_NAME,
        Event::WEBHOOK_CLASS_NAME,
        Event::CERTIFICATES_QUEUE_NAME,
        Event::BUILDS_QUEUE_NAME,
        Event::MESSAGING_QUEUE_NAME,
-        Event::MIGRATIONS_QUEUE_NAME
+        Event::MIGRATIONS_QUEUE_NAME,
+        Event::HAMSTER_CLASS_NAME
    ]), 'The name of the queue')
    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
    ->label('sdk.description', '/docs/references/health/get-failed-queue-jobs.md')
@@ -817,7 +723,7 @@ App::get('/v1/health/queue/failed/:name')
        $failed = $client->countFailedJobs();

        if ($failed >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue failed jobs threshold hit. Current size is {$failed} and threshold is {$threshold}.");
+            throw new Exception(Exception::QUEUE_SIZE_EXCEEDED, "Queue failed jobs threshold hit. Current size is {$failed} and threshold is {$threshold}.");
        }

        $response->dynamic(new Document([ 'size' => $failed ]), Response::MODEL_HEALTH_QUEUE);
@@ -144,30 +144,9 @@ App::get('/v1/project/usage')
            ];
        }, $dbForProject->find('buckets'));

-        // merge network inbound + outbound
-        $projectBandwidth = [];
-        foreach ($usage[METRIC_NETWORK_INBOUND] as $item) {
-            $projectBandwidth[$item['date']] ??= 0;
-            $projectBandwidth[$item['date']] += $item['value'];
-        }
-
-        foreach ($usage[METRIC_NETWORK_OUTBOUND] as $item) {
-            $projectBandwidth[$item['date']] ??= 0;
-            $projectBandwidth[$item['date']] += $item['value'];
-        }
-
-
-        $network = [];
-        foreach ($projectBandwidth as $date => $value) {
-            $network[] = [
-                'date' => $date,
-                'value' => $value
-            ];
-        }
-
        $response->dynamic(new Document([
            'requests' => ($usage[METRIC_NETWORK_REQUESTS]),
-            'network' => $network,
+            'network' => ($usage[METRIC_NETWORK_INBOUND] + $usage[METRIC_NETWORK_OUTBOUND]),
            'users' => ($usage[METRIC_USERS]),
            'executions' => ($usage[METRIC_EXECUTIONS]),
            'executionsTotal' => $total[METRIC_EXECUTIONS],
@@ -1446,7 +1446,7 @@ App::patch('/v1/projects/:projectId/smtp')
    ->param('port', 587, new Integer(), 'SMTP server port', true)
    ->param('username', '', new Text(0, 0), 'SMTP server username', true)
    ->param('password', '', new Text(0, 0), 'SMTP server password', true)
-    ->param('secure', '', new WhiteList(['tls', 'ssl'], true), 'Does SMTP server use secure connection', true)
+    ->param('secure', '', new WhiteList(['tls'], true), 'Does SMTP server use secure connection', true)
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, bool $enabled, string $senderName, string $senderEmail, string $replyTo, string $host, int $port, string $username, string $password, string $secure, Response $response, Database $dbForConsole) {
@@ -581,95 +581,111 @@ App::post('/v1/storage/buckets/:bucketId/files')
                $openSSLIV = \bin2hex($iv);
            }

-            if ($file->isEmpty()) {
-                $doc = new Document([
-                    '$id' => $fileId,
-                    '$permissions' => $permissions,
-                    'bucketId' => $bucket->getId(),
-                    'bucketInternalId' => $bucket->getInternalId(),
-                    'name' => $fileName,
-                    'path' => $path,
-                    'signature' => $fileHash,
-                    'mimeType' => $mimeType,
-                    'sizeOriginal' => $fileSize,
-                    'sizeActual' => $sizeActual,
-                    'algorithm' => $algorithm,
-                    'comment' => '',
-                    'chunksTotal' => $chunks,
-                    'chunksUploaded' => $chunksUploaded,
-                    'openSSLVersion' => $openSSLVersion,
-                    'openSSLCipher' => $openSSLCipher,
-                    'openSSLTag' => $openSSLTag,
-                    'openSSLIV' => $openSSLIV,
-                    'search' => implode(' ', [$fileId, $fileName]),
-                    'metadata' => $metadata,
-                ]);
+            try {
+                if ($file->isEmpty()) {
+                    $doc = new Document([
+                        '$id' => $fileId,
+                        '$permissions' => $permissions,
+                        'bucketId' => $bucket->getId(),
+                        'bucketInternalId' => $bucket->getInternalId(),
+                        'name' => $fileName,
+                        'path' => $path,
+                        'signature' => $fileHash,
+                        'mimeType' => $mimeType,
+                        'sizeOriginal' => $fileSize,
+                        'sizeActual' => $sizeActual,
+                        'algorithm' => $algorithm,
+                        'comment' => '',
+                        'chunksTotal' => $chunks,
+                        'chunksUploaded' => $chunksUploaded,
+                        'openSSLVersion' => $openSSLVersion,
+                        'openSSLCipher' => $openSSLCipher,
+                        'openSSLTag' => $openSSLTag,
+                        'openSSLIV' => $openSSLIV,
+                        'search' => implode(' ', [$fileId, $fileName]),
+                        'metadata' => $metadata,
+                    ]);

-                $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
-            } else {
-                $file = $file
-                    ->setAttribute('$permissions', $permissions)
-                    ->setAttribute('signature', $fileHash)
-                    ->setAttribute('mimeType', $mimeType)
-                    ->setAttribute('sizeActual', $sizeActual)
-                    ->setAttribute('algorithm', $algorithm)
-                    ->setAttribute('openSSLVersion', $openSSLVersion)
-                    ->setAttribute('openSSLCipher', $openSSLCipher)
-                    ->setAttribute('openSSLTag', $openSSLTag)
-                    ->setAttribute('openSSLIV', $openSSLIV)
-                    ->setAttribute('metadata', $metadata)
-                    ->setAttribute('chunksUploaded', $chunksUploaded);
+                    $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
+                } else {
+                    $file = $file
+                        ->setAttribute('$permissions', $permissions)
+                        ->setAttribute('signature', $fileHash)
+                        ->setAttribute('mimeType', $mimeType)
+                        ->setAttribute('sizeActual', $sizeActual)
+                        ->setAttribute('algorithm', $algorithm)
+                        ->setAttribute('openSSLVersion', $openSSLVersion)
+                        ->setAttribute('openSSLCipher', $openSSLCipher)
+                        ->setAttribute('openSSLTag', $openSSLTag)
+                        ->setAttribute('openSSLIV', $openSSLIV)
+                        ->setAttribute('metadata', $metadata)
+                        ->setAttribute('chunksUploaded', $chunksUploaded);

-                /**
-                 * Validate create permission and skip authorization in updateDocument
-                 * Without this, the file creation will fail when user doesn't have update permission
-                 * However as with chunk upload even if we are updating, we are essentially creating a file
-                 * adding it's new chunk so we validate create permission instead of update
-                 */
-                $validator = new Authorization(Database::PERMISSION_CREATE);
-                if (!$validator->isValid($bucket->getCreate())) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED);
+                    /**
+                     * Validate create permission and skip authorization in updateDocument
+                     * Without this, the file creation will fail when user doesn't have update permission
+                     * However as with chunk upload even if we are updating, we are essentially creating a file
+                     * adding it's new chunk so we validate create permission instead of update
+                     */
+                    $validator = new Authorization(Database::PERMISSION_CREATE);
+                    if (!$validator->isValid($bucket->getCreate())) {
+                        throw new Exception(Exception::USER_UNAUTHORIZED);
+                    }
+                    $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
                }
-                $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+            } catch (AuthorizationException) {
+                throw new Exception(Exception::USER_UNAUTHORIZED);
+            } catch (StructureException $exception) {
+                throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
+            } catch (DuplicateException) {
+                throw new Exception(Exception::DOCUMENT_ALREADY_EXISTS);
            }
        } else {
-            if ($file->isEmpty()) {
-                $doc = new Document([
-                    '$id' => ID::custom($fileId),
-                    '$permissions' => $permissions,
-                    'bucketId' => $bucket->getId(),
-                    'bucketInternalId' => $bucket->getInternalId(),
-                    'name' => $fileName,
-                    'path' => $path,
-                    'signature' => '',
-                    'mimeType' => '',
-                    'sizeOriginal' => $fileSize,
-                    'sizeActual' => 0,
-                    'algorithm' => '',
-                    'comment' => '',
-                    'chunksTotal' => $chunks,
-                    'chunksUploaded' => $chunksUploaded,
-                    'search' => implode(' ', [$fileId, $fileName]),
-                    'metadata' => $metadata,
-                ]);
+            try {
+                if ($file->isEmpty()) {
+                    $doc = new Document([
+                        '$id' => ID::custom($fileId),
+                        '$permissions' => $permissions,
+                        'bucketId' => $bucket->getId(),
+                        'bucketInternalId' => $bucket->getInternalId(),
+                        'name' => $fileName,
+                        'path' => $path,
+                        'signature' => '',
+                        'mimeType' => '',
+                        'sizeOriginal' => $fileSize,
+                        'sizeActual' => 0,
+                        'algorithm' => '',
+                        'comment' => '',
+                        'chunksTotal' => $chunks,
+                        'chunksUploaded' => $chunksUploaded,
+                        'search' => implode(' ', [$fileId, $fileName]),
+                        'metadata' => $metadata,
+                    ]);

-                $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
-            } else {
-                $file = $file
-                    ->setAttribute('chunksUploaded', $chunksUploaded)
-                    ->setAttribute('metadata', $metadata);
+                    $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
+                } else {
+                    $file = $file
+                        ->setAttribute('chunksUploaded', $chunksUploaded)
+                        ->setAttribute('metadata', $metadata);

-                /**
-                 * Validate create permission and skip authorization in updateDocument
-                 * Without this, the file creation will fail when user doesn't have update permission
-                 * However as with chunk upload even if we are updating, we are essentially creating a file
-                 * adding it's new chunk so we validate create permission instead of update
-                 */
-                $validator = new Authorization(Database::PERMISSION_CREATE);
-                if (!$validator->isValid($bucket->getCreate())) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED);
+                    /**
+                     * Validate create permission and skip authorization in updateDocument
+                     * Without this, the file creation will fail when user doesn't have update permission
+                     * However as with chunk upload even if we are updating, we are essentially creating a file
+                     * adding it's new chunk so we validate create permission instead of update
+                     */
+                    $validator = new Authorization(Database::PERMISSION_CREATE);
+                    if (!$validator->isValid($bucket->getCreate())) {
+                        throw new Exception(Exception::USER_UNAUTHORIZED);
+                    }
+                    $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
                }
-                $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+            } catch (AuthorizationException) {
+                throw new Exception(Exception::USER_UNAUTHORIZED);
+            } catch (StructureException $exception) {
+                throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
+            } catch (DuplicateException) {
+                throw new Exception(Exception::DOCUMENT_ALREADY_EXISTS);
            }
        }

@@ -1367,7 +1383,11 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        }

        if ($fileSecurity && !$valid) {
-            $file = $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file);
+            try {
+                $file = $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file);
+            } catch (AuthorizationException) {
+                throw new Exception(Exception::USER_UNAUTHORIZED);
+            }
        } else {
            $file = Authorization::skip(fn() => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
        }
@@ -1451,7 +1471,11 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
            ;

            if ($fileSecurity && !$valid) {
-                $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                try {
+                    $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                } catch (AuthorizationException) {
+                    throw new Exception(Exception::USER_UNAUTHORIZED);
+                }
            } else {
                $deleted = Authorization::skip(fn() => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
            }
@@ -380,6 +380,7 @@ App::post('/v1/teams/:teamId/memberships')
    ->param('roles', [], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
    ->param('url', '', fn($clients) => new Host($clients), 'URL to redirect the user back to your app from the invitation email.  Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients']) // TODO add our own built-in confirm page
    ->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
+    ->inject('request')
    ->inject('response')
    ->inject('project')
    ->inject('user')
@@ -388,7 +389,7 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('queueForMails')
    ->inject('queueForMessaging')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, EventPhone $queueForMessaging, Event $queueForEvents) {
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Request $request, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, EventPhone $queueForMessaging, Event $queueForEvents) {
        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());

@@ -638,6 +639,8 @@ App::post('/v1/teams/:teamId/memberships')
                $message = $message->setParam('{{token}}', $url);
                $message = $message->render();

+                var_dump($request->getIP());
+                var_dump($project->getId());
                $queueForMessaging
                    ->setRecipient($phone)
                    ->setMessage($message)
@@ -694,7 +697,7 @@ App::get('/v1/teams/:teamId/memberships')
        }

        // Set internal queries
-        $queries[] = Query::equal('teamInternalId', [$team->getInternalId()]);
+        $queries[] = Query::equal('teamId', [$teamId]);

        // Get cursor document if there was a cursor query
        $cursor = \array_filter($queries, function ($query) {
@@ -894,16 +897,16 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            throw new Exception(Exception::MEMBERSHIP_NOT_FOUND);
        }

+        if ($membership->getAttribute('teamId') !== $teamId) {
+            throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
+        }
+
        $team = Authorization::skip(fn() => $dbForProject->getDocument('teams', $teamId));

        if ($team->isEmpty()) {
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }

-        if ($membership->getAttribute('teamInternalId') !== $team->getInternalId()) {
-            throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
-        }
-
        if (Auth::hash($secret) !== $membership->getAttribute('secret')) {
            throw new Exception(Exception::TEAM_INVALID_SECRET);
        }
@@ -916,7 +919,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            $user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
        }

-        if ($membership->getAttribute('userInternalId') !== $user->getInternalId()) {
+        if ($membership->getAttribute('userId') !== $user->getId()) {
            throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')');
        }

@@ -967,7 +970,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')

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

-        Authorization::skip(fn() => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
+        $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('total', $team->getAttribute('total', 0) + 1)));

        $queueForEvents
            ->setParam('teamId', $team->getId())
@@ -1020,6 +1023,10 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
            throw new Exception(Exception::TEAM_INVITE_NOT_FOUND);
        }

+        if ($membership->getAttribute('teamId') !== $teamId) {
+            throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
+        }
+
        $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));

        if ($user->isEmpty()) {
@@ -1032,15 +1039,19 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }

-        if ($membership->getAttribute('teamInternalId') !== $team->getInternalId()) {
-            throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
+        try {
+            $dbForProject->deleteDocument('memberships', $membership->getId());
+        } catch (AuthorizationException $exception) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
+        } catch (\Exception $exception) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove membership from DB');
        }

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

        if ($membership->getAttribute('confirm')) { // Count only confirmed members
-            Authorization::skip(fn() => $dbForProject->decreaseDocumentAttribute('teams', $team->getId(), 'total', 1, 0));
+            $team->setAttribute('total', \max($team->getAttribute('total', 0) - 1, 0));
+            Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team));
        }

        $queueForEvents
@@ -9,7 +9,6 @@ use Appwrite\Event\Event;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Identities;
-use Utopia\CLI\Console;
 use Utopia\Database\Validator\Queries;
 use Appwrite\Utopia\Database\Validator\Queries\Users;
 use Utopia\Database\Validator\Query\Limit;
@@ -142,6 +141,7 @@ App::post('/v1/users')
    ->inject('hooks')
    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $queueForEvents, $hooks);
+
        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
            ->dynamic($user, Response::MODEL_USER);
@@ -941,7 +941,7 @@ App::patch('/v1/users/:userId/email')
        // Makes sure this email is not already used in another identity
        $identityWithMatchingEmail = $dbForProject->findOne('identities', [
            Query::equal('providerEmail', [$email]),
-            Query::notEqual('userInternalId', $user->getInternalId()),
+            Query::notEqual('userId', $user->getId()),
        ]);
        if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
@@ -95,7 +95,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

            $latestCommentId = '';

-            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
+            if (!empty($providerPullRequestId)) {
                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
@@ -9,8 +9,9 @@ use Utopia\Logger\Logger;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Swoole\Http\Request as SwooleRequest;
+use Utopia\Cache\Cache;
+use Utopia\Pools\Group;
 use Appwrite\Utopia\Request;
-use MaxMind\Db\Reader;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\View;
 use Appwrite\Extend\Exception as AppwriteException;
@@ -18,8 +19,6 @@ use Utopia\Config\Config;
 use Utopia\Domains\Domain;
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
-use Appwrite\Event\Event;
-use Appwrite\Event\Usage;
 use Appwrite\Network\Validator\Origin;
 use Appwrite\Utopia\Response\Filters\V11 as ResponseV11;
 use Appwrite\Utopia\Response\Filters\V12 as ResponseV12;
@@ -32,7 +31,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\Hostname;
 use Appwrite\Utopia\Request\Filters\V12 as RequestV12;
@@ -40,7 +38,6 @@ use Appwrite\Utopia\Request\Filters\V13 as RequestV13;
 use Appwrite\Utopia\Request\Filters\V14 as RequestV14;
 use Appwrite\Utopia\Request\Filters\V15 as RequestV15;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
-use Executor\Executor;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;

@@ -48,7 +45,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

-function router(App $utopia, Database $dbForConsole, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Reader $geodb)
+function router(App $utopia, Database $dbForConsole, SwooleRequest $swooleRequest, Request $request, Response $response)
 {
    $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');

@@ -120,226 +117,49 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            $path .= '?' . $query;
        }

-
-        $body = $swooleRequest->getContent() ?? '';
-        $method = $swooleRequest->server['request_method'];
-
        $requestHeaders = $request->getHeaders();

-        $project = Authorization::skip(fn () => $dbForConsole->getDocument('projects', $projectId));
-
-        $dbForProject = $getProjectDB($project);
-
-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-
-        if ($function->isEmpty() || !$function->getAttribute('enabled')) {
-            throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
-        }
-
-        $version = $function->getAttribute('version', 'v2');
-        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-
-        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
-
-        if (\is_null($runtime)) {
-            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
-        }
-
-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
-        }
-
-        if ($deployment->isEmpty()) {
-            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
-        }
-
-        /** Check if build has completed */
-        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
-        if ($build->isEmpty()) {
-            throw new AppwriteException(AppwriteException::BUILD_NOT_FOUND);
-        }
-
-        if ($build->getAttribute('status') !== 'ready') {
-            throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
-        }
-
-        $permissions = $function->getAttribute('execute');
-
-        if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
-            throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
-        }
-
-        $headers = \array_merge([], $requestHeaders);
-        $headers['x-appwrite-trigger'] = 'http';
-        $headers['x-appwrite-user-id'] = '';
-        $headers['x-appwrite-user-jwt'] = '';
-        $headers['x-appwrite-country-code'] = '';
-        $headers['x-appwrite-continent-code'] = '';
-        $headers['x-appwrite-continent-eu'] = 'false';
-
-        $ip = $headers['x-real-ip'] ?? '';
-        if (!empty($ip)) {
-            $record = $geodb->get($ip);
-
-            if ($record) {
-                $eu = Config::getParam('locale-eu');
-
-                $headers['x-appwrite-country-code'] = $record['country']['iso_code'] ?? '';
-                $headers['x-appwrite-continent-code'] = $record['continent']['code'] ?? '';
-                $headers['x-appwrite-continent-eu'] = (\in_array($record['country']['iso_code'], $eu)) ? 'true' : 'false';
-            }
-        }
-
-        $headersFiltered = [];
-        foreach ($headers as $key => $value) {
-            if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_REQUEST)) {
-                $headersFiltered[] = ['name' => $key, 'value' => $value];
-            }
-        }
-
-        $executionId = ID::unique();
-
-        $execution = new Document([
-            '$id' => $executionId,
-            '$permissions' => [],
-            'functionInternalId' => $function->getInternalId(),
-            'functionId' => $function->getId(),
-            'deploymentInternalId' => $deployment->getInternalId(),
-            'deploymentId' => $deployment->getId(),
-            'trigger' => 'http', // http / schedule / event
-            'status' =>  'processing', // waiting / processing / completed / failed
-            'responseStatusCode' => 0,
-            'responseHeaders' => [],
-            'requestPath' => $path,
-            'requestMethod' => $method,
-            'requestHeaders' => $headersFiltered,
-            'errors' => '',
-            'logs' => '',
-            'duration' => 0.0,
-            'search' => implode(' ', [$functionId, $executionId]),
+        $body = \json_encode([
+            'async' => false,
+            'body' => $swooleRequest->getContent() ?? '',
+            'method' => $swooleRequest->server['request_method'],
+            'path' => $path,
+            'headers' => $requestHeaders
        ]);

-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('executionId', $execution->getId())
-            ->setContext('function', $function);
+        $headers = [
+            'Content-Type: application/json',
+            'Content-Length: ' . \strlen($body),
+            'X-Appwrite-Project: ' . $projectId
+        ];

-        $durationStart = \microtime(true);
+        $ch = \curl_init();
+        \curl_setopt($ch, CURLOPT_URL, "http://localhost/v1/functions/{$functionId}/executions");
+        \curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
+        \curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        \curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        \curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        // \curl_setopt($ch, CURLOPT_HEADER, true);
+        \curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+        \curl_setopt($ch, CURLOPT_TIMEOUT, 30);

-        $vars = [];
+        $executionResponse = \curl_exec($ch);
+        $statusCode = \curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $error = \curl_error($ch);
+        $errNo = \curl_errno($ch);

-        // V2 vars
-        if ($version === 'v2') {
-            $vars = \array_merge($vars, [
-                'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body ?? '',
-                'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
-                'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
-            ]);
+        \curl_close($ch);
+
+        if ($errNo !== 0) {
+            throw new AppwriteException(AppwriteException::GENERAL_ARGUMENT_INVALID, "Internal error: " . $error);
        }

-        // Shared vars
-        foreach ($function->getAttribute('varsProject', []) as $var) {
-            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
+        if ($statusCode >= 400) {
+            $error = \json_decode($executionResponse, true)['message'];
+            throw new AppwriteException(AppwriteException::GENERAL_ARGUMENT_INVALID, "Execution error: " . $error);
        }

-        // Function vars
-        foreach ($function->getAttribute('vars', []) as $var) {
-            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
-        }
-
-        // Appwrite vars
-        $vars = \array_merge($vars, [
-            'APPWRITE_FUNCTION_ID' => $functionId,
-            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
-            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
-            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
-            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
-            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-        ]);
-
-        /** Execute function */
-        $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
-        try {
-            $version = $function->getAttribute('version', 'v2');
-            $command = $runtime['startCommand'];
-            $command = $version === 'v2' ? '' : 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $command . '"';
-            $executionResponse = $executor->createExecution(
-                projectId: $project->getId(),
-                deploymentId: $deployment->getId(),
-                body: \strlen($body) > 0 ? $body : null,
-                variables: $vars,
-                timeout: $function->getAttribute('timeout', 0),
-                image: $runtime['image'],
-                source: $build->getAttribute('path', ''),
-                entrypoint: $deployment->getAttribute('entrypoint', ''),
-                version: $version,
-                path: $path,
-                method: $method,
-                headers: $headers,
-                runtimeEntrypoint: $command,
-                requestTimeout: 30
-            );
-
-            $headersFiltered = [];
-            foreach ($executionResponse['headers'] as $key => $value) {
-                if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_RESPONSE)) {
-                    $headersFiltered[] = ['name' => $key, 'value' => $value];
-                }
-            }
-
-            /** Update execution status */
-            $status = $executionResponse['statusCode'] >= 400 ? 'failed' : 'completed';
-            $execution->setAttribute('status', $status);
-            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
-            $execution->setAttribute('responseHeaders', $headersFiltered);
-            $execution->setAttribute('logs', $executionResponse['logs']);
-            $execution->setAttribute('errors', $executionResponse['errors']);
-            $execution->setAttribute('duration', $executionResponse['duration']);
-        } catch (\Throwable $th) {
-            $durationEnd = \microtime(true);
-
-            $execution
-                ->setAttribute('duration', $durationEnd - $durationStart)
-                ->setAttribute('status', 'failed')
-                ->setAttribute('responseStatusCode', 500)
-                ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
-            Console::error($th->getMessage());
-        } finally {
-            $queueForUsage
-                ->addMetric(METRIC_EXECUTIONS, 1)
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
-                ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
-            ;
-        }
-
-        if ($function->getAttribute('logging')) {
-            /** @var Document $execution */
-            $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
-        }
-
-        $execution->setAttribute('logs', '');
-        $execution->setAttribute('errors', '');
-
-        $headers = [];
-        foreach (($executionResponse['headers'] ?? []) as $key => $value) {
-            $headers[] = ['name' => $key, 'value' => $value];
-        }
-
-        $execution->setAttribute('responseBody', $executionResponse['body'] ?? '');
-        $execution->setAttribute('responseHeaders', $headers);
-
-        $body = $execution['responseBody'] ?? '';
-
-        $encodingKey = \array_search('x-open-runtimes-encoding', \array_column($execution['responseHeaders'], 'name'));
-        if ($encodingKey !== false) {
-            if (($execution['responseHeaders'][$encodingKey]['value'] ?? '') === 'base64') {
-                $body = \base64_decode($body);
-            }
-        }
+        $execution = \json_decode($executionResponse, true);

        $contentType = 'text/plain';
        foreach ($execution['responseHeaders'] as $header) {
@@ -350,6 +170,15 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            $response->setHeader($header['name'], $header['value']);
        }

+        $body = $execution['responseBody'] ?? '';
+
+        $encodingKey = \array_search('x-open-runtimes-encoding', \array_column($execution['responseHeaders'], 'name'));
+        if ($encodingKey !== false) {
+            if (($execution['responseHeaders'][$encodingKey]['value'] ?? '') === 'base64') {
+                $body = \base64_decode($body);
+            }
+        }
+
        $response
            ->setContentType($contentType)
            ->setStatusCode($execution['responseStatusCode'] ?? 200)
@@ -376,17 +205,13 @@ App::init()
    ->inject('console')
    ->inject('project')
    ->inject('dbForConsole')
-    ->inject('getProjectDB')
    ->inject('user')
    ->inject('locale')
    ->inject('localeCodes')
    ->inject('clients')
    ->inject('servers')
    ->inject('queueForCertificates')
-    ->inject('queueForEvents')
-    ->inject('queueForUsage')
-    ->inject('geodb')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Document $user, Locale $locale, array $localeCodes, array $clients, array $servers, Certificate $queueForCertificates, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, Document $user, Locale $locale, array $localeCodes, array $clients, array $servers, Certificate $queueForCertificates) {
        /*
        * Appwrite Router
        */
@@ -395,7 +220,7 @@ App::init()
        $mainDomain = App::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain) {
-            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb)) {
+            if (router($utopia, $dbForConsole, $swooleRequest, $request, $response)) {
                return;
            }
        }
@@ -746,11 +571,7 @@ App::options()
    ->inject('request')
    ->inject('response')
    ->inject('dbForConsole')
-    ->inject('getProjectDB')
-    ->inject('queueForEvents')
-    ->inject('queueForUsage')
-    ->inject('geodb')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole) {
        /*
        * Appwrite Router
        */
@@ -758,7 +579,7 @@ App::options()
        $mainDomain = App::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain) {
-            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb)) {
+            if (router($utopia, $dbForConsole, $swooleRequest, $request, $response)) {
                return;
            }
        }
@@ -786,100 +607,17 @@ App::error()
    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log) {
        $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
        $route = $utopia->getRoute();
-        $class = \get_class($error);
-        $code = $error->getCode();
-        $message = $error->getMessage();
-        $file = $error->getFile();
-        $line = $error->getLine();
-        $trace = $error->getTrace();
-
-        if (php_sapi_name() === 'cli') {
-            Console::error('[Error] Timestamp: ' . date('c', time()));
-
-            if ($route) {
-                Console::error('[Error] Method: ' . $route->getMethod());
-                Console::error('[Error] URL: ' . $route->getPath());
-            }
-
-            Console::error('[Error] Type: ' . get_class($error));
-            Console::error('[Error] Message: ' . $message);
-            Console::error('[Error] File: ' . $file);
-            Console::error('[Error] Line: ' . $line);
-        }
-
-        switch ($class) {
-            case 'Utopia\Exception':
-                $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
-                switch ($code) {
-                    case 400:
-                        $error->setType(AppwriteException::GENERAL_ARGUMENT_INVALID);
-                        break;
-                    case 404:
-                        $error->setType(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
-                        break;
-                }
-                break;
-            case 'Utopia\Database\Exception\Conflict':
-                \var_dump('Wrapping conflict exception');
-                $error = new AppwriteException(AppwriteException::DOCUMENT_UPDATE_CONFLICT, previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Timeout':
-                \var_dump('Wrapping timeout exception');
-                $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Query':
-                \var_dump('Wrapping query exception');
-                $error = new AppwriteException(AppwriteException::GENERAL_QUERY_INVALID, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Structure':
-                \var_dump('Wrapping structure exception');
-                $error = new AppwriteException(AppwriteException::DOCUMENT_INVALID_STRUCTURE, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Duplicate':
-                \var_dump('Wrapping duplicate exception');
-                $error = new AppwriteException(AppwriteException::DOCUMENT_ALREADY_EXISTS);
-                break;
-            case 'Utopia\Database\Exception\Restricted':
-                \var_dump('Wrapping restricted exception');
-                $error = new AppwriteException(AppwriteException::DOCUMENT_DELETE_RESTRICTED);
-                break;
-            case 'Utopia\Database\Exception\Authorization':
-                \var_dump('Wrapping authorization exception');
-                $error = new AppwriteException(AppwriteException::USER_UNAUTHORIZED);
-                break;
-        }
-
-        $code = $error->getCode();
-        $message = $error->getMessage();
+        $publish = true;

        if ($error instanceof AppwriteException) {
            $publish = $error->isPublishable();
-        } else {
-            $publish = $error->getCode() === 0 || $error->getCode() >= 500;
        }

-        if ($error->getCode() >= 400 && $error->getCode() < 500) {
-            // Register error logger
-            $providerName = App::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
-            $providerConfig = App::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');
-
-            if (!(empty($providerName) || empty($providerConfig))) {
-                if (!Logger::hasProvider($providerName)) {
-                    throw new Exception("Logging provider not supported. Logging is disabled");
-                }
-
-                $classname = '\\Utopia\\Logger\\Adapter\\' . \ucfirst($providerName);
-                $adapter = new $classname($providerConfig);
-                $logger = new Logger($adapter);
-                $publish = true;
-            }
-        }
-
-        if ($logger && $publish) {
+        if ($logger && ($publish || $error->getCode() === 0)) {
            try {
                /** @var Utopia\Database\Document $user */
                $user = $utopia->getResource('user');
-            } catch (\Throwable) {
+            } catch (\Throwable $th) {
                // All good, user is optional information for logger
            }

@@ -918,6 +656,47 @@ App::error()
            Console::info('Log pushed with status code: ' . $responseCode);
        }

+        $code = $error->getCode();
+        $message = $error->getMessage();
+        $file = $error->getFile();
+        $line = $error->getLine();
+        $trace = $error->getTrace();
+
+        if (php_sapi_name() === 'cli') {
+            Console::error('[Error] Timestamp: ' . date('c', time()));
+
+            if ($route) {
+                Console::error('[Error] Method: ' . $route->getMethod());
+                Console::error('[Error] URL: ' . $route->getPath());
+            }
+
+            Console::error('[Error] Type: ' . get_class($error));
+            Console::error('[Error] Message: ' . $message);
+            Console::error('[Error] File: ' . $file);
+            Console::error('[Error] Line: ' . $line);
+        }
+
+        /** Handle Utopia Errors */
+        if ($error instanceof Utopia\Exception) {
+            $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
+            switch ($code) {
+                case 400:
+                    $error->setType(AppwriteException::GENERAL_ARGUMENT_INVALID);
+                    break;
+                case 404:
+                    $error->setType(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
+                    break;
+            }
+        } elseif ($error instanceof Utopia\Database\Exception\Conflict) {
+            $error = new AppwriteException(AppwriteException::DOCUMENT_UPDATE_CONFLICT, previous: $error);
+            $code = $error->getCode();
+            $message = $error->getMessage();
+        } elseif ($error instanceof Utopia\Database\Exception\Timeout) {
+            $error = new AppwriteException(AppwriteException::DATABASE_TIMEOUT, previous: $error);
+            $code = $error->getCode();
+            $message = $error->getMessage();
+        }
+
        /** Wrap all exceptions inside Appwrite\Extend\Exception */
        if (!($error instanceof AppwriteException)) {
            $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
@@ -977,10 +756,10 @@ App::error()
                ->setParam('development', App::isDevelopment())
                ->setParam('projectName', $project->getAttribute('name'))
                ->setParam('projectURL', $project->getAttribute('url'))
-                ->setParam('message', $output['message'] ?? '')
-                ->setParam('type', $output['type'] ?? '')
-                ->setParam('code', $output['code'] ?? '')
-                ->setParam('trace', $output['trace'] ?? []);
+                ->setParam('message', $error->getMessage())
+                ->setParam('type', $type)
+                ->setParam('code', $code)
+                ->setParam('trace', $trace);

            $response->html($layout->render());
        }
@@ -112,7 +112,7 @@ const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return
 const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_USER_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 331;
+const APP_CACHE_BUSTER = 329;
 const APP_VERSION_STABLE = '1.4.13';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
@@ -195,7 +195,6 @@ const FUNCTION_ALLOWLIST_HEADERS_RESPONSE = ['content-type', 'content-length'];
 // Usage metrics
 const METRIC_TEAMS = 'teams';
 const METRIC_USERS = 'users';
-const METRIC_MESSAGES  = 'messages';
 const METRIC_SESSIONS  = 'sessions';
 const METRIC_DATABASES = 'databases';
 const METRIC_COLLECTIONS = 'collections';
@@ -1034,7 +1033,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
    }

    if (APP_MODE_ADMIN === $mode) {
-        if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
+        if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) {
            Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
        } else {
            $user = new Document([]);
@@ -59,7 +59,7 @@ $title = $this->getParam('title', '')
    <link rel="stylesheet" href="/fonts/main.css" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta http-equiv="content-security-policy" content="">
-    <title><?php echo $this->print($title); ?></title>
+    <title><?php echo $this->print($title, self::FILTER_ESCAPE); ?></title>

    <style>
        @media(min-width:768px) {
@@ -74,11 +74,11 @@ $title = $this->getParam('title', '')
    <div class="container u-margin-block-start-24">
        <article class="card u-padding-16">
            <div class="u-flex u-flex-vertical u-gap-16">
-                <h1 class="heading-level-4 u-trim-1">Error <?php echo $this->print($code); ?></h1>
-                <p class="text"><?php echo $this->print($message); ?></p>
+                <h1 class="heading-level-4 u-trim-1">Error <?php echo $this->print($code, self::FILTER_ESCAPE); ?></h1>
+                <p class="text"><?php echo $this->print($message, self::FILTER_ESCAPE); ?></p>
                <div class="u-flex u-flex-vertical u-gap-8">
                    <p class="text">Type</p>
-                    <p><code class="inline-code"><?php echo $this->print($type); ?></code></p>
+                    <p><code class="inline-code"><?php echo $this->print($type, self::FILTER_ESCAPE); ?></code></p>
                </div>
                <?php if ($development) : ?>
                    <h2 class="heading-level-5 u-trim-1">Error Trace</h2>
@@ -111,6 +111,45 @@ $title = $this->getParam('title', '')
            </div>
        </article>
    </div>
+    <!--section>
+        <h1>Error <?php echo $this->print($code, self::FILTER_ESCAPE); ?></h1>
+
+        <p><?php echo $this->print($message, self::FILTER_ESCAPE); ?></p>
+
+        <small>Error ID: <?php echo $this->print($errorID, self::FILTER_ESCAPE); ?></small>
+
+        <?php if (!empty($projectURL)) : ?>
+            <hr />
+
+            <p><a href="<?php echo $this->print($projectURL, self::FILTER_ESCAPE); ?>" rel="noopener">Back to <?php echo $this->print($projectName, self::FILTER_ESCAPE); ?></a></p>
+        <?php endif; ?>
+
+        <?php if ($development) : ?>
+            <div>
+
+                <h2>Error Trace</h2>
+
+                <?php foreach ($trace as $log) : ?>
+                    <table>
+                        <?php foreach ($log as $key => $value) : ?>
+                            <tr>
+                                <td style="width: 120px"><?php echo $this->print($key, self::FILTER_ESCAPE); ?></td>
+                                <td>
+                                    <?php if (is_array($value)) : ?>
+                                        <?php echo $this->print(var_export($value, true), self::FILTER_ESCAPE); ?>
+                                    <?php else : ?>
+                                        <?php echo $this->print($value, self::FILTER_ESCAPE); ?>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
+
+                        <?php endforeach; ?>
+                    </table>
+                <?php endforeach; ?>
+            </div>
+        <?php endif; ?>
+
+    </section-->
    <script type="text/javascript">
        const app = (JSON.parse(localStorage.getItem('appwrite')) ?? {});
        const theme = app.theme ?? 'auto';
@@ -143,7 +143,6 @@ services:
      - _APP_LOGGING_PROVIDER
      - _APP_LOGGING_CONFIG
      - _APP_MAINTENANCE_INTERVAL
-      - _APP_MAINTENANCE_DELAY
      - _APP_MAINTENANCE_RETENTION_EXECUTION
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
@@ -14,7 +14,6 @@ use Appwrite\Event\Mail;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Phone;
 use Appwrite\Event\Usage;
-use Appwrite\Event\UsageDump;
 use Appwrite\Platform\Appwrite;
 use Swoole\Runtime;
 use Utopia\App;
@@ -147,9 +146,6 @@ Server::setResource('log', fn() => new Log());
 Server::setResource('queueForUsage', function (Connection $queue) {
    return new Usage($queue);
 }, ['queue']);
-Server::setResource('queueForUsageDump', function (Connection $queue) {
-    return new UsageDump($queue);
-}, ['queue']);
 Server::setResource('queue', function (Group $pools) {
    return $pools->get('queue')->pop()->getResource();
 }, ['pools']);
@@ -183,6 +179,9 @@ Server::setResource('queueForCertificates', function (Connection $queue) {
 Server::setResource('queueForMigrations', function (Connection $queue) {
    return new Migration($queue);
 }, ['queue']);
+Server::setResource('queueForHamster', function (Connection $queue) {
+    return new Hamster($queue);
+}, ['queue']);
 Server::setResource('logger', function (Registry $register) {
    return $register->get('logger');
 }, ['register']);
@@ -250,6 +249,7 @@ try {
    Console::error($e->getMessage() . ', File: ' . $e->getFile() .  ', Line: ' . $e->getLine());
 }

+
 $worker = $platform->getWorker();

 $worker
@@ -264,8 +264,7 @@ $worker
    ->inject('error')
    ->inject('logger')
    ->inject('log')
-    ->inject('project')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Document $project) {
+    ->action(function (Throwable $error, ?Logger $logger, Log $log) {
        $version = App::getEnv('_APP_VERSION', 'UNKNOWN');

        if ($error instanceof PDOException) {
@@ -281,7 +280,6 @@ $worker
            $log->setAction('appwrite-queue-' . App::getEnv('QUEUE'));
            $log->addTag('verboseType', get_class($error));
            $log->addTag('code', $error->getCode());
-            $log->addTag('projectId', $project->getId() ?? 'n/a');
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
@@ -301,9 +299,12 @@ $worker
        Console::error('[Error] Line: ' . $error->getLine());
    });

-$worker->workerStart()
-    ->action(function () use ($workerName) {
-        Console::info("Worker $workerName  started");
-    });
+try {
+    $workerStart = $worker->getWorkerStart();
+} catch (\Throwable $error) {
+    $worker->workerStart();
+} finally {
+    Console::info("Worker $workerName  started");
+}

 $worker->start();
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php create-inf-metric $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php patch-delete-project-collections $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php patch-delete-schedule-updated-at-attribute $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php patch-recreate-repositories-documents $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/cli.php volume-sync $@
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php usage-dump $@
@@ -1,5 +1,4 @@
 {
-
    "name": "appwrite/server-ce",
    "description": "End to end backend server for frontend and mobile apps.",
    "type": "project",
@@ -50,15 +49,14 @@
        "utopia-php/cache": "0.9.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.45.8",
-        "utopia-php/domains": "0.5.*",
+        "utopia-php/database": "0.45.*",
+        "utopia-php/domains": "0.3.*",
        "utopia-php/dsn": "0.1.*",
        "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.2.*",
-        "utopia-php/image": "0.6.*",
+        "utopia-php/image": "0.5.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.3.*",
-        "utopia-php/messaging": "0.3.*",
+        "utopia-php/messaging": "0.2.*",
        "utopia-php/migration": "0.3.*",
        "utopia-php/orchestration": "0.9.*",
        "utopia-php/platform": "0.5.*",
@@ -66,7 +64,7 @@
        "utopia-php/preloader": "0.2.*",
        "utopia-php/queue": "0.7.*",
        "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "dev-tmp-logs as 0.18.3",
+        "utopia-php/storage": "0.18.*",
        "utopia-php/swoole": "0.5.*",
        "utopia-php/vcs": "0.6.*",
        "utopia-php/websocket": "0.1.*",
@@ -5,12 +5,12 @@

 x-logging: &x-logging
  logging:
-    driver: "json-file"
+    driver: 'json-file'
    options:
-      max-file: "5"
-      max-size: "10m"
+      max-file: '5'
+      max-size: '10m'

-version: "3"
+version: '3'

 services:
  traefik:
@@ -53,7 +53,7 @@ services:
        DEBUG: false
        TESTING: true
        VERSION: dev
-    ports: 
+    ports:
      - 9501:80
    networks:
      - appwrite
@@ -185,8 +185,6 @@ services:
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_ASSISTANT_OPENAI_API_KEY
-      - _APP_EXPERIMENT_LOGGING_PROVIDER
-      - _APP_EXPERIMENT_LOGGING_CONFIG

  appwrite-realtime:
    entrypoint: realtime
@@ -647,7 +645,6 @@ services:
      - _APP_MAINTENANCE_RETENTION_AUDIT
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
-      - _APP_MAINTENANCE_DELAY

  appwrite-worker-usage:
    entrypoint: worker-usage
@@ -680,37 +677,6 @@ services:
      - _APP_LOGGING_CONFIG
      - _APP_USAGE_AGGREGATION_INTERVAL

-  appwrite-worker-usage-dump:
-    entrypoint: worker-usage-dump
-    <<: *x-logging
-    container_name: appwrite-worker-usage-dump
-    image: appwrite-dev
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_PROVIDER
-      - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
-
  appwrite-schedule:
    entrypoint: schedule
    <<: *x-logging
@@ -834,7 +800,7 @@ services:
      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
      - MYSQL_USER=${_APP_DB_USER}
      - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: "mysqld --innodb-flush-method=fsync" # add ' --query_cache_size=0' for DB tests
+    command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests
    # command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu

  # smtp:
@@ -880,16 +846,15 @@ services:
  #
  # MailCatcher - An SMTP server. Catches all system emails and displays them in a nice UI.
  # RequestCatcher - An HTTP server. Catches all system https calls and displays them using a simple HTTP API. Used to debug & tests webhooks and HTTP tasks
-  # Redis Insight - A nice UI for exploring Redis data
-  # Adminer - A nice UI for exploring MariaDB data
-  # GraphQl Explorer - A nice UI for exploring GraphQL API
+  # RedisCommander - A nice UI for exploring Redis data
+  # Webgrind - A nice UI for exploring and debugging code-level stuff

  maildev: # used mainly for dev tests
    image: appwrite/mailcatcher:1.0.0
    container_name: appwrite-mailcatcher
    <<: *x-logging
    ports:
-      - "9503:1080"
+      - '9503:1080'
    networks:
      - appwrite

@@ -898,7 +863,7 @@ services:
    container_name: appwrite-requestcatcher
    <<: *x-logging
    ports:
-      - "9504:5000"
+      - '9504:5000'
    networks:
      - appwrite

@@ -912,15 +877,21 @@ services:
    networks:
      - appwrite

-  redis-insight:
-    image: redis/redisinsight:latest
-    restart: unless-stopped
-    networks:
-      - appwrite
-    environment:
-      - REDIS_HOSTS=redis
-    ports:
-      - "8081:5540"
+  # redis-commander:
+  #   image: rediscommander/redis-commander:latest
+  #   restart: unless-stopped
+  #   networks:
+  #   - appwrite
+  #   environment:
+  #   - REDIS_HOSTS=redis
+  #   ports:
+  #   - "8081:8081"
+  # webgrind:
+  #   image: 'jokkedk/webgrind:latest'
+  #   volumes:
+  #     - './debug:/tmp'
+  #   ports:
+  #     - '3001:80'

  graphql-explorer:
    container_name: appwrite-graphql-explorer
@@ -933,6 +904,7 @@ services:
    environment:
      - SERVER_URL=http://localhost/v1/graphql

+
  # Dev Tools End   ------------------------------------------------------------------------------------------

 networks:
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.create_phone_verification()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.create_recovery(email: 'email@example.com', url: 'https://example.com')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.create_verification(url: 'https://example.com')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.delete_identity(identity_id: '[IDENTITY_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.delete_session(session_id: '[SESSION_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.delete_sessions()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.get_prefs()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.get_session(session_id: '[SESSION_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.get()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.list_identities()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.list_logs()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.list_sessions()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_email(email: 'email@example.com', password: 'password')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_name(name: '[NAME]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_password(password: '')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_phone_verification(user_id: '[USER_ID]', secret: '[SECRET]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_phone(phone: '+12065550100', password: 'password')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_prefs(prefs: {})

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_recovery(user_id: '[USER_ID]', secret: '[SECRET]', password: 'password', password_again: 'password')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_session(session_id: '[SESSION_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_status()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ account = Account.new(client)

 response = account.update_verification(user_id: '[USER_ID]', secret: '[SECRET]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_browser(code: 'aa')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_credit_card(code: 'amex')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_favicon(url: 'https://example.com')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_flag(code: 'af')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_image(url: 'https://example.com')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_initials()

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ avatars = Avatars.new(client)

 response = avatars.get_qr(text: '[TEXT]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_boolean_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_collection(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', name: '[NAME]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_datetime_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_document(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', document_id: '[DOCUMENT_ID]', data: {})

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_email_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_enum_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', elements: [], required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_float_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_index(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', type: 'key', attributes: [])

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_integer_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_ip_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_relationship_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', related_collection_id: '[RELATED_COLLECTION_ID]', type: 'oneToOne')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_string_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', size: 1, required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create_url_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '', required: false)

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.create(database_id: '[DATABASE_ID]', name: '[NAME]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.delete_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.delete_collection(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.delete_document(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', document_id: '[DOCUMENT_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.delete_index(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.delete(database_id: '[DATABASE_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.get_attribute(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.get_collection(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.get_document(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', document_id: '[DOCUMENT_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.get_index(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]', key: '')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.get(database_id: '[DATABASE_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.list_attributes(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.list_collections(database_id: '[DATABASE_ID]')

-puts response.inspect
+puts response.inspect
@@ -1,4 +1,4 @@
-require 'appwrite'
+require 'Appwrite'

 include Appwrite

@@ -11,4 +11,4 @@ databases = Databases.new(client)

 response = databases.list_documents(database_id: '[DATABASE_ID]', collection_id: '[COLLECTION_ID]')

-puts response.inspect
+puts response.inspect
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
shimon	807ce0469c	Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into refactor-move-cli-scripts Conflicts: src/Appwrite/Platform/Services/Tasks.php	2024-01-30 20:37:24 +02:00
shimon	f9613e919e	cleanup	2024-01-30 17:50:25 +02:00
shimon	7eae0bff3d	cleanup	2024-01-30 17:47:13 +02:00
shimon	227b410252	cleanup	2024-01-30 17:43:31 +02:00
shimon	ddc8d0e444	Merge branch 'main' of github.com:appwrite/appwrite into refactor-move-cli-scripts Conflicts: Dockerfile src/Appwrite/Platform/Services/Tasks.php src/Appwrite/Platform/Tasks/CalcTierStats.php	2024-01-30 17:37:31 +02:00
shimon	724c07914d	clear unnecessary cli task	2023-12-21 20:50:26 +02:00