Mark edge differences

fix(gif preview): enable resource limits

.env

@@ -85,7 +85,7 @@ _APP_COMPUTE_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
-_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
+_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.32
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_START_TIME=12:00
 _APP_MAINTENANCE_RETENTION_CACHE=2592000

README-CN.md

@@ -72,7 +72,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.7.4
 ```
 
 ### Windows
@@ -84,7 +84,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.7.4
 ```
 
 #### PowerShell
@@ -94,7 +94,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.7.4
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -78,7 +78,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.7.4
 ```
 
 ### Windows
@@ -90,7 +90,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.7.4
 ```
 
 #### PowerShell
@@ -100,7 +100,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.7.4
 ```
 
 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.

app/config/collections/common.php

@@ -1439,13 +1439,6 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
-            [
-                '$id' => ID::custom('_key_roles'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['roles'],
-                'lengths' => [128],
-                'orders' => [],
-            ],
         ],
     ],
 

app/config/errors.php

@@ -393,6 +393,16 @@ return [
         'description' => 'Membership is already confirmed.',
         'code' => 409,
     ],
+    Exception::MEMBERSHIP_DELETION_PROHIBITED => [
+        'name' => Exception::MEMBERSHIP_DELETION_PROHIBITED,
+        'description' => 'Membership deletion is prohibited.',
+        'code' => 400,
+    ],
+    Exception::MEMBERSHIP_DOWNGRADE_PROHIBITED => [
+        'name' => Exception::MEMBERSHIP_DOWNGRADE_PROHIBITED,
+        'description' => 'Membership role downgrade is prohibited.',
+        'code' => 400,
+    ],
 
     /** Avatars */
     Exception::AVATAR_SET_NOT_FOUND => [

app/config/platforms.php

@@ -217,7 +217,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '6.2.3',
+                'version' => '7.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,

app/config/specs/open-api3-1.7.x-client.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",

app/config/specs/open-api3-1.7.x-console.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -8049,6 +8049,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/components\/schemas\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8204,7 +8227,10 @@
                                             "type": "object"
                                         }
                                     }
-                                }
+                                },
+                                "required": [
+                                    "documents"
+                                ]
                             }
                         }
                     }

app/config/specs/open-api3-1.7.x-server.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -7530,6 +7530,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/components\/schemas\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -7688,7 +7711,10 @@
                                             "type": "object"
                                         }
                                     }
-                                }
+                                },
+                                "required": [
+                                    "documents"
+                                ]
                             }
                         }
                     }

app/config/specs/open-api3-latest-client.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",

app/config/specs/open-api3-latest-console.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -8049,6 +8049,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/components\/schemas\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8204,7 +8227,10 @@
                                             "type": "object"
                                         }
                                     }
-                                }
+                                },
+                                "required": [
+                                    "documents"
+                                ]
                             }
                         }
                     }

app/config/specs/open-api3-latest-server.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -7530,6 +7530,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/components\/schemas\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -7688,7 +7711,10 @@
                                             "type": "object"
                                         }
                                     }
-                                }
+                                },
+                                "required": [
+                                    "documents"
+                                ]
                             }
                         }
                     }

app/config/specs/swagger2-1.7.x-client.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",

app/config/specs/swagger2-1.7.x-console.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -8178,6 +8178,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/definitions\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8323,13 +8346,16 @@
                                 "documents": {
                                     "type": "array",
                                     "description": "Array of document data as JSON objects. May contain partial documents.",
-                                    "default": [],
+                                    "default": null,
                                     "x-example": null,
                                     "items": {
                                         "type": "object"
                                     }
                                 }
-                            }
+                            },
+                            "required": [
+                                "documents"
+                            ]
                         }
                     }
                 ]

app/config/specs/swagger2-1.7.x-server.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -7649,6 +7649,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/definitions\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -7797,13 +7820,16 @@
                                 "documents": {
                                     "type": "array",
                                     "description": "Array of document data as JSON objects. May contain partial documents.",
-                                    "default": [],
+                                    "default": null,
                                     "x-example": null,
                                     "items": {
                                         "type": "object"
                                     }
                                 }
-                            }
+                            },
+                            "required": [
+                                "documents"
+                            ]
                         }
                     }
                 ]

app/config/specs/swagger2-latest-client.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",

app/config/specs/swagger2-latest-console.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -8178,6 +8178,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/definitions\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -8323,13 +8346,16 @@
                                 "documents": {
                                     "type": "array",
                                     "description": "Array of document data as JSON objects. May contain partial documents.",
-                                    "default": [],
+                                    "default": null,
                                     "x-example": null,
                                     "items": {
                                         "type": "object"
                                     }
                                 }
-                            }
+                            },
+                            "required": [
+                                "documents"
+                            ]
                         }
                     }
                 ]

app/config/specs/swagger2-latest-server.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.7.4",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -7649,6 +7649,29 @@
                                 }
                             ],
                             "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
+                        },
+                        {
+                            "name": "createDocuments",
+                            "auth": {
+                                "Key": []
+                            },
+                            "parameters": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "required": [
+                                "databaseId",
+                                "collectionId",
+                                "documents"
+                            ],
+                            "responses": [
+                                {
+                                    "code": 201,
+                                    "model": "#\/definitions\/documentList"
+                                }
+                            ],
+                            "description": "Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console."
                         }
                     ],
                     "auth": {
@@ -7797,13 +7820,16 @@
                                 "documents": {
                                     "type": "array",
                                     "description": "Array of document data as JSON objects. May contain partial documents.",
-                                    "default": [],
+                                    "default": null,
                                     "x-example": null,
                                     "items": {
                                         "type": "object"
                                     }
                                 }
-                            }
+                            },
+                            "required": [
+                                "documents"
+                            ]
                         }
                     }
                 ]

app/config/storage/inputs.php

@@ -7,4 +7,5 @@ return [
     "png" => "image/png",
     "heic" => "image/heic",
     "webp" => "image/webp",
+    "gif" => "image/gif",
 ];

app/config/storage/outputs.php

@@ -8,4 +8,5 @@ return [
     "webp" => "image/webp",
     "heic" => "image/heic",
     "avif" => "image/avif",
+    "gif" => "image/gif",
 ];

app/config/storage/resource_limits.php

@@ -0,0 +1,6 @@
+<?php
+
+use Utopia\Image\Image;
+use Utopia\System\System;
+
+Image::setResourceLimit('memory', intval(System::getEnv('_APP_IMAGES_RESOURCE_LIMIT_MEMORY', 1024*1024*64)));

app/config/template-runtimes.php

@@ -14,7 +14,7 @@ return [
     ],
     'DART' => [
         'name' => 'dart',
-        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
+        'versions' => ['3.8', '3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
     ],
     'GO' => [
         'name' => 'go',
@@ -38,6 +38,6 @@ return [
     ],
     'FLUTTER' => [
         'name' => 'flutter',
-        'versions' => ['3.24']
+        'versions' => ['3.32', '3.24']
     ],
 ];

app/controllers/api/databases.php

@@ -1347,11 +1347,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
     ->inject('dbForProject')
     ->inject('queueForDatabase')
     ->inject('queueForEvents')
-    ->inject('plan')
-    ->action(function (string $databaseId, string $collectionId, string $key, ?int $size, ?bool $required, ?string $default, bool $array, bool $encrypt, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, array $plan) {
-        if ($encrypt && !empty($plan) && !($plan['databasesAllowEncrypt'] ?? false)) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Encrypted string attributes are not available on your plan. Please upgrade to create encrypted string attributes.');
-        }
+    ->action(function (string $databaseId, string $collectionId, string $key, ?int $size, ?bool $required, ?string $default, bool $array, bool $encrypt, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
         // Ensure attribute default is within required size
         $validator = new Text($size, 0);
         if (!is_null($default) && !$validator->isValid($default)) {
@@ -4585,7 +4581,7 @@ App::put('/v1/databases/:databaseId/collections/:collectionId/documents')
     ))
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('collectionId', '', new UID(), 'Collection ID.')
-    ->param('documents', [], fn (array $plan) => new ArrayList(new JSON(), $plan['databasesBatchSize'] ?? APP_LIMIT_DATABASE_BATCH), 'Array of document data as JSON objects. May contain partial documents.', true, ['plan'])
+    ->param('documents', [], fn (array $plan) => new ArrayList(new JSON(), $plan['databasesBatchSize'] ?? APP_LIMIT_DATABASE_BATCH), 'Array of document data as JSON objects. May contain partial documents.', false, ['plan'])
     ->inject('response')
     ->inject('dbForProject')
     ->inject('queueForStatsUsage')

app/controllers/api/proxy.php

@@ -214,11 +214,42 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
             throw new Exception(Exception::RULE_NOT_FOUND);
         }
 
-        $validators = [];
-        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
-        if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-            $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+        $targetCNAME = null;
+        switch ($rule->getAttribute('type', '')) {
+            case 'api':
+                // For example: fra.cloud.appwrite.io
+                $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
+                break;
+            case 'redirect':
+                // For example: appwrite.network
+                $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
+                break;
+            case 'deployment':
+                switch ($rule->getAttribute('deploymentResourceType', '')) {
+                    case 'function':
+                        // For example: fra.appwrite.run
+                        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_FUNCTIONS', ''));
+                        break;
+                    case 'site':
+                        // For example: appwrite.network
+                        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_SITES', ''));
+                        break;
+                    default:
+                        break;
+                }
+                // no break
+            default:
+                break;
         }
+
+        $validators = [];
+
+        if (!is_null($targetCNAME)) {
+            if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
+                $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
+            }
+        }
+
         if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
             $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
         }
@@ -260,7 +291,8 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
         // Issue a TLS certificate when domain is verified
         $queueForCertificates
             ->setDomain(new Document([
-                'domain' => $rule->getAttribute('domain')
+                'domain' => $rule->getAttribute('domain'),
+                'domainType' => $rule->getAttribute('deploymentResourceType', $rule->getAttribute('type')),
             ]))
             ->trigger();
 

app/controllers/api/storage.php

@@ -1004,7 +1004,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
         $algorithm = $file->getAttribute('algorithm', Compression::NONE);
         $cipher = $file->getAttribute('openSSLCipher');
         $mime = $file->getAttribute('mimeType');
-        if (!\in_array($mime, $inputs) || $file->getAttribute('sizeActual') > (int) System::getEnv('_APP_STORAGE_PREVIEW_LIMIT', 20000000)) {
+        if (!\in_array($mime, $inputs) || $file->getAttribute('sizeActual') > (int) System::getEnv('_APP_STORAGE_PREVIEW_LIMIT', APP_STORAGE_READ_BUFFER)) {
             if (!\in_array($mime, $inputs)) {
                 $path = (\array_key_exists($mime, $fileLogos)) ? $fileLogos[$mime] : $fileLogos['default'];
             } else {
@@ -1178,13 +1178,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
             throw new Exception(Exception::STORAGE_FILE_NOT_FOUND, 'File not found in ' . $path);
         }
 
-        $response
-            ->setContentType($file->getAttribute('mimeType'))
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage())
-            ->addHeader('Content-Disposition', 'attachment; filename="' . $file->getAttribute('name', '') . '"')
-        ;
-
         $size = $file->getAttribute('sizeOriginal', 0);
 
         $rangeHeader = $request->getHeader('range');
@@ -1193,7 +1186,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
             $end = $request->getRangeEnd();
             $unit = $request->getRangeUnit();
 
-            if ($end === null) {
+            if ($end === null || $end - $start > APP_STORAGE_READ_BUFFER) {
                 $end = min(($start + MAX_OUTPUT_CHUNK_SIZE - 1), ($size - 1));
             }
 
@@ -1208,6 +1201,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
                 ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
         }
 
+        $response
+            ->setContentType($file->getAttribute('mimeType'))
+            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
+            ->addHeader('X-Peak', \memory_get_peak_usage())
+            ->addHeader('Content-Disposition', 'attachment; filename="' . $file->getAttribute('name', '') . '"')
+        ;
+
         $source = '';
         if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
             $source = $deviceForFiles->read($path);
@@ -1345,15 +1345,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
             $contentType = $file->getAttribute('mimeType');
         }
 
-        $response
-            ->setContentType($contentType)
-            ->addHeader('Content-Security-Policy', 'script-src none;')
-            ->addHeader('X-Content-Type-Options', 'nosniff')
-            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage())
-        ;
-
         $size = $file->getAttribute('sizeOriginal', 0);
 
         $rangeHeader = $request->getHeader('range');
@@ -1362,8 +1353,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
             $end = $request->getRangeEnd();
             $unit = $request->getRangeUnit();
 
-            if ($end === null) {
-                $end = min(($start + 2000000 - 1), ($size - 1));
+            if ($end === null || $end - $start > APP_STORAGE_READ_BUFFER) {
+                $end = min(($start + APP_STORAGE_READ_BUFFER - 1), ($size - 1));
             }
 
             if ($unit != 'bytes' || $start >= $end || $end >= $size) {
@@ -1377,6 +1368,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
                 ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
         }
 
+        $response
+            ->setContentType($contentType)
+            ->addHeader('Content-Security-Policy', 'script-src none;')
+            ->addHeader('X-Content-Type-Options', 'nosniff')
+            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
+            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
+            ->addHeader('X-Peak', \memory_get_peak_usage())
+        ;
+
         $source = '';
         if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
             $source = $deviceForFiles->read($path);
@@ -1498,14 +1498,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
             $contentType = $file->getAttribute('mimeType');
         }
 
-        $response
-            ->setContentType($contentType)
-            ->addHeader('Content-Security-Policy', 'script-src none;')
-            ->addHeader('X-Content-Type-Options', 'nosniff')
-            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage());
-
         $size = $file->getAttribute('sizeOriginal', 0);
 
         $rangeHeader = $request->getHeader('range');
@@ -1514,8 +1506,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
             $end = $request->getRangeEnd();
             $unit = $request->getRangeUnit();
 
-            if ($end === null) {
-                $end = min(($start + 2000000 - 1), ($size - 1));
+            if ($end === null || $end - $start > APP_STORAGE_READ_BUFFER) {
+                $end = min(($start + APP_STORAGE_READ_BUFFER - 1), ($size - 1));
             }
 
             if ($unit != 'bytes' || $start >= $end || $end >= $size) {
@@ -1529,6 +1521,14 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
                 ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
         }
 
+        $response
+            ->setContentType($contentType)
+            ->addHeader('Content-Security-Policy', 'script-src none;')
+            ->addHeader('X-Content-Type-Options', 'nosniff')
+            ->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
+            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
+            ->addHeader('X-Peak', \memory_get_peak_usage());
+
         $source = '';
         if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
             $source = $deviceForFiles->read($path);

app/controllers/api/teams.php

@@ -1097,10 +1097,13 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
                 max: 2
             );
 
+            // Is the role change being requested by the user on their own membership?
+            $isCurrentUserAnOwner =  $user->getInternalId() === $membership->getAttribute('userInternalId');
+
             // Prevent role change if there's only one owner left,
-            // the requester is that owner, and the new `$roles` no longer include 'owner'!
-            if ($ownersCount === 1 && $isOwner && !\in_array('owner', $roles)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'There must be at least one owner in the organization.');
+            // the requester is that owner, and the new `$roles` no longer include 'owner'
+            if ($ownersCount === 1 && $isOwner && $isCurrentUserAnOwner && !\in_array('owner', $roles)) {
+                throw new Exception(Exception::MEMBERSHIP_DOWNGRADE_PROHIBITED, 'There must be at least one owner in the organization.');
             }
         }
 
@@ -1315,10 +1318,12 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     ))
     ->param('teamId', '', new UID(), 'Team ID.')
     ->param('membershipId', '', new UID(), 'Membership ID.')
+    ->inject('user')
+    ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents) {
 
         $membership = $dbForProject->getDocument('memberships', $membershipId);
 
@@ -1326,9 +1331,9 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             throw new Exception(Exception::TEAM_INVITE_NOT_FOUND);
         }
 
-        $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
+        $profile = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
 
-        if ($user->isEmpty()) {
+        if ($profile->isEmpty()) {
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
@@ -1342,6 +1347,29 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             throw new Exception(Exception::TEAM_MEMBERSHIP_MISMATCH);
         }
 
+        if ($project->getId() === 'console') {
+            // Quick check:
+            // fetch up to 2 owners to determine if only one exists
+            $ownersCount = $dbForProject->count(
+                collection: 'memberships',
+                queries: [
+                    Query::contains('roles', ['owner']),
+                    Query::equal('teamInternalId', [$team->getInternalId()])
+                ],
+                max: 2
+            );
+
+            // Is the deletion being requested by the user on their own membership and they are also the owner?
+            $isSelfOwner =
+                in_array('owner', $membership->getAttribute('roles')) &&
+                $membership->getAttribute('userInternalId') === $user->getInternalId();
+
+            if ($ownersCount === 1 && $isSelfOwner) {
+                /* Prevent removal if the user is the only owner. */
+                throw new Exception(Exception::MEMBERSHIP_DELETION_PROHIBITED, 'There must be at least one owner in the organization.');
+            }
+        }
+
         try {
             $dbForProject->deleteDocument('memberships', $membership->getId());
         } catch (AuthorizationException $exception) {
@@ -1350,15 +1378,15 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove membership from DB');
         }
 
-        $dbForProject->purgeCachedDocument('users', $user->getId());
+        $dbForProject->purgeCachedDocument('users', $profile->getId());
 
         if ($membership->getAttribute('confirm')) { // Count only confirmed members
             Authorization::skip(fn () => $dbForProject->decreaseDocumentAttribute('teams', $team->getId(), 'total', 1, 0));
         }
 
         $queueForEvents
-            ->setParam('userId', $user->getId())
             ->setParam('teamId', $team->getId())
+            ->setParam('userId', $profile->getId())
             ->setParam('membershipId', $membership->getId())
             ->setPayload($response->output($membership, Response::MODEL_MEMBERSHIP))
         ;

app/controllers/api/vcs.php

@@ -293,7 +293,13 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
                 // VCS branch preview
                 if (!empty($providerBranch)) {
-                    $domain = "branch-{$providerBranch}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
+                    $branchPrefix = substr($providerBranch, 0, 16);
+                    if (strlen($providerBranch) > 16) {
+                        $remainingChars = substr($providerBranch, 16);
+                        $branchPrefix .= '-' . substr(hash('sha256', $remainingChars), 0, 7);
+                    }
+                    $resourceProjectHash = substr(hash('sha256', $resource->getId() . $project->getId()), 0, 7);
+                    $domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
                     $ruleId = md5($domain);
                     try {
                         Authorization::skip(
@@ -324,7 +330,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
                 // VCS commit preview
                 if (!empty($providerCommitHash)) {
-                    $domain = "commit-{$providerCommitHash}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
+                    $domain = "commit-" . substr($providerCommitHash, 0, 16) . ".{$sitesDomain}";
                     $ruleId = md5($domain);
                     try {
                         Authorization::skip(
@@ -1209,6 +1215,7 @@ App::post('/v1/vcs/github/events')
 
             if ($event == $github::EVENT_PUSH) {
                 $providerBranchCreated = $parsedPayload["branchCreated"] ?? false;
+                $providerBranchDeleted = $parsedPayload["branchDeleted"] ?? false;
                 $providerBranch = $parsedPayload["branch"] ?? '';
                 $providerBranchUrl = $parsedPayload["branchUrl"] ?? '';
                 $providerRepositoryId = $parsedPayload["repositoryId"] ?? '';
@@ -1230,8 +1237,8 @@ App::post('/v1/vcs/github/events')
                     Query::limit(100),
                 ]));
 
-                // create new deployment only on push and not when branch is created
-                if (!$providerBranchCreated) {
+                // create new deployment only on push and not when branch is created or deleted
+                if (!$providerBranchCreated && !$providerBranchDeleted) {
                     $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);
                 }
             } elseif ($event == $github::EVENT_INSTALLATION) {

app/controllers/general.php

@@ -107,6 +107,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         return false;
     }
 
+    // @luke implement START
     $projectId = $rule->getAttribute('projectId');
     $project = Authorization::skip(
         fn () => $dbForPlatform->getDocument('projects', $projectId)
@@ -126,6 +127,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             throw new AppwriteException(AppwriteException::GENERAL_SERVICE_DISABLED, view: $errorView);
         }
     }
+    // @luke implement END
 
     // Skip Appwrite Router for ACME challenge. Nessessary for certificate generation
     $path = ($swooleRequest->server['request_uri'] ?? '/');
@@ -136,6 +138,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
     $type = $rule->getAttribute('type', '');
 
     if ($type === 'deployment') {
+        // @luke implement START
         if (System::getEnv('_APP_OPTIONS_ROUTER_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
             if ($request->getProtocol() !== 'https' && $request->getHostname() !== APP_HOSTNAME_INTERNAL) {
                 if ($request->getMethod() !== Request::METHOD_GET) {
@@ -144,6 +147,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                 return $response->redirect('https://' . $request->getHostname() . $request->getURI());
             }
         }
+        // @luke implement END
 
         /** @var Database $dbForProject */
         $dbForProject = $getProjectDB($project);
@@ -194,6 +198,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             Authorization::skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
             Authorization::skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));
 
+        // @luke implement START
         $isPreview = $type === 'function' ? false : ($rule->getAttribute('trigger', '') !== 'manual');
 
         $path = ($swooleRequest->server['request_uri'] ?? '/');
@@ -275,6 +280,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                 return true;
             }
         }
+        // @luke implement END
 
         $body = $swooleRequest->getContent() ?? '';
         $method = $swooleRequest->server['request_method'];
@@ -289,9 +295,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             }
         }
 
+        // @luke implement START
         if ($isResourceBlocked($project, $type === 'function' ? RESOURCE_TYPE_FUNCTIONS : RESOURCE_TYPE_SITES, $resource->getId())) {
             throw new AppwriteException(AppwriteException::GENERAL_RESOURCE_BLOCKED, view: $errorView);
         }
+        // @luke implement END
 
         $version = match ($type) {
             'function' => $resource->getAttribute('version', 'v2'),
@@ -316,8 +324,10 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported', view: $errorView);
         }
 
+        // @luke implement START
         $allowAnyStatus = !\is_null($apiKey) && $apiKey->isDeploymentStatusIgnored();
         if (!$allowAnyStatus && $deployment->getAttribute('status') !== 'ready') {
+        // @luke implement END
             $status = $deployment->getAttribute('status');
 
             switch ($status) {
@@ -428,6 +438,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         $vars = [];
 
         // V2 vars
+        // @luke implement START
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
                 'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
@@ -436,6 +447,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                 'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
             ]);
         }
+        // @luke implement END
 
         // Shared vars
         foreach ($resource->getAttribute('varsProject', []) as $var) {
@@ -507,10 +519,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                 'function' => $resource->getAttribute('version', 'v2'),
                 'site' => 'v5',
             };
+            // @luke implement START
             $entrypoint = match ($type) {
                 'function' => $deployment->getAttribute('entrypoint', ''),
                 'site' => '',
             };
+            // @luke implement END
 
             if ($type === 'function') {
                 $runtimeEntrypoint = match ($version) {
@@ -587,6 +601,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             }
 
             // Branded error pages (when developer left body empty)
+            // @luke implement START
             if ($executionResponse['statusCode'] >= 400 && empty($executionResponse['body'])) {
                 $layout = new View($errorView);
                 $layout
@@ -603,6 +618,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                     }
                 }
             }
+            // @luke implement END
 
             $headersFiltered = [];
             foreach ($executionResponse['headers'] as $key => $value) {
@@ -749,12 +765,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         return false;
     } elseif ($type === 'redirect') {
         $url = $rule->getAttribute('redirectUrl', '');
-
-        $query = ($swooleRequest->server['query_string'] ?? '');
-        if (!empty($query)) {
-            $url .= '?' . $query;
-        }
-
         $response->redirect($url, \intval($rule->getAttribute('redirectStatusCode', 301)));
         return true;
     } else {

app/init/configs.php

@@ -2,6 +2,8 @@
 
 use Utopia\Config\Config;
 
+require_once __DIR__ . '/../config/storage/resource_limits.php';
+
 Config::load('template-runtimes', __DIR__ . '/../config/template-runtimes.php');
 Config::load('events', __DIR__ . '/../config/events.php');
 Config::load('auth', __DIR__ . '/../config/auth.php');

app/init/constants.php

@@ -37,8 +37,8 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_RESOURCE_TOKEN_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 4319;
-const APP_VERSION_STABLE = '1.7.2';
+const APP_CACHE_BUSTER = 4320;
+const APP_VERSION_STABLE = '1.7.4';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';

app/init/resources.php

@@ -455,7 +455,7 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
 
 App::setResource('telemetry', fn () => new NoTelemetry());
 
-App::setResource('cache', function (Group $pools) {
+App::setResource('cache', function (Group $pools, Telemetry $telemetry) {
     $list = Config::getParam('pools-cache', []);
     $adapters = [];
 
@@ -463,8 +463,10 @@ App::setResource('cache', function (Group $pools) {
         $adapters[] = new CachePool($pools->get($value));
     }
 
-    return new Cache(new Sharding($adapters));
-}, ['pools']);
+    $cache = new Cache(new Sharding($adapters));
+    $cache->setTelemetry($telemetry);
+    return $cache;
+}, ['pools', 'telemetry']);
 
 App::setResource('redis', function () {
     $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
@@ -488,24 +490,23 @@ App::setResource('timelimit', function (\Redis $redis) {
 }, ['redis']);
 
 App::setResource('deviceForLocal', function (Telemetry $telemetry) {
-    return new Local();
+    return new Device\Telemetry($telemetry, new Local());
 }, ['telemetry']);
-
-App::setResource('deviceForFiles', function ($project) {
-    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForSites', function ($project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForImports', function ($project) {
-    return getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForFunctions', function ($project) {
-    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForBuilds', function ($project) {
-    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
-}, ['project']);
+App::setResource('deviceForFiles', function ($project, Telemetry $telemetry) {
+    return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+App::setResource('deviceForSites', function ($project, Telemetry $telemetry) {
+    return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+App::setResource('deviceForImports', function ($project, Telemetry $telemetry) {
+    return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+App::setResource('deviceForFunctions', function ($project, Telemetry $telemetry) {
+    return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+App::setResource('deviceForBuilds', function ($project, Telemetry $telemetry) {
+    return new Device\Telemetry($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
 function getDevice(string $root, string $connection = ''): Device
 {
@@ -534,7 +535,8 @@ function getDevice(string $root, string $connection = ''): Device
         switch ($device) {
             case Storage::DEVICE_S3:
                 if (!empty($url)) {
-                    return new S3($root, $accessKey, $accessSecret, $url, $region, $acl);
+                    $bucketRoot = (!empty($bucket) ? $bucket . '/' : '') . \ltrim($root, '/');
+                    return new S3($bucketRoot, $accessKey, $accessSecret, $url, $region, $acl);
                 } else {
                     return new AWS($root, $accessKey, $accessSecret, $bucket, $region, $acl);
                 }
@@ -566,7 +568,8 @@ function getDevice(string $root, string $connection = ''): Device
                 $s3Acl = 'private';
                 $s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
                 if (!empty($s3EndpointUrl)) {
-                    return new S3($root, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
+                    $bucketRoot = (!empty($s3Bucket) ? $s3Bucket . '/' : '') . \ltrim($root, '/');
+                    return new S3($bucketRoot, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
                 } else {
                     return new AWS($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
                 }

app/views/general/404.phtml

@@ -151,37 +151,6 @@
             <div class="center"><a href="/"><button>Go to homepage</button></a></div>
         </div>
     </div>
-
-    <div class="brand">
-        <p>Powered by</p>
-        <svg class="logo-dark" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8649 16.2461C33.6492 16.2461 34.5511 15.3184 34.9433 14.6867H35.1197C35.1981 15.3578 35.6687 15.9895 36.5903 15.9895H38.3353V14.0156H37.8843C37.5706 14.0156 37.4138 13.838 37.4138 13.5617V5.64661H35.1001V6.90986H34.9236C34.4727 6.27823 33.5315 5.39001 31.8061 5.39001C29.0611 5.39001 27.022 7.67965 27.022 10.818C27.022 13.9564 29.1003 16.2461 31.8649 16.2461ZM32.2767 13.9959C30.6493 13.9959 29.3748 12.7919 29.3748 10.8378C29.3748 8.92316 30.6101 7.62044 32.2571 7.62044C33.8256 7.62044 35.1393 8.78499 35.1393 10.8378C35.1393 12.5945 34.0217 13.9959 32.2767 13.9959Z" fill="#EDEDF0" />
-            <path d="M39.7013 20H42.0149V14.6867H42.1914C42.6227 15.3184 43.5443 16.2461 45.3677 16.2461C48.1127 16.2461 50.1127 13.9169 50.1127 10.818C50.1127 7.69939 47.9755 5.39001 45.2109 5.39001C43.4462 5.39001 42.5835 6.35719 42.1718 6.89012H41.9953V5.64661H39.7013V20ZM44.8776 14.0551C43.2894 14.0551 41.9757 12.8708 41.9757 10.818C41.9757 9.06133 43.0933 7.58096 44.8383 7.58096C46.4657 7.58096 47.7402 8.86395 47.7402 10.818C47.7402 12.7326 46.5049 14.0551 44.8776 14.0551Z" fill="#EDEDF0" />
-            <path d="M51.3065 20H53.6202V14.6867H53.7966C54.228 15.3184 55.1495 16.2461 56.973 16.2461C59.718 16.2461 61.5273 13.9169 61.5273 10.818C61.5273 7.69939 59.5807 5.39001 56.8161 5.39001C55.0515 5.39001 54.1888 6.35719 53.777 6.89012H53.6005V5.64661H51.3065V20ZM56.4828 14.0551C54.8946 14.0551 53.5809 12.8708 53.5809 10.818C53.5809 9.06133 54.6985 7.58096 56.4436 7.58096C58.071 7.58096 59.3454 8.86395 59.3454 10.818C59.3454 12.7326 58.1102 14.0551 56.4828 14.0551Z" fill="#EDEDF0" />
-            <path d="M64.5857 16.2296H67.8601L69.7227 8.11721H69.8404L71.7031 16.2296H74.9579L77.5642 5.88678H75.2323L73.3697 14.0189H73.1932L71.3305 5.88678H68.2522L66.3699 14.0189H66.1935L64.3504 5.88678H61.8799L64.5857 16.2296Z" fill="#EDEDF0" />
-            <path d="M78.7363 16.2296H81.0499V11.1174C81.0499 9.16334 81.9519 7.9593 83.6381 7.9593H84.6576V5.63019H83.893C82.5793 5.63019 81.5793 6.53815 81.1872 7.40663H81.0303V5.88678H78.7363V16.2296Z" fill="#EDEDF0" />
-            <path d="M96.1391 16.2296H97.943V14.1571H96.1587C95.4529 14.1571 95.1588 13.8413 95.1588 13.111V7.93956H98.0606V5.88678H95.1588V2.98526H92.9628V5.88678H91.0413V7.93956H92.8255V13.1307C92.8255 15.3217 94.1392 16.2296 96.1391 16.2296Z" fill="#EDEDF0" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.17 15.1802 108.836 13.0287L106.719 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.327 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.915 7.58096 98.915 10.8378C98.915 13.9959 101.013 16.2461 104.15 16.2461ZM101.327 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.621 8.31128 106.738 9.71269H101.327Z" fill="#EDEDF0" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0125 16.2296H87.6989V7.93956H85.895V5.88678H90.0125V16.2296Z" fill="#EDEDF0" />
-            <path d="M88.6834 4.45145C89.5265 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5265 1.54993 88.6834 1.54993C87.8403 1.54993 87.2129 2.18155 87.2129 2.99082C87.2129 3.81983 87.8403 4.45145 88.6834 4.45145Z" fill="#EDEDF0" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2006 7.88412V12.4486H11.9414C12.8021 11.6166 13.3389 10.4373 13.3389 9.12899C13.3389 8.69744 13.2806 8.27999 13.1713 7.88412H20.2006Z" fill="#FD366E" />
-        </svg>
-        <svg class="logo-light" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8648 16.2461C33.649 16.2461 34.5509 15.3184 34.9431 14.6867H35.1195C35.198 15.3578 35.6685 15.9895 36.5901 15.9895H38.3351V14.0156H37.8841C37.5704 14.0156 37.4136 13.838 37.4136 13.5617V5.64661H35.0999V6.90986H34.9235C34.4725 6.27823 33.5314 5.39001 31.8059 5.39001C29.0609 5.39001 27.0218 7.67965 27.0218 10.818C27.0218 13.9564 29.1001 16.2461 31.8648 16.2461ZM32.2765 13.9959C30.6491 13.9959 29.3746 12.7919 29.3746 10.8378C29.3746 8.92316 30.6099 7.62044 32.2569 7.62044C33.8255 7.62044 35.1391 8.78499 35.1391 10.8378C35.1391 12.5945 34.0215 13.9959 32.2765 13.9959Z" fill="#2D2D31" />
-            <path d="M39.7011 20H42.0147V14.6867H42.1912C42.6226 15.3184 43.5441 16.2461 45.3676 16.2461C48.1126 16.2461 50.1125 13.9169 50.1125 10.818C50.1125 7.69939 47.9753 5.39001 45.2107 5.39001C43.4461 5.39001 42.5833 6.35719 42.1716 6.89012H41.9951V5.64661H39.7011V20ZM44.8774 14.0551C43.2892 14.0551 41.9755 12.8708 41.9755 10.818C41.9755 9.06133 43.0931 7.58096 44.8382 7.58096C46.4656 7.58096 47.74 8.86395 47.74 10.818C47.74 12.7326 46.5048 14.0551 44.8774 14.0551Z" fill="#2D2D31" />
-            <path d="M51.3063 20H53.62V14.6867H53.7964C54.2278 15.3184 55.1493 16.2461 56.9728 16.2461C59.7178 16.2461 61.5271 13.9169 61.5271 10.818C61.5271 7.69939 59.5805 5.39001 56.8159 5.39001C55.0513 5.39001 54.1886 6.35719 53.7768 6.89012H53.6004V5.64661H51.3063V20ZM56.4826 14.0551C54.8944 14.0551 53.5808 12.8708 53.5808 10.818C53.5808 9.06133 54.6984 7.58096 56.4434 7.58096C58.0708 7.58096 59.3453 8.86395 59.3453 10.818C59.3453 12.7326 58.11 14.0551 56.4826 14.0551Z" fill="#2D2D31" />
-            <path d="M64.5855 16.2296H67.8599L69.7226 8.11721H69.8402L71.7029 16.2296H74.9577L77.564 5.88678H75.2322L73.3695 14.0189H73.193L71.3303 5.88678H68.252L66.3697 14.0189H66.1933L64.3502 5.88678H61.8797L64.5855 16.2296Z" fill="#2D2D31" />
-            <path d="M78.7361 16.2296H81.0498V11.1174C81.0498 9.16334 81.9517 7.9593 83.6379 7.9593H84.6575V5.63019H83.8928C82.5791 5.63019 81.5791 6.53815 81.187 7.40663H81.0301V5.88678H78.7361V16.2296Z" fill="#2D2D31" />
-            <path d="M96.1389 16.2296H97.9428V14.1571H96.1585C95.4527 14.1571 95.1586 13.8413 95.1586 13.111V7.93956H98.0604V5.88678H95.1586V2.98526H92.9626V5.88678H91.0411V7.93956H92.8253V13.1307C92.8253 15.3217 94.139 16.2296 96.1389 16.2296Z" fill="#2D2D31" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.169 15.1802 108.836 13.0287L106.718 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.326 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.9148 7.58096 98.9148 10.8378C98.9148 13.9959 101.013 16.2461 104.15 16.2461ZM101.326 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.62 8.31128 106.738 9.71269H101.326Z" fill="#2D2D31" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0123 16.2296H87.6987V7.93956H85.8948V5.88678H90.0123V16.2296Z" fill="#2D2D31" />
-            <path d="M88.6835 4.45145C89.5266 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5266 1.54993 88.6835 1.54993C87.8404 1.54993 87.213 2.18155 87.213 2.99082C87.213 3.81983 87.8404 4.45145 88.6835 4.45145Z" fill="#2D2D31" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2007 7.88412V12.4486H11.9415C12.8022 11.6166 13.339 10.4373 13.339 9.12899C13.339 8.69744 13.2807 8.27999 13.1714 7.88412H20.2007Z" fill="#FD366E" />
-        </svg>
-
-    </div>
 </body>
 
 </html>

app/views/general/error.phtml

@@ -479,67 +479,39 @@ switch ($type) {
             </div>
         </div>
 
-        <div x-show="page === 'trace'" class="error-trace">
-            <button class="back-button" x-on:click="page = 'error'">
-                Back
-            </button>
-            <div class="trace-grid-header">Error trace</div>
-            <?php foreach ($trace as $index => $traceItem): ?>
-                <div class="trace-grid">
-                    <?php if (isset($traceItem['file'])): ?>
-                        <div class="trace-label">file</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['file']); ?></div>
-                    <?php endif; ?>
+        <?php if ($development) : ?>
+            <div x-show="page === 'trace'" class="error-trace">
+                <button class="back-button" x-on:click="page = 'error'">
+                    Back
+                </button>
+                <div class="trace-grid-header">Error trace</div>
+                <?php foreach ($trace as $index => $traceItem): ?>
+                    <div class="trace-grid">
+                        <?php if (isset($traceItem['file'])): ?>
+                            <div class="trace-label">file</div>
+                            <div class="trace-value"><?php echo $this->print($traceItem['file']); ?></div>
+                        <?php endif; ?>
 
-                    <?php if (isset($traceItem['line'])): ?>
-                        <div class="trace-label">line</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['line']); ?></div>
-                    <?php endif; ?>
+                        <?php if (isset($traceItem['line'])): ?>
+                            <div class="trace-label">line</div>
+                            <div class="trace-value"><?php echo $this->print($traceItem['line']); ?></div>
+                        <?php endif; ?>
 
-                    <?php if (isset($traceItem['function'])): ?>
-                        <div class="trace-label">function</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['function']); ?></div>
-                    <?php endif; ?>
+                        <?php if (isset($traceItem['function'])): ?>
+                            <div class="trace-label">function</div>
+                            <div class="trace-value"><?php echo $this->print($traceItem['function']); ?></div>
+                        <?php endif; ?>
 
-                    <?php if (isset($traceItem['args'])): ?>
-                        <div class="trace-label">args</div>
-                        <div class="trace-args"><pre><?php echo $this->print(\var_export($traceItem['args'], true)); ?></pre></div>
-                    <?php endif; ?>
-                </div>
-            <?php endforeach; ?>
-        </div>
+                        <?php if (isset($traceItem['args'])): ?>
+                            <div class="trace-label">args</div>
+                            <div class="trace-args"><pre><?php echo $this->print(\var_export($traceItem['args'], true)); ?></pre></div>
+                        <?php endif; ?>
+                    </div>
+                <?php endforeach; ?>
+            </div>
+        <?php endif; ?>
     </div>
 
-    <div x-show="page === 'error'" class="brand">
-        <p>Powered by</p>
-        <svg class="logo-dark" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8649 16.2461C33.6492 16.2461 34.5511 15.3184 34.9433 14.6867H35.1197C35.1981 15.3578 35.6687 15.9895 36.5903 15.9895H38.3353V14.0156H37.8843C37.5706 14.0156 37.4138 13.838 37.4138 13.5617V5.64661H35.1001V6.90986H34.9236C34.4727 6.27823 33.5315 5.39001 31.8061 5.39001C29.0611 5.39001 27.022 7.67965 27.022 10.818C27.022 13.9564 29.1003 16.2461 31.8649 16.2461ZM32.2767 13.9959C30.6493 13.9959 29.3748 12.7919 29.3748 10.8378C29.3748 8.92316 30.6101 7.62044 32.2571 7.62044C33.8256 7.62044 35.1393 8.86395 35.1393 10.8378C35.1393 12.5945 34.0217 13.9959 32.2767 13.9959Z" fill="#EDEDF0" />
-            <path d="M39.7013 20H42.0149V14.6867H42.1914C42.6227 15.3184 43.5443 16.2461 45.3677 16.2461C48.1127 16.2461 50.1127 13.9169 50.1127 10.818C50.1127 7.69939 47.9755 5.39001 45.2109 5.39001C43.4462 5.39001 42.5835 6.35719 42.1718 6.89012H41.9953V5.63019H39.7013V20ZM44.8776 14.0551C43.2894 14.0551 41.9757 12.8708 41.9757 10.818C41.9757 9.06133 43.0933 7.58096 44.8383 7.58096C46.4657 7.58096 47.7402 8.86395 47.7402 10.818C47.7402 12.7326 46.5049 14.0551 44.8776 14.0551Z" fill="#EDEDF0" />
-            <path d="M51.3065 20H53.6202V14.6867H53.7966C54.228 15.3184 55.1495 16.2461 56.973 16.2461C59.718 16.2461 61.5273 13.9169 61.5273 10.818C61.5273 7.69939 59.5807 5.39001 56.8161 5.39001C55.0515 5.39001 54.1888 6.35719 53.777 6.89012H53.6005V5.64661H51.3065V20ZM56.4828 14.0551C54.8946 14.0551 53.5809 12.8708 53.5809 10.818C53.5809 9.06133 54.6985 7.58096 56.4436 7.58096C58.071 7.58096 59.3454 8.86395 59.3454 10.818C59.3454 12.7326 58.1102 14.0551 56.4828 14.0551Z" fill="#EDEDF0" />
-            <path d="M64.5857 16.2296H67.8601L69.7227 8.11721H69.8404L71.7031 16.2296H74.9579L77.5642 5.88678H75.2323L73.3697 14.0189H73.1932L71.3305 5.88678H68.2522L66.3699 14.0189H66.1935L64.3504 5.88678H61.8799L64.5857 16.2296Z" fill="#EDEDF0" />
-            <path d="M78.7363 16.2296H81.0499V11.1174C81.0499 9.16334 81.9519 7.9593 83.6381 7.9593H84.6576V5.63019H83.893C82.5793 5.63019 81.5793 6.53815 81.1872 7.40663H81.0303V5.88678H78.7363V16.2296Z" fill="#EDEDF0" />
-            <path d="M96.1391 16.2296H97.943V14.1571H96.1587C95.4529 14.1571 95.1588 13.8413 95.1588 13.111V7.93956H98.0606V5.88678H95.1588V2.98526H92.9628V5.88678H91.0413V7.93956H92.8255V13.1307C92.8255 15.3217 94.1392 16.2296 96.1391 16.2296Z" fill="#EDEDF0" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.17 15.1802 108.836 13.0287L106.719 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.327 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.915 7.58096 98.915 10.8378C98.915 13.9959 101.013 16.2461 104.15 16.2461ZM101.327 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.621 8.31128 106.738 9.71269H101.327Z" fill="#EDEDF0" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0125 16.2296H87.6989V7.93956H85.895V5.88678H90.0125V16.2296Z" fill="#EDEDF0" />
-            <path d="M88.6834 4.45145C89.5265 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5265 1.54993 88.6834 1.54993C87.8403 1.54993 87.2129 2.18155 87.2129 2.99082C87.2129 3.81983 87.8403 4.45145 88.6834 4.45145Z" fill="#EDEDF0" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2006 7.88412V12.4486H11.9414C12.8021 11.6166 13.3389 10.4373 13.3389 9.12899C13.3389 8.69744 13.2806 8.27999 13.1713 7.88412H20.2006Z" fill="#FD366E" />
-        </svg>
-        <svg class="logo-light" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8648 16.2461C33.649 16.2461 34.5509 15.3184 34.9431 14.6867H35.1195C35.198 15.3578 35.6685 15.9895 36.5901 15.9895H38.3351V14.0156H37.8841C37.5704 14.0156 37.4136 13.838 37.4136 13.5617V5.64661H35.0999V6.90986H34.9235C34.4725 6.27823 33.5314 5.39001 31.8059 5.39001C29.0609 5.39001 27.0218 7.67965 27.0218 10.818C27.0218 13.9564 29.1001 16.2461 31.8648 16.2461ZM32.2765 13.9959C30.6491 13.9959 29.3746 12.7919 29.3746 10.8378C29.3746 8.92316 30.6099 7.62044 32.2569 7.62044C33.8255 7.62044 35.1391 8.78499 35.1391 10.8378C35.1391 12.5945 34.0215 13.9959 32.2765 13.9959Z" fill="#2D2D31" />
-            <path d="M39.7011 20H42.0147V14.6867H42.1912C42.6226 15.3184 43.5441 16.2461 45.3676 16.2461C48.1126 16.2461 50.1125 13.9169 50.1125 10.818C50.1125 7.69939 47.9753 5.39001 45.2107 5.39001C43.4461 5.39001 42.5833 6.35719 42.1716 6.89012H41.9951V5.64661H39.7011V20ZM44.8774 14.0551C43.2892 14.0551 41.9755 12.8708 41.9755 10.818C41.9755 9.06133 43.0931 7.58096 44.8382 7.58096C46.4656 7.58096 47.74 8.86395 47.74 10.818C47.74 12.7326 46.5048 14.0551 44.8774 14.0551Z" fill="#2D2D31" />
-            <path d="M51.3063 20H53.62V14.6867H53.7964C54.2278 15.3184 55.1493 16.2461 56.9728 16.2461C59.7178 16.2461 61.5271 13.9169 61.5271 10.818C61.5271 7.69939 59.5805 5.39001 56.8159 5.39001C55.0513 5.39001 54.1886 6.35719 53.7768 6.89012H53.6004V5.64661H51.3063V20ZM56.4826 14.0551C54.8944 14.0551 53.5808 12.8708 53.5808 10.818C53.5808 9.06133 54.6984 7.58096 56.4434 7.58096C58.0708 7.58096 59.3453 8.86395 59.3453 10.818C59.3453 12.7326 58.11 14.0551 56.4826 14.0551Z" fill="#2D2D31" />
-            <path d="M64.5855 16.2296H67.8599L69.7226 8.11721H69.8402L71.7029 16.2296H74.9577L77.564 5.88678H75.2322L73.3695 14.0189H73.193L71.3303 5.88678H68.252L66.3697 14.0189H66.1933L64.3502 5.88678H61.8797L64.5855 16.2296Z" fill="#2D2D31" />
-            <path d="M78.7361 16.2296H81.0498V11.1174C81.0498 9.16334 81.9517 7.9593 83.6379 7.9593H84.6575V5.63019H83.8928C82.5791 5.63019 81.5791 6.53815 81.187 7.40663H81.0301V5.88678H78.7361V16.2296Z" fill="#2D2D31" />
-            <path d="M96.1389 16.2296H97.9428V14.1571H96.1585C95.4527 14.1571 95.1586 13.8413 95.1586 13.111V7.93956H98.0604V5.88678H95.1586V2.98526H92.9626V5.88678H91.0411V7.93956H92.8253V13.1307C92.8253 15.3217 94.139 16.2296 96.1389 16.2296Z" fill="#2D2D31" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.169 15.1802 108.836 13.0287L106.718 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.326 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.9148 7.58096 98.9148 10.8378C98.9148 13.9959 101.013 16.2461 104.15 16.2461ZM101.326 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.62 8.31128 106.738 9.71269H101.326Z" fill="#2D2D31" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0123 16.2296H87.6987V7.93956H85.8948V5.88678H90.0123V16.2296Z" fill="#2D2D31" />
-            <path d="M88.6835 4.45145C89.5266 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5266 1.54993 88.6835 1.54993C87.8404 1.54993 87.213 2.18155 87.213 2.99082C87.213 3.81983 87.8404 4.45145 88.6835 4.45145Z" fill="#2D2D31" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2007 7.88412V12.4486H11.9415C12.8022 11.6166 13.339 10.4373 13.339 9.12899C13.339 8.69744 13.2807 8.27999 13.1714 7.88412H20.2007Z" fill="#FD366E" />
-        </svg>
-
-    </div>
 </body>
 
 </html>

app/views/install/compose.phtml

@@ -177,7 +177,7 @@ $image = $this->getParam('image', '');
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:6.0.8
+    image: <?php echo $organization; ?>/console:6.0.13
     restart: unless-stopped
     networks:
       - appwrite
@@ -864,7 +864,7 @@ $image = $this->getParam('image', '');
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
-    image: openruntimes/executor:0.7.14
+    image: openruntimes/executor:0.7.20
     networks:
       - appwrite
       - runtimes

app/worker.php

@@ -18,7 +18,9 @@ use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
 use Executor\Executor;
+use Swoole\Process;
 use Swoole\Runtime;
+use Swoole\Timer;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
@@ -40,7 +42,9 @@ use Utopia\Queue\Message;
 use Utopia\Queue\Publisher;
 use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
+use Utopia\Storage\Device\Telemetry as TelemetryDevice;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
 Authorization::disable();
@@ -240,6 +244,7 @@ Server::setResource('timelimit', function (\Redis $redis) {
 
 Server::setResource('log', fn () => new Log());
 
+
 Server::setResource('publisher', function (Group $pools) {
     return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
@@ -310,29 +315,29 @@ Server::setResource('pools', function (Registry $register) {
 
 Server::setResource('telemetry', fn () => new NoTelemetry());
 
-Server::setResource('deviceForSites', function (Document $project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
+Server::setResource('deviceForSites', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
-Server::setResource('deviceForImports', function (Document $project) {
-    return getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId());
-}, ['project']);
+Server::setResource('deviceForImports', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
-Server::setResource('deviceForFunctions', function (Document $project) {
-    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
-}, ['project']);
+Server::setResource('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
-Server::setResource('deviceForFiles', function (Document $project) {
-    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
-}, ['project']);
+Server::setResource('deviceForFiles', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
-Server::setResource('deviceForBuilds', function (Document $project) {
-    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
-}, ['project']);
+Server::setResource('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
-Server::setResource('deviceForCache', function (Document $project) {
-    return getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId());
-}, ['project']);
+Server::setResource('deviceForCache', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
 
 Server::setResource(
     'isResourceBlocked',
@@ -479,8 +484,15 @@ $worker
     });
 
 $worker->workerStart()
-    ->action(function () use ($workerName) {
-        Console::info("Worker $workerName  started");
+    ->action(function () use ($worker, $workerName) {
+        Console::info("Worker $workerName started");
+
+        Process::signal(SIGTERM, function () use ($worker, $workerName) {
+            Console::info("Stopping worker $workerName.");
+
+            $worker->stop();
+            Timer::clearAll();
+        });
     });
 
 $worker->start();

bin/doctor

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php doctor $@
+exec php /usr/src/code/app/cli.php doctor $@

bin/install

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php install $@
+exec php /usr/src/code/app/cli.php install $@

bin/maintenance

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php maintenance $@
+exec php /usr/src/code/app/cli.php maintenance $@

bin/migrate

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php migrate $@
+exec php /usr/src/code/app/cli.php migrate $@

bin/queue-count-failed

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php queue-count --type=failed $@
+exec php /usr/src/code/app/cli.php queue-count --type=failed $@

bin/queue-count-processing

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php queue-count --type=processing $@
+exec php /usr/src/code/app/cli.php queue-count --type=processing $@

bin/queue-count-success

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php queue-count --type=success $@
+exec php /usr/src/code/app/cli.php queue-count --type=success $@

bin/queue-retry

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php queue-retry $@
+exec php /usr/src/code/app/cli.php queue-retry $@

bin/realtime

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/realtime.php $@
+exec php /usr/src/code/app/realtime.php $@

bin/schedule-executions

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php schedule-executions $@
+exec php /usr/src/code/app/cli.php schedule-executions $@

bin/schedule-functions

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php schedule-functions $@
+exec php /usr/src/code/app/cli.php schedule-functions $@

bin/schedule-messages

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php schedule-messages $@
+exec php /usr/src/code/app/cli.php schedule-messages $@

bin/screenshot

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php screenshot $@
+exec php /usr/src/code/app/cli.php screenshot $@

bin/sdks

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php sdks $@
+exec php /usr/src/code/app/cli.php sdks $@

bin/specs

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php specs $@
+exec php /usr/src/code/app/cli.php specs $@

bin/ssl

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php ssl $@
+exec php /usr/src/code/app/cli.php ssl $@

bin/stats-resources

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php stats-resources $@
+exec php /usr/src/code/app/cli.php stats-resources $@

bin/test

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml $@
+exec /usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml $@

bin/upgrade

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php upgrade $@
+exec php /usr/src/code/app/cli.php upgrade $@

bin/vars

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/cli.php vars $@
+exec php /usr/src/code/app/cli.php vars $@

bin/worker-audits

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php audits $@
+exec php /usr/src/code/app/worker.php audits $@

bin/worker-builds

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php builds $@
+exec php /usr/src/code/app/worker.php builds $@

bin/worker-certificates

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php certificates $@
+exec php /usr/src/code/app/worker.php certificates $@

bin/worker-databases

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php databases $@
+exec php /usr/src/code/app/worker.php databases $@

bin/worker-deletes

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php deletes $@
+exec php /usr/src/code/app/worker.php deletes $@

bin/worker-functions

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php functions $@
+exec php /usr/src/code/app/worker.php functions $@

bin/worker-mails

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php mails $@
+exec php /usr/src/code/app/worker.php mails $@

bin/worker-messaging

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php messaging $@
+exec php /usr/src/code/app/worker.php messaging $@

bin/worker-migrations

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php migrations $@
+exec php /usr/src/code/app/worker.php migrations $@

bin/worker-stats-resources

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php stats-resources $@
+exec php /usr/src/code/app/worker.php stats-resources $@

bin/worker-stats-usage

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php stats-usage $@
+exec php /usr/src/code/app/worker.php stats-usage $@

bin/worker-webhooks

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php /usr/src/code/app/worker.php webhooks $@
+exec php /usr/src/code/app/worker.php webhooks $@

composer.json

@@ -61,13 +61,13 @@
         "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.17.*",
+        "utopia-php/messaging": "0.18.*",
         "utopia-php/migration": "0.9.*",
         "utopia-php/orchestration": "0.9.*",
         "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "0.8.*",
         "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.10.*",
+        "utopia-php/queue": "0.11.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.18.*",
         "utopia-php/swoole": "0.8.*",
@@ -76,17 +76,17 @@
         "utopia-php/vcs": "0.10.*",
         "utopia-php/websocket": "0.3.*",
         "matomo/device-detector": "6.1.*",
-        "dragonmantank/cron-expression": "3.3.2",
-        "phpmailer/phpmailer": "6.9.1",
-        "chillerlan/php-qrcode": "4.3.4",
-        "adhocore/jwt": "1.1.2",
+        "dragonmantank/cron-expression": "3.3.*",
+        "phpmailer/phpmailer": "6.9.*",
+        "chillerlan/php-qrcode": "4.3.*",
+        "adhocore/jwt": "1.1.*",
         "spomky-labs/otphp": "^10.0",
         "webonyx/graphql-php": "14.11.*",
         "league/csv": "9.14.*"
     },
     "require-dev": {
         "ext-fileinfo": "*",
-        "appwrite/sdk-generator": "0.40.*",
+        "appwrite/sdk-generator": "0.41.*",
         "phpunit/phpunit": "9.*",
         "swoole/ide-helper": "5.1.2",
         "phpstan/phpstan": "1.8.*",

composer.lock

@@ -4,27 +4,27 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9f5de64d73e2ef73d796fa64f2baf232",
+    "content-hash": "3230eea9e592f0b712e78c1ef5f5e244",
     "packages": [
         {
             "name": "adhocore/jwt",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/adhocore/php-jwt.git",
-                "reference": "6c434af7170090bb7a8880d2bc220a2254ba7899"
+                "reference": "ad417603d9d45578b6af2089ad5b78f101c82367"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/adhocore/php-jwt/zipball/6c434af7170090bb7a8880d2bc220a2254ba7899",
-                "reference": "6c434af7170090bb7a8880d2bc220a2254ba7899",
+                "url": "https://api.github.com/repos/adhocore/php-jwt/zipball/ad417603d9d45578b6af2089ad5b78f101c82367",
+                "reference": "ad417603d9d45578b6af2089ad5b78f101c82367",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.5 || ^7.5"
+                "phpunit/phpunit": "^7.5 || ^8.5"
             },
             "type": "library",
             "autoload": {
@@ -53,15 +53,19 @@
             ],
             "support": {
                 "issues": "https://github.com/adhocore/php-jwt/issues",
-                "source": "https://github.com/adhocore/php-jwt/tree/1.1.2"
+                "source": "https://github.com/adhocore/php-jwt/tree/1.1.3"
             },
             "funding": [
                 {
                     "url": "https://paypal.me/ji10",
                     "type": "custom"
+                },
+                {
+                    "url": "https://github.com/adhocore",
+                    "type": "github"
                 }
             ],
-            "time": "2021-02-20T09:56:44+00:00"
+            "time": "2025-02-18T01:00:50+00:00"
         },
         {
             "name": "appwrite/appwrite",
@@ -157,16 +161,16 @@
         },
         {
             "name": "appwrite/php-runtimes",
-            "version": "0.19.0",
+            "version": "0.19.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/runtimes.git",
-                "reference": "8d21483efc19b9d977e323188989ee67a188464b"
+                "reference": "7bd0cc3cb97de625d7b07230bd91b121f88e72ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/8d21483efc19b9d977e323188989ee67a188464b",
-                "reference": "8d21483efc19b9d977e323188989ee67a188464b",
+                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/7bd0cc3cb97de625d7b07230bd91b121f88e72ae",
+                "reference": "7bd0cc3cb97de625d7b07230bd91b121f88e72ae",
                 "shasum": ""
             },
             "require": {
@@ -206,9 +210,9 @@
             ],
             "support": {
                 "issues": "https://github.com/appwrite/runtimes/issues",
-                "source": "https://github.com/appwrite/runtimes/tree/0.19.0"
+                "source": "https://github.com/appwrite/runtimes/tree/0.19.1"
             },
-            "time": "2025-03-25T22:37:51+00:00"
+            "time": "2025-05-27T07:12:56+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -279,16 +283,16 @@
         },
         {
             "name": "brick/math",
-            "version": "0.12.3",
+            "version": "0.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/math.git",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba"
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/math/zipball/866551da34e9a618e64a819ee1e01c20d8a588ba",
-                "reference": "866551da34e9a618e64a819ee1e01c20d8a588ba",
+                "url": "https://api.github.com/repos/brick/math/zipball/fc7ed316430118cc7836bf45faff18d5dfc8de04",
+                "reference": "fc7ed316430118cc7836bf45faff18d5dfc8de04",
                 "shasum": ""
             },
             "require": {
@@ -327,7 +331,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/0.12.3"
+                "source": "https://github.com/brick/math/tree/0.13.1"
             },
             "funding": [
                 {
@@ -335,7 +339,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-02-28T13:11:00+00:00"
+            "time": "2025-03-29T13:50:30+00:00"
         },
         {
             "name": "chillerlan/php-qrcode",
@@ -565,16 +569,16 @@
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8"
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
+                "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a",
                 "shasum": ""
             },
             "require": {
@@ -614,7 +618,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.3"
             },
             "funding": [
                 {
@@ -622,7 +626,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-10T18:51:20+00:00"
+            "time": "2023-08-10T19:36:49+00:00"
         },
         {
             "name": "giggsey/libphonenumber-for-php-lite",
@@ -709,16 +713,16 @@
         },
         {
             "name": "google/protobuf",
-            "version": "v4.31.0",
+            "version": "v4.31.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/protocolbuffers/protobuf-php.git",
-                "reference": "d59e31ce4bf0e4b48728e90c4d880839edb5be07"
+                "reference": "2b028ce8876254e2acbeceea7d9b573faad41864"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/d59e31ce4bf0e4b48728e90c4d880839edb5be07",
-                "reference": "d59e31ce4bf0e4b48728e90c4d880839edb5be07",
+                "url": "https://api.github.com/repos/protocolbuffers/protobuf-php/zipball/2b028ce8876254e2acbeceea7d9b573faad41864",
+                "reference": "2b028ce8876254e2acbeceea7d9b573faad41864",
                 "shasum": ""
             },
             "require": {
@@ -747,9 +751,9 @@
                 "proto"
             ],
             "support": {
-                "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.31.0"
+                "source": "https://github.com/protocolbuffers/protobuf-php/tree/v4.31.1"
             },
-            "time": "2025-05-14T16:17:23+00:00"
+            "time": "2025-05-28T18:52:35+00:00"
         },
         {
             "name": "league/csv",
@@ -1238,16 +1242,16 @@
         },
         {
             "name": "open-telemetry/exporter-otlp",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opentelemetry-php/exporter-otlp.git",
-                "reference": "19adf03d2b0f91f9e9b1c7f93db6c755c737cf6c"
+                "reference": "8b3ca1f86d01429c73b407bf1a2075d9c187001e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/19adf03d2b0f91f9e9b1c7f93db6c755c737cf6c",
-                "reference": "19adf03d2b0f91f9e9b1c7f93db6c755c737cf6c",
+                "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/8b3ca1f86d01429c73b407bf1a2075d9c187001e",
+                "reference": "8b3ca1f86d01429c73b407bf1a2075d9c187001e",
                 "shasum": ""
             },
             "require": {
@@ -1298,7 +1302,7 @@
                 "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                 "source": "https://github.com/open-telemetry/opentelemetry-php"
             },
-            "time": "2025-05-12T00:36:35+00:00"
+            "time": "2025-05-21T12:02:20+00:00"
         },
         {
             "name": "open-telemetry/gen-otlp-protobuf",
@@ -1365,16 +1369,16 @@
         },
         {
             "name": "open-telemetry/sdk",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opentelemetry-php/sdk.git",
-                "reference": "939d3a28395c249a763676458140dad44b3a8011"
+                "reference": "cd0d7367599717fc29e04eb8838ec061e6c2c657"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/939d3a28395c249a763676458140dad44b3a8011",
-                "reference": "939d3a28395c249a763676458140dad44b3a8011",
+                "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/cd0d7367599717fc29e04eb8838ec061e6c2c657",
+                "reference": "cd0d7367599717fc29e04eb8838ec061e6c2c657",
                 "shasum": ""
             },
             "require": {
@@ -1451,7 +1455,7 @@
                 "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                 "source": "https://github.com/open-telemetry/opentelemetry-php"
             },
-            "time": "2025-05-07T12:32:21+00:00"
+            "time": "2025-05-22T02:33:34+00:00"
         },
         {
             "name": "open-telemetry/sem-conv",
@@ -2319,20 +2323,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.6",
+            "version": "4.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
-                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
+                "reference": "fdf4dd4e2ff1813111bd0ad58d7a1ddbb5b56c28",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -2341,26 +2345,23 @@
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-                "captainhook/captainhook": "^5.10",
+                "captainhook/captainhook": "^5.25",
                 "captainhook/plugin-composer": "^5.3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-                "doctrine/annotations": "^1.8",
-                "ergebnis/composer-normalize": "^2.15",
-                "mockery/mockery": "^1.3",
+                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+                "ergebnis/composer-normalize": "^2.47",
+                "mockery/mockery": "^1.6",
                 "paragonie/random-lib": "^2",
-                "php-mock/php-mock": "^2.2",
-                "php-mock/php-mock-mockery": "^1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpbench/phpbench": "^1.0",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.8",
-                "phpstan/phpstan-mockery": "^1.1",
-                "phpstan/phpstan-phpunit": "^1.1",
-                "phpunit/phpunit": "^8.5 || ^9",
-                "ramsey/composer-repl": "^1.4",
-                "slevomat/coding-standard": "^8.4",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.9"
+                "php-mock/php-mock": "^2.6",
+                "php-mock/php-mock-mockery": "^1.5",
+                "php-parallel-lint/php-parallel-lint": "^1.4.0",
+                "phpbench/phpbench": "^1.2.14",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-mockery": "^2.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.6",
+                "slevomat/coding-standard": "^8.18",
+                "squizlabs/php_codesniffer": "^3.13"
             },
             "suggest": {
                 "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
@@ -2395,19 +2396,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
+                "source": "https://github.com/ramsey/uuid/tree/4.8.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/ramsey/uuid",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-27T21:32:50+00:00"
+            "time": "2025-06-01T06:28:46+00:00"
         },
         {
             "name": "spomky-labs/otphp",
@@ -2486,16 +2477,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
-                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
                 "shasum": ""
             },
             "require": {
@@ -2508,7 +2499,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2533,7 +2524,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2549,20 +2540,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v7.2.4",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "78981a2ffef6437ed92d4d7e2a86a82f256c6dc6"
+                "reference": "57e4fb86314015a695a750ace358d07a7e37b8a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/78981a2ffef6437ed92d4d7e2a86a82f256c6dc6",
-                "reference": "78981a2ffef6437ed92d4d7e2a86a82f256c6dc6",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/57e4fb86314015a695a750ace358d07a7e37b8a9",
+                "reference": "57e4fb86314015a695a750ace358d07a7e37b8a9",
                 "shasum": ""
             },
             "require": {
@@ -2628,7 +2619,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.2.4"
+                "source": "https://github.com/symfony/http-client/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -2644,20 +2635,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-13T10:27:23+00:00"
+            "time": "2025-05-02T08:23:16+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.5.2",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645"
+                "reference": "75d7043853a42837e68111812f4d964b01e5101c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645",
-                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/75d7043853a42837e68111812f4d964b01e5101c",
+                "reference": "75d7043853a42837e68111812f4d964b01e5101c",
                 "shasum": ""
             },
             "require": {
@@ -2670,7 +2661,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2706,7 +2697,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2722,7 +2713,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-07T08:49:48+00:00"
+            "time": "2025-04-29T11:18:49+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -2883,16 +2874,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.1",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
-                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
                 "shasum": ""
             },
             "require": {
@@ -2910,7 +2901,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.5-dev"
+                    "dev-main": "3.6-dev"
                 }
             },
             "autoload": {
@@ -2946,7 +2937,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -2962,7 +2953,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2025-04-25T09:37:31+00:00"
         },
         {
             "name": "tbachert/spi",
@@ -3499,16 +3490,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "0.69.5",
+            "version": "0.69.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "4abe53609dfc23b2ea82884d12b149df6a8af2f5"
+                "reference": "3db51ec544b3f287511209e34bab3f5ec85fa56e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/4abe53609dfc23b2ea82884d12b149df6a8af2f5",
-                "reference": "4abe53609dfc23b2ea82884d12b149df6a8af2f5",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/3db51ec544b3f287511209e34bab3f5ec85fa56e",
+                "reference": "3db51ec544b3f287511209e34bab3f5ec85fa56e",
                 "shasum": ""
             },
             "require": {
@@ -3549,9 +3540,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.69.5"
+                "source": "https://github.com/utopia-php/database/tree/0.69.7"
             },
-            "time": "2025-05-17T08:01:51+00:00"
+            "time": "2025-05-30T14:41:25+00:00"
         },
         {
             "name": "utopia-php/detector",
@@ -3794,16 +3785,16 @@
         },
         {
             "name": "utopia-php/image",
-            "version": "0.8.3",
+            "version": "0.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/image.git",
-                "reference": "8820b0e53b3636b7bdf815e92394d333fef06f26"
+                "reference": "ce788ff0121a79286fdbe3ef3eba566de646df65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/image/zipball/8820b0e53b3636b7bdf815e92394d333fef06f26",
-                "reference": "8820b0e53b3636b7bdf815e92394d333fef06f26",
+                "url": "https://api.github.com/repos/utopia-php/image/zipball/ce788ff0121a79286fdbe3ef3eba566de646df65",
+                "reference": "ce788ff0121a79286fdbe3ef3eba566de646df65",
                 "shasum": ""
             },
             "require": {
@@ -3837,9 +3828,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/image/issues",
-                "source": "https://github.com/utopia-php/image/tree/0.8.3"
+                "source": "https://github.com/utopia-php/image/tree/0.8.4"
             },
-            "time": "2025-05-15T10:39:28+00:00"
+            "time": "2025-06-03T08:32:20+00:00"
         },
         {
             "name": "utopia-php/locale",
@@ -3948,16 +3939,16 @@
         },
         {
             "name": "utopia-php/messaging",
-            "version": "0.17.0",
+            "version": "0.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "c51915d0e030db3a3add37f1561751d18b2d9a85"
+                "reference": "c151aa5d4d475c788ca15c210b5b2017e21c41d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/c51915d0e030db3a3add37f1561751d18b2d9a85",
-                "reference": "c51915d0e030db3a3add37f1561751d18b2d9a85",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/c151aa5d4d475c788ca15c210b5b2017e21c41d6",
+                "reference": "c151aa5d4d475c788ca15c210b5b2017e21c41d6",
                 "shasum": ""
             },
             "require": {
@@ -3993,9 +3984,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/messaging/issues",
-                "source": "https://github.com/utopia-php/messaging/tree/0.17.0"
+                "source": "https://github.com/utopia-php/messaging/tree/0.18.0"
             },
-            "time": "2025-05-12T16:14:08+00:00"
+            "time": "2025-05-15T05:00:03+00:00"
         },
         {
             "name": "utopia-php/migration",
@@ -4105,16 +4096,16 @@
         },
         {
             "name": "utopia-php/platform",
-            "version": "0.7.7",
+            "version": "0.7.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "8c43cd866148a7c4c495e3401268429e338004b3"
+                "reference": "e3a4536c46f10988b1a446ec6b8dd8a9914be854"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/platform/zipball/8c43cd866148a7c4c495e3401268429e338004b3",
-                "reference": "8c43cd866148a7c4c495e3401268429e338004b3",
+                "url": "https://api.github.com/repos/utopia-php/platform/zipball/e3a4536c46f10988b1a446ec6b8dd8a9914be854",
+                "reference": "e3a4536c46f10988b1a446ec6b8dd8a9914be854",
                 "shasum": ""
             },
             "require": {
@@ -4123,7 +4114,7 @@
                 "php": ">=8.0",
                 "utopia-php/cli": "0.15.*",
                 "utopia-php/framework": "0.33.*",
-                "utopia-php/queue": "0.10.*"
+                "utopia-php/queue": "0.11.*"
             },
             "require-dev": {
                 "laravel/pint": "1.*",
@@ -4149,9 +4140,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/platform/issues",
-                "source": "https://github.com/utopia-php/platform/tree/0.7.7"
+                "source": "https://github.com/utopia-php/platform/tree/0.7.8"
             },
-            "time": "2025-05-20T09:23:44+00:00"
+            "time": "2025-05-30T10:05:43+00:00"
         },
         {
             "name": "utopia-php/pools",
@@ -4260,16 +4251,16 @@
         },
         {
             "name": "utopia-php/queue",
-            "version": "0.10.0",
+            "version": "0.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/queue.git",
-                "reference": "0eccc559168ea72241c39a4c482d868314666be1"
+                "reference": "498bbbef418b1db71b51e1bb62f5d1d752ddd8d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/queue/zipball/0eccc559168ea72241c39a4c482d868314666be1",
-                "reference": "0eccc559168ea72241c39a4c482d868314666be1",
+                "url": "https://api.github.com/repos/utopia-php/queue/zipball/498bbbef418b1db71b51e1bb62f5d1d752ddd8d6",
+                "reference": "498bbbef418b1db71b51e1bb62f5d1d752ddd8d6",
                 "shasum": ""
             },
             "require": {
@@ -4320,9 +4311,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/queue/issues",
-                "source": "https://github.com/utopia-php/queue/tree/0.10.0"
+                "source": "https://github.com/utopia-php/queue/tree/0.11.1"
             },
-            "time": "2025-04-17T12:15:52+00:00"
+            "time": "2025-05-30T11:50:34+00:00"
         },
         {
             "name": "utopia-php/registry",
@@ -4378,16 +4369,16 @@
         },
         {
             "name": "utopia-php/storage",
-            "version": "0.18.12",
+            "version": "0.18.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/storage.git",
-                "reference": "9a2556c39b5f4d9f8e79111fd34ec889b7bb1e97"
+                "reference": "3d8ce53ae042173bf230445e996056c5f65ded22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/9a2556c39b5f4d9f8e79111fd34ec889b7bb1e97",
-                "reference": "9a2556c39b5f4d9f8e79111fd34ec889b7bb1e97",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/3d8ce53ae042173bf230445e996056c5f65ded22",
+                "reference": "3d8ce53ae042173bf230445e996056c5f65ded22",
                 "shasum": ""
             },
             "require": {
@@ -4430,9 +4421,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/0.18.12"
+                "source": "https://github.com/utopia-php/storage/tree/0.18.13"
             },
-            "time": "2025-05-15T07:55:58+00:00"
+            "time": "2025-05-26T13:10:35+00:00"
         },
         {
             "name": "utopia-php/swoole",
@@ -4593,16 +4584,16 @@
         },
         {
             "name": "utopia-php/vcs",
-            "version": "0.10.2",
+            "version": "0.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/vcs.git",
-                "reference": "1f9823ebcb8fd098607de0074f18f48e28985012"
+                "reference": "f635b368909eb3c3fe57344fe43525e74e8fdc03"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/vcs/zipball/1f9823ebcb8fd098607de0074f18f48e28985012",
-                "reference": "1f9823ebcb8fd098607de0074f18f48e28985012",
+                "url": "https://api.github.com/repos/utopia-php/vcs/zipball/f635b368909eb3c3fe57344fe43525e74e8fdc03",
+                "reference": "f635b368909eb3c3fe57344fe43525e74e8fdc03",
                 "shasum": ""
             },
             "require": {
@@ -4636,9 +4627,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/vcs/issues",
-                "source": "https://github.com/utopia-php/vcs/tree/0.10.2"
+                "source": "https://github.com/utopia-php/vcs/tree/0.10.4"
             },
-            "time": "2025-04-17T04:35:25+00:00"
+            "time": "2025-06-02T09:18:36+00:00"
         },
         {
             "name": "utopia-php/websocket",
@@ -4816,16 +4807,16 @@
     "packages-dev": [
         {
             "name": "appwrite/sdk-generator",
-            "version": "0.40.18",
+            "version": "0.41.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "38de4b9c58112d7e83eb75955994c8412a401093"
+                "reference": "6d9318abf4542a757c87abf056557d6afa1dc06b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/38de4b9c58112d7e83eb75955994c8412a401093",
-                "reference": "38de4b9c58112d7e83eb75955994c8412a401093",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/6d9318abf4542a757c87abf056557d6afa1dc06b",
+                "reference": "6d9318abf4542a757c87abf056557d6afa1dc06b",
                 "shasum": ""
             },
             "require": {
@@ -4861,9 +4852,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/0.40.18"
+                "source": "https://github.com/appwrite/sdk-generator/tree/0.41.1"
             },
-            "time": "2025-05-21T14:14:47+00:00"
+            "time": "2025-06-01T04:20:04+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -5340,16 +5331,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.4.0",
+            "version": "v5.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
-                "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9",
+                "reference": "ae59794362fe85e051a58ad36b289443f57be7a9",
                 "shasum": ""
             },
             "require": {
@@ -5392,9 +5383,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0"
             },
-            "time": "2024-12-30T11:07:19+00:00"
+            "time": "2025-05-31T08:24:38+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7262,23 +7253,24 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218"
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
-                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
+                "url": "https://api.github.com/repos/symfony/console/zipball/66c1440edf6f339fd82ed6c7caa76cb006211b44",
+                "reference": "66c1440edf6f339fd82ed6c7caa76cb006211b44",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^6.4|^7.0"
+                "symfony/string": "^7.2"
             },
             "conflict": {
                 "symfony/dependency-injection": "<6.4",
@@ -7335,7 +7327,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.6"
+                "source": "https://github.com/symfony/console/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7351,11 +7343,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-07T19:09:28+00:00"
+            "time": "2025-05-24T10:34:04+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -7401,7 +7393,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.2.0"
+                "source": "https://github.com/symfony/filesystem/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7421,16 +7413,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.2.2",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
+                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
-                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ec2344cf77a48253bbca6939aa3d2477773ea63d",
+                "reference": "ec2344cf77a48253bbca6939aa3d2477773ea63d",
                 "shasum": ""
             },
             "require": {
@@ -7465,7 +7457,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.2.2"
+                "source": "https://github.com/symfony/finder/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7481,20 +7473,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-30T19:00:17+00:00"
+            "time": "2024-12-30T19:00:26+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v7.2.0",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50"
+                "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
-                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/afb9a8038025e5dbc657378bfab9198d75f10fca",
+                "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca",
                 "shasum": ""
             },
             "require": {
@@ -7532,7 +7524,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.2.0"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7548,7 +7540,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-20T11:17:29+00:00"
+            "time": "2025-04-04T13:12:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7866,16 +7858,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.5",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
+                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
-                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
+                "url": "https://api.github.com/repos/symfony/process/zipball/40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
+                "reference": "40c295f2deb408d5e9d2d32b8ba1dd61e36f05af",
                 "shasum": ""
             },
             "require": {
@@ -7907,7 +7899,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.5"
+                "source": "https://github.com/symfony/process/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -7923,20 +7915,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-13T12:21:46+00:00"
+            "time": "2025-04-17T09:11:12+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.6",
+            "version": "v7.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931"
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
-                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125",
+                "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125",
                 "shasum": ""
             },
             "require": {
@@ -7994,7 +7986,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.6"
+                "source": "https://github.com/symfony/string/tree/v7.3.0"
             },
             "funding": [
                 {
@@ -8010,7 +8002,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-20T20:18:16+00:00"
+            "time": "2025-04-20T20:19:01+00:00"
         },
         {
             "name": "textalk/websocket",
@@ -8242,7 +8234,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -8266,5 +8258,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }

docker-compose.yml

@@ -213,7 +213,7 @@ services:
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:6.0.8
+    image: appwrite/console:6.0.32
     restart: unless-stopped
     networks:
       - appwrite
@@ -951,7 +951,7 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.7.16
+    image: openruntimes/executor:0.7.20
     restart: unless-stopped
     networks:
       - appwrite

docs/examples/1.7.x/console-cli/examples/databases/upsert-document.md

@@ -0,0 +1,6 @@
+appwrite databases upsertDocument \
+        --databaseId <DATABASE_ID> \
+        --collectionId <COLLECTION_ID> \
+        --documentId <DOCUMENT_ID> \
+        --data '{ "key": "value" }' \
+

docs/examples/1.7.x/console-cli/examples/databases/upsert-documents.md

@@ -1,4 +1,4 @@
 appwrite databases upsertDocuments \
         --databaseId <DATABASE_ID> \
         --collectionId <COLLECTION_ID> \
-
+        --documents one two three

docs/sdks/flutter/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 
-## 16.0.1
+## 16.1.1
+
+* Update `flutter_web_auth_2` dependency to version 4.1.0
+* Update `auth.html` example in README.md to align with `flutter_web_auth_2` documentation
+
+## 16.1.0
 
 * Add `setDevKey` method to Client service
 * Add `upsertDocument` method to Databases service

docs/sdks/flutter/GETTING_STARTED.md

@@ -56,13 +56,25 @@ For web in order to capture the OAuth2 callback URL and send it to the applicati
 ```html
 <!DOCTYPE html>
 <title>Authentication complete</title>
-<p>Authentication is complete. If this does not happen automatically, please
-close the window.
+<p>Authentication is complete. If this does not happen automatically, please close the window.</p>
 <script>
-  window.opener.postMessage({
-    'flutter-web-auth-2': window.location.href
-  }, window.location.origin);
-  window.close();
+  function postAuthenticationMessage() {
+    const message = {
+      'flutter-web-auth-2': window.location.href
+    };
+
+    if (window.opener) {
+      window.opener.postMessage(message, window.location.origin);
+      window.close();
+    } else if (window.parent && window.parent !== window) {
+      window.parent.postMessage(message, window.location.origin);
+    } else {
+      localStorage.setItem('flutter-web-auth-2', window.location.href);
+      window.close();
+    }
+  }
+
+  postAuthenticationMessage();
 </script>
 ```
 

src/Appwrite/Extend/Exception.php

@@ -124,6 +124,8 @@ class Exception extends \Exception
     /** Membership */
     public const MEMBERSHIP_NOT_FOUND              = 'membership_not_found';
     public const MEMBERSHIP_ALREADY_CONFIRMED      = 'membership_already_confirmed';
+    public const MEMBERSHIP_DELETION_PROHIBITED    = 'membership_deletion_prohibited';
+    public const MEMBERSHIP_DOWNGRADE_PROHIBITED   = 'membership_downgrade_prohibited';
 
     /** Avatars */
     public const AVATAR_SET_NOT_FOUND              = 'avatar_set_not_found';

src/Appwrite/Migration/Migration.php

@@ -87,6 +87,8 @@ abstract class Migration
         '1.7.0' => 'V22',
         '1.7.1' => 'V22',
         '1.7.2' => 'V22',
+        '1.7.3' => 'V22',
+        '1.7.4' => 'V22',
     ];
 
     /**

src/Appwrite/Migration/Version/V22.php

@@ -12,6 +12,7 @@ use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Structure;
 use Utopia\Database\Exception\Timeout;
 use Utopia\Database\Query;
+use Utopia\System\System;
 
 class V22 extends Migration
 {
@@ -149,9 +150,9 @@ class V22 extends Migration
                     ];
                     foreach ($indexes as $index) {
                         try {
-                            $this->createIndexFromCollection($this->dbForProject, $id, $index);
+                            $this->dbForProject->deleteIndex($id, $index);
                         } catch (Throwable $th) {
-                            Console::warning("Failed to create index \"$index\" from {$id}: {$th->getMessage()}");
+                            Console::warning("Failed to delete index \"$index\" from {$id}: {$th->getMessage()}");
                         }
                     }
                     $this->dbForProject->purgeCachedCollection($id);
@@ -324,7 +325,9 @@ class V22 extends Migration
                 4. Fill "trigger" with "manual"
                 5. Fill "deploymentResourceType". If "resourceType" is "function", set "deploymentResourceType" to "function"
                 6. Fill "search" with "{$id} {domain}"
-                7. Fill "deploymentId" and "deploymentInternalId". If "deploymentResourceType" is "function", get project DB, and find function with ID "resourceId". Then fill rule's "deploymentId" with function's "deployment", and "deploymentId" as backup
+                7. Set "region" to project region
+                8. Fill "owner" with "Appwrite" if "domain" ends with "functions" or "sites"
+                9. Fill "deploymentId" and "deploymentInternalId". If "deploymentResourceType" is "function", get project DB, and find function with ID "resourceId". Then fill rule's "deploymentId" with function's "deployment", and "deploymentId" as backup
                 */
 
                 $deploymentResourceType = null;
@@ -346,14 +349,29 @@ class V22 extends Migration
                     ->setAttribute('deploymentResourceType', $document->getAttribute('deploymentResourceType', $deploymentResourceType))
                     ->setAttribute('search', \implode(' ', [$document->getId(), $document->getAttribute('domain', '')]));
 
+                $project = $this->dbForProject->getDocument('projects', $document->getAttribute('projectId'));
+
+                if ($project->isEmpty()) {
+                    Console::warning("Project \"{$document->getAttribute('projectId')}\" not found for rule \"{$document->getId()}\"");
+                    $document->setAttribute('region', System::getEnv('_APP_REGION', 'default'));
+                    break;
+                }
+
+                $document->setAttribute('region', $project->getAttribute('region', System::getEnv('_APP_REGION', 'default')));
+
+                $domain = $document->getAttribute('domain', '');
+                $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+                $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+                $owner = $document->getAttribute('owner', '');
+                if (
+                    empty($owner) &&
+                    (!empty($functionsDomain) && \str_ends_with($domain, $functionsDomain)) ||
+                    (!empty($sitesDomain) && \str_ends_with($domain, $sitesDomain))
+                ) {
+                    $document->setAttribute('owner', 'Appwrite');
+                }
+
                 if ($deploymentResourceType === 'function') {
-                    $project = $this->dbForProject->getDocument('projects', $document->getAttribute('projectId'));
-
-                    if ($project->isEmpty()) {
-                        Console::warning("Project \"{$document->getAttribute('projectId')}\" not found for rule \"{$document->getId()}\"");
-                        break;
-                    }
-
                     $dbForOwnerProject = ($this->getProjectDB)($project);
                     $function = $dbForOwnerProject->getDocument('functions', $resourceId);
 

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

@@ -4,7 +4,6 @@ namespace Appwrite\Platform\Modules\Compute;
 
 use Appwrite\Event\Build;
 use Appwrite\Extend\Exception;
-use Appwrite\Query;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
@@ -235,38 +234,4 @@ class Base extends Action
 
         return $deployment;
     }
-
-    protected function listRules(Document $project, array $queries, Database $database, callable $callback): void
-    {
-        $limit = 100;
-        $cursor = null;
-
-        do {
-            $queries = \array_merge([
-                Query::limit($limit),
-                Query::equal("projectInternalId", [$project->getInternalId()])
-            ], $queries);
-
-            if ($cursor !== null) {
-                $queries[] = Query::cursorAfter($cursor);
-            }
-
-            $results = $database->find('rules', $queries);
-
-            $total = \count($results);
-            if ($total > 0) {
-                $cursor = $results[$total - 1];
-            }
-
-            if ($total < $limit) {
-                $cursor = null;
-            }
-
-            foreach ($results as $document) {
-                if (is_callable($callback)) {
-                    $callback($document);
-                }
-            }
-        } while (!\is_null($cursor));
-    }
 }

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php

@@ -86,6 +86,7 @@ class Create extends Action
             ->inject('deviceForFunctions')
             ->inject('deviceForLocal')
             ->inject('queueForBuilds')
+            ->inject('plan')
             ->callback([$this, 'action']);
     }
 
@@ -102,7 +103,8 @@ class Create extends Action
         Document $project,
         Device $deviceForFunctions,
         Device $deviceForLocal,
-        Build $queueForBuilds
+        Build $queueForBuilds,
+        array $plan
     ) {
         $activate = \strval($activate) === 'true' || \strval($activate) === '1';
 
@@ -135,8 +137,14 @@ class Create extends Action
             throw new Exception(Exception::STORAGE_FILE_EMPTY, 'No file sent');
         }
 
+        $functionSizeLimit = (int) System::getEnv('_APP_COMPUTE_SIZE_LIMIT', '30000000');
+
+        if (isset($plan['deploymentSize'])) {
+            $functionSizeLimit = $plan['deploymentSize'] * 1000 * 1000;
+        }
+
         $fileExt = new FileExt([FileExt::TYPE_GZIP]);
-        $fileSizeValidator = new FileSize(System::getEnv('_APP_COMPUTE_SIZE_LIMIT', '30000000'));
+        $fileSizeValidator = new FileSize($functionSizeLimit);
         $upload = new Upload();
 
         // Make sure we handle a single file and multiple files the same way
@@ -174,7 +182,7 @@ class Create extends Action
             }
         }
 
-        if (!$fileSizeValidator->isValid($fileSize)) { // Check if file size is exceeding allowed limit
+        if (!$fileSizeValidator->isValid($fileSize) && $functionSizeLimit !== 0) { // Check if file size is exceeding allowed limit
             throw new Exception(Exception::STORAGE_INVALID_FILE_SIZE);
         }
 

src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php

@@ -5,7 +5,6 @@ namespace Appwrite\Platform\Modules\Functions\Http\Functions\Deployment;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\Query;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
@@ -13,6 +12,7 @@ use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
 use Utopia\Platform\Action;
@@ -89,8 +89,6 @@ class Update extends Base
             throw new Exception(Exception::BUILD_NOT_READY);
         }
 
-        $oldDeploymentInternalId = $function->getAttribute('deploymentInternalId', '');
-
         $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
             'deploymentInternalId' => $deployment->getInternalId(),
             'deploymentId' => $deployment->getId(),
@@ -106,24 +104,20 @@ class Update extends Base
         Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
 
         $queries = [
-            Query::equal('trigger', 'manual'),
+            Query::equal('trigger', ['manual']),
             Query::equal("type", ["deployment"]),
             Query::equal("deploymentResourceType", ["function"]),
             Query::equal("deploymentResourceInternalId", [$function->getInternalId()]),
+            Query::equal("deploymentVcsProviderBranch", [""]),
+            Query::equal("projectInternalId", [$project->getInternalId()])
         ];
 
-        if (empty($oldDeploymentInternalId)) {
-            $queries[] =  Query::equal("deploymentInternalId", [""]);
-        } else {
-            $queries[] =  Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
-        }
-
-        $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
+        Authorization::skip(fn () => $dbForPlatform->foreach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
             $rule = $rule
                 ->setAttribute('deploymentId', $deployment->getId())
                 ->setAttribute('deploymentInternalId', $deployment->getInternalId());
-            $dbForPlatform->updateDocument('rules', $rule->getId(), $rule);
-        });
+            Authorization::skip(fn () => $dbForPlatform->updateDocument('rules', $rule->getId(), $rule));
+        }, $queries));
 
         $queueForEvents
             ->setParam('functionId', $function->getId())

src/Appwrite/Platform/Modules/Functions/Workers/Builds.php

@@ -57,6 +57,7 @@ class Builds extends Action
     {
         $this
             ->desc('Builds worker')
+            ->groups(['builds'])
             ->inject('message')
             ->inject('project')
             ->inject('dbForPlatform')
@@ -73,6 +74,7 @@ class Builds extends Action
             ->inject('deviceForFiles')
             ->inject('log')
             ->inject('executor')
+            ->inject('plan')
             ->callback([$this, 'action']);
     }
 
@@ -92,6 +94,7 @@ class Builds extends Action
      * @param Device $deviceForFiles
      * @param Log $log
      * @param Executor $executor
+     * @param array $plan
      * @return void
      * @throws \Utopia\Database\Exception
      */
@@ -111,7 +114,8 @@ class Builds extends Action
         callable $isResourceBlocked,
         Device $deviceForFiles,
         Log $log,
-        Executor $executor
+        Executor $executor,
+        array $plan
     ): void {
         $payload = $message->getPayload() ?? [];
 
@@ -150,7 +154,8 @@ class Builds extends Action
                     $template,
                     $isResourceBlocked,
                     $log,
-                    $executor
+                    $executor,
+                    $plan
                 );
                 break;
 
@@ -177,6 +182,7 @@ class Builds extends Action
      * @param Document $template
      * @param Log $log
      * @param Executor $executor
+     * @param array $plan
      * @return void
      * @throws \Utopia\Database\Exception
      *
@@ -200,7 +206,8 @@ class Builds extends Action
         Document $template,
         callable $isResourceBlocked,
         Log $log,
-        Executor $executor
+        Executor $executor,
+        array $plan
     ): void {
         $resourceKey = match ($resource->getCollection()) {
             'functions' => 'functionId',
@@ -476,8 +483,12 @@ class Builds extends Action
                 $directorySize = $localDevice->getDirectorySize($tmpDirectory);
                 $sizeLimit = (int)System::getEnv('_APP_COMPUTE_SIZE_LIMIT', '30000000');
 
-                if ($directorySize > $sizeLimit) {
-                    throw new \Exception('Repository directory size should be less than ' . number_format($sizeLimit / 1048576, 2) . ' MBs.');
+                if (isset($plan['deploymentSize'])) {
+                    $sizeLimit = (int) $plan['deploymentSize'] * 1000 * 1000;
+                }
+
+                if ($directorySize > $sizeLimit && $sizeLimit !== 0) {
+                    throw new \Exception('Repository directory size should be less than ' . number_format($sizeLimit / (1000 * 1000), 2) . ' MBs.');
                 }
 
                 Console::execute('find ' . \escapeshellarg($tmpDirectory) . ' -type d -name ".git" -exec rm -rf {} +', '', $stdout, $stderr);
@@ -803,8 +814,11 @@ class Builds extends Action
             $durationEnd = \microtime(true);
 
             $buildSizeLimit = (int)System::getEnv('_APP_COMPUTE_BUILD_SIZE_LIMIT', '2000000000');
-            if ($response['size'] > $buildSizeLimit) {
-                throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / 1048576, 2) . ' MBs.');
+            if (isset($plan['buildSize'])) {
+                $buildSizeLimit = $plan['buildSize'] * 1000 * 1000;
+            }
+            if ($response['size'] > $buildSizeLimit && $buildSizeLimit !== 0) {
+                throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / (1000 * 1000), 2) . ' MBs.');
             }
 
             /** Update the build document */
@@ -1061,8 +1075,6 @@ class Builds extends Action
                 $resource->setAttribute('live', true);
                 switch ($resource->getCollection()) {
                     case 'functions':
-                        $oldDeploymentInternalId = $resource->getAttribute('deploymentInternalId', '');
-
                         $resource->setAttribute('deploymentId', $deployment->getId());
                         $resource->setAttribute('deploymentInternalId', $deployment->getInternalId());
                         $resource->setAttribute('deploymentCreatedAt', $deployment->getCreatedAt());
@@ -1074,26 +1086,20 @@ class Builds extends Action
                             Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]),
                             Query::equal('deploymentResourceType', ['function']),
                             Query::equal('trigger', ['manual']),
+                            Query::equal('deploymentVcsProviderBranch', ['']),
+                            Query::equal("projectInternalId", [$project->getInternalId()])
                         ];
 
-                        if (empty($oldDeploymentInternalId)) {
-                            $queries[] =  Query::equal("deploymentInternalId", [""]);
-                        } else {
-                            $queries[] = Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
-                        }
-
                         $rulesUpdated = false;
-                        $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment, &$rulesUpdated) {
+                        $dbForPlatform->forEach('rules', function (Document $rule) use ($dbForPlatform, $deployment, &$rulesUpdated) {
                             $rulesUpdated = true;
                             $rule = $rule
                                 ->setAttribute('deploymentId', $deployment->getId())
                                 ->setAttribute('deploymentInternalId', $deployment->getInternalId());
                             $dbForPlatform->updateDocument('rules', $rule->getId(), $rule);
-                        });
+                        }, $queries);
                         break;
                     case 'sites':
-                        $oldDeploymentInternalId = $resource->getAttribute('deploymentInternalId', '');
-
                         $resource->setAttribute('deploymentId', $deployment->getId());
                         $resource->setAttribute('deploymentInternalId', $deployment->getInternalId());
                         $resource->setAttribute('deploymentScreenshotDark', $deployment->getAttribute('screenshotDark', ''));
@@ -1106,20 +1112,16 @@ class Builds extends Action
                             Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]),
                             Query::equal('deploymentResourceType', ['site']),
                             Query::equal('trigger', ['manual']),
+                            Query::equal('deploymentVcsProviderBranch', ['']),
+                            Query::equal("projectInternalId", [$project->getInternalId()])
                         ];
 
-                        if (empty($oldDeploymentInternalId)) {
-                            $queries[] =  Query::equal("deploymentInternalId", [""]);
-                        } else {
-                            $queries[] = Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
-                        }
-
-                        $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
+                        $dbForPlatform->forEach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
                             $rule = $rule
                                 ->setAttribute('deploymentId', $deployment->getId())
                                 ->setAttribute('deploymentInternalId', $deployment->getInternalId());
                             $dbForPlatform->updateDocument('rules', $rule->getId(), $rule);
-                        });
+                        }, $queries);
 
                         break;
                 }
@@ -1130,7 +1132,13 @@ class Builds extends Action
                 $branchName = $deployment->getAttribute('providerBranch');
                 if (!empty($branchName)) {
                     $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-                    $domain = "branch-{$branchName}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
+                    $branchPrefix = substr($branchName, 0, 16);
+                    if (strlen($branchName) > 16) {
+                        $remainingChars = substr($branchName, 16);
+                        $branchPrefix .= '-' . substr(hash('sha256', $remainingChars), 0, 7);
+                    }
+                    $resourceProjectHash = substr(hash('sha256', $resource->getId() . $project->getId()), 0, 7);
+                    $domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
                     $ruleId = md5($domain);
 
                     try {
@@ -1161,19 +1169,22 @@ class Builds extends Action
                         $dbForPlatform->updateDocument('rules', $rule->getId(), $rule);
                     }
 
-                    $this->listRules($project, [
+                    $queries = [
                         Query::equal("projectInternalId", [$project->getInternalId()]),
                         Query::equal("type", ["deployment"]),
                         Query::equal("deploymentResourceInternalId", [$resource->getInternalId()]),
                         Query::equal('deploymentResourceType', ['site']),
                         Query::equal("deploymentVcsProviderBranch", [$branchName]),
                         Query::equal("trigger", ['manual']),
-                    ], $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
+                        Query::equal("projectInternalId", [$project->getInternalId()])
+                    ];
+
+                    $dbForPlatform->foreach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
                         $rule = $rule
                                 ->setAttribute('deploymentId', $deployment->getId())
                                 ->setAttribute('deploymentInternalId', $deployment->getInternalId());
                         $dbForPlatform->updateDocument('rules', $rule->getId(), $rule);
-                    });
+                    }, $queries);
                 }
             }
 
@@ -1218,13 +1229,22 @@ class Builds extends Action
                 $message .= "\n" . $error;
             }
 
+            // Combine with previous logs if deployment got past build process
+            $previousLogs = '';
+            if (!empty($deployment->getAttribute('buildEndedAt', ''))) {
+                $previousLogs = $deployment->getAttribute('buildLogs', '');
+                if (!empty($previousLogs)) {
+                    $message = $previousLogs . "\n" . $message;
+                }
+            }
+
             $endTime = DateTime::now();
             $durationEnd = \microtime(true);
             $deployment->setAttribute('buildEndedAt', $endTime);
             $deployment->setAttribute('buildDuration', \intval(\ceil($durationEnd - $durationStart)));
             $deployment->setAttribute('status', 'failed');
-            $deployment->setAttribute('buildLogs', $deployment->getAttribute('buildLogs', '') . "\n" . $message);
 
+            $deployment->setAttribute('buildLogs', $message);
             $deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment);
 
             if ($deployment->getInternalId() === $resource->getAttribute('latestDeploymentInternalId', '')) {
@@ -1467,38 +1487,4 @@ class Builds extends Action
             }
         }
     }
-
-    protected function listRules(Document $project, array $queries, Database $database, callable $callback): void
-    {
-        $limit = 100;
-        $cursor = null;
-
-        do {
-            $queries = \array_merge([
-                Query::limit($limit),
-                Query::equal("projectInternalId", [$project->getInternalId()])
-            ], $queries);
-
-            if ($cursor !== null) {
-                $queries[] = Query::cursorAfter($cursor);
-            }
-
-            $results = $database->find('rules', $queries);
-
-            $total = \count($results);
-            if ($total > 0) {
-                $cursor = $results[$total - 1];
-            }
-
-            if ($total < $limit) {
-                $cursor = null;
-            }
-
-            foreach ($results as $document) {
-                if (is_callable($callback)) {
-                    $callback($document);
-                }
-            }
-        } while (!\is_null($cursor));
-    }
 }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php

@@ -174,7 +174,7 @@ class Create extends Action
             $queueForCertificates
                 ->setDomain(new Document([
                     'domain' => $rule->getAttribute('domain'),
-                    'domainType' => 'api',
+                    'domainType' => $rule->getAttribute('deploymentResourceType', $rule->getAttribute('type')),
                 ]))
                 ->trigger();
         }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php

@@ -192,7 +192,7 @@ class Create extends Action
             $queueForCertificates
                 ->setDomain(new Document([
                     'domain' => $rule->getAttribute('domain'),
-                    'domainType' => 'function',
+                    'domainType' => $rule->getAttribute('deploymentResourceType', $rule->getAttribute('type')),
                 ]))
                 ->trigger();
         }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php

@@ -180,7 +180,7 @@ class Create extends Action
             $queueForCertificates
                 ->setDomain(new Document([
                     'domain' => $rule->getAttribute('domain'),
-                    'domainType' => 'redirect',
+                    'domainType' => $rule->getAttribute('deploymentResourceType', $rule->getAttribute('type')),
                 ]))
                 ->trigger();
         }

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php

@@ -192,7 +192,7 @@ class Create extends Action
             $queueForCertificates
                 ->setDomain(new Document([
                     'domain' => $rule->getAttribute('domain'),
-                    'domainType' => 'site',
+                    'domainType' => $rule->getAttribute('deploymentResourceType', $rule->getAttribute('type')),
                 ]))
                 ->trigger();
         }

src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php

@@ -85,6 +85,7 @@ class Create extends Action
             ->inject('deviceForSites')
             ->inject('deviceForLocal')
             ->inject('queueForBuilds')
+            ->inject('plan')
             ->callback([$this, 'action']);
     }
 
@@ -103,7 +104,8 @@ class Create extends Action
         Event $queueForEvents,
         Device $deviceForSites,
         Device $deviceForLocal,
-        Build $queueForBuilds
+        Build $queueForBuilds,
+        array $plan
     ) {
         $activate = \strval($activate) === 'true' || \strval($activate) === '1';
 
@@ -136,8 +138,14 @@ class Create extends Action
             throw new Exception(Exception::STORAGE_FILE_EMPTY, 'No file sent');
         }
 
+        $siteSizeLimit = (int) System::getEnv('_APP_COMPUTE_SIZE_LIMIT', '30000000');
+
+        if (isset($plan['deploymentSize'])) {
+            $siteSizeLimit = $plan['deploymentSize'] * 1000 * 1000;
+        }
+
         $fileExt = new FileExt([FileExt::TYPE_GZIP]);
-        $fileSizeValidator = new FileSize(System::getEnv('_APP_COMPUTE_SIZE_LIMIT', '30000000'));
+        $fileSizeValidator = new FileSize($siteSizeLimit);
         $upload = new Upload();
 
         // Make sure we handle a single file and multiple files the same way
@@ -175,7 +183,7 @@ class Create extends Action
             }
         }
 
-        if (!$fileSizeValidator->isValid($fileSize)) { // Check if file size is exceeding allowed limit
+        if (!$fileSizeValidator->isValid($fileSize) && $siteSizeLimit !== 0) { // Check if file size is exceeding allowed limit
             throw new Exception(Exception::STORAGE_INVALID_FILE_SIZE);
         }
 
@@ -339,10 +347,16 @@ class Create extends Action
                         'domain' => $domain,
                         'type' => 'deployment',
                         'trigger' => 'deployment',
-                        'value' => $deployment->getId(),
+                        'deploymentId' => $deployment->isEmpty() ? '' : $deployment->getId(),
+                        'deploymentInternalId' => $deployment->isEmpty() ? '' : $deployment->getInternalId(),
+                        'deploymentResourceType' => 'site',
+                        'deploymentResourceId' => $site->getId(),
+                        'deploymentResourceInternalId' => $site->getInternalId(),
                         'status' => 'verified',
                         'certificateId' => '',
                         'search' => implode(' ', [$ruleId, $domain]),
+                        'owner' => 'Appwrite',
+                        'region' => $project->getAttribute('region')
                     ]))
                 );
             } else {

src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php

@@ -5,13 +5,14 @@ namespace Appwrite\Platform\Modules\Sites\Http\Sites\Deployment;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
 use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\Query;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
 use Utopia\Platform\Action;
 use Utopia\Platform\Scope\HTTP;
@@ -86,8 +87,6 @@ class Update extends Base
             throw new Exception(Exception::BUILD_NOT_READY);
         }
 
-        $oldDeploymentInternalId = $site->getAttribute('deploymentInternalId', '');
-
         $site = $dbForProject->updateDocument('sites', $site->getId(), new Document(array_merge($site->getArrayCopy(), [
             'deploymentInternalId' => $deployment->getInternalId(),
             'deploymentId' => $deployment->getId(),
@@ -97,24 +96,20 @@ class Update extends Base
         ])));
 
         $queries = [
-            Query::equal('trigger', 'manual'),
+            Query::equal('trigger', ['manual']),
             Query::equal("type", ["deployment"]),
             Query::equal("deploymentResourceType", ["site"]),
             Query::equal("deploymentResourceInternalId", [$site->getInternalId()]),
+            Query::equal("deploymentVcsProviderBranch", [""]),
+            Query::equal("projectInternalId", [$project->getInternalId()])
         ];
 
-        if (empty($oldDeploymentInternalId)) {
-            $queries[] =  Query::equal("deploymentInternalId", [""]);
-        } else {
-            $queries[] =  Query::equal("deploymentInternalId", [$oldDeploymentInternalId]);
-        }
-
-        $this->listRules($project, $queries, $dbForPlatform, function (Document $rule) use ($dbForPlatform, $deployment) {
+        Authorization::skip(fn () => $dbForPlatform->foreach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
             $rule = $rule
                 ->setAttribute('deploymentId', $deployment->getId())
                 ->setAttribute('deploymentInternalId', $deployment->getInternalId());
-            $dbForPlatform->updateDocument('rules', $rule->getId(), $rule);
-        });
+            Authorization::skip(fn () => $dbForPlatform->updateDocument('rules', $rule->getId(), $rule));
+        }, $queries));
 
         $queueForEvents
             ->setParam('siteId', $site->getId())

src/Appwrite/Platform/Workers/Certificates.php

@@ -96,7 +96,7 @@ class Certificates extends Action
 
         $log->addTag('domain', $domain->get());
 
-        $domainType = $payload['domainType'] ?? null;
+        $domainType = $document->getAttribute('domainType');
 
         $this->execute($domain, $domainType, $dbForPlatform, $queueForMails, $queueForEvents, $queueForWebhooks, $queueForFunctions, $queueForRealtime, $log, $certificates, $skipRenewCheck, $plan);
     }

src/Appwrite/Vcs/Comment.php

@@ -36,6 +36,7 @@ class Comment
         $this->builds[$id] = [
             'projectName' => $project->getAttribute('name'),
             'projectId' => $project->getId(),
+            'region' => $project->getAttribute('region', 'default'),
             'resourceName' => $resource->getAttribute('name'),
             'resourceId' => $resource->getId(),
             'resourceType' => $resourceType,
@@ -66,6 +67,7 @@ class Comment
             if ($build['resourceType'] === 'site') {
                 $projects[$build['projectId']]['site'][$build['resourceId']] = [
                     'name' => $build['resourceName'],
+                    'region' => $build['region'],
                     'status' => $build['buildStatus'],
                     'deploymentId' => $build['deploymentId'],
                     'action' => $build['action'],
@@ -74,6 +76,7 @@ class Comment
             } elseif ($build['resourceType'] === 'function') {
                 $projects[$build['projectId']]['function'][$build['resourceId']] = [
                     'name' => $build['resourceName'],
+                    'region' => $build['region'],
                     'status' => $build['buildStatus'],
                     'deploymentId' => $build['deploymentId'],
                     'action' => $build['action'],
@@ -84,7 +87,7 @@ class Comment
         $i = 0;
         foreach ($projects as $projectId => $project) {
             $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-            $hostname = System::getEnv('_APP_DOMAIN');
+            $hostname = System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN'));
 
             $text .= "## {$project['name']}\n\n";
             $text .= "Project ID: `{$projectId}`\n\n";
@@ -100,10 +103,12 @@ class Comment
                 $text .= "| :- | :-  | :-  | :-  | :- |\n";
 
                 foreach ($project['site'] as $siteId => $site) {
+                    $imageStatus = in_array($site['status'], ['processing', 'building']) ? 'building' : $site['status'];
+
                     $extension = $site['status'] === 'building' ? 'gif' : 'png';
 
-                    $pathLight = '/images/vcs/status-' . $site['status'] . '-light.' . $extension;
-                    $pathDark = '/images/vcs/status-' . $site['status'] . '-dark.' . $extension;
+                    $pathLight = '/images/vcs/status-' . $imageStatus . '-light.' . $extension;
+                    $pathDark = '/images/vcs/status-' . $imageStatus . '-dark.' . $extension;
 
                     $status = match ($site['status']) {
                         'waiting' => $this->generatImage($pathLight, $pathDark, 'Queued', 85) . ' _Queued_',
@@ -114,7 +119,7 @@ class Comment
                     };
 
                     if ($site['action']['type'] === 'logs') {
-                        $action = '[View Logs](' . $protocol . '://' . $hostname . '/console/project-' . $projectId . '/sites/site-' . $siteId . '/deployments/deployment-' . $site['deploymentId'] . ')';
+                        $action = '[View Logs](' . $protocol . '://' . $hostname . '/console/project-' . $site['region'] . '-' . $projectId . '/sites/site-' . $siteId . '/deployments/deployment-' . $site['deploymentId'] . ')';
                     } else {
                         $action = '[Authorize](' . $site['action']['url'] . ')';
                     }
@@ -146,12 +151,13 @@ class Comment
                 $text .= "| :- | :-  | :-  | :- |\n";
 
                 foreach ($project['function'] as $functionId => $function) {
-                    $extension = $site['status'] === 'building' ? 'gif' : 'png';
+                    $imageStatus = in_array($function['status'], ['processing', 'building']) ? 'building' : $function['status'];
+                    $extension = $imageStatus === 'building' ? 'gif' : 'png';
 
-                    $pathLight = '/images/vcs/status-' . $site['status'] . '-light.' . $extension;
-                    $pathDark = '/images/vcs/status-' . $site['status'] . '-dark.' . $extension;
+                    $pathLight = '/images/vcs/status-' . $imageStatus . '-light.' . $extension;
+                    $pathDark = '/images/vcs/status-' . $imageStatus . '-dark.' . $extension;
 
-                    $status = match ($site['status']) {
+                    $status = match ($function['status']) {
                         'waiting' => $this->generatImage($pathLight, $pathDark, 'Queued', 85) . ' _Queued_',
                         'processing' => $this->generatImage($pathLight, $pathDark, 'Processing', 85) . ' _Processing_',
                         'building' => $this->generatImage($pathLight, $pathDark, 'Building', 85) . ' _Building_',
@@ -160,12 +166,13 @@ class Comment
                     };
 
                     if ($function['action']['type'] === 'logs') {
-                        $action = '[View Logs](' . $protocol . '://' . $hostname . '/console/project-' . $projectId . '/functions/function-' . $functionId . '/deployment-' . $function['deploymentId'] . ')';
+                        $action = '[View Logs](' . $protocol . '://' . $hostname . '/console/project-' . $function['region'] . '-' . $projectId . '/functions/function-' . $functionId . '/deployment-' . $function['deploymentId'] . ')';
                     } else {
                         $action = '[Authorize](' . $function['action']['url'] . ')';
                     }
 
-                    $text .= "| &nbsp;**{$function['name']}**<br>`$functionId`";
+                    $text .= "| &nbsp;**{$function['name']}**";
+                    $text .= "| `{$functionId}`";
                     $text .= "| {$status}";
                     $text .= "| {$action}";
                     $text .= "|\n";
@@ -194,7 +201,7 @@ class Comment
     public function generatImage(string $pathLight, string $pathDark, string $alt, int $width): string
     {
         $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-        $hostname = System::getEnv('_APP_DOMAIN');
+        $hostname = System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN'));
 
         $imageLight = $protocol . '://' . $hostname . $pathLight;
         $imageDark = $protocol . '://' . $hostname . $pathDark;

tests/e2e/General/UsageTest.php

@@ -3,7 +3,6 @@
 namespace Tests\E2E\General;
 
 use Appwrite\Platform\Modules\Compute\Specification;
-use Appwrite\Tests\Retry;
 use CURLFile;
 use DateTime;
 use Tests\E2E\Client;
@@ -183,40 +182,43 @@ class UsageTest extends Scope
     /**
      * @depends testPrepareUsersStats
      */
-    #[Retry(count: 1)]
     public function testUsersStats(array $data): array
     {
         $requestsTotal = $data['requestsTotal'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1h',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
+        $this->assertEventually(function () {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1h',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertGreaterThanOrEqual(31, count($response['body']));
-        $this->validateDates($response['body']['network']);
-        $this->validateDates($response['body']['requests']);
-        $this->validateDates($response['body']['users']);
-        $this->assertArrayHasKey('executionsBreakdown', $response['body']);
-        $this->assertArrayHasKey('bucketsBreakdown', $response['body']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertGreaterThanOrEqual(31, count($response['body']));
+            $this->validateDates($response['body']['network']);
+            $this->validateDates($response['body']['requests']);
+            $this->validateDates($response['body']['users']);
+            $this->assertArrayHasKey('executionsBreakdown', $response['body']);
+            $this->assertArrayHasKey('bucketsBreakdown', $response['body']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/users/usage?range=90d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/users/usage?range=90d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals('90d', $response['body']['range']);
-        $this->assertEquals(90, count($response['body']['users']));
-        $this->assertEquals(90, count($response['body']['sessions']));
-        $this->assertEquals((self::CREATE / 2), $response['body']['users'][array_key_last($response['body']['users'])]['value']);
+            $this->assertEquals('90d', $response['body']['range']);
+            $this->assertEquals(90, count($response['body']['users']));
+            $this->assertEquals(90, count($response['body']['sessions']));
+            $this->assertEquals((self::CREATE / 2), $response['body']['users'][array_key_last($response['body']['users'])]['value']);
+        });
 
         return array_merge($data, [
             'requestsTotal' => $requestsTotal
@@ -359,7 +361,6 @@ class UsageTest extends Scope
     /**
      * @depends testPrepareStorageStats
      */
-    #[Retry(count: 10)]
     public function testStorageStats(array $data): array
     {
         $bucketId      = $data['bucketId'];
@@ -368,44 +369,50 @@ class UsageTest extends Scope
         $storageTotal  = $data['storageTotal'];
         $filesTotal    = $data['filesTotal'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1d',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
+        $this->assertEventually(function () use ($requestsTotal, $storageTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1d',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-        $this->assertGreaterThanOrEqual(31, count($response['body']));
-        $this->assertEquals(1, count($response['body']['requests']));
-        $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
-        $this->validateDates($response['body']['requests']);
-        $this->assertEquals($storageTotal, $response['body']['filesStorageTotal']);
+            $this->assertGreaterThanOrEqual(31, count($response['body']));
+            $this->assertEquals(1, count($response['body']['requests']));
+            $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
+            $this->validateDates($response['body']['requests']);
+            $this->assertEquals($storageTotal, $response['body']['filesStorageTotal']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/storage/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($bucketsTotal, $filesTotal, $storageTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/storage/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
-        $this->validateDates($response['body']['storage']);
-        $this->assertEquals($bucketsTotal, $response['body']['buckets'][array_key_last($response['body']['buckets'])]['value']);
-        $this->validateDates($response['body']['buckets']);
-        $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
-        $this->validateDates($response['body']['files']);
+            $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
+            $this->validateDates($response['body']['storage']);
+            $this->assertEquals($bucketsTotal, $response['body']['buckets'][array_key_last($response['body']['buckets'])]['value']);
+            $this->validateDates($response['body']['buckets']);
+            $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
+            $this->validateDates($response['body']['files']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/storage/' . $bucketId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($bucketId, $storageTotal, $filesTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/storage/' . $bucketId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
-        $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
+            $this->assertEquals($storageTotal, $response['body']['storage'][array_key_last($response['body']['storage'])]['value']);
+            $this->assertEquals($filesTotal, $response['body']['files'][array_key_last($response['body']['files'])]['value']);
+        });
 
         return $data;
     }
@@ -577,7 +584,7 @@ class UsageTest extends Scope
     }
 
     /** @depends testPrepareDatabaseStats */
-    #[Retry(count: 1)]
+
     public function testDatabaseStats(array $data): array
     {
         $databaseId = $data['databaseId'];
@@ -587,60 +594,66 @@ class UsageTest extends Scope
         $collectionsTotal = $data['collectionsTotal'];
         $documentsTotal = $data['documentsTotal'];
 
-        sleep(self::WAIT);
+        $this->assertEventually(function () use ($requestsTotal, $databasesTotal, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1d',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1d',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
+            $this->assertGreaterThanOrEqual(31, count($response['body']));
+            $this->assertEquals(1, count($response['body']['requests']));
+            $this->assertEquals(1, count($response['body']['network']));
+            $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
+            $this->validateDates($response['body']['requests']);
+            $this->assertEquals($databasesTotal, $response['body']['databasesTotal']);
+            $this->assertEquals($documentsTotal, $response['body']['documentsTotal']);
+        });
 
-        $this->assertGreaterThanOrEqual(31, count($response['body']));
-        $this->assertEquals(1, count($response['body']['requests']));
-        $this->assertEquals(1, count($response['body']['network']));
-        $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
-        $this->validateDates($response['body']['requests']);
-        $this->assertEquals($databasesTotal, $response['body']['databasesTotal']);
-        $this->assertEquals($documentsTotal, $response['body']['documentsTotal']);
+        $this->assertEventually(function () use ($collectionsTotal, $databasesTotal, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/databases/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/databases/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+            $this->assertEquals($databasesTotal, $response['body']['databases'][array_key_last($response['body']['databases'])]['value']);
+            $this->validateDates($response['body']['databases']);
+            $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
+            $this->validateDates($response['body']['collections']);
+            $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
+            $this->validateDates($response['body']['documents']);
+        });
 
-        $this->assertEquals($databasesTotal, $response['body']['databases'][array_key_last($response['body']['databases'])]['value']);
-        $this->validateDates($response['body']['databases']);
-        $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
-        $this->validateDates($response['body']['collections']);
-        $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
-        $this->validateDates($response['body']['documents']);
+        $this->assertEventually(function () use ($databaseId, $collectionsTotal, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/databases/' . $databaseId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/databases/' . $databaseId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+            $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
+            $this->validateDates($response['body']['collections']);
 
-        $this->assertEquals($collectionsTotal, $response['body']['collections'][array_key_last($response['body']['collections'])]['value']);
-        $this->validateDates($response['body']['collections']);
+            $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
+            $this->validateDates($response['body']['documents']);
+        });
 
-        $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
-        $this->validateDates($response['body']['documents']);
+        $this->assertEventually(function () use ($databaseId, $collectionId, $documentsTotal) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/databases/' . $databaseId . '/collections/' . $collectionId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/databases/' . $databaseId . '/collections/' . $collectionId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
-
-        $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
-        $this->validateDates($response['body']['documents']);
+            $this->assertEquals($documentsTotal, $response['body']['documents'][array_key_last($response['body']['documents'])]['value']);
+            $this->validateDates($response['body']['documents']);
+        });
 
         return $data;
     }
@@ -799,67 +812,69 @@ class UsageTest extends Scope
     }
 
     /** @depends testPrepareFunctionsStats */
-    #[Retry(count: 1)]
     public function testFunctionsStats(array $data): array
     {
         $functionId = $data['functionId'];
         $executionTime = $data['executionTime'];
         $executions = $data['executions'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/functions/' . $functionId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($functionId, $executions, $executionTime) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/functions/' . $functionId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(24, count($response['body']));
-        $this->assertEquals('30d', $response['body']['range']);
-        $this->assertIsArray($response['body']['deployments']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
-        $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
-        $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
-        $this->assertIsArray($response['body']['builds']);
-        $this->assertIsArray($response['body']['buildsTime']);
-        $this->assertIsArray($response['body']['buildsMbSeconds']);
-        $this->assertIsArray($response['body']['executions']);
-        $this->assertIsArray($response['body']['executionsTime']);
-        $this->assertIsArray($response['body']['executionsMbSeconds']);
-        $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
-        $this->validateDates($response['body']['executions']);
-        $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
-        $this->validateDates($response['body']['executionsTime']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(24, count($response['body']));
+            $this->assertEquals('30d', $response['body']['range']);
+            $this->assertIsArray($response['body']['deployments']);
+            $this->assertIsArray($response['body']['deploymentsStorage']);
+            $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
+            $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
+            $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
+            $this->assertIsArray($response['body']['builds']);
+            $this->assertIsArray($response['body']['buildsTime']);
+            $this->assertIsArray($response['body']['buildsMbSeconds']);
+            $this->assertIsArray($response['body']['executions']);
+            $this->assertIsArray($response['body']['executionsTime']);
+            $this->assertIsArray($response['body']['executionsMbSeconds']);
+            $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
+            $this->validateDates($response['body']['executions']);
+            $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
+            $this->validateDates($response['body']['executionsTime']);
+        });
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/functions/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use ($executions, $executionTime) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/functions/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(25, count($response['body']));
-        $this->assertEquals($response['body']['range'], '30d');
-        $this->assertIsArray($response['body']['functions']);
-        $this->assertIsArray($response['body']['deployments']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsArray($response['body']['builds']);
-        $this->assertIsArray($response['body']['buildsTime']);
-        $this->assertIsArray($response['body']['buildsMbSeconds']);
-        $this->assertIsArray($response['body']['executions']);
-        $this->assertIsArray($response['body']['executionsTime']);
-        $this->assertIsArray($response['body']['executionsMbSeconds']);
-        $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
-        $this->validateDates($response['body']['executions']);
-        $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
-        $this->validateDates($response['body']['executionsTime']);
-        $this->assertGreaterThan(0, $response['body']['buildsTime'][array_key_last($response['body']['buildsTime'])]['value']);
-        $this->validateDates($response['body']['buildsTime']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(25, count($response['body']));
+            $this->assertEquals($response['body']['range'], '30d');
+            $this->assertIsArray($response['body']['functions']);
+            $this->assertIsArray($response['body']['deployments']);
+            $this->assertIsArray($response['body']['deploymentsStorage']);
+            $this->assertIsArray($response['body']['builds']);
+            $this->assertIsArray($response['body']['buildsTime']);
+            $this->assertIsArray($response['body']['buildsMbSeconds']);
+            $this->assertIsArray($response['body']['executions']);
+            $this->assertIsArray($response['body']['executionsTime']);
+            $this->assertIsArray($response['body']['executionsMbSeconds']);
+            $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
+            $this->validateDates($response['body']['executions']);
+            $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
+            $this->validateDates($response['body']['executionsTime']);
+            $this->assertGreaterThan(0, $response['body']['buildsTime'][array_key_last($response['body']['buildsTime'])]['value']);
+            $this->validateDates($response['body']['buildsTime']);
+        });
 
         return $data;
     }
 
-
     public function testPrepareSitesStats(): array
     {
         $siteId = $this->setupSite([
@@ -927,7 +942,6 @@ class UsageTest extends Scope
     }
 
     /** @depends testPrepareSitesStats */
-    #[Retry(count: 1)]
     public function testSitesStats(array $data)
     {
         $siteId = $data['siteId'];
@@ -935,67 +949,72 @@ class UsageTest extends Scope
         $executions = $data['executions'] ?? 0;
         $deploymentsSuccess = $data['deploymentsSuccess'];
         $deploymentsFailed = $data['deploymentsFailed'];
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/sites/' . $siteId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(30, count($response['body']));
-        $this->assertEquals('30d', $response['body']['range']);
-        $this->assertIsArray($response['body']['deployments']);
-        $this->assertEquals($deploymentsSuccess, $response['body']['buildsSuccessTotal']);
-        $this->assertEquals($deploymentsFailed, $response['body']['buildsFailedTotal']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
-        $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
-        $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
-        $this->assertIsArray($response['body']['builds']);
-        $this->assertIsArray($response['body']['buildsTime']);
-        $this->assertIsArray($response['body']['buildsMbSeconds']);
-        $this->assertIsArray($response['body']['executions']);
-        $this->assertIsArray($response['body']['executionsTime']);
-        $this->assertIsArray($response['body']['executionsMbSeconds']);
-        $this->assertIsArray($response['body']['buildsSuccess']);
-        $this->assertIsArray($response['body']['buildsFailed']);
-        $this->assertIsArray($response['body']['requests']);
-        $this->assertIsArray($response['body']['inbound']);
-        $this->assertIsArray($response['body']['outbound']);
-        $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
-        $this->validateDates($response['body']['executions']);
-        $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
-        $this->validateDates($response['body']['executionsTime']);
+        $this->assertEventually(function () use ($siteId, $deploymentsSuccess, $deploymentsFailed, $executions, $executionTime) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/sites/' . $siteId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/sites/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(30, count($response['body']));
+            $this->assertEquals('30d', $response['body']['range']);
+            $this->assertIsArray($response['body']['deployments']);
+            $this->assertEquals($deploymentsSuccess, $response['body']['buildsSuccessTotal']);
+            $this->assertEquals($deploymentsFailed, $response['body']['buildsFailedTotal']);
+            $this->assertIsArray($response['body']['deploymentsStorage']);
+            $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
+            $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
+            $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
+            $this->assertIsArray($response['body']['builds']);
+            $this->assertIsArray($response['body']['buildsTime']);
+            $this->assertIsArray($response['body']['buildsMbSeconds']);
+            $this->assertIsArray($response['body']['executions']);
+            $this->assertIsArray($response['body']['executionsTime']);
+            $this->assertIsArray($response['body']['executionsMbSeconds']);
+            $this->assertIsArray($response['body']['buildsSuccess']);
+            $this->assertIsArray($response['body']['buildsFailed']);
+            $this->assertIsArray($response['body']['requests']);
+            $this->assertIsArray($response['body']['inbound']);
+            $this->assertIsArray($response['body']['outbound']);
+            $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
+            $this->validateDates($response['body']['executions']);
+            $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
+            $this->validateDates($response['body']['executionsTime']);
+        });
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(31, count($response['body']));
-        $this->assertEquals($response['body']['range'], '30d');
-        $this->assertIsArray($response['body']['sites']);
-        $this->assertIsArray($response['body']['deployments']);
-        $this->assertIsArray($response['body']['deploymentsStorage']);
-        $this->assertIsArray($response['body']['builds']);
-        $this->assertIsArray($response['body']['buildsTime']);
-        $this->assertIsArray($response['body']['buildsMbSeconds']);
-        $this->assertIsArray($response['body']['executions']);
-        $this->assertIsArray($response['body']['executionsTime']);
-        $this->assertIsArray($response['body']['executionsMbSeconds']);
-        $this->assertIsArray($response['body']['buildsSuccess']);
-        $this->assertIsArray($response['body']['buildsFailed']);
-        $this->assertIsArray($response['body']['requests']);
-        $this->assertIsArray($response['body']['inbound']);
-        $this->assertIsArray($response['body']['outbound']);
-        $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
-        $this->validateDates($response['body']['executions']);
-        $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
-        $this->validateDates($response['body']['executionsTime']);
-        $this->assertGreaterThan(0, $response['body']['buildsTime'][array_key_last($response['body']['buildsTime'])]['value']);
-        $this->validateDates($response['body']['buildsTime']);
+        $this->assertEventually(function () use ($executions, $executionTime) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/sites/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
+
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(31, count($response['body']));
+            $this->assertEquals($response['body']['range'], '30d');
+            $this->assertIsArray($response['body']['sites']);
+            $this->assertIsArray($response['body']['deployments']);
+            $this->assertIsArray($response['body']['deploymentsStorage']);
+            $this->assertIsArray($response['body']['builds']);
+            $this->assertIsArray($response['body']['buildsTime']);
+            $this->assertIsArray($response['body']['buildsMbSeconds']);
+            $this->assertIsArray($response['body']['executions']);
+            $this->assertIsArray($response['body']['executionsTime']);
+            $this->assertIsArray($response['body']['executionsMbSeconds']);
+            $this->assertIsArray($response['body']['buildsSuccess']);
+            $this->assertIsArray($response['body']['buildsFailed']);
+            $this->assertIsArray($response['body']['requests']);
+            $this->assertIsArray($response['body']['inbound']);
+            $this->assertIsArray($response['body']['outbound']);
+            $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
+            $this->validateDates($response['body']['executions']);
+            $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
+            $this->validateDates($response['body']['executionsTime']);
+            $this->assertGreaterThan(0, $response['body']['buildsTime'][array_key_last($response['body']['buildsTime'])]['value']);
+            $this->validateDates($response['body']['buildsTime']);
+        });
     }
 
     /** @depends testFunctionsStats */
@@ -1032,30 +1051,33 @@ class UsageTest extends Scope
 
         $domain = $rule['body']['domain'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/functions/' . $functionId . '/usage?range=30d',
-            $this->getConsoleHeaders()
-        );
+        $this->assertEventually(function () use (&$response, $functionId) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/functions/' . $functionId . '/usage?range=30d',
+                $this->getConsoleHeaders()
+            );
 
-        $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(24, count($response['body']));
-        $this->assertEquals('30d', $response['body']['range']);
+            $this->assertEquals(200, $response['headers']['status-code']);
+            $this->assertEquals(24, count($response['body']));
+            $this->assertEquals('30d', $response['body']['range']);
+        });
 
         $functionsMetrics = $response['body'];
 
-        $response = $this->client->call(
-            Client::METHOD_GET,
-            '/project/usage',
-            $this->getConsoleHeaders(),
-            [
-                'period' => '1h',
-                'startDate' => self::getToday(),
-                'endDate' => self::getTomorrow(),
-            ]
-        );
-
-        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEventually(function () use (&$response) {
+            $response = $this->client->call(
+                Client::METHOD_GET,
+                '/project/usage',
+                $this->getConsoleHeaders(),
+                [
+                    'period' => '1h',
+                    'startDate' => self::getToday(),
+                    'endDate' => self::getTomorrow(),
+                ]
+            );
+            $this->assertEquals(200, $response['headers']['status-code']);
+        });
 
         $projectMetrics = $response['body'];
 
@@ -1070,8 +1092,6 @@ class UsageTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        $tries = 0;
-
         $this->assertEventually(function () use ($functionId, $functionsMetrics, $projectMetrics) {
             // Compare new values with old values
             $response = $this->client->call(

tests/e2e/Scopes/Scope.php

@@ -2,6 +2,7 @@
 
 namespace Tests\E2E\Scopes;
 
+use Appwrite\Tests\Async;
 use Appwrite\Tests\Retryable;
 use PHPUnit\Framework\TestCase;
 use Tests\E2E\Client;
@@ -10,6 +11,7 @@ use Utopia\Database\Helpers\ID;
 abstract class Scope extends TestCase
 {
     use Retryable;
+    use Async;
 
     protected ?Client $client = null;
     protected string $endpoint = 'http://localhost/v1';
@@ -43,6 +45,18 @@ abstract class Scope extends TestCase
         return [];
     }
 
+    protected function assertLastRequest(callable $probe, $timeoutMs = 20_000, $waitMs = 500): array
+    {
+        $this->assertEventually(function () use (&$request, $probe) {
+            $request = json_decode(file_get_contents('http://request-catcher:5000/__last_request__'), true);
+            $request['data'] = json_decode($request['data'], true);
+
+            call_user_func($probe, $request);
+        }, $timeoutMs, $waitMs);
+
+        return $request;
+    }
+
     protected function getLastRequest(): array
     {
         sleep(2);

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -2034,7 +2034,6 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals($response['body']['users'][0]['email'], $email);
     }
 
-    #[Retry(count: 2)]
     public function testCreatePhone(): array
     {
         $number = '+123456789';
@@ -2058,17 +2057,15 @@ class AccountCustomClientTest extends Scope
 
         $userId = $response['body']['userId'];
 
-        \sleep(7);
-
-        $smsRequest = $this->getLastRequest();
-
-        $this->assertEquals('http://request-catcher:5000/mock-sms', $smsRequest['url']);
-        $this->assertEquals('Appwrite Mock Message Sender', $smsRequest['headers']['User-Agent']);
-        $this->assertEquals('username', $smsRequest['headers']['X-Username']);
-        $this->assertEquals('password', $smsRequest['headers']['X-Key']);
-        $this->assertEquals('POST', $smsRequest['method']);
-        $this->assertEquals('+123456789', $smsRequest['data']['from']);
-        $this->assertEquals($number, $smsRequest['data']['to']);
+        $smsRequest = $this->assertLastRequest(function (array $request) use ($number) {
+            $this->assertEquals('http://request-catcher:5000/mock-sms', $request['url']);
+            $this->assertEquals('Appwrite Mock Message Sender', $request['headers']['User-Agent']);
+            $this->assertEquals('username', $request['headers']['X-Username']);
+            $this->assertEquals('password', $request['headers']['X-Key']);
+            $this->assertEquals('POST', $request['method']);
+            $this->assertEquals('+123456789', $request['data']['from']);
+            $this->assertEquals($number, $request['data']['to']);
+        });
 
         $data['token'] = $smsRequest['data']['message'];
         $data['id'] = $userId;
@@ -2396,7 +2393,6 @@ class AccountCustomClientTest extends Scope
     /**
      * @depends testUpdatePhone
      */
-    #[Retry(count: 3)]
     public function testPhoneVerification(array $data): array
     {
         $session = $data['session'] ?? '';
@@ -2416,10 +2412,10 @@ class AccountCustomClientTest extends Scope
         $this->assertEmpty($response['body']['secret']);
         $this->assertTrue((new DatetimeValidator())->isValid($response['body']['expire']));
 
-        $smsRequest = $this->getLastRequest();
-
-        $message = $smsRequest['data']['message'];
-        $token = substr($message, 0, 6);
+        $smsRequest = $this->assertLastRequest(function ($request) {
+            $this->assertArrayHasKey('data', $request);
+            $this->assertArrayHasKey('message', $request['data']);
+        });
 
         /**
          * Test for FAILURE

tests/e2e/Services/Databases/DatabasesCustomServerTest.php

@@ -695,7 +695,7 @@ class DatabasesCustomServerTest extends Scope
             'key' => 'lastName',
             'size' => 256,
             'required' => true,
-            'encrypt' => true
+            'encrypt' => true,
         ]);
 
 

tests/e2e/Services/Functions/FunctionsBase.php

@@ -49,7 +49,7 @@ trait FunctionsBase
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]));
             $this->assertEquals('ready', $deployment['body']['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
-        }, 50000, 500);
+        }, 100000, 500);
 
         // Not === so multipart/form-data works fine too
         if (($params['activate'] ?? false) == true) {

tests/e2e/Services/Messaging/MessagingConsoleClientTest.php

@@ -206,15 +206,17 @@ class MessagingConsoleClientTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        $logs = $this->client->call(Client::METHOD_GET, '/messaging/topics/' . $topic['body']['$id'] . '/logs', \array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+        $this->assertEventually(function () use ($topic) {
+            $logs = $this->client->call(Client::METHOD_GET, '/messaging/topics/' . $topic['body']['$id'] . '/logs', \array_merge([
+                'content-type' => 'application/json',
+                'x-appwrite-project' => $this->getProject()['$id'],
+            ], $this->getHeaders()));
 
-        $this->assertEquals($logs['headers']['status-code'], 200);
-        $this->assertIsArray($logs['body']['logs']);
-        $this->assertCount(2, $logs['body']['logs']);
-        $this->assertIsNumeric($logs['body']['total']);
+            $this->assertEquals($logs['headers']['status-code'], 200);
+            $this->assertIsArray($logs['body']['logs']);
+            $this->assertCount(2, $logs['body']['logs']);
+            $this->assertIsNumeric($logs['body']['total']);
+        });
 
         $logs = $this->client->call(Client::METHOD_GET, '/messaging/topics/' . $topic['body']['$id'] . '/logs', \array_merge([
             'content-type' => 'application/json',

tests/e2e/Services/Migrations/MigrationsBase.php

@@ -871,7 +871,7 @@ trait MigrationsBase
             $this->assertEquals(1, $deployments['body']['total']);
 
             $this->assertEquals('ready', $deployments['body']['deployments'][0]['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployments['body']['deployments'][0], JSON_PRETTY_PRINT));
-        }, 50000, 500);
+        }, 100000, 500);
 
         // Attempt execution
         $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', [

tests/e2e/Services/Sites/SitesBase.php

@@ -265,7 +265,7 @@ trait SitesBase
         $this->assertEventually(function () use ($siteId, $deploymentId) {
             $deployment = $this->getDeployment($siteId, $deploymentId);
             $this->assertEquals('ready', $deployment['body']['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
-        }, 100000, 500);
+        }, 150000, 500);
 
         $this->assertEventually(function () use ($siteId, $deploymentId) {
             $site = $this->getSite($siteId);

tests/e2e/Services/Sites/SitesCustomServerTest.php

@@ -1446,7 +1446,7 @@ class SitesCustomServerTest extends Scope
         $this->assertEquals(404, $response['headers']['status-code']);
         $this->assertStringContainsString("Page not found", $response['body']); // Title
         $this->assertStringContainsString("Go to homepage", $response['body']); // Button
-        $this->assertStringContainsString("Powered by", $response['body']); // Brand
+        $this->assertStringNotContainsString("Powered by", $response['body']); // Brand
 
         $this->cleanupSite($siteId);
     }
@@ -1502,7 +1502,7 @@ class SitesCustomServerTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertStringContainsString("Customized 404 page", $response['body']);
-        $this->assertStringNotContainsString("Powered by", $response['body']); // Brand
+        $this->assertStringNotContainsString("Powered by", $response['body']); //brand
 
         $this->cleanupSite($siteId);
     }

tests/e2e/Services/Teams/TeamsBase.php

@@ -64,7 +64,7 @@ trait TeamsBase
 
             // Step 4: Assert failure — cannot remove the only OWNER from a team
             $this->assertEquals(400, $response['headers']['status-code']);
-            $this->assertEquals('general_argument_invalid', $response['body']['type']);
+            $this->assertEquals('membership_downgrade_prohibited', $response['body']['type']);
             $this->assertEquals('There must be at least one owner in the organization.', $response['body']['message']);
         }
 

tests/e2e/Services/Teams/TeamsConsoleClientTest.php

@@ -65,7 +65,7 @@ class TeamsConsoleClientTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $response = $this->client->call(Client::METHOD_POST, '/teams/' . $teamUid . '/memberships', array_merge([
+        $developer = $this->client->call(Client::METHOD_POST, '/teams/' . $teamUid . '/memberships', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -75,7 +75,8 @@ class TeamsConsoleClientTest extends Scope
             'url' => 'http://localhost:5000/join-us#title'
         ]);
 
-        $this->assertEquals(201, $response['headers']['status-code']);
+        $developerUserId = $developer['body']['$id'];
+        $this->assertEquals(201, $developer['headers']['status-code']);
 
         $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
             'content-type' => 'application/json',
@@ -90,13 +91,26 @@ class TeamsConsoleClientTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        $ownerMembershipUid = $response['body']['memberships'][1]['$id'];
+        $ownerMembershipUid = $response['body']['memberships'][0]['$id'];
 
         $response = $this->client->call(Client::METHOD_DELETE, '/teams/' . $teamUid . '/memberships/' . $ownerMembershipUid, array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
+
+        $this->assertEquals(400, $response['headers']['status-code']);
+        $this->assertEquals('membership_deletion_prohibited', $response['body']['type']);
+        $this->assertEquals('There must be at least one owner in the organization.', $response['body']['message']);
+
+        // Remove the excess developer member to reduce the membership count in `TeamsBaseClient` tests.
+        // This is necessary because the only owner cannot be removed in the console project / top level team / organization.
+        $response = $this->client->call(Client::METHOD_DELETE, '/teams/' . $teamUid . '/memberships/' . $developerUserId, array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
         $this->assertEquals(204, $response['headers']['status-code']);
 
         return $data;
@@ -109,21 +123,6 @@ class TeamsConsoleClientTest extends Scope
         $membershipUid = $data['membershipUid'] ?? '';
         $session = $data['session'] ?? '';
 
-        /**
-         * Test for FAILURE
-         */
-        $roles = ['developer'];
-        $response = $this->client->call(Client::METHOD_PATCH, '/teams/' . $teamUid . '/memberships/' . $membershipUid, array_merge([
-            'origin' => 'http://localhost',
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'roles' => $roles
-        ]);
-
-        $this->assertEquals(400, $response['headers']['status-code']);
-        $this->assertEquals('There must be at least one owner in the organization.', $response['body']['message']);
-
         /**
          * Test for unknown team
          */
@@ -132,7 +131,7 @@ class TeamsConsoleClientTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'roles' => $roles
+            'roles' => ['developer']
         ]);
 
         $this->assertEquals(404, $response['headers']['status-code']);
@@ -145,7 +144,7 @@ class TeamsConsoleClientTest extends Scope
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'roles' => $roles
+            'roles' => ['developer']
         ]);
 
         $this->assertEquals(404, $response['headers']['status-code']);
@@ -160,7 +159,7 @@ class TeamsConsoleClientTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id'],
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ], [
-            'roles' => $roles
+            'roles' => ['developer']
         ]);
 
         $this->assertEquals(401, $response['headers']['status-code']);
@@ -168,4 +167,89 @@ class TeamsConsoleClientTest extends Scope
 
         return $data;
     }
+
+    /**
+     * @depends testUpdateTeamMembershipRoles
+     */
+    public function testDeleteTeamMembership($data): array
+    {
+        $teamUid = $data['teamUid'] ?? '';
+        $membershipUid = $data['membershipUid'] ?? '';
+        $session = $data['session'] ?? '';
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(3, $response['body']['total']);
+
+        $ownerMembershipUid = $response['body']['memberships'][0]['$id'];
+
+        /**
+         * Test deleting a membership that does not exists
+         */
+        $response = $this->client->call(Client::METHOD_DELETE, '/teams/' . $teamUid . '/memberships/dne', [
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ]);
+
+        $this->assertEquals(404, $response['headers']['status-code']);
+
+        /**
+         * Test deleting another user's membership
+         */
+        $response = $this->client->call(Client::METHOD_DELETE, '/teams/' . $teamUid . '/memberships/' . $ownerMembershipUid, [
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ]);
+
+        $this->assertEquals(401, $response['headers']['status-code']);
+        $this->assertEquals('The current user is not authorized to perform the requested action.', $response['body']['message']);
+
+        $response = $this->client->call(Client::METHOD_DELETE, '/teams/' . $teamUid . '/memberships/' . $membershipUid, [
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ]);
+
+        $this->assertEquals(204, $response['headers']['status-code']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals(2, $response['body']['total']);
+
+        /**
+         * Test for when the owner tries to delete their membership
+         */
+        $response = $this->client->call(Client::METHOD_DELETE, '/teams/' . $teamUid . '/memberships/' . $ownerMembershipUid, array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
+        $this->assertEquals(400, $response['headers']['status-code']);
+        $this->assertEquals('membership_deletion_prohibited', $response['body']['type']);
+        $this->assertEquals('There must be at least one owner in the organization.', $response['body']['message']);
+
+        $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships/' . $ownerMembershipUid, array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+
+        return [];
+    }
 }