Merge pull request #8694 from appwrite/fix-auth-injection

Fix auth injection
fix: injection name
2026-05-26 13:51:13 +00:00 · 2024-09-20 02:33:16 +04:00 · 2024-09-19 18:28:24 -04:00 · 2024-09-19 22:25:52 +04:00 · 2024-09-19 14:25:05 -04:00 · 2024-09-19 22:16:50 +04:00
5190 changed files with 450746 additions and 5848 deletions
@@ -9,7 +9,8 @@ _APP_CONSOLE_WHITELIST_IPS=
 _APP_CONSOLE_COUNTRIES_DENYLIST=AQ
 _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
 _APP_SYSTEM_EMAIL_NAME=Appwrite
-_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
+_APP_SYSTEM_EMAIL_ADDRESS=noreply@appwrite.io
+_APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
@@ -68,8 +69,8 @@ _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
-_APP_FUNCTIONS_CPUS=1
-_APP_FUNCTIONS_MEMORY=1024
+_APP_FUNCTIONS_CPUS=8
+_APP_FUNCTIONS_MEMORY=8192
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600
 _APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
 _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
@@ -0,0 +1,16 @@
+name: "CodeQL"
+
+on: [pull_request]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+
+    - name: Run CodeQL
+      run: |
+        docker run --rm -v $PWD:/app composer sh -c \
+        "composer install --profile --ignore-platform-reqs && composer check"
@@ -0,0 +1,47 @@
+name: Nightly Security Scan
+on:
+  schedule:
+    - cron: '0 0 * * *'  # 12am UTC daily runtime
+  workflow_dispatch:
+
+jobs:
+  scan-image:
+    name: Scan Docker Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build the Docker image
+        run: docker build . -t appwrite_image:latest
+      - name: Run Trivy vulnerability scanner on image
+        uses: aquasecurity/trivy-action@0.20.0
+        with:
+          image-ref: 'appwrite_image:latest'
+          format: 'sarif'
+          output: 'trivy-image-results.sarif'
+          ignore-unfixed: 'false'
+          severity: 'CRITICAL,HIGH'
+      - name: Upload Docker Image Scan Results
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-image-results.sarif'
+
+  scan-code:
+    name: Scan Code
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Run Trivy vulnerability scanner on filesystem
+        uses: aquasecurity/trivy-action@0.20.0
+        with:
+          scan-type: 'fs'
+          format: 'sarif'
+          output: 'trivy-fs-results.sarif'
+          severity: 'CRITICAL,HIGH'
+      - name: Upload Code Scan Results
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-fs-results.sarif'
@@ -0,0 +1,105 @@
+name: PR Security Scan
+on: 
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+ 
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+    - name: Check out code 
+      uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
+        fetch-depth: 0
+        submodules: 'recursive'
+
+    - name: Build the Docker image
+      uses: docker/build-push-action@v5
+      with: 
+        context: .
+        push: false
+        load: true
+        tags: pr_image:${{ github.sha }}
+
+    - name: Run Trivy vulnerability scanner on image
+      uses: aquasecurity/trivy-action@0.20.0
+      with:
+        image-ref: 'pr_image:${{ github.sha }}'
+        format: 'json'
+        output: 'trivy-image-results.json'
+        severity: 'CRITICAL,HIGH'
+
+    - name: Run Trivy vulnerability scanner on source code
+      uses: aquasecurity/trivy-action@0.20.0
+      with:
+        scan-type: 'fs'
+        scan-ref: '.'
+        format: 'json'
+        output: 'trivy-fs-results.json'
+        severity: 'CRITICAL,HIGH'
+
+    - name: Process Trivy scan results
+      id: process-results
+      uses: actions/github-script@v7
+      with:
+        script: |
+          const fs = require('fs');
+          let commentBody = '## Security Scan Results for PR\n\n';
+          
+          function processResults(results, title) {
+            let sectionBody = `### ${title}\n\n`;
+            if (results.Results && results.Results.some(result => result.Vulnerabilities && result.Vulnerabilities.length > 0)) {
+              sectionBody += '| Package | Version | Vulnerability | Severity |\n';
+              sectionBody += '|---------|---------|----------------|----------|\n';
+              
+              const uniqueVulns = new Set();
+              results.Results.forEach(result => {
+                if (result.Vulnerabilities) {
+                  result.Vulnerabilities.forEach(vuln => {
+                    const vulnKey = `${vuln.PkgName}-${vuln.InstalledVersion}-${vuln.VulnerabilityID}`;
+                    if (!uniqueVulns.has(vulnKey)) {
+                      uniqueVulns.add(vulnKey);
+                      sectionBody += `| ${vuln.PkgName} | ${vuln.InstalledVersion} | [${vuln.VulnerabilityID}](https://nvd.nist.gov/vuln/detail/${vuln.VulnerabilityID}) | ${vuln.Severity} |\n`;
+                    }
+                  });
+                }
+              });
+            } else {
+              sectionBody += '🎉 No vulnerabilities found!\n';
+            }
+            return sectionBody;
+          }
+          
+          try {
+            const imageResults = JSON.parse(fs.readFileSync('trivy-image-results.json', 'utf8'));
+            const fsResults = JSON.parse(fs.readFileSync('trivy-fs-results.json', 'utf8'));
+            
+            commentBody += processResults(imageResults, "Docker Image Scan Results");
+            commentBody += '\n';
+            commentBody += processResults(fsResults, "Source Code Scan Results");
+            
+          } catch (error) {
+            commentBody += `There was an error while running the security scan: ${error.message}\n`;
+            commentBody += 'Please contact the core team for assistance.';
+          }
+          
+          core.setOutput('comment-body', commentBody);
+    - name: Find Comment
+      uses: peter-evans/find-comment@v3
+      id: fc
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-author: 'github-actions[bot]'
+        body-includes: Security Scan Results for PR
+
+    - name: Create or update comment
+      uses: peter-evans/create-or-update-comment@v3
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-id: ${{ steps.fc.outputs.comment-id }}
+        body: ${{ steps.process-results.outputs.comment-body }}
+        edit-mode: replace
@@ -148,3 +148,81 @@ jobs:

      - name: Run ${{matrix.service}} Shared Tables Tests
        run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+
+  benchamrking:
+    name: Benchmark
+    runs-on: ubuntu-latest
+    needs: setup
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Load Cache
+        uses: actions/cache@v3
+        with:
+          key: ${{ env.CACHE_KEY }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          fail-on-cache-miss: true
+      - name: Load and Start Appwrite
+        run: |
+          sed -i 's/traefik/localhost/g' .env 
+          docker load --input /tmp/${{ env.IMAGE }}.tar          
+          docker compose up -d
+          sleep 10
+      - name: Install Oha
+        run: |
+          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
+          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
+          sudo apt update
+          sudo apt install oha
+      - name: Benchmark PR
+        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark.json
+      - name: Cleaning
+        run: docker compose down -v
+      - name: Installing latest version
+        run: |
+          rm docker-compose.yml
+          rm .env
+          curl https://appwrite.io/install/compose -o docker-compose.yml
+          curl https://appwrite.io/install/env -o .env
+          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
+          docker compose up -d
+          sleep 10
+      - name: Benchmark Latest
+        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark-latest.json
+      - name: Prepare comment
+        run: |
+          echo '## :sparkles: Benchmark results' > benchmark.txt
+          echo ' ' >> benchmark.txt
+          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
+          echo "| --- | --- | --- | "  >> benchmark.txt
+          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
+      - name: Save results
+        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: benchmark.json
+          path: benchmark.json
+          retention-days: 7
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Benchmark results
+      - name: Comment on PR
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-path: benchmark.txt
+          edit-mode: replace
@@ -9,6 +9,7 @@
 !/.idea/php.xml
 .DS_Store
 .php_cs.cache
+.phpactor.json
 debug/
 app/sdks
 dev/yasd_init.php
@@ -1,4 +0,0 @@
-[submodule "app/console"]
-	path = app/console
-	url = https://github.com/appwrite/console
-	branch = 1.6.x
@@ -1,3 +1,228 @@
+# Version 1.6.0
+
+## What's Changed
+
+### Notable changes
+
+* Allow execution filter attributes in [#7607](https://github.com/appwrite/appwrite/pull/7607)
+* Add dynamic API keys for function executions in [#7512](https://github.com/appwrite/appwrite/pull/7512)
+* Add metrics for successful and failed builds in [#8210](https://github.com/appwrite/appwrite/pull/8210)
+* Update logging config to use a DSN approach in [#8187](https://github.com/appwrite/appwrite/pull/8187)
+* Add projects.createJWT endpoint for dynamic keys in [#8213](https://github.com/appwrite/appwrite/pull/8213)
+* Add users.createJWT() endpoint for local function development in [#8207](https://github.com/appwrite/appwrite/pull/8207)
+* Added cancel build endpoint in [#7605](https://github.com/appwrite/appwrite/pull/7605)
+* Add CLI as a function deployment type in [#8215](https://github.com/appwrite/appwrite/pull/8215)
+* Add vcs.getRepositoryContents() endpoint in [#8330](https://github.com/appwrite/appwrite/pull/8330)
+* Add appwrite version in function variables in [#8336](https://github.com/appwrite/appwrite/pull/8336)
+* Add support for scheduled executions in [#8243](https://github.com/appwrite/appwrite/pull/8243)
+* Add endpoint to delete execution in [#8337](https://github.com/appwrite/appwrite/pull/8337)
+* OPR v4 support in [#8323](https://github.com/appwrite/appwrite/pull/8323)
+* Mock OTP and phone numbers in [#7565](https://github.com/appwrite/appwrite/pull/7565)
+* Support scheduled executions in [#8355](https://github.com/appwrite/appwrite/pull/8355)
+* Add alert for new sessions in [#8315](https://github.com/appwrite/appwrite/pull/8315)
+* Update delete authenticator to remove OTP Validation in [#8367](https://github.com/appwrite/appwrite/pull/8367)
+* Track project last activity in [#8366](https://github.com/appwrite/appwrite/pull/8366)
+* Containerize the console in [#8406](https://github.com/appwrite/appwrite/pull/8406)
+* Implement MBSeconds Metric on 1.5.X in [#8385](https://github.com/appwrite/appwrite/pull/8385)
+* Support JWTs without session ID in [#8420](https://github.com/appwrite/appwrite/pull/8420)
+* 1.6.x sdks in [#8359](https://github.com/appwrite/appwrite/pull/8359)
+* Base migration for 1.6.x in [#8417](https://github.com/appwrite/appwrite/pull/8417)
+* 1.6.x migrations and filters in [#8403](https://github.com/appwrite/appwrite/pull/8403)
+* Add APPWRITE_REGION in function variables in [#8394](https://github.com/appwrite/appwrite/pull/8394)
+* Support dynamic keys for domain executions in [#8428](https://github.com/appwrite/appwrite/pull/8428)
+* Bump DBIP to latest version in [#8467](https://github.com/appwrite/appwrite/pull/8467)
+* Automatically restart function on crash in [#8473](https://github.com/appwrite/appwrite/pull/8473)
+* Don't send session alerts for otp and magic-url logins in [#8459](https://github.com/appwrite/appwrite/pull/8459)
+* Mark 4XX executions as successful in [#8493](https://github.com/appwrite/appwrite/pull/8493)
+* Add dynamic keys in builds in [#8492](https://github.com/appwrite/appwrite/pull/8492)
+* Allow deployment queries on type and size in [#8515](https://github.com/appwrite/appwrite/pull/8515)
+* Add OTP email template in [#8501](https://github.com/appwrite/appwrite/pull/8501)
+* Update console links in [#8523](https://github.com/appwrite/appwrite/pull/8523)
+* Add multipart support in [#8477](https://github.com/appwrite/appwrite/pull/8477)
+* Separate deployment sizes in [#8556](https://github.com/appwrite/appwrite/pull/8556)
+* Add go runtime in [#8572](https://github.com/appwrite/appwrite/pull/8572)
+* Add react native platform in [#8562](https://github.com/appwrite/appwrite/pull/8562)
+* Merge deployments and build storage metrics together in API in [#8443](https://github.com/appwrite/appwrite/pull/8443)
+* Support string attribute resizing in [#8597](https://github.com/appwrite/appwrite/pull/8597)
+* Support renaming attributes in [#8544](https://github.com/appwrite/appwrite/pull/8544)
+* Add VCS vars to deployments & executions in [#8631](https://github.com/appwrite/appwrite/pull/8631)
+* Function storage metrics in [#8668](https://github.com/appwrite/appwrite/pull/8668)
+* External messaging usage count in [#8672](https://github.com/appwrite/appwrite/pull/8672)
+
+### Fixes
+
+* Fix execution duration in [#8357](https://github.com/appwrite/appwrite/pull/8357)
+* Fix file size calculations in [#8432](https://github.com/appwrite/appwrite/pull/8432)
+* Fix disabled function logging in [#8398](https://github.com/appwrite/appwrite/pull/8398)
+* Fix function redeployments in [#8434](https://github.com/appwrite/appwrite/pull/8434)
+* Add value to variables template in [#8483](https://github.com/appwrite/appwrite/pull/8483)
+* Fix build size limits in [#8396](https://github.com/appwrite/appwrite/pull/8396)
+* Fix deployment method name in [#8490](https://github.com/appwrite/appwrite/pull/8490)
+* Fix function disconnecting from git in [#8500](https://github.com/appwrite/appwrite/pull/8500)
+* Increase buckets metadata in [#8452](https://github.com/appwrite/appwrite/pull/8452)
+* Fix deploy from git with space in [#8517](https://github.com/appwrite/appwrite/pull/8517)
+* Fix missing build logs in [#8484](https://github.com/appwrite/appwrite/pull/8484)
+* Delete team memberships synchronously in [#8217](https://github.com/appwrite/appwrite/pull/8217)
+* Fix Anyof validator in specs in [#8543](https://github.com/appwrite/appwrite/pull/8543)
+* Fix missing function variables in [#8554](https://github.com/appwrite/appwrite/pull/8554)
+* Fix deadlock in [#8609](https://github.com/appwrite/appwrite/pull/8609)
+* Fix domain execution stats in [#8608](https://github.com/appwrite/appwrite/pull/8608)
+* Update console redirect to include query params in [#8619](https://github.com/appwrite/appwrite/pull/8619)
+* Update abuse-key for mfa challenge endpoints in [#8649](https://github.com/appwrite/appwrite/pull/8649)
+* Fix cross-project scheduler stability in [#8641](https://github.com/appwrite/appwrite/pull/8641)
+* Fix vcs deployment size in [#8640](https://github.com/appwrite/appwrite/pull/8640)
+* Fix logging behaviour for Functions in [#8627](https://github.com/appwrite/appwrite/pull/8627)
+* Add retention env vars to deletes worker in [#8662](https://github.com/appwrite/appwrite/pull/8662)
+* Fix scheduled executions data in [#8639](https://github.com/appwrite/appwrite/pull/8639)
+
+### Miscellaneous
+
+* Sync 1.6.x with main in [#8163](https://github.com/appwrite/appwrite/pull/8163)
+* Remove build ID from rebuild deployment endpoint in [#8214](https://github.com/appwrite/appwrite/pull/8214)
+* 1.6.x specs in [#8304](https://github.com/appwrite/appwrite/pull/8304)
+* Sync with main in [#8295](https://github.com/appwrite/appwrite/pull/8295)
+* Fix 1.6.x failing tests in [#8333](https://github.com/appwrite/appwrite/pull/8333)
+* Ensure CI/CD works in [#8350](https://github.com/appwrite/appwrite/pull/8350)
+* Update specs in [#8356](https://github.com/appwrite/appwrite/pull/8356)
+* Sync main to 1.6.x in [#8430](https://github.com/appwrite/appwrite/pull/8430)
+* Add scheduledAt in execution response model in [#8425](https://github.com/appwrite/appwrite/pull/8425)
+* Move functions marketplace to appwrite in [#8427](https://github.com/appwrite/appwrite/pull/8427)
+* Refactor deployment check in function tests in [#8444](https://github.com/appwrite/appwrite/pull/8444)
+* Add ci/cd benchmark in [#8414](https://github.com/appwrite/appwrite/pull/8414)
+* Upgrade SDK version in [#8465](https://github.com/appwrite/appwrite/pull/8465)
+* Improve session alert in [#8399](https://github.com/appwrite/appwrite/pull/8399)
+* Address review comments in [#8422](https://github.com/appwrite/appwrite/pull/8422)
+* Add scopes to function template in [#8496](https://github.com/appwrite/appwrite/pull/8496)
+* Update benchmark comment in [#8507](https://github.com/appwrite/appwrite/pull/8507)
+* Add key to runtime model in [#8503](https://github.com/appwrite/appwrite/pull/8503)
+* Upgrade logger in [#8497](https://github.com/appwrite/appwrite/pull/8497)
+* Change default email addresses in [#8466](https://github.com/appwrite/appwrite/pull/8466)
+* Improve scheduled executions in [#8412](https://github.com/appwrite/appwrite/pull/8412)
+* Sync 1.5.x into main in [#8509](https://github.com/appwrite/appwrite/pull/8509)
+* Sync 1.6 with main in [#8529](https://github.com/appwrite/appwrite/pull/8529)
+* Fix templates CORS in [#8528](https://github.com/appwrite/appwrite/pull/8528)
+* Update size to specification for variable runtimes in [#8537](https://github.com/appwrite/appwrite/pull/8537)
+* Add boundary to multipart header in [#8539](https://github.com/appwrite/appwrite/pull/8539)
+* Support manual templates in [#8527](https://github.com/appwrite/appwrite/pull/8527)
+* Reorder runtimes in [#8540](https://github.com/appwrite/appwrite/pull/8540)
+* Fix 1.6 bugs in [#8358](https://github.com/appwrite/appwrite/pull/8358)
+* Add seconds precision to scheduledAt in [#8546](https://github.com/appwrite/appwrite/pull/8546)
+* Update docker base image in [#8485](https://github.com/appwrite/appwrite/pull/8485)
+* Update create execution return type in [#8542](https://github.com/appwrite/appwrite/pull/8542)
+* Default fallback to  for templateBranch in [#8547](https://github.com/appwrite/appwrite/pull/8547)
+* Fix env vars functions test in [#8555](https://github.com/appwrite/appwrite/pull/8555)
+* Fix session alerts in [#8550](https://github.com/appwrite/appwrite/pull/8550)
+* Add runtime controls in [#8384](https://github.com/appwrite/appwrite/pull/8384)
+* Revert request type to json in create execution in [#8563](https://github.com/appwrite/appwrite/pull/8563)
+* Sync 1.6.x Filters and Migrations with latest in [#8553](https://github.com/appwrite/appwrite/pull/8553)
+* Update sdks in [#8551](https://github.com/appwrite/appwrite/pull/8551)
+* Update Docs in [#8567](https://github.com/appwrite/appwrite/pull/8567)
+* Headers validator benchmark in [#8561](https://github.com/appwrite/appwrite/pull/8561)
+* Fix go version in [#8571](https://github.com/appwrite/appwrite/pull/8571)
+* Update dependencies in [#8574](https://github.com/appwrite/appwrite/pull/8574)
+* Upgrade console in [#8575](https://github.com/appwrite/appwrite/pull/8575)
+* 1.6.x logging test in [#8580](https://github.com/appwrite/appwrite/pull/8580)
+* Bump console sdk in [#8581](https://github.com/appwrite/appwrite/pull/8581)
+* Update sdks in [#8582](https://github.com/appwrite/appwrite/pull/8582)
+* Add changelogs for dart and flutter in [#8587](https://github.com/appwrite/appwrite/pull/8587)
+* Add payload validator in [#8594](https://github.com/appwrite/appwrite/pull/8594)
+* Update geodb in [#8615](https://github.com/appwrite/appwrite/pull/8615)
+* Update createdeployment methodtype to upload in [#8616](https://github.com/appwrite/appwrite/pull/8616)
+* Remove tenant in document filter in [#8624](https://github.com/appwrite/appwrite/pull/8624)
+* Improve mail datetime format in [#8628](https://github.com/appwrite/appwrite/pull/8628)
+* Fix router function execution logging in [#8625](https://github.com/appwrite/appwrite/pull/8625)
+* Add Functions templates async test in [#8622](https://github.com/appwrite/appwrite/pull/8622)
+* Update console in [#8629](https://github.com/appwrite/appwrite/pull/8629)
+* 1.6.1 in [#8630](https://github.com/appwrite/appwrite/pull/8630)
+* Update version in [#8646](https://github.com/appwrite/appwrite/pull/8646)
+* Phone auth metric rename in [#8648](https://github.com/appwrite/appwrite/pull/8648)
+* Pretty print specs in [#8643](https://github.com/appwrite/appwrite/pull/8643)
+* Fix messaging metrics in [#8674](https://github.com/appwrite/appwrite/pull/8674)
+* Bump console to 5.0.6 in [#8585](https://github.com/appwrite/appwrite/pull/8585)
+
+# Version 1.5.10
+
+## What's Changed
+
+### Notable changes
+
+* Bump console to version 4.3.30 in [#8520](https://github.com/appwrite/appwrite/pull/8520)
+
+### Fixes
+
+* Fix migration stuck at "Starting Data Migration [...]" in [#8519](https://github.com/appwrite/appwrite/pull/8519)
+
+# Version 1.5.9
+
+## What's Changed
+
+### Notable changes
+
+* Add Darija (Moroccan Arabic) translation file in [7501](https://github.com/appwrite/appwrite/pull/7501)
+* Bump console to version 4.3.29 in [8504](https://github.com/appwrite/appwrite/pull/8504)
+
+### Fixes
+
+* Fix domain check in [8472](https://github.com/appwrite/appwrite/pull/8472)
+* Fix "API must be called in the coroutine" in [8495](https://github.com/appwrite/appwrite/pull/8495)
+* Bump executor version from 0.5.5 to 0.5.7 in [8502](https://github.com/appwrite/appwrite/pull/8502)
+
+### Miscellaneous
+* Add profiler for debugging in [8397](https://github.com/appwrite/appwrite/pull/8397)
+* Document APIs that don't support redirects in [8233](https://github.com/appwrite/appwrite/pull/8233)
+
+# Version 1.5.8
+
+## What's Changed
+
+### Notable changes
+
+* Support Twilio messaging service SID in [8222](https://github.com/appwrite/appwrite/pull/8222)
+* Improve cache performance in [8230](https://github.com/appwrite/appwrite/pull/8230)
+* Add hk in translations in [8179](https://github.com/appwrite/appwrite/pull/8179)
+* Update pwd abuse in [8255](https://github.com/appwrite/appwrite/pull/8255)
+* Remove detailed trace in [8374](https://github.com/appwrite/appwrite/pull/8374)
+* Remove relationship attributes from realtime event payloads in [8381](https://github.com/appwrite/appwrite/pull/8381)
+* Sanitize URLs in emails in [8415](https://github.com/appwrite/appwrite/pull/8415)
+* Bump console to version 4.3.27 in [8482](https://github.com/appwrite/appwrite/pull/8482)
+
+### Fixes
+
+* Ensure usage is counted for errors in [8120](https://github.com/appwrite/appwrite/pull/8120)
+* Fix MFA for OAuth2 only accounts in [8245](https://github.com/appwrite/appwrite/pull/8245)
+* Delete Expired Targets Per Project in [8239](https://github.com/appwrite/appwrite/pull/8239)
+* Don't set the target field if the existing target document is false in [8236](https://github.com/appwrite/appwrite/pull/8236)
+* Disable validation for project DBs during migration in [8298](https://github.com/appwrite/appwrite/pull/8298)
+* Add `default` to Collection Attributes in Migration in [8271](https://github.com/appwrite/appwrite/pull/8271)
+* Fix Create bucket endpoint validator for maximum file size in [8275](https://github.com/appwrite/appwrite/pull/8275)
+* Disable validation for subquery to prevent error in [8297](https://github.com/appwrite/appwrite/pull/8297)
+* Fix 'Missing required attribute "expire"' on `users.createSession()` in [8308](https://github.com/appwrite/appwrite/pull/8308)
+* Fix certificate emails in [8292](https://github.com/appwrite/appwrite/pull/8292)
+* Fix browser-cached deleted file in [8264](https://github.com/appwrite/appwrite/pull/8264)
+* Fix migration of firebase users [8377](https://github.com/appwrite/appwrite/pull/8377)
+* Fix `path` for vcs function deployments in [8408](https://github.com/appwrite/appwrite/pull/8408)
+* Fix calculations in [8431](https://github.com/appwrite/appwrite/pull/8431)
+* Fix bugs with migrations in [8442](https://github.com/appwrite/appwrite/pull/8442)
+* Fix queueForUsage not triggering for domain executions in [8463](https://github.com/appwrite/appwrite/pull/8463)
+* Fix realtime permission change in [8416](https://github.com/appwrite/appwrite/pull/8416)
+
+### Miscellaneous
+
+* Bump base image from 0.9.0 to 0.9.1 in [8238](https://github.com/appwrite/appwrite/pull/8238)
+* Use latest Platform and add Core module in [7936](https://github.com/appwrite/appwrite/pull/7936)
+* Add Test to Validate Headers aren't Overridden in [8228](https://github.com/appwrite/appwrite/pull/8228)
+* Fix hyperlink in storage docs in [8269](https://github.com/appwrite/appwrite/pull/8269)
+* Update cache & database in [8285](https://github.com/appwrite/appwrite/pull/8285)
+* Fix flaky certificate test in [8316](https://github.com/appwrite/appwrite/pull/8316)
+* Fix flaky function test in [8317](https://github.com/appwrite/appwrite/pull/8317)
+* Update account API reference in [8305](https://github.com/appwrite/appwrite/pull/8305)
+* Update functions API reference in [8346](https://github.com/appwrite/appwrite/pull/8346)
+* Implement deploymentsStorage metric for projects API in [8258](https://github.com/appwrite/appwrite/pull/8258)
+* Add new audit events in [8424](https://github.com/appwrite/appwrite/pull/8424)
+* Move mbSeconds into 1.5.x in [8449](https://github.com/appwrite/appwrite/pull/8449)
+* Clean projects cache while migrating in [8395](https://github.com/appwrite/appwrite/pull/8395)
+* Use git tags for function template in [8445](https://github.com/appwrite/appwrite/pull/8445)
+
 # Version 1.5.7
 ## What's Changed

@@ -497,6 +497,18 @@ If you are in PHP Storm you don't need any plugin. Below are the settings requir
 2. If needed edit the **dev/xdebug.ini** file to your needs.
 3. Launch your Appwrite instance while your debugger is listening for connections.

+## Profiling
+Appwrite uses XDebug [Profiler](https://xdebug.org/docs/profiler) for generating **CacheGrind** files. The generated file would be located in each of the `appwrite` containers inside the `/tmp/xdebug` folder.
+
+To disable the profiler while debugging remove the `,profiler` mode from the `xdebug.ini` file
+```diff
+zend_extension=xdebug
+
+[xdebug]
+-xdebug.mode=develop,debug,profile
+xdebug.mode=develop,debug
+```
+
 ### VS Code Launch Configuration

 ```json
@@ -541,6 +553,12 @@ To run end-2-end tests for a specific service use:
 docker compose exec appwrite test /usr/src/code/tests/e2e/Services/[ServiceName]
 ```

+To run one specific test:
+
+```bash
+docker compose exec appwrite vendor/bin/phpunit --filter [FunctionName]
+```
+
 ## Benchmarking

 You can use WRK Docker image to benchmark the server performance. Benchmarking is extremely useful when you want to compare how the server behaves before and after a change has been applied. Replace [APPWRITE_HOSTNAME_OR_IP] with your Appwrite server hostname or IP. Note that localhost is not accessible from inside the WRK container.
@@ -1,4 +1,4 @@
-FROM composer:2.0 as composer
+FROM composer:2.0 AS composer

 ARG TESTING=false
 ENV TESTING=$TESTING
@@ -12,24 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
    --no-plugins --no-scripts --prefer-dist \
    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

-FROM --platform=$BUILDPLATFORM node:20.11.0-alpine3.19 as node
-
-COPY app/console /usr/local/src/console
-
-WORKDIR /usr/local/src/console
-
-ARG VITE_GA_PROJECT
-ARG VITE_CONSOLE_MODE
-ARG VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
-
-ENV VITE_GA_PROJECT=$VITE_GA_PROJECT
-ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE
-ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
-
-RUN npm ci
-RUN npm run build
-
-FROM appwrite/base:0.9.1 as final
+FROM appwrite/base:0.9.3 AS final

 LABEL maintainer="team@appwrite.io"

@@ -48,7 +31,6 @@ RUN \
 WORKDIR /usr/src/code

 COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
-COPY --from=node /usr/local/src/console/build /usr/src/code/console

 # Add Source Code
 COPY ./app /usr/src/code/app
@@ -109,9 +91,10 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/

 # Enable Extensions
 RUN if [ "$DEBUG" == "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
+RUN if [ "$DEBUG" == "true" ]; then mkdir -p /tmp/xdebug; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so; fi

 EXPOSE 80

-CMD [ "php", "app/http.php" ]
+CMD [ "php", "app/http.php" ]
@@ -67,7 +67,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.5.7
+    appwrite/appwrite:1.6.0
 ```

 ### Windows
@@ -79,7 +79,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.5.7
+    appwrite/appwrite:1.6.0
 ```

 #### PowerShell
@@ -89,7 +89,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.5.7
+    appwrite/appwrite:1.6.0
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -1,4 +1,4 @@
-> Our Appwrite Init event has concluded. You can check out all the new and upcoming features [on our Init website](https://appwrite.io/init) 🚀
+> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) 🚀

 <br />
 <p align="center">
@@ -75,7 +75,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.5.7
+    appwrite/appwrite:1.6.0
 ```

 ### Windows
@@ -87,7 +87,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.5.7
+    appwrite/appwrite:1.6.0
 ```

 #### PowerShell
@@ -97,7 +97,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.5.7
+    appwrite/appwrite:1.6.0
 ```

 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.
@@ -134,6 +134,12 @@ Choose from one of the providers below:
          <br /><sub><b>Akamai Compute</b></sub></a>    
      </a>
    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://aws.amazon.com/marketplace/pp/prodview-2hiaeo2px4md6">
+        <img width="50" height="39" src="public/images/integrations/aws-logo.svg" alt="AWS Logo" />
+          <br /><sub><b>AWS Marketplace</b></sub></a>    
+      </a>
+    </td>
  </tr>
 </table>

@@ -1,211 +1,136 @@
 <?php

 require_once __DIR__ . '/init.php';
-require_once __DIR__ . '/controllers/general.php';

 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Func;
 use Appwrite\Platform\Appwrite;
-use Utopia\Cache\Adapter\Sharding;
-use Utopia\Cache\Cache;
-use Utopia\CLI\CLI;
+use Appwrite\Runtimes\Runtimes;
+use Swoole\Runtime;
+use Utopia\CLI\Adapters\Swoole as SwooleCLI;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DSN\DSN;
+use Utopia\DI\Dependency;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
-use Utopia\Pools\Group;
 use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\System\System;

-Authorization::disable();
+global $registry, $container;

-CLI::setResource('register', fn () => $register);
+Runtime::enableCoroutine(SWOOLE_HOOK_ALL);

-CLI::setResource('cache', function ($pools) {
-    $list = Config::getParam('pools-cache', []);
-    $adapters = [];
+// overwriting runtimes to be architectur agnostic for CLI
+Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));

-    foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource()
-        ;
-    }
+// require controllers after overwriting runtimes
+require_once __DIR__ . '/controllers/general.php';

-    return new Cache(new Sharding($adapters));
-}, ['pools']);
+/**
+ * @var Registry $registry
+ * @var Container $container
+ */
+$context = new Dependency();
+$register = new Dependency();
+$logError = new Dependency();
+$queueForDeletes = new Dependency();
+$queueForFunctions = new Dependency();
+$queueForCertificates = new Dependency();

-CLI::setResource('pools', function (Registry $register) {
-    return $register->get('pools');
-}, ['register']);
+$context
+    ->setName('context')
+    ->setCallback(fn () => $container);

-CLI::setResource('dbForConsole', function ($pools, $cache) {
-    $sleep = 3;
-    $maxAttempts = 5;
-    $attempts = 0;
-    $ready = false;
+$register
+    ->setName('register')
+    ->setCallback(function () use (&$registry): Registry {
+        return $registry;
+    });

-    do {
-        $attempts++;
-        try {
-            // Prepare database connection
-            $dbAdapter = $pools
-                ->get('console')
-                ->pop()
-                ->getResource();
+$queueForFunctions
+    ->setName('queueForFunctions')
+    ->inject('queue')
+    ->setCallback(function (Connection $queue) {
+        return new Func($queue);
+    });

-            $dbForConsole = new Database($dbAdapter, $cache);

-            $dbForConsole
-                ->setNamespace('_console')
-                ->setMetadata('host', \gethostname())
-                ->setMetadata('project', 'console');
+$queueForDeletes
+    ->setName('queueForDeletes')
+    ->inject('queue')
+    ->setCallback(function (Connection $queue) {
+        return new Delete($queue);
+    });

-            // Ensure tables exist
-            $collections = Config::getParam('collections', [])['console'];
-            $last = \array_key_last($collections);
+$queueForCertificates
+    ->setName('queueForCertificates')
+    ->inject('queue')
+    ->setCallback(function (Connection $queue) {
+        return new Certificate($queue);
+    });

-            if (!($dbForConsole->exists($dbForConsole->getDatabase(), $last))) { /** TODO cache ready variable using registry */
-                throw new Exception('Tables not ready yet.');
+$logError
+    ->setName('logError')
+    ->inject('register')
+    ->setCallback(function (Registry $register) {
+        return function (Throwable $error, string $namespace, string $action) use ($register) {
+            $logger = $register->get('logger');
+
+            if ($logger) {
+                $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+
+                $log = new Log();
+                $log->setNamespace($namespace);
+                $log->setServer(\gethostname());
+                $log->setVersion($version);
+                $log->setType(Log::TYPE_ERROR);
+                $log->setMessage($error->getMessage());
+
+                $log->addTag('code', $error->getCode());
+                $log->addTag('verboseType', get_class($error));
+
+                $log->addExtra('file', $error->getFile());
+                $log->addExtra('line', $error->getLine());
+                $log->addExtra('trace', $error->getTraceAsString());
+                $log->addExtra('trace', $error->getTraceAsString());
+
+                $log->setAction($action);
+
+                $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+
+                $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+                $responseCode = $logger->addLog($log);
+                Console::info('Usage stats log pushed with status code: ' . $responseCode);
            }

-            $ready = true;
-        } catch (\Throwable $err) {
-            Console::warning($err->getMessage());
-            $pools->get('console')->reclaim();
-            sleep($sleep);
-        }
-    } while ($attempts < $maxAttempts && !$ready);
+            Console::warning("Failed: {$error->getMessage()}");
+            Console::warning($error->getTraceAsString());
+        };
+    });

-    if (!$ready) {
-        throw new Exception("Console is not ready yet. Please try again later.");
-    }
-
-    return $dbForConsole;
-}, ['pools', 'cache']);
-
-CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
-    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
-
-    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForConsole;
-        }
-
-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
-
-        if (isset($databases[$dsn->getHost()])) {
-            $database = $databases[$dsn->getHost()];
-
-            if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
-
-            return $database;
-        }
-
-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($dbAdapter, $cache);
-
-        $databases[$dsn->getHost()] = $database;
-
-        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
-            $database
-                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
-        }
-
-        $database
-            ->setMetadata('host', \gethostname())
-            ->setMetadata('project', $project->getId());
-
-        return $database;
-    };
-}, ['pools', 'dbForConsole', 'cache']);
-
-CLI::setResource('queue', function (Group $pools) {
-    return $pools->get('queue')->pop()->getResource();
-}, ['pools']);
-CLI::setResource('queueForFunctions', function (Connection $queue) {
-    return new Func($queue);
-}, ['queue']);
-CLI::setResource('queueForDeletes', function (Connection $queue) {
-    return new Delete($queue);
-}, ['queue']);
-CLI::setResource('queueForCertificates', function (Connection $queue) {
-    return new Certificate($queue);
-}, ['queue']);
-CLI::setResource('logError', function (Registry $register) {
-    return function (Throwable $error, string $namespace, string $action) use ($register) {
-        $logger = $register->get('logger');
-
-        if ($logger) {
-            $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
-
-            $log = new Log();
-            $log->setNamespace($namespace);
-            $log->setServer(\gethostname());
-            $log->setVersion($version);
-            $log->setType(Log::TYPE_ERROR);
-            $log->setMessage($error->getMessage());
-
-            $log->addTag('code', $error->getCode());
-            $log->addTag('verboseType', get_class($error));
-
-            $log->addExtra('file', $error->getFile());
-            $log->addExtra('line', $error->getLine());
-            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());
-
-            $log->setAction($action);
-
-            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
-            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-            $responseCode = $logger->addLog($log);
-            Console::info('Usage stats log pushed with status code: ' . $responseCode);
-        }
-
-        Console::warning("Failed: {$error->getMessage()}");
-        Console::warning($error->getTraceAsString());
-    };
-}, ['register']);
+$container->set($context);
+$container->set($logError);
+$container->set($register);
+$container->set($queueForDeletes);
+$container->set($queueForFunctions);
+$container->set($queueForCertificates);

 $platform = new Appwrite();
-$platform->init(Service::TYPE_TASK);
+$platform->init(Service::TYPE_TASK, ['adapter' => new SwooleCLI(1)]);

 $cli = $platform->getCli();

+$cli
+    ->init()
+    ->inject('authorization')
+    ->action(function (Authorization $authorization) {
+        $authorization->disable();
+    });
+
 $cli
    ->error()
    ->inject('error')
@@ -213,4 +138,6 @@ $cli
        Console::error($error->getMessage());
    });

-$cli->run();
+$cli
+    ->setContainer($container)
+    ->run();
@@ -3055,14 +3055,25 @@ $projectCollections = array_merge([
                'default' => null,
                'filters' => [],
            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('specification'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => false,
+                'required' => false,
+                'default' => APP_FUNCTION_SPECIFICATION_DEFAULT,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('scopes'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
                'signed' => true,
-                'required' => true,
-                'default' => null,
+                'required' => false,
+                'default' => [],
                'array' => true,
                'filters' => [],
            ],
@@ -3848,6 +3859,39 @@ $projectCollections = array_merge([
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('scheduledAt'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
+            [
+                '$id' => ID::custom('scheduleInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('scheduleId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
        ],
        'indexes' => [
            [
@@ -4343,6 +4387,17 @@ $consoleCollections = array_merge([
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => 'accessedAt',
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
            [
                '$id' => ID::custom('services'),
                'type' => Database::VAR_STRING,
@@ -4633,7 +4688,7 @@ $consoleCollections = array_merge([
                '$id' => ID::custom('type'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 16,
+                'size' => Database::LENGTH_KEY,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -5728,7 +5783,7 @@ $bucketCollections = [
                '$id' => ID::custom('metadata'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 16384, // https://tools.ietf.org/html/rfc4288#section-4.2
+                'size' => 75000, // https://tools.ietf.org/html/rfc4288#section-4.2
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -529,6 +529,11 @@ return [
        'description' => 'Synchronous function execution timed out. Use asynchronous execution instead, or ensure the execution duration doesn\'t exceed 30 seconds.',
        'code' => 408,
    ],
+    Exception::FUNCTION_TEMPLATE_NOT_FOUND => [
+        'name' => Exception::FUNCTION_TEMPLATE_NOT_FOUND,
+        'description' => 'Function Template with the requested ID could not be found.',
+        'code' => 404,
+    ],

    /** Builds  */
    Exception::BUILD_NOT_FOUND => [
@@ -694,6 +699,11 @@ return [
        'description' => 'The relationship value is invalid.',
        'code' => 400,
    ],
+    Exception::ATTRIBUTE_INVALID_RESIZE => [
+        'name' => Exception::ATTRIBUTE_INVALID_RESIZE,
+        'description' => "Existing data is too large for new size, truncate your existing data then try again.",
+        'code' => 400,
+    ],

    /** Indexes */
    Exception::INDEX_NOT_FOUND => [
@@ -6,7 +6,9 @@ return [
        'magicSession',
        'recovery',
        'invitation',
-        'mfaChallenge'
+        'mfaChallenge',
+        'sessionAlert',
+        'otpSession'
    ],
    'sms' => [
        'verification',
@@ -4,7 +4,9 @@
 <table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
    <tr>
        <td align="center" style="border-radius: 8px; background-color: #ffffff;">
-            <p style="text-align: start; font-size: 14px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 32px; border: 1px solid #EDEDF0; display: inline-block; word-break: break-word;">{{error}}</p>
+            <p style="text-align: start; font-size: 14px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 32px; border: 1px solid #EDEDF0; display: inline-block; word-break: break-word;">
+                {{error}}
+            </p>
        </td>
    </tr>
 </table>
@@ -11,4 +11,4 @@
 <p>{{footer}}</p>

 <p style="margin-bottom: 0px;">{{thanks}}</p>
-<p style="margin-top: 0px;">{{signature}}</p>
+<p style="margin-top: 0px;">{{signature}}</p>
@@ -0,0 +1,238 @@
+{
+    "settings.inspire": "\"الفن ديال الحكمة هو الفن ديال أنك تعرف أش تنخّل.\"",
+    "settings.locale": "ar-ma",
+    "settings.direction": "rtl",
+    "emails.sender": "فرقة %s",
+    "emails.verification.subject": "التيْقان ديال الحساب",
+    "emails.verification.hello": "السلام {{user}}",
+    "emails.verification.body": "تبّع هاد الوصلة باش تيقّن لادريسة تاع ليميل ديالك.",
+    "emails.verification.footer": "إلا ماشي نتا اللي طلبتي تيقّن هاد لادريسة تاع ليميل، ممكن تنخّل هاد البرية.",
+    "emails.verification.thanks": "شكرا",
+    "emails.verification.signature": "فرقة {{project}}",
+    "emails.magicSession.subject": "تكونيكطا",
+    "emails.magicSession.hello": "السلام,",
+    "emails.magicSession.body": "تبّع هاد الوصلة باش تتكونيكطا.",
+    "emails.magicSession.footer": "إلا ماشي نتا اللي طلبتي تتكونيكطا بهاد ليميل، ممكن تنخّل هاد البرية.",
+    "emails.magicSession.thanks": "شكرا",
+    "emails.magicSession.signature": "فرقة {{project}}",
+    "emails.recovery.subject": "تبدال كلمة السر",
+    "emails.recovery.hello": "السلام {{user}}",
+    "emails.recovery.body": "تبّع هاد الوصلة باش تبدّل كلمة السر تاع {{project}}.",
+    "emails.recovery.footer": "إلا ماشي نتا اللي طلبتي تبدّل كلمة السر، ممكن تنخّل هاد البرية.",
+    "emails.recovery.thanks": "شكرا",
+    "emails.recovery.signature": "فرقة {{project}}",
+    "emails.invitation.subject": "عراضة ل فرقة %s ف %s",
+    "emails.invitation.hello": "السلام",
+    "emails.invitation.body": "هاد البرية تصيفطات ليك حيت {{owner}} بغى يعرض عليك تولّي عضو ف فرقة {{team}} عند {{project}}.",
+    "emails.invitation.footer": "إلا كنتي ما مسوّقش, ممكن تنخّل هاد البرية.",
+    "emails.invitation.thanks": "شكرا",
+    "emails.invitation.signature": "فرقة {{project}}",
+    "emails.certificate.subject": "السرتافيكة فشلات ل %s",
+    "emails.certificate.hello": "السلام",
+    "emails.certificate.body": "السرتافيكة ديال الضومين ديالك '{{domain}}' ما قدّاتش تجينيرا. هادي هي المحاولة نمرة {{attempt}}, السبب ديال هاد الفشل هو: {{error}}",
+    "emails.certificate.footer": "السرتافيكة الفايتة ديالك غاتبقى مزيانة لمدة  30 يوم من عند أول فشل. كانشجعوك بزاف أنك تبقشش فهاد الموضوع, وا إلّا الضومين ديالك ما غايبقاش خدّام فيه الـ SSL.",
+    "emails.certificate.thanks": "شكرا",
+    "emails.certificate.signature": "فرقة {{project}}",
+    "locale.country.unknown": "ما معروفش",
+    "countries.af": "أفغانستان",
+    "countries.ao": "أنڭولا",
+    "countries.al": "ألبانيا",
+    "countries.ad": "أندورا",
+    "countries.ae": "الإمارات العربية المتّاحدة",
+    "countries.ar": "الأرجنتين",
+    "countries.am": "أرمينيا",
+    "countries.ag": "أنتيڭوا وبربودا",
+    "countries.au": "ؤسطراليا",
+    "countries.at": "النامسا",
+    "countries.az": "أديربيجان",
+    "countries.bi": "بوروندي",
+    "countries.be": "بلجيكا",
+    "countries.bj": "بينين",
+    "countries.bf": "بوركينا فاصو",
+    "countries.bd": "بنڭلاديش",
+    "countries.bg": "بلڭاريا",
+    "countries.bh": "البحرين",
+    "countries.bs": "دزيرات البهاما",
+    "countries.ba": "البوسنة ؤ الهرسك",
+    "countries.by": "بيلاروسيا",
+    "countries.bz": "بيليز",
+    "countries.bo": "بوليڤيا",
+    "countries.br": "البرازيل",
+    "countries.bb": "باربادوس",
+    "countries.bn": "بروناي",
+    "countries.bt": "بوتان",
+    "countries.bw": "بوتسوانا",
+    "countries.cf": "جمهورية إفريقيا الوسطانية",
+    "countries.ca": "كانادا",
+    "countries.ch": "سويسرا",
+    "countries.cl": "تشيلي",
+    "countries.cn": "الشينوا",
+    "countries.ci": "ساحل العاج",
+    "countries.cm": "الكاميرون",
+    "countries.cd": "جمهورية الكونڭو الديمقراطية",
+    "countries.cg": "جمهورية الكونڭو",
+    "countries.co": "كولومبيا",
+    "countries.km": "دزيرات القومور",
+    "countries.cv": "الراس الخضر",
+    "countries.cr": "كوسطاريكا",
+    "countries.cu": "كوبا",
+    "countries.cy": "قوبروص",
+    "countries.cz": "التشيك",
+    "countries.de": "ألمانيا",
+    "countries.dj": "دجيبوتي",
+    "countries.dm": "ضومينيكا",
+    "countries.dk": "الدنمارك",
+    "countries.do": "جمهورية الضومينيكان",
+    "countries.dz": "الدزاير",
+    "countries.ec": "إكوادور",
+    "countries.eg": "مصر",
+    "countries.er": "إريتريا",
+    "countries.es": "سبانيا",
+    "countries.ee": "إسطونيا",
+    "countries.et": "إتيوپيا",
+    "countries.fi": "فينلاندا",
+    "countries.fj": "فيدجي",
+    "countries.fr": "فرانسا",
+    "countries.fm": "ميكرونيزيا",
+    "countries.ga": "الڭابون",
+    "countries.gb": "المملكة المتّاحدة",
+    "countries.ge": "تجورجيا",
+    "countries.gh": "غانا",
+    "countries.gn": "غينيا",
+    "countries.gm": "ڭامبيا",
+    "countries.gw": "غينيا بيساو",
+    "countries.gq": "غينيا الستوائية",
+    "countries.gr": "اليونان",
+    "countries.gd": "ڭرينادا",
+    "countries.gt": "ڭواتيمالا",
+    "countries.gy": "ڭيانا",
+    "countries.hn": "هوندوراس",
+    "countries.hr": "كرواتيا",
+    "countries.ht": "هايتي",
+    "countries.hu": "الماجر",
+    "countries.id": "إندونيسيا",
+    "countries.in": "الهند",
+    "countries.ie": "إرلاندا",
+    "countries.ir": "إران",
+    "countries.iq": "العراق",
+    "countries.is": "إسلاندا",
+    "countries.il": "إسرائيل",
+    "countries.it": "الطاليان",
+    "countries.jm": "جامايكا",
+    "countries.jo": "الأردن",
+    "countries.jp": "الجاپون",
+    "countries.kz": "كازاخستان",
+    "countries.ke": "كينيا",
+    "countries.kg": "قيرغيزستان",
+    "countries.kh": "كمبوديا",
+    "countries.ki": "كيريباتي",
+    "countries.kn": "سانت كيتس ؤ نيفيس",
+    "countries.kr": "كوريا الجنوبية",
+    "countries.kw": "الكويت",
+    "countries.la": "لاوس",
+    "countries.lb": "لبنان",
+    "countries.lr": "ليبيريا",
+    "countries.ly": "ليبيا",
+    "countries.lc": "سانت لوسيا",
+    "countries.li": "ليختنشتاين",
+    "countries.lk": "سري لانكا",
+    "countries.ls": "ليسوتو",
+    "countries.lt": "ليتوانيا",
+    "countries.lu": "لوكسمبورڭ",
+    "countries.lv": "لاتفيا",
+    "countries.ma": "المغريب",
+    "countries.mc": "موناكو",
+    "countries.md": "مولضوڤا",
+    "countries.mg": "ماداغشقار",
+    "countries.mv": "دزيرات المالديڤ",
+    "countries.mx": "الميكسيك",
+    "countries.mh": "دزيرات مارشال",
+    "countries.mk": "مقدونيا",
+    "countries.ml": "مالي",
+    "countries.mt": "مالطا",
+    "countries.mm": "ميانمار",
+    "countries.me": "مونطينيڭرو",
+    "countries.mn": "منغوليا",
+    "countries.mz": "الموزمبيق",
+    "countries.mr": "موريتانيا",
+    "countries.mu": "موريشيوس",
+    "countries.mw": "مالاوي",
+    "countries.my": "ماليزيا",
+    "countries.na": "ناميبيا",
+    "countries.ne": "النيجر",
+    "countries.ng": "نيجيريا",
+    "countries.ni": "نيكاراڭوا",
+    "countries.nl": "هولاندا",
+    "countries.no": "النرويج",
+    "countries.np": "نيپال",
+    "countries.nr": "ناورو",
+    "countries.nz": "نيوزيلاندا",
+    "countries.om": "عمّان",
+    "countries.pk": "پاكيستان",
+    "countries.pa": "پاناما",
+    "countries.pe": "الپيرو",
+    "countries.ph": "الفيليپين",
+    "countries.pw": "پالاو",
+    "countries.pg": "پاپوا غينيا الجديدة",
+    "countries.pl": "پولاندا",
+    "countries.kp": "كوريا الشمالية",
+    "countries.pt": "البرطقيز",
+    "countries.py": "الپاراڭواي",
+    "countries.qa": "قطر",
+    "countries.ro": "رومانيا",
+    "countries.ru": "روسيا",
+    "countries.rw": "روّاندا",
+    "countries.sa": "المملكة العربية السعودية",
+    "countries.sd": "السودان",
+    "countries.sn": "السينيڭال",
+    "countries.sg": "سنغافورة",
+    "countries.sb": "دزيرات سليمان",
+    "countries.sl": "صييراليون",
+    "countries.sv": "السالڤاضور",
+    "countries.sm": "سان مارينو",
+    "countries.so": "الصومال",
+    "countries.rs": "صيربيا",
+    "countries.ss": "جنوب السودان",
+    "countries.st": "صاو طومي ؤ پرينسيپي",
+    "countries.sr": "سورينام",
+    "countries.sk": "صلوڤاكيا",
+    "countries.si": "صلوڤينيا",
+    "countries.se": "السويد",
+    "countries.sz": "سوازيلاند",
+    "countries.sc": "السيشيل",
+    "countries.sy": "سوريا",
+    "countries.td": "تشاد",
+    "countries.tg": "الطوڭو",
+    "countries.th": "الطايلوند",
+    "countries.tj": "طادجيكيستان",
+    "countries.tm": "تركمانيستان",
+    "countries.tl": "تيمور الشرقية",
+    "countries.to": "تونڭا",
+    "countries.tt": "ترينيداد ؤ طوباڭو",
+    "countries.tn": "تونس",
+    "countries.tr": "توركيا",
+    "countries.tv": "توڤالو",
+    "countries.tz": "طنزانيا",
+    "countries.ug": "ؤڭاندا",
+    "countries.ua": "ؤكرانيا",
+    "countries.uy": "ؤروڭواي",
+    "countries.us": "ميريكان",
+    "countries.uz": "ؤزباكيستان",
+    "countries.va": "مدينة الڤاتيكان",
+    "countries.vc": "سانت ڤانسون ؤ دزيرات ڭرينادين",
+    "countries.ve": "ڤينيزويلا",
+    "countries.vn": "ڤيطنام",
+    "countries.vu": "ڤانواتو",
+    "countries.ws": "ساموا",
+    "countries.ye": "اليمن",
+    "countries.za": "جنوب إفريقيا",
+    "countries.zm": "زامبيا",
+    "countries.zw": "زيمبابوي",
+    "continents.af": "أفريقيا",
+    "continents.an": "القارة القطبية الجنوبية",
+    "continents.as": "أسيا",
+    "continents.eu": "ؤروپا",
+    "continents.na": "ميريكان الشمالية",
+    "continents.oc": "ؤقيانوسيا",
+    "continents.sa": "ميريكان الجنوبية"
+}
@@ -18,13 +18,13 @@
    "emails.magicSession.securityPhrase": "Security phrase for this email is {{b}}{{phrase}}{{/b}}. You can trust this email if this phrase matches the phrase shown during sign in.",
    "emails.magicSession.thanks": "Thanks,",
    "emails.magicSession.signature": "{{project}} team",
-    "emails.sessionAlert.subject": "New session alert for {{project}}",
+    "emails.sessionAlert.subject": "Security alert: new session on your {{project}} account",
    "emails.sessionAlert.hello":"Hello {{user}}",
-    "emails.sessionAlert.body": "We're writing to inform you that a new session has been initiated on your {{b}}{{project}}{{/b}} account, on {{b}}{{dateTime}}{{/b}}. \nHere are the details of the new session: ",
+    "emails.sessionAlert.body": "A new session has been created on your {{b}}{{project}}{{/b}} account, {{b}}on {{date}}, {{year}} at {{time}} UTC{{/b}}.\nHere are the details of the new session: ",
    "emails.sessionAlert.listDevice": "Device: {{b}}{{device}}{{/b}}",
    "emails.sessionAlert.listIpAddress": "IP Address: {{b}}{{ipAddress}}{{/b}}",
    "emails.sessionAlert.listCountry": "Country: {{b}}{{country}}{{/b}}",
-    "emails.sessionAlert.footer":  "If you didn't request the sign in, you can safely ignore this email. If you suspect unauthorized activity, please secure your account immediately.",
+    "emails.sessionAlert.footer":  "If this was you, there's nothing more you need to do.\nIf you didn't initiate this session or suspect any unauthorized activity, please secure your account.",
    "emails.sessionAlert.thanks": "Thanks,",
    "emails.sessionAlert.signature": "{{project}} team",
    "emails.otpSession.subject": "OTP for {{project}} Login",
@@ -52,6 +52,12 @@
    "emails.invitation.footer": "If you are not interested, you can ignore this message.",
    "emails.invitation.thanks": "Thanks",
    "emails.invitation.signature": "{{project}} team",
+    "emails.certificate.subject": "Certificate failure for %s",
+    "emails.certificate.hello": "Hello",
+    "emails.certificate.body": "Certificate for your domain '{{domain}}' could not be generated. This is attempt no. {{attempt}}, and the failure was caused by: {{error}}",
+    "emails.certificate.footer": "Your previous certificate will be valid for 30 days since the first failure. We highly recommend investigating this case, otherwise your domain will end up without a valid SSL communication.",
+    "emails.certificate.thanks": "Thanks",
+    "emails.certificate.signature": "{{project}} team",
    "sms.verification.body": "{{secret}}",
    "locale.country.unknown": "Unknown",
    "countries.af": "Afghanistan",
@@ -15,7 +15,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '15.0.0',
+                'version' => '16.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@@ -63,7 +63,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '12.0.4',
+                'version' => '13.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@@ -81,7 +81,7 @@ return [
            [
                'key' => 'apple',
                'name' => 'Apple',
-                'version' => '6.0.0',
+                'version' => '7.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-apple',
                'package' => 'https://github.com/appwrite/sdk-for-apple',
                'enabled' => true,
@@ -116,7 +116,7 @@ return [
            [
                'key' => 'android',
                'name' => 'Android',
-                'version' => '5.1.1',
+                'version' => '6.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-android',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                'enabled' => true,
@@ -138,7 +138,7 @@ return [
            [
                'key' => 'react-native',
                'name' => 'React Native',
-                'version' => '0.4.0',
+                'version' => '0.5.0',
                'url' => 'https://github.com/appwrite/sdk-for-react-native',
                'package' => 'https://npmjs.com/package/react-native-appwrite',
                'enabled' => true,
@@ -203,7 +203,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Console',
-                'version' => '0.6.3',
+                'version' => '1.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-console',
                'package' => '',
                'enabled' => true,
@@ -214,14 +214,14 @@ return [
                'prism' => 'javascript',
                'source' => \realpath(__DIR__ . '/../sdks/console-web'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-console.git',
-                'gitBranch' => 'main',
+                'gitBranch' => 'dev',
                'gitRepoName' => 'sdk-for-console',
                'gitUserName' => 'appwrite',
            ],
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '5.0.5',
+                'version' => '6.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@@ -249,7 +249,7 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '13.0.0',
+                'version' => '14.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@@ -267,7 +267,7 @@ return [
            [
                'key' => 'deno',
                'name' => 'Deno',
-                'version' => '11.0.0',
+                'version' => '12.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-deno',
                'package' => 'https://deno.land/x/appwrite',
                'enabled' => true,
@@ -285,7 +285,7 @@ return [
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '11.0.2',
+                'version' => '12.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
@@ -303,7 +303,7 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '5.0.3',
+                'version' => '6.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@@ -321,7 +321,7 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '11.0.2',
+                'version' => '12.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@@ -339,10 +339,10 @@ return [
            [
                'key' => 'go',
                'name' => 'Go',
-                'version' => '4.0.1',
+                'version' => '0.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-go',
-                'package' => '',
-                'enabled' => false,
+                'package' => 'https://github.com/appwrite/sdk-for-go',
+                'enabled' => true,
                'beta' => true,
                'dev' => false,
                'hidden' => false,
@@ -354,28 +354,10 @@ return [
                'gitUserName' => 'appwrite',
                'gitBranch' => 'dev',
            ],
-            [
-                'key' => 'java',
-                'name' => 'Java',
-                'version' => '4.0.2',
-                'url' => 'https://github.com/appwrite/sdk-for-java',
-                'package' => '',
-                'enabled' => false,
-                'beta' => true,
-                'dev' => false,
-                'hidden' => false,
-                'family' => APP_PLATFORM_SERVER,
-                'prism' => 'java',
-                'source' => \realpath(__DIR__ . '/../sdks/server-java'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-java.git',
-                'gitRepoName' => 'sdk-for-java',
-                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
-            ],
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.8.2',
+                'version' => '0.10.0',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
                'enabled' => true,
@@ -393,7 +375,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '11.0.3',
+                'version' => '12.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@@ -411,7 +393,7 @@ return [
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
-                'version' => '5.0.2',
+                'version' => '6.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                'enabled' => true,
@@ -433,7 +415,7 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '5.0.2',
+                'version' => '6.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
@@ -0,0 +1,51 @@
+<?php
+
+use Appwrite\Functions\Specification;
+
+return [
+    Specification::S_05VCPU_512MB => [
+        'slug' => Specification::S_05VCPU_512MB,
+        'memory' => 512,
+        'cpus' => 0.5
+    ],
+    Specification::S_1VCPU_512MB => [
+        'slug' => Specification::S_1VCPU_512MB,
+        'memory' => 512,
+        'cpus' => 1
+    ],
+    Specification::S_1VCPU_1GB => [
+        'slug' => Specification::S_1VCPU_1GB,
+        'memory' => 1024,
+        'cpus' => 1
+    ],
+    Specification::S_2VCPU_2GB => [
+        'slug' => Specification::S_2VCPU_2GB,
+        'memory' => 2048,
+        'cpus' => 2
+    ],
+    Specification::S_2VCPU_4GB => [
+        'slug' => Specification::S_2VCPU_4GB,
+        'memory' => 4096,
+        'cpus' => 2
+    ],
+    Specification::S_4VCPU_4GB => [
+        'slug' => Specification::S_4VCPU_4GB,
+        'memory' => 4096,
+        'cpus' => 4
+    ],
+    Specification::S_4VCPU_8GB => [
+        'slug' => Specification::S_4VCPU_8GB,
+        'memory' => 8192,
+        'cpus' => 4
+    ],
+    Specification::S_8VCPU_4GB => [
+        'slug' => Specification::S_8VCPU_4GB,
+        'memory' => 4096,
+        'cpus' => 8
+    ],
+    Specification::S_8VCPU_8GB => [
+        'slug' => Specification::S_8VCPU_8GB,
+        'memory' => 8192,
+        'cpus' => 8
+    ]
+];
@@ -144,8 +144,17 @@ return [
            ],
            [
                'name' => '_APP_SYSTEM_EMAIL_ADDRESS',
-                'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'team@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.',
+                'description' => 'This is the sender email address that will appear on email messages sent to developers from the Appwrite console. The default value is \'noreply@appwrite.io\'. You should choose an email address that is allowed to be used from your SMTP server to avoid the server email ending in the users\' SPAM folders.',
                'introduction' => '0.7.0',
+                'default' => 'noreply@appwrite.io',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_SYSTEM_TEAM_EMAIL',
+                'description' => 'This is the sender email address that will appear in the generated specs. The default value is \'team@appwrite.io\'.',
+                'introduction' => '1.6.0',
                'default' => 'team@appwrite.io',
                'required' => false,
                'question' => '',
@@ -184,7 +193,7 @@ return [
                'introduction' => '1.5.1',
                'default' => '',
                'required' => true,
-                'question' => '',
+                'question' => 'Enter an email that will be used when registering for SSL certificates',
                'filter' => ''
            ],
            [
@@ -245,7 +254,7 @@ return [
                'name' => '_APP_WORKER_PER_CORE',
                'description' => 'Internal Worker per core for the API, Realtime and Executor containers. Can be configured to optimize performance.',
                'introduction' => '0.13.0',
-                'default' => 6,
+                'default' => 2,
                'required' => false,
                'question' => '',
                'filter' => ''
@@ -711,13 +720,22 @@ return [
        'variables' => [
            [
                'name' => '_APP_FUNCTIONS_SIZE_LIMIT',
-                'description' => 'The maximum size deployment in bytes. The default value is 30MB.',
+                'description' => 'The maximum size of a function in bytes. The default value is 30MB.',
                'introduction' => '0.13.0',
                'default' => '30000000',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_FUNCTIONS_BUILD_SIZE_LIMIT',
+                'description' => 'The maximum size of a built deployment in bytes. The default value is 2,000,000,000 (2GB), and the maximum value is 4,294,967,295 (4.2GB).',
+                'introduction' => '1.6.0',
+                'default' => '2000000000',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_FUNCTIONS_TIMEOUT',
                'description' => 'The maximum number of seconds allowed as a timeout value when creating a new function. The default value is 900 seconds. This is the global limit, timeout for individual functions are configured in the function\'s settings or in appwrite.json.',
@@ -5,7 +5,7 @@ use Appwrite\URL\URL as URLParse;
 use Appwrite\Utopia\Response;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
-use Utopia\App;
+use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -14,15 +14,17 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
 use Utopia\Fetch\Client;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\Boolean;
+use Utopia\Http\Validator\HexColor;
+use Utopia\Http\Validator\Range;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\URL;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Image\Image;
+use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\System\System;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\HexColor;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;

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

@@ -61,9 +63,9 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
    unset($image);
 };

-$getUserGitHub = function (string $userId, Document $project, Database $dbForProject, Database $dbForConsole, ?Logger $logger) {
+$getUserGitHub = function (string $userId, Document $project, Database $dbForProject, Database $dbForConsole, ?Logger $logger, Authorization $auth) {
    try {
-        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));
+        $user = $auth->skip(fn () => $dbForConsole->getDocument('users', $userId));

        $sessions = $user->getAttribute('sessions', []);

@@ -114,7 +116,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
                    ->setAttribute('providerRefreshToken', $refreshToken)
                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$oauth2->getAccessTokenExpiry('')));

-                Authorization::skip(fn () => $dbForProject->updateDocument('sessions', $gitHubSession->getId(), $gitHubSession));
+                $auth->skip(fn () => $dbForProject->updateDocument('sessions', $gitHubSession->getId(), $gitHubSession));

                $dbForProject->purgeCachedDocument('users', $user->getId());
            } catch (Throwable $err) {
@@ -122,7 +124,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
                do {
                    $previousAccessToken = $gitHubSession->getAttribute('providerAccessToken');

-                    $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));
+                    $user = $auth->skip(fn () => $dbForConsole->getDocument('users', $userId));
                    $sessions = $user->getAttribute('sessions', []);

                    $gitHubSession = new Document();
@@ -154,11 +156,42 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
            'id' => $githubId
        ];
    } catch (Exception $error) {
+        if ($logger) {
+            $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+
+            $log = new Log();
+            $log->setNamespace('console');
+            $log->setServer(\gethostname());
+            $log->setVersion($version);
+            $log->setType(Log::TYPE_ERROR);
+            $log->setMessage($error->getMessage());
+
+            $log->addTag('code', $error->getCode());
+            $log->addTag('verboseType', get_class($error));
+
+            $log->addExtra('file', $error->getFile());
+            $log->addExtra('line', $error->getLine());
+            $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('detailedTrace', $error->getTrace());
+
+            $log->setAction('avatarsGetGitHub');
+
+            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            $responseCode = $logger->addLog($log);
+            Console::info('GitHub error log pushed with status code: ' . $responseCode);
+        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
+
        return [];
    }
 };

-App::get('/v1/avatars/credit-cards/:code')
+Http::get('/v1/avatars/credit-cards/:code')
    ->desc('Get credit card icon')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -178,7 +211,7 @@ App::get('/v1/avatars/credit-cards/:code')
    ->inject('response')
    ->action(fn (string $code, int $width, int $height, int $quality, Response $response) =>  $avatarCallback('credit-cards', $code, $width, $height, $quality, $response));

-App::get('/v1/avatars/browsers/:code')
+Http::get('/v1/avatars/browsers/:code')
    ->desc('Get browser icon')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -198,7 +231,7 @@ App::get('/v1/avatars/browsers/:code')
    ->inject('response')
    ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('browsers', $code, $width, $height, $quality, $response));

-App::get('/v1/avatars/flags/:code')
+Http::get('/v1/avatars/flags/:code')
    ->desc('Get country flag')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -218,7 +251,7 @@ App::get('/v1/avatars/flags/:code')
    ->inject('response')
    ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('flags', $code, $width, $height, $quality, $response));

-App::get('/v1/avatars/image')
+Http::get('/v1/avatars/image')
    ->desc('Get image from URL')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -281,7 +314,7 @@ App::get('/v1/avatars/image')
        unset($image);
    });

-App::get('/v1/avatars/favicon')
+Http::get('/v1/avatars/favicon')
    ->desc('Get favicon')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -426,7 +459,7 @@ App::get('/v1/avatars/favicon')
        unset($image);
    });

-App::get('/v1/avatars/qr')
+Http::get('/v1/avatars/qr')
    ->desc('Get QR code')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -466,7 +499,7 @@ App::get('/v1/avatars/qr')
            ->send($image->output('png', 9));
    });

-App::get('/v1/avatars/initials')
+Http::get('/v1/avatars/initials')
    ->desc('Get user initials')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -549,7 +582,7 @@ App::get('/v1/avatars/initials')
            ->file($image->getImageBlob());
    });

-App::get('/v1/cards/cloud')
+Http::get('/v1/cards/cloud')
    ->desc('Get Front Of Cloud Card')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -571,8 +604,9 @@ App::get('/v1/cards/cloud')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
-        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));
+    ->inject('authorization')
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger, Authorization $authorization) use ($getUserGitHub) {
+        $user = $authorization->skip(fn () => $dbForConsole->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -583,7 +617,7 @@ App::get('/v1/cards/cloud')
            $email = $user->getAttribute('email', '');
            $createdAt = new \DateTime($user->getCreatedAt());

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger, $authorization);
            $githubName = $gitHub['name'] ?? '';
            $githubId = $gitHub['id'] ?? '';

@@ -756,7 +790,7 @@ App::get('/v1/cards/cloud')
            ->file($baseImage->getImageBlob());
    });

-App::get('/v1/cards/cloud-back')
+Http::get('/v1/cards/cloud-back')
    ->desc('Get Back Of Cloud Card')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -778,8 +812,9 @@ App::get('/v1/cards/cloud-back')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
-        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));
+    ->inject('authorization')
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger, Authorization $authorization) use ($getUserGitHub) {
+        $user = $authorization->skip(fn () => $dbForConsole->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -789,7 +824,7 @@ App::get('/v1/cards/cloud-back')
            $userId = $user->getId();
            $email = $user->getAttribute('email', '');

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger, $authorization);
            $githubId = $gitHub['id'] ?? '';

            $isHero = \array_key_exists($email, $heroes);
@@ -834,7 +869,7 @@ App::get('/v1/cards/cloud-back')
            ->file($baseImage->getImageBlob());
    });

-App::get('/v1/cards/cloud-og')
+Http::get('/v1/cards/cloud-og')
    ->desc('Get OG Image From Cloud Card')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
@@ -856,8 +891,9 @@ App::get('/v1/cards/cloud-og')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
-        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));
+    ->inject('authorization')
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger, Authorization $authorization) use ($getUserGitHub) {
+        $user = $authorization->skip(fn () => $dbForConsole->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -872,7 +908,7 @@ App::get('/v1/cards/cloud-og')
            $email = $user->getAttribute('email', '');
            $createdAt = new \DateTime($user->getCreatedAt());

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger, $authorization);
            $githubName = $gitHub['name'] ?? '';
            $githubId = $gitHub['id'] ?? '';

@@ -2,12 +2,12 @@

 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Database\Document;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\Text;
 use Utopia\System\System;
-use Utopia\Validator\Text;

-App::init()
+Http::init()
    ->groups(['console'])
    ->inject('project')
    ->action(function (Document $project) {
@@ -17,7 +17,7 @@ App::init()
    });


-App::get('/v1/console/variables')
+Http::get('/v1/console/variables')
    ->desc('Get variables')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -56,7 +56,7 @@ App::get('/v1/console/variables')
        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
    });

-App::post('/v1/console/assistant')
+Http::post('/v1/console/assistant')
    ->desc('Ask Query')
    ->groups(['api', 'assistant'])
    ->label('scope', 'assistant.read')
@@ -14,27 +14,28 @@ use GraphQL\Validator\Rules\DisableIntrospection;
 use GraphQL\Validator\Rules\QueryComplexity;
 use GraphQL\Validator\Rules\QueryDepth;
 use Swoole\Coroutine\WaitGroup;
-use Utopia\App;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\JSON;
+use Utopia\Http\Validator\Text;
 use Utopia\System\System;
-use Utopia\Validator\JSON;
-use Utopia\Validator\Text;

-App::init()
+Http::init()
    ->groups(['graphql'])
    ->inject('project')
-    ->action(function (Document $project) {
+    ->inject('authorization')
+    ->action(function (Document $project, Authorization $authorization) {
        if (
            array_key_exists('graphql', $project->getAttribute('apis', []))
            && !$project->getAttribute('apis', [])['graphql']
-            && !(Auth::isPrivilegedUser(Authorization::getRoles()) || Auth::isAppUser(Authorization::getRoles()))
+            && !(Auth::isPrivilegedUser($authorization->getRoles()) || Auth::isAppUser($authorization->getRoles()))
        ) {
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }
    });

-App::get('/v1/graphql')
+Http::get('/v1/graphql')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
@@ -74,7 +75,7 @@ App::get('/v1/graphql')
            ->json($output);
    });

-App::post('/v1/graphql/mutation')
+Http::post('/v1/graphql/mutation')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
@@ -119,7 +120,7 @@ App::post('/v1/graphql/mutation')
            ->json($output);
    });

-App::post('/v1/graphql')
+Http::post('/v1/graphql')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
@@ -156,7 +157,6 @@ App::post('/v1/graphql')
        if (\str_starts_with($type, 'multipart/form-data')) {
            $query = parseMultipart($query, $request);
        }
-
        $output = execute($schema, $promiseAdapter, $query);

        $response
@@ -205,7 +205,7 @@ function execute(
        $validations[] = new QueryComplexity($maxComplexity);
        $validations[] = new QueryDepth($maxDepth);
    }
-    if (App::getMode() === App::MODE_TYPE_PRODUCTION) {
+    if (Http::getMode() === Http::MODE_TYPE_PRODUCTION) {
        $flags = DebugFlag::NONE;
    }

@@ -306,9 +306,10 @@ function processResult($result, $debugFlags): array
    );
 }

-App::shutdown()
+Http::shutdown()
    ->groups(['schema'])
    ->inject('project')
-    ->action(function (Document $project) {
-        Schema::setDirty($project->getId());
+    ->inject('schemaVariable')
+    ->action(function (Document $project, Schema $schemaVariable) {
+        $schemaVariable->setDirty($project->getId());
    });
@@ -3,12 +3,19 @@
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
+use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Document;
 use Utopia\Domains\Validator\PublicDomain;
-use Utopia\Pools\Group;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\Domain;
+use Utopia\Http\Validator\Integer;
+use Utopia\Http\Validator\Multiple;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Queue\Client;
 use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
@@ -16,13 +23,8 @@ use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 use Utopia\System\System;
-use Utopia\Validator\Domain;
-use Utopia\Validator\Integer;
-use Utopia\Validator\Multiple;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;

-App::get('/v1/health')
+Http::get('/v1/health')
    ->desc('Get HTTP')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -45,7 +47,7 @@ App::get('/v1/health')
        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
    });

-App::get('/v1/health/version')
+Http::get('/v1/health/version')
    ->desc('Get version')
    ->groups(['api', 'health'])
    ->label('scope', 'public')
@@ -57,7 +59,7 @@ App::get('/v1/health/version')
        $response->dynamic(new Document([ 'version' => APP_VERSION_STABLE ]), Response::MODEL_HEALTH_VERSION);
    });

-App::get('/v1/health/db')
+Http::get('/v1/health/db')
    ->desc('Get DB')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -70,21 +72,34 @@ App::get('/v1/health/db')
    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
-    ->action(function (Response $response, Group $pools) {
+    ->inject('connections')
+    ->action(function (Response $response, array $pools, Connections $connections) {

        $output = [];

        $configs = [
-            'Console.DB' => Config::getParam('pools-console'),
-            'Projects.DB' => Config::getParam('pools-database'),
+            'console' => Config::getParam('pools-console'),
+            'database' => Config::getParam('pools-database'),
        ];

        foreach ($configs as $key => $config) {
            foreach ($config as $database) {
+                $checkStart = \microtime(true);
+
                try {
-                    $adapter = $pools->get($database)->pop()->getResource();
+
+                    $pool = $pools['pools-'.$key.'-'.$database]['pool'];
+                    $dsn = $pools['pools-'.$key.'-'.$database]['dsn'];
+
+                    $connection = $pool->get();
+                    $connections->add($connection, $pool);
+                    $adapter = match ($dsn->getScheme()) {
+                        'mariadb' => new MariaDB($connection),
+                        'mysql' => new MySQL($connection),
+                        default => null
+                    };
+                    $adapter->setDatabase($dsn->getPath());

-                    $checkStart = \microtime(true);

                    if ($adapter->ping()) {
                        $output[] = new Document([
@@ -111,7 +126,7 @@ App::get('/v1/health/db')
        ]), Response::MODEL_HEALTH_STATUS_LIST);
    });

-App::get('/v1/health/cache')
+Http::get('/v1/health/cache')
    ->desc('Get cache')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -124,7 +139,8 @@ App::get('/v1/health/cache')
    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
-    ->action(function (Response $response, Group $pools) {
+    ->inject('connections')
+    ->action(function (Response $response, array $pools, Connections $connections) {

        $output = [];

@@ -134,10 +150,15 @@ App::get('/v1/health/cache')

        foreach ($configs as $key => $config) {
            foreach ($config as $database) {
+                $checkStart = \microtime(true);
                try {
-                    $adapter = $pools->get($database)->pop()->getResource();
+                    $pool = $pools['pools-cache-' . $database]['pool'];
+                    $dsn = $pools['pools-cache-' . $database]['dsn'];
+                    $connection = $pool->get();
+                    $connections->add($connection, $pool);
+
+                    $adapter =  new Connection\Redis($dsn->getHost(), $dsn->getPort());

-                    $checkStart = \microtime(true);

                    if ($adapter->ping()) {
                        $output[] = new Document([
@@ -158,6 +179,8 @@ App::get('/v1/health/cache')
                        'status' => 'fail',
                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
                    ]);
+                } finally {
+                    $connections->reclaim();
                }
            }
        }
@@ -168,7 +191,7 @@ App::get('/v1/health/cache')
        ]), Response::MODEL_HEALTH_STATUS_LIST);
    });

-App::get('/v1/health/queue')
+Http::get('/v1/health/queue')
    ->desc('Get queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -181,7 +204,8 @@ App::get('/v1/health/queue')
    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
-    ->action(function (Response $response, Group $pools) {
+    ->inject('connections')
+    ->action(function (Response $response, array $pools, Connections $connections) {

        $output = [];

@@ -190,12 +214,16 @@ App::get('/v1/health/queue')
        ];

        foreach ($configs as $key => $config) {
+            $checkStart = \microtime(true);
+
            foreach ($config as $database) {
                try {
-                    $adapter = $pools->get($database)->pop()->getResource();
-
-                    $checkStart = \microtime(true);
+                    $pool = $pools['pools-queue-' . $database]['pool'];
+                    $dsn = $pools['pools-queue-' . $database]['dsn'];
+                    $connection = $pool->get();
+                    $connections->add($connection, $pool);

+                    $adapter =  new Connection\Redis($dsn->getHost(), $dsn->getPort());
                    if ($adapter->ping()) {
                        $output[] = new Document([
                            'name' => $key . " ($database)",
@@ -215,6 +243,8 @@ App::get('/v1/health/queue')
                        'status' => 'fail',
                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
                    ]);
+                } finally {
+                    $connections->reclaim();
                }
            }
        }
@@ -225,7 +255,7 @@ App::get('/v1/health/queue')
        ]), Response::MODEL_HEALTH_STATUS_LIST);
    });

-App::get('/v1/health/pubsub')
+Http::get('/v1/health/pubsub')
    ->desc('Get pubsub')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -238,7 +268,8 @@ App::get('/v1/health/pubsub')
    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
-    ->action(function (Response $response, Group $pools) {
+    ->inject('connections')
+    ->action(function (Response $response, array $pools, Connections $connections) {

        $output = [];

@@ -249,7 +280,12 @@ App::get('/v1/health/pubsub')
        foreach ($configs as $key => $config) {
            foreach ($config as $database) {
                try {
-                    $adapter = $pools->get($database)->pop()->getResource();
+                    $pool = $pools['pools-pubsub-' . $database]['pool'];
+
+                    $connection = $pool->get();
+                    $connections->add($connection, $pool);
+
+                    $adapter =  new Connection\Redis($connection);

                    $checkStart = \microtime(true);

@@ -272,6 +308,8 @@ App::get('/v1/health/pubsub')
                        'status' => 'fail',
                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
                    ]);
+                } finally {
+                    $connections->reclaim();
                }
            }
        }
@@ -282,7 +320,7 @@ App::get('/v1/health/pubsub')
        ]), Response::MODEL_HEALTH_STATUS_LIST);
    });

-App::get('/v1/health/time')
+Http::get('/v1/health/time')
    ->desc('Get time')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -339,7 +377,7 @@ App::get('/v1/health/time')
        $response->dynamic(new Document($output), Response::MODEL_HEALTH_TIME);
    });

-App::get('/v1/health/queue/webhooks')
+Http::get('/v1/health/queue/webhooks')
    ->desc('Get webhooks queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -366,7 +404,7 @@ App::get('/v1/health/queue/webhooks')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/logs')
+Http::get('/v1/health/queue/logs')
    ->desc('Get logs queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -393,7 +431,7 @@ App::get('/v1/health/queue/logs')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/certificate')
+Http::get('/v1/health/certificate')
    ->desc('Get the SSL certificate for a domain')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -443,7 +481,7 @@ App::get('/v1/health/certificate')
        ]), Response::MODEL_HEALTH_CERTIFICATE);
    }, ['response']);

-App::get('/v1/health/queue/certificates')
+Http::get('/v1/health/queue/certificates')
    ->desc('Get certificates queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -470,7 +508,7 @@ App::get('/v1/health/queue/certificates')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/builds')
+Http::get('/v1/health/queue/builds')
    ->desc('Get builds queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -497,7 +535,7 @@ App::get('/v1/health/queue/builds')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/databases')
+Http::get('/v1/health/queue/databases')
    ->desc('Get databases queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -525,7 +563,7 @@ App::get('/v1/health/queue/databases')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/deletes')
+Http::get('/v1/health/queue/deletes')
    ->desc('Get deletes queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -552,7 +590,7 @@ App::get('/v1/health/queue/deletes')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/mails')
+Http::get('/v1/health/queue/mails')
    ->desc('Get mails queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -579,7 +617,7 @@ App::get('/v1/health/queue/mails')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/messaging')
+Http::get('/v1/health/queue/messaging')
    ->desc('Get messaging queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -606,7 +644,7 @@ App::get('/v1/health/queue/messaging')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/migrations')
+Http::get('/v1/health/queue/migrations')
    ->desc('Get migrations queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -633,7 +671,7 @@ App::get('/v1/health/queue/migrations')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/functions')
+Http::get('/v1/health/queue/functions')
    ->desc('Get functions queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -660,7 +698,7 @@ App::get('/v1/health/queue/functions')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/usage')
+Http::get('/v1/health/queue/usage')
    ->desc('Get usage queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -687,7 +725,7 @@ App::get('/v1/health/queue/usage')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    });

-App::get('/v1/health/queue/usage-dump')
+Http::get('/v1/health/queue/usage-dump')
    ->desc('Get usage dump queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -714,7 +752,7 @@ App::get('/v1/health/queue/usage-dump')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    });

-App::get('/v1/health/storage/local')
+Http::get('/v1/health/storage/local')
    ->desc('Get local storage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -757,7 +795,7 @@ App::get('/v1/health/storage/local')
        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
    });

-App::get('/v1/health/storage')
+Http::get('/v1/health/storage')
    ->desc('Get storage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -798,7 +836,7 @@ App::get('/v1/health/storage')
        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
    });

-App::get('/v1/health/anti-virus')
+Http::get('/v1/health/anti-virus')
    ->desc('Get antivirus')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -837,7 +875,7 @@ App::get('/v1/health/anti-virus')
        $response->dynamic(new Document($output), Response::MODEL_HEALTH_ANTIVIRUS);
    });

-App::get('/v1/health/queue/failed/:name')
+Http::get('/v1/health/queue/failed/:name')
    ->desc('Get number of failed queue jobs')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
@@ -878,7 +916,7 @@ App::get('/v1/health/queue/failed/:name')
        $response->dynamic(new Document([ 'size' => $failed ]), Response::MODEL_HEALTH_QUEUE);
    });

-App::get('/v1/health/stats') // Currently only used internally
+Http::get('/v1/health/stats') // Currently only used internally
 ->desc('Get system stats')
    ->groups(['api', 'health'])
    ->label('scope', 'root')
@@ -3,12 +3,12 @@
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
-use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\Database\Document;
+use Utopia\Http\Http;
 use Utopia\Locale\Locale;

-App::get('/v1/locale')
+Http::get('/v1/locale')
    ->desc('Get user locale')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -68,7 +68,7 @@ App::get('/v1/locale')
        $response->dynamic(new Document($output), Response::MODEL_LOCALE);
    });

-App::get('/v1/locale/codes')
+Http::get('/v1/locale/codes')
    ->desc('List Locale Codes')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -90,7 +90,7 @@ App::get('/v1/locale/codes')
        ]), Response::MODEL_LOCALE_CODE_LIST);
    });

-App::get('/v1/locale/countries')
+Http::get('/v1/locale/countries')
    ->desc('List countries')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -123,7 +123,7 @@ App::get('/v1/locale/countries')
        $response->dynamic(new Document(['countries' => $output, 'total' => \count($output)]), Response::MODEL_COUNTRY_LIST);
    });

-App::get('/v1/locale/countries/eu')
+Http::get('/v1/locale/countries/eu')
    ->desc('List EU countries')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -158,7 +158,7 @@ App::get('/v1/locale/countries/eu')
        $response->dynamic(new Document(['countries' => $output, 'total' => \count($output)]), Response::MODEL_COUNTRY_LIST);
    });

-App::get('/v1/locale/countries/phones')
+Http::get('/v1/locale/countries/phones')
    ->desc('List countries phone codes')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -192,7 +192,7 @@ App::get('/v1/locale/countries/phones')
        $response->dynamic(new Document(['phones' => $output, 'total' => \count($output)]), Response::MODEL_PHONE_LIST);
    });

-App::get('/v1/locale/continents')
+Http::get('/v1/locale/continents')
    ->desc('List continents')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -224,7 +224,7 @@ App::get('/v1/locale/continents')
        $response->dynamic(new Document(['continents' => $output, 'total' => \count($output)]), Response::MODEL_CONTINENT_LIST);
    });

-App::get('/v1/locale/currencies')
+Http::get('/v1/locale/currencies')
    ->desc('List currencies')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -247,7 +247,7 @@ App::get('/v1/locale/currencies')
    });


-App::get('/v1/locale/languages')
+Http::get('/v1/locale/languages')
    ->desc('List languages')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
@@ -20,7 +20,6 @@ use Appwrite\Utopia\Database\Validator\Queries\Targets;
 use Appwrite\Utopia\Database\Validator\Queries\Topics;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
-use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -30,25 +29,27 @@ use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\Roles;
 use Utopia\Database\Validator\UID;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\ArrayList;
+use Utopia\Http\Validator\Boolean;
+use Utopia\Http\Validator\Integer;
+use Utopia\Http\Validator\JSON;
+use Utopia\Http\Validator\Range;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Locale\Locale;
 use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Integer;
-use Utopia\Validator\JSON;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;

 use function Swoole\Coroutine\batch;

-App::post('/v1/messaging/providers/mailgun')
+Http::post('/v1/messaging/providers/mailgun')
    ->desc('Create Mailgun provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -135,7 +136,7 @@ App::post('/v1/messaging/providers/mailgun')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/sendgrid')
+Http::post('/v1/messaging/providers/sendgrid')
    ->desc('Create Sendgrid provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -210,7 +211,7 @@ App::post('/v1/messaging/providers/sendgrid')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/smtp')
+Http::post('/v1/messaging/providers/smtp')
    ->desc('Create SMTP provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -298,7 +299,7 @@ App::post('/v1/messaging/providers/smtp')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/msg91')
+Http::post('/v1/messaging/providers/msg91')
    ->desc('Create Msg91 provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -374,7 +375,7 @@ App::post('/v1/messaging/providers/msg91')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/telesign')
+Http::post('/v1/messaging/providers/telesign')
    ->desc('Create Telesign provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -451,7 +452,7 @@ App::post('/v1/messaging/providers/telesign')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/textmagic')
+Http::post('/v1/messaging/providers/textmagic')
    ->desc('Create Textmagic provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -528,7 +529,7 @@ App::post('/v1/messaging/providers/textmagic')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/twilio')
+Http::post('/v1/messaging/providers/twilio')
    ->desc('Create Twilio provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -605,7 +606,7 @@ App::post('/v1/messaging/providers/twilio')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/vonage')
+Http::post('/v1/messaging/providers/vonage')
    ->desc('Create Vonage provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -682,7 +683,7 @@ App::post('/v1/messaging/providers/vonage')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/fcm')
+Http::post('/v1/messaging/providers/fcm')
    ->desc('Create FCM provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -745,7 +746,7 @@ App::post('/v1/messaging/providers/fcm')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::post('/v1/messaging/providers/apns')
+Http::post('/v1/messaging/providers/apns')
    ->desc('Create APNS provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.create')
@@ -831,7 +832,7 @@ App::post('/v1/messaging/providers/apns')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::get('/v1/messaging/providers')
+Http::get('/v1/messaging/providers')
    ->desc('List providers')
    ->groups(['api', 'messaging'])
    ->label('scope', 'providers.read')
@@ -846,7 +847,8 @@ App::get('/v1/messaging/providers')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (array $queries, string $search, Database $dbForProject, Response $response) {
+    ->inject('authorization')
+    ->action(function (array $queries, string $search, Database $dbForProject, Response $response, Authorization $authorization) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -867,7 +869,7 @@ App::get('/v1/messaging/providers')

        if ($cursor) {
            $providerId = $cursor->getValue();
-            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('providers', $providerId));
+            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('providers', $providerId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Provider '{$providerId}' for the 'cursor' value not found.");
@@ -882,7 +884,7 @@ App::get('/v1/messaging/providers')
        ]), Response::MODEL_PROVIDER_LIST);
    });

-App::get('/v1/messaging/providers/:providerId/logs')
+Http::get('/v1/messaging/providers/:providerId/logs')
    ->desc('List provider logs')
    ->groups(['api', 'messaging'])
    ->label('scope', 'providers.read')
@@ -970,7 +972,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
        ]), Response::MODEL_LOG_LIST);
    });

-App::get('/v1/messaging/providers/:providerId')
+Http::get('/v1/messaging/providers/:providerId')
    ->desc('Get provider')
    ->groups(['api', 'messaging'])
    ->label('scope', 'providers.read')
@@ -994,7 +996,7 @@ App::get('/v1/messaging/providers/:providerId')
        $response->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/mailgun/:providerId')
+Http::patch('/v1/messaging/providers/mailgun/:providerId')
    ->desc('Update Mailgun provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1100,7 +1102,7 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/sendgrid/:providerId')
+Http::patch('/v1/messaging/providers/sendgrid/:providerId')
    ->desc('Update Sendgrid provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1191,7 +1193,7 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/smtp/:providerId')
+Http::patch('/v1/messaging/providers/smtp/:providerId')
    ->desc('Update SMTP provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1313,7 +1315,7 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/msg91/:providerId')
+Http::patch('/v1/messaging/providers/msg91/:providerId')
    ->desc('Update Msg91 provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1393,7 +1395,7 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/telesign/:providerId')
+Http::patch('/v1/messaging/providers/telesign/:providerId')
    ->desc('Update Telesign provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1475,7 +1477,7 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/textmagic/:providerId')
+Http::patch('/v1/messaging/providers/textmagic/:providerId')
    ->desc('Update Textmagic provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1557,7 +1559,7 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/twilio/:providerId')
+Http::patch('/v1/messaging/providers/twilio/:providerId')
    ->desc('Update Twilio provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1639,7 +1641,7 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/vonage/:providerId')
+Http::patch('/v1/messaging/providers/vonage/:providerId')
    ->desc('Update Vonage provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1721,7 +1723,7 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::patch('/v1/messaging/providers/fcm/:providerId')
+Http::patch('/v1/messaging/providers/fcm/:providerId')
    ->desc('Update FCM provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1790,7 +1792,7 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
    });


-App::patch('/v1/messaging/providers/apns/:providerId')
+Http::patch('/v1/messaging/providers/apns/:providerId')
    ->desc('Update APNS provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.update')
@@ -1885,7 +1887,7 @@ App::patch('/v1/messaging/providers/apns/:providerId')
            ->dynamic($provider, Response::MODEL_PROVIDER);
    });

-App::delete('/v1/messaging/providers/:providerId')
+Http::delete('/v1/messaging/providers/:providerId')
    ->desc('Delete provider')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'provider.delete')
@@ -1920,7 +1922,7 @@ App::delete('/v1/messaging/providers/:providerId')
            ->noContent();
    });

-App::post('/v1/messaging/topics')
+Http::post('/v1/messaging/topics')
    ->desc('Create topic')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'topic.create')
@@ -1963,7 +1965,7 @@ App::post('/v1/messaging/topics')
            ->dynamic($topic, Response::MODEL_TOPIC);
    });

-App::get('/v1/messaging/topics')
+Http::get('/v1/messaging/topics')
    ->desc('List topics')
    ->groups(['api', 'messaging'])
    ->label('scope', 'topics.read')
@@ -1978,7 +1980,8 @@ App::get('/v1/messaging/topics')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (array $queries, string $search, Database $dbForProject, Response $response) {
+    ->inject('authorization')
+    ->action(function (array $queries, string $search, Database $dbForProject, Response $response, Authorization $authorization) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -1999,7 +2002,7 @@ App::get('/v1/messaging/topics')

        if ($cursor) {
            $topicId = $cursor->getValue();
-            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));
+            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Topic '{$topicId}' for the 'cursor' value not found.");
@@ -2014,7 +2017,7 @@ App::get('/v1/messaging/topics')
        ]), Response::MODEL_TOPIC_LIST);
    });

-App::get('/v1/messaging/topics/:topicId/logs')
+Http::get('/v1/messaging/topics/:topicId/logs')
    ->desc('List topic logs')
    ->groups(['api', 'messaging'])
    ->label('scope', 'topics.read')
@@ -2031,7 +2034,8 @@ App::get('/v1/messaging/topics/:topicId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $topicId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (string $topicId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Authorization $authorization) {
        $topic = $dbForProject->getDocument('topics', $topicId);

        if ($topic->isEmpty()) {
@@ -2103,7 +2107,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
        ]), Response::MODEL_LOG_LIST);
    });

-App::get('/v1/messaging/topics/:topicId')
+Http::get('/v1/messaging/topics/:topicId')
    ->desc('Get topic')
    ->groups(['api', 'messaging'])
    ->label('scope', 'topics.read')
@@ -2128,7 +2132,7 @@ App::get('/v1/messaging/topics/:topicId')
            ->dynamic($topic, Response::MODEL_TOPIC);
    });

-App::patch('/v1/messaging/topics/:topicId')
+Http::patch('/v1/messaging/topics/:topicId')
    ->desc('Update topic')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'topic.update')
@@ -2172,7 +2176,7 @@ App::patch('/v1/messaging/topics/:topicId')
            ->dynamic($topic, Response::MODEL_TOPIC);
    });

-App::delete('/v1/messaging/topics/:topicId')
+Http::delete('/v1/messaging/topics/:topicId')
    ->desc('Delete topic')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'topic.delete')
@@ -2212,7 +2216,7 @@ App::delete('/v1/messaging/topics/:topicId')
            ->noContent();
    });

-App::post('/v1/messaging/topics/:topicId/subscribers')
+Http::post('/v1/messaging/topics/:topicId/subscribers')
    ->desc('Create subscriber')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'subscriber.create')
@@ -2232,28 +2236,27 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
    ->inject('queueForEvents')
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (string $subscriberId, string $topicId, string $targetId, Event $queueForEvents, Database $dbForProject, Response $response) {
+    ->inject('authorization')
+    ->action(function (string $subscriberId, string $topicId, string $targetId, Event $queueForEvents, Database $dbForProject, Response $response, Authorization $authorization) {
        $subscriberId = $subscriberId == 'unique()' ? ID::unique() : $subscriberId;

-        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));
+        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
        }

-        $validator = new Authorization('subscribe');
-
-        if (!$validator->isValid($topic->getAttribute('subscribe'))) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $validator->getDescription());
+        if (!$authorization->isValid(new Input('subscribe', $topic->getAttribute('subscribe')))) {
+            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
        }

-        $target = Authorization::skip(fn () => $dbForProject->getDocument('targets', $targetId));
+        $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $targetId));

        if ($target->isEmpty()) {
            throw new Exception(Exception::USER_TARGET_NOT_FOUND);
        }

-        $user = Authorization::skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));
+        $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));

        $subscriber = new Document([
            '$id' => $subscriberId,
@@ -2286,7 +2289,7 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
                default => throw new Exception(Exception::TARGET_PROVIDER_INVALID_TYPE),
            };

-            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute(
+            $authorization->skip(fn () => $dbForProject->increaseDocumentAttribute(
                'topics',
                $topicId,
                $totalAttribute,
@@ -2308,7 +2311,7 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
            ->dynamic($subscriber, Response::MODEL_SUBSCRIBER);
    });

-App::get('/v1/messaging/topics/:topicId/subscribers')
+Http::get('/v1/messaging/topics/:topicId/subscribers')
    ->desc('List subscribers')
    ->groups(['api', 'messaging'])
    ->label('scope', 'subscribers.read')
@@ -2324,7 +2327,8 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (string $topicId, array $queries, string $search, Database $dbForProject, Response $response) {
+    ->inject('authorization')
+    ->action(function (string $topicId, array $queries, string $search, Database $dbForProject, Response $response, Authorization $authorization) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -2335,7 +2339,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
            $queries[] = Query::search('search', $search);
        }

-        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));
+        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
@@ -2353,7 +2357,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')

        if ($cursor) {
            $subscriberId = $cursor->getValue();
-            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('subscribers', $subscriberId));
+            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('subscribers', $subscriberId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Subscriber '{$subscriberId}' for the 'cursor' value not found.");
@@ -2364,10 +2368,10 @@ App::get('/v1/messaging/topics/:topicId/subscribers')

        $subscribers = $dbForProject->find('subscribers', $queries);

-        $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject) {
-            return function () use ($subscriber, $dbForProject) {
-                $target = Authorization::skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
-                $user = Authorization::skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));
+        $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject, $authorization) {
+            return function () use ($subscriber, $dbForProject, $authorization) {
+                $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
+                $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));

                return $subscriber
                    ->setAttribute('target', $target)
@@ -2382,7 +2386,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
            ]), Response::MODEL_SUBSCRIBER_LIST);
    });

-App::get('/v1/messaging/subscribers/:subscriberId/logs')
+Http::get('/v1/messaging/subscribers/:subscriberId/logs')
    ->desc('List subscriber logs')
    ->groups(['api', 'messaging'])
    ->label('scope', 'subscribers.read')
@@ -2399,7 +2403,8 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $subscriberId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (string $subscriberId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Authorization $authorization) {
        $subscriber = $dbForProject->getDocument('subscribers', $subscriberId);

        if ($subscriber->isEmpty()) {
@@ -2471,7 +2476,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
        ]), Response::MODEL_LOG_LIST);
    });

-App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
+Http::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->desc('Get subscriber')
    ->groups(['api', 'messaging'])
    ->label('scope', 'subscribers.read')
@@ -2486,8 +2491,9 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->param('subscriberId', '', new UID(), 'Subscriber ID.')
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (string $topicId, string $subscriberId, Database $dbForProject, Response $response) {
-        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));
+    ->inject('authorization')
+    ->action(function (string $topicId, string $subscriberId, Database $dbForProject, Response $response, Authorization $authorization) {
+        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
@@ -2499,8 +2505,8 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
            throw new Exception(Exception::SUBSCRIBER_NOT_FOUND);
        }

-        $target = Authorization::skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
-        $user = Authorization::skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));
+        $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
+        $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));

        $subscriber
            ->setAttribute('target', $target)
@@ -2510,7 +2516,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
            ->dynamic($subscriber, Response::MODEL_SUBSCRIBER);
    });

-App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
+Http::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->desc('Delete subscriber')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'subscriber.delete')
@@ -2529,8 +2535,9 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->inject('queueForEvents')
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (string $topicId, string $subscriberId, Event $queueForEvents, Database $dbForProject, Response $response) {
-        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));
+    ->inject('authorization')
+    ->action(function (string $topicId, string $subscriberId, Event $queueForEvents, Database $dbForProject, Response $response, Authorization $authorization) {
+        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
@@ -2553,7 +2560,7 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
            default => throw new Exception(Exception::TARGET_PROVIDER_INVALID_TYPE),
        };

-        Authorization::skip(fn () => $dbForProject->decreaseDocumentAttribute(
+        $authorization->skip(fn () => $dbForProject->decreaseDocumentAttribute(
            'topics',
            $topicId,
            $totalAttribute,
@@ -2569,7 +2576,7 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
            ->noContent();
    });

-App::post('/v1/messaging/messages/email')
+Http::post('/v1/messaging/messages/email')
    ->desc('Create email')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.create')
@@ -2721,7 +2728,7 @@ App::post('/v1/messaging/messages/email')
            ->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::post('/v1/messaging/messages/sms')
+Http::post('/v1/messaging/messages/sms')
    ->desc('Create SMS')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.create')
@@ -2837,7 +2844,7 @@ App::post('/v1/messaging/messages/sms')
            ->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::post('/v1/messaging/messages/push')
+Http::post('/v1/messaging/messages/push')
    ->desc('Create push notification')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.create')
@@ -3013,7 +3020,7 @@ App::post('/v1/messaging/messages/push')
            ->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::get('/v1/messaging/messages')
+Http::get('/v1/messaging/messages')
    ->desc('List messages')
    ->groups(['api', 'messaging'])
    ->label('scope', 'messages.read')
@@ -3028,7 +3035,8 @@ App::get('/v1/messaging/messages')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('dbForProject')
    ->inject('response')
-    ->action(function (array $queries, string $search, Database $dbForProject, Response $response) {
+    ->inject('authorization')
+    ->action(function (array $queries, string $search, Database $dbForProject, Response $response, Authorization $authorization) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -3049,7 +3057,7 @@ App::get('/v1/messaging/messages')

        if ($cursor) {
            $messageId = $cursor->getValue();
-            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('messages', $messageId));
+            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('messages', $messageId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Message '{$messageId}' for the 'cursor' value not found.");
@@ -3064,7 +3072,7 @@ App::get('/v1/messaging/messages')
        ]), Response::MODEL_MESSAGE_LIST);
    });

-App::get('/v1/messaging/messages/:messageId/logs')
+Http::get('/v1/messaging/messages/:messageId/logs')
    ->desc('List message logs')
    ->groups(['api', 'messaging'])
    ->label('scope', 'messages.read')
@@ -3081,7 +3089,8 @@ App::get('/v1/messaging/messages/:messageId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $messageId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (string $messageId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Authorization $authorization) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@@ -3153,7 +3162,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
        ]), Response::MODEL_LOG_LIST);
    });

-App::get('/v1/messaging/messages/:messageId/targets')
+Http::get('/v1/messaging/messages/:messageId/targets')
    ->desc('List message targets')
    ->groups(['api', 'messaging'])
    ->label('scope', 'messages.read')
@@ -3218,7 +3227,7 @@ App::get('/v1/messaging/messages/:messageId/targets')
        ]), Response::MODEL_TARGET_LIST);
    });

-App::get('/v1/messaging/messages/:messageId')
+Http::get('/v1/messaging/messages/:messageId')
    ->desc('Get message')
    ->groups(['api', 'messaging'])
    ->label('scope', 'messages.read')
@@ -3242,7 +3251,7 @@ App::get('/v1/messaging/messages/:messageId')
        $response->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::patch('/v1/messaging/messages/email/:messageId')
+Http::patch('/v1/messaging/messages/email/:messageId')
    ->desc('Update email')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.update')
@@ -3442,7 +3451,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
            ->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::patch('/v1/messaging/messages/sms/:messageId')
+Http::patch('/v1/messaging/messages/sms/:messageId')
    ->desc('Update SMS')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.update')
@@ -3597,7 +3606,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
            ->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::patch('/v1/messaging/messages/push/:messageId')
+Http::patch('/v1/messaging/messages/push/:messageId')
    ->desc('Update push notification')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.update')
@@ -3835,7 +3844,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
            ->dynamic($message, Response::MODEL_MESSAGE);
    });

-App::delete('/v1/messaging/messages/:messageId')
+Http::delete('/v1/messaging/messages/:messageId')
    ->desc('Delete message')
    ->groups(['api', 'messaging'])
    ->label('audits.event', 'message.delete')
@@ -9,7 +9,6 @@ use Appwrite\Role;
 use Appwrite\Utopia\Database\Validator\Queries\Migrations;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -17,21 +16,22 @@ use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\UID;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\ArrayList;
+use Utopia\Http\Validator\Host;
+use Utopia\Http\Validator\Integer;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\URL;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Migration\Sources\Appwrite;
 use Utopia\Migration\Sources\Firebase;
 use Utopia\Migration\Sources\NHost;
 use Utopia\Migration\Sources\Supabase;
 use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Host;
-use Utopia\Validator\Integer;
-use Utopia\Validator\Text;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;

 include_once __DIR__ . '/../shared/api.php';

-App::post('/v1/migrations/appwrite')
+Http::post('/v1/migrations/appwrite')
    ->groups(['api', 'migrations'])
    ->desc('Migrate Appwrite Data')
    ->label('scope', 'migrations.write')
@@ -85,7 +85,7 @@ App::post('/v1/migrations/appwrite')
            ->dynamic($migration, Response::MODEL_MIGRATION);
    });

-App::post('/v1/migrations/firebase/oauth')
+Http::post('/v1/migrations/firebase/oauth')
    ->groups(['api', 'migrations'])
    ->desc('Migrate Firebase Data (OAuth)')
    ->label('scope', 'migrations.write')
@@ -187,7 +187,7 @@ App::post('/v1/migrations/firebase/oauth')
            ->dynamic($migration, Response::MODEL_MIGRATION);
    });

-App::post('/v1/migrations/firebase')
+Http::post('/v1/migrations/firebase')
    ->groups(['api', 'migrations'])
    ->desc('Migrate Firebase Data (Service Account)')
    ->label('scope', 'migrations.write')
@@ -247,7 +247,7 @@ App::post('/v1/migrations/firebase')
            ->dynamic($migration, Response::MODEL_MIGRATION);
    });

-App::post('/v1/migrations/supabase')
+Http::post('/v1/migrations/supabase')
    ->groups(['api', 'migrations'])
    ->desc('Migrate Supabase Data')
    ->label('scope', 'migrations.write')
@@ -307,7 +307,7 @@ App::post('/v1/migrations/supabase')
            ->dynamic($migration, Response::MODEL_MIGRATION);
    });

-App::post('/v1/migrations/nhost')
+Http::post('/v1/migrations/nhost')
    ->groups(['api', 'migrations'])
    ->desc('Migrate NHost Data')
    ->label('scope', 'migrations.write')
@@ -369,7 +369,7 @@ App::post('/v1/migrations/nhost')
            ->dynamic($migration, Response::MODEL_MIGRATION);
    });

-App::get('/v1/migrations')
+Http::get('/v1/migrations')
    ->groups(['api', 'migrations'])
    ->desc('List Migrations')
    ->label('scope', 'migrations.read')
@@ -422,7 +422,7 @@ App::get('/v1/migrations')
        ]), Response::MODEL_MIGRATION_LIST);
    });

-App::get('/v1/migrations/:migrationId')
+Http::get('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
    ->desc('Get Migration')
    ->label('scope', 'migrations.read')
@@ -446,7 +446,7 @@ App::get('/v1/migrations/:migrationId')
        $response->dynamic($migration, Response::MODEL_MIGRATION);
    });

-App::get('/v1/migrations/appwrite/report')
+Http::get('/v1/migrations/appwrite/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on Appwrite Data')
    ->label('scope', 'migrations.write')
@@ -488,7 +488,7 @@ App::get('/v1/migrations/appwrite/report')
            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
    });

-App::get('/v1/migrations/firebase/report')
+Http::get('/v1/migrations/firebase/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on Firebase Data')
    ->label('scope', 'migrations.write')
@@ -535,7 +535,7 @@ App::get('/v1/migrations/firebase/report')
            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
    });

-App::get('/v1/migrations/firebase/report/oauth')
+Http::get('/v1/migrations/firebase/report/oauth')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on Firebase Data using OAuth')
    ->label('scope', 'migrations.write')
@@ -626,7 +626,7 @@ App::get('/v1/migrations/firebase/report/oauth')
            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
    });

-App::get('/v1/migrations/firebase/connect')
+Http::get('/v1/migrations/firebase/connect')
    ->desc('Authorize with firebase')
    ->groups(['api', 'migrations'])
    ->label('scope', 'migrations.write')
@@ -668,7 +668,7 @@ App::get('/v1/migrations/firebase/connect')
            ->redirect($url);
    });

-App::get('/v1/migrations/firebase/redirect')
+Http::get('/v1/migrations/firebase/redirect')
    ->desc('Capture and receive data on Firebase authorization')
    ->groups(['api', 'migrations'])
    ->label('scope', 'public')
@@ -780,7 +780,7 @@ App::get('/v1/migrations/firebase/redirect')
            ->redirect($redirect);
    });

-App::get('/v1/migrations/firebase/projects')
+Http::get('/v1/migrations/firebase/projects')
    ->desc('List Firebase Projects')
    ->groups(['api', 'migrations'])
    ->label('scope', 'migrations.read')
@@ -869,7 +869,7 @@ App::get('/v1/migrations/firebase/projects')
        ]), Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST);
    });

-App::get('/v1/migrations/firebase/deauthorize')
+Http::get('/v1/migrations/firebase/deauthorize')
    ->desc('Revoke Appwrite\'s authorization to access Firebase Projects')
    ->groups(['api', 'migrations'])
    ->label('scope', 'migrations.write')
@@ -897,7 +897,7 @@ App::get('/v1/migrations/firebase/deauthorize')
        $response->noContent();
    });

-App::get('/v1/migrations/supabase/report')
+Http::get('/v1/migrations/supabase/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on Supabase Data')
    ->label('scope', 'migrations.write')
@@ -940,7 +940,7 @@ App::get('/v1/migrations/supabase/report')
            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
    });

-App::get('/v1/migrations/nhost/report')
+Http::get('/v1/migrations/nhost/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on NHost Data')
    ->label('scope', 'migrations.write')
@@ -983,7 +983,7 @@ App::get('/v1/migrations/nhost/report')
            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
    });

-App::patch('/v1/migrations/:migrationId')
+Http::patch('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
    ->desc('Retry Migration')
    ->label('scope', 'migrations.write')
@@ -1028,7 +1028,7 @@ App::patch('/v1/migrations/:migrationId')
        $response->noContent();
    });

-App::delete('/v1/migrations/:migrationId')
+Http::delete('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
    ->desc('Delete Migration')
    ->label('scope', 'migrations.write')
@@ -2,7 +2,6 @@

 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
@@ -13,10 +12,11 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
 use Utopia\Database\Validator\UID;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;

-App::get('/v1/project/usage')
+Http::get('/v1/project/usage')
    ->desc('Get project usage stats')
    ->groups(['api', 'usage'])
    ->label('scope', 'projects.read')
@@ -31,7 +31,8 @@ App::get('/v1/project/usage')
    ->param('period', '1d', new WhiteList(['1h', '1d']), 'Period used', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $startDate, string $endDate, string $period, Response $response, Database $dbForProject) {
+    ->inject('authorization')
+    ->action(function (string $startDate, string $endDate, string $period, Response $response, Database $dbForProject, Authorization $authorization) {
        $stats = $total = $usage = [];
        $format = 'Y-m-d 00:00:00';
        $firstDay = (new DateTime($startDate))->format($format);
@@ -40,18 +41,24 @@ App::get('/v1/project/usage')
        $metrics = [
            'total' => [
                METRIC_EXECUTIONS,
+                METRIC_EXECUTIONS_MB_SECONDS,
+                METRIC_BUILDS_MB_SECONDS,
                METRIC_DOCUMENTS,
                METRIC_DATABASES,
                METRIC_USERS,
                METRIC_BUCKETS,
-                METRIC_FILES_STORAGE
+                METRIC_FILES_STORAGE,
+                METRIC_DEPLOYMENTS_STORAGE,
+                METRIC_BUILDS_STORAGE
            ],
            'period' => [
                METRIC_NETWORK_REQUESTS,
                METRIC_NETWORK_INBOUND,
                METRIC_NETWORK_OUTBOUND,
                METRIC_USERS,
-                METRIC_EXECUTIONS
+                METRIC_EXECUTIONS,
+                METRIC_EXECUTIONS_MB_SECONDS,
+                METRIC_BUILDS_MB_SECONDS
            ]
        ];

@@ -70,7 +77,7 @@ App::get('/v1/project/usage')
            '1d' => 'Y-m-d\T00:00:00.000P',
        };

-        Authorization::skip(function () use ($dbForProject, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
+        $authorization->skip(function () use ($dbForProject, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
            foreach ($metrics['total'] as $metric) {
                $result = $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
@@ -128,6 +135,38 @@ App::get('/v1/project/usage')
            ];
        }, $dbForProject->find('functions'));

+        $executionsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
+            $id = $function->getId();
+            $name = $function->getAttribute('name');
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS);
+            $value = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$metric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            return [
+                'resourceId' => $id,
+                'name' => $name,
+                'value' => $value['value'] ?? 0,
+            ];
+        }, $dbForProject->find('functions'));
+
+        $buildsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
+            $id = $function->getId();
+            $name = $function->getAttribute('name');
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS);
+            $value = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$metric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            return [
+                'resourceId' => $id,
+                'name' => $name,
+                'value' => $value['value'] ?? 0,
+            ];
+        }, $dbForProject->find('functions'));
+
        $bucketsBreakdown = array_map(function ($bucket) use ($dbForProject) {
            $id = $bucket->getId();
            $name = $bucket->getAttribute('name');
@@ -144,6 +183,62 @@ App::get('/v1/project/usage')
            ];
        }, $dbForProject->find('buckets'));

+        $functionsStorageBreakdown = array_map(function ($function) use ($dbForProject) {
+            $id = $function->getId();
+            $name = $function->getAttribute('name');
+            $deploymentMetric = str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE);
+            $deploymentValue = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$deploymentMetric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            $buildMetric = str_replace(['{functionInternalId}'], [$function->getInternalId()], METRIC_FUNCTION_ID_BUILDS_STORAGE);
+            $buildValue = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$buildMetric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            $value = ($buildValue['value'] ?? 0) + ($deploymentValue['value'] ?? 0);
+
+            return [
+                'resourceId' => $id,
+                'name' => $name,
+                'value' => $value,
+            ];
+        }, $dbForProject->find('functions'));
+
+        $executionsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
+            $id = $function->getId();
+            $name = $function->getAttribute('name');
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS);
+            $value = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$metric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            return [
+                'resourceId' => $id,
+                'name' => $name,
+                'value' => $value['value'] ?? 0,
+            ];
+        }, $dbForProject->find('functions'));
+
+        $buildsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
+            $id = $function->getId();
+            $name = $function->getAttribute('name');
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS);
+            $value = $dbForProject->findOne('stats', [
+                Query::equal('metric', [$metric]),
+                Query::equal('period', ['inf'])
+            ]);
+
+            return [
+                'resourceId' => $id,
+                'name' => $name,
+                'value' => $value['value'] ?? 0,
+            ];
+        }, $dbForProject->find('functions'));
+
        // merge network inbound + outbound
        $projectBandwidth = [];
        foreach ($usage[METRIC_NETWORK_INBOUND] as $item) {
@@ -171,19 +266,27 @@ App::get('/v1/project/usage')
            'users' => ($usage[METRIC_USERS]),
            'executions' => ($usage[METRIC_EXECUTIONS]),
            'executionsTotal' => $total[METRIC_EXECUTIONS],
+            'executionsMbSecondsTotal' => $total[METRIC_EXECUTIONS_MB_SECONDS],
+            'buildsMbSecondsTotal' => $total[METRIC_BUILDS_MB_SECONDS],
            'documentsTotal' => $total[METRIC_DOCUMENTS],
            'databasesTotal' => $total[METRIC_DATABASES],
            'usersTotal' => $total[METRIC_USERS],
            'bucketsTotal' => $total[METRIC_BUCKETS],
            'filesStorageTotal' => $total[METRIC_FILES_STORAGE],
+            'functionsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE] + $total[METRIC_BUILDS_STORAGE],
+            'buildsStorageTotal' => $total[METRIC_BUILDS_STORAGE],
+            'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
            'executionsBreakdown' => $executionsBreakdown,
-            'bucketsBreakdown' => $bucketsBreakdown
+            'bucketsBreakdown' => $bucketsBreakdown,
+            'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
+            'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
+            'functionsStorageBreakdown' => $functionsStorageBreakdown,
        ]), Response::MODEL_USAGE_PROJECT);
    });


 // Variables
-App::post('/v1/project/variables')
+Http::post('/v1/project/variables')
    ->desc('Create Variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
@@ -238,7 +341,7 @@ App::post('/v1/project/variables')
            ->dynamic($variable, Response::MODEL_VARIABLE);
    });

-App::get('/v1/project/variables')
+Http::get('/v1/project/variables')
    ->desc('List Variables')
    ->groups(['api'])
    ->label('scope', 'projects.read')
@@ -263,7 +366,7 @@ App::get('/v1/project/variables')
        ]), Response::MODEL_VARIABLE_LIST);
    });

-App::get('/v1/project/variables/:variableId')
+Http::get('/v1/project/variables/:variableId')
    ->desc('Get Variable')
    ->groups(['api'])
    ->label('scope', 'projects.read')
@@ -287,7 +390,7 @@ App::get('/v1/project/variables/:variableId')
        $response->dynamic($variable, Response::MODEL_VARIABLE);
    });

-App::put('/v1/project/variables/:variableId')
+Http::put('/v1/project/variables/:variableId')
    ->desc('Update Variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
@@ -333,7 +436,7 @@ App::put('/v1/project/variables/:variableId')
        $response->dynamic($variable, Response::MODEL_VARIABLE);
    });

-App::delete('/v1/project/variables/:variableId')
+Http::delete('/v1/project/variables/:variableId')
    ->desc('Delete Variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
@@ -13,15 +13,18 @@ use Appwrite\Network\Validator\Origin;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\ProjectId;
 use Appwrite\Utopia\Database\Validator\Queries\Projects;
+use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use PHPMailer\PHPMailer\PHPMailer;
-use Utopia\Abuse\Adapters\TimeLimit;
-use Utopia\App;
+use Utopia\Abuse\Adapters\Database\TimeLimit;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Database;
+use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Exception\Query as QueryException;
@@ -29,24 +32,25 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Validator\PublicDomain;
 use Utopia\DSN\DSN;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\ArrayList;
+use Utopia\Http\Validator\Boolean;
+use Utopia\Http\Validator\Hostname;
+use Utopia\Http\Validator\Integer;
+use Utopia\Http\Validator\Multiple;
+use Utopia\Http\Validator\Range;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\URL;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Locale\Locale;
-use Utopia\Pools\Group;
 use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Hostname;
-use Utopia\Validator\Integer;
-use Utopia\Validator\Multiple;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;

-App::init()
+Http::init()
    ->groups(['projects'])
    ->inject('project')
    ->action(function (Document $project) {
@@ -55,9 +59,10 @@ App::init()
        }
    });

-App::post('/v1/projects')
+Http::post('/v1/projects')
    ->desc('Create project')
    ->groups(['api', 'projects'])
+    ->label('audits.event', 'projects.create')
    ->label('scope', 'projects.write')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'projects')
@@ -84,8 +89,9 @@ App::post('/v1/projects')
    ->inject('cache')
    ->inject('pools')
    ->inject('hooks')
-    ->action(function (string $projectId, string $name, string $teamId, string $region, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Request $request, Response $response, Database $dbForConsole, Cache $cache, Group $pools, Hooks $hooks) {
-
+    ->inject('authorization')
+    ->inject('connections')
+    ->action(function (string $projectId, string $name, string $teamId, string $region, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Request $request, Response $response, Database $dbForConsole, Cache $cache, array $pools, Hooks $hooks, Authorization $authorization, Connections $connections) {
        $team = $dbForConsole->getDocument('teams', $teamId);

        if ($team->isEmpty()) {
@@ -172,6 +178,7 @@ App::post('/v1/projects')
                'webhooks' => null,
                'keys' => null,
                'auths' => $auths,
+                'accessedAt' => DateTime::now(),
                'search' => implode(' ', [$projectId, $name]),
                'database' => $dsn,
            ]));
@@ -186,8 +193,21 @@ App::post('/v1/projects')
            $dsn = new DSN('mysql://' . $dsn);
        }

-        $adapter = $pools->get($dsn->getHost())->pop()->getResource();
+        $pool = $pools['pools-database-' . $dsn->getHost()]['pool'];
+        $connectionDsn = $pools['pools-database-' . $dsn->getHost()]['dsn'];
+        $connection = $pool->get();
+        $connections->add($connection, $pool);
+
+        $adapter = match ($connectionDsn->getScheme()) {
+            'mariadb' => new MariaDB($connection),
+            'mysql' => new MySQL($connection),
+            default => null
+        };
+
+        $adapter->setDatabase($connectionDsn->getPath());
+
        $dbForProject = new Database($adapter, $cache);
+        $dbForProject->setAuthorization($authorization);

        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
            $dbForProject
@@ -205,10 +225,8 @@ App::post('/v1/projects')

        $audit = new Audit($dbForProject);
        $audit->setup();
-
        $abuse = new TimeLimit('', 0, 1, $dbForProject);
        $abuse->setup();
-
        /** @var array $collections */
        $collections = Config::getParam('collections', [])['projects'] ?? [];

@@ -231,17 +249,17 @@ App::post('/v1/projects')
                // Collection already exists
            }
        }
-
+        $connections->reclaim();
        // Hook allowing instant project mirroring during migration
        // Outside of migration, hook is not registered and has no effect
-        $hooks->trigger('afterProjectCreation', [ $project, $pools, $cache ]);
+        $hooks->trigger('afterProjectCreation', [$project, $pools, $cache]);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
            ->dynamic($project, Response::MODEL_PROJECT);
    });

-App::get('/v1/projects')
+Http::get('/v1/projects')
    ->desc('List projects')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -256,7 +274,6 @@ App::get('/v1/projects')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (array $queries, string $search, Response $response, Database $dbForConsole) {
-
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -294,7 +311,7 @@ App::get('/v1/projects')
        ]), Response::MODEL_PROJECT_LIST);
    });

-App::get('/v1/projects/:projectId')
+Http::get('/v1/projects/:projectId')
    ->desc('Get project')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -308,7 +325,6 @@ App::get('/v1/projects/:projectId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -318,7 +334,7 @@ App::get('/v1/projects/:projectId')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId')
+Http::patch('/v1/projects/:projectId')
    ->desc('Update project')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -342,31 +358,34 @@ App::patch('/v1/projects/:projectId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $name, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
            throw new Exception(Exception::PROJECT_NOT_FOUND);
        }

-        $project = $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('name', $name)
-            ->setAttribute('description', $description)
-            ->setAttribute('logo', $logo)
-            ->setAttribute('url', $url)
-            ->setAttribute('legalName', $legalName)
-            ->setAttribute('legalCountry', $legalCountry)
-            ->setAttribute('legalState', $legalState)
-            ->setAttribute('legalCity', $legalCity)
-            ->setAttribute('legalAddress', $legalAddress)
-            ->setAttribute('legalTaxId', $legalTaxId)
-            ->setAttribute('search', implode(' ', [$projectId, $name])));
+        $project = $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('name', $name)
+                ->setAttribute('description', $description)
+                ->setAttribute('logo', $logo)
+                ->setAttribute('url', $url)
+                ->setAttribute('legalName', $legalName)
+                ->setAttribute('legalCountry', $legalCountry)
+                ->setAttribute('legalState', $legalState)
+                ->setAttribute('legalCity', $legalCity)
+                ->setAttribute('legalAddress', $legalAddress)
+                ->setAttribute('legalTaxId', $legalTaxId)
+                ->setAttribute('search', implode(' ', [$projectId, $name]))
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/team')
-    ->desc('Update project team')
+Http::patch('/v1/projects/:projectId/team')
+    ->desc('Update Project Team')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -380,7 +399,6 @@ App::patch('/v1/projects/:projectId/team')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $teamId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);
        $team = $dbForConsole->getDocument('teams', $teamId);

@@ -433,7 +451,7 @@ App::patch('/v1/projects/:projectId/team')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/service')
+Http::patch('/v1/projects/:projectId/service')
    ->desc('Update service status')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -449,7 +467,6 @@ App::patch('/v1/projects/:projectId/service')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $service, bool $status, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -464,7 +481,7 @@ App::patch('/v1/projects/:projectId/service')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/service/all')
+Http::patch('/v1/projects/:projectId/service/all')
    ->desc('Update all service status')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -479,7 +496,6 @@ App::patch('/v1/projects/:projectId/service/all')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, bool $status, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -498,7 +514,7 @@ App::patch('/v1/projects/:projectId/service/all')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/api')
+Http::patch('/v1/projects/:projectId/api')
    ->desc('Update API status')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -514,7 +530,6 @@ App::patch('/v1/projects/:projectId/api')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $api, bool $status, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -529,7 +544,7 @@ App::patch('/v1/projects/:projectId/api')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/api/all')
+Http::patch('/v1/projects/:projectId/api/all')
    ->desc('Update all API status')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -544,7 +559,6 @@ App::patch('/v1/projects/:projectId/api/all')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, bool $status, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -563,7 +577,7 @@ App::patch('/v1/projects/:projectId/api/all')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/oauth2')
+Http::patch('/v1/projects/:projectId/oauth2')
    ->desc('Update project OAuth2')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -581,7 +595,6 @@ App::patch('/v1/projects/:projectId/oauth2')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $provider, ?string $appId, ?string $secret, ?bool $enabled, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -607,7 +620,7 @@ App::patch('/v1/projects/:projectId/oauth2')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/session-alerts')
+Http::patch('/v1/projects/:projectId/auth/session-alerts')
    ->desc('Update project sessions emails')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -638,7 +651,7 @@ App::patch('/v1/projects/:projectId/auth/session-alerts')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/limit')
+Http::patch('/v1/projects/:projectId/auth/limit')
    ->desc('Update project users limit')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -653,7 +666,6 @@ App::patch('/v1/projects/:projectId/auth/limit')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -663,13 +675,17 @@ App::patch('/v1/projects/:projectId/auth/limit')
        $auths = $project->getAttribute('auths', []);
        $auths['limit'] = $limit;

-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
+        $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('auths', $auths)
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/duration')
+Http::patch('/v1/projects/:projectId/auth/duration')
    ->desc('Update project authentication duration')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -684,7 +700,6 @@ App::patch('/v1/projects/:projectId/auth/duration')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, int $duration, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -694,13 +709,17 @@ App::patch('/v1/projects/:projectId/auth/duration')
        $auths = $project->getAttribute('auths', []);
        $auths['duration'] = $duration;

-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
+        $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('auths', $auths)
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/:method')
+Http::patch('/v1/projects/:projectId/auth/:method')
    ->desc('Update project auth method status. Use this endpoint to enable or disable a given auth method for this project.')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -716,10 +735,9 @@ App::patch('/v1/projects/:projectId/auth/:method')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $method, bool $status, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);
-        $auth = Config::getParam('auth')[$method] ?? [];
-        $authKey = $auth['key'] ?? '';
+        $authConfig = Config::getParam('auth')[$method] ?? [];
+        $authKey = $authConfig['key'] ?? '';
        $status = ($status === '1' || $status === 'true' || $status === 1 || $status === true);

        if ($project->isEmpty()) {
@@ -734,7 +752,7 @@ App::patch('/v1/projects/:projectId/auth/:method')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/password-history')
+Http::patch('/v1/projects/:projectId/auth/password-history')
    ->desc('Update authentication password history. Use this endpoint to set the number of password history to save and 0 to disable password history.')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -749,7 +767,6 @@ App::patch('/v1/projects/:projectId/auth/password-history')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -759,13 +776,17 @@ App::patch('/v1/projects/:projectId/auth/password-history')
        $auths = $project->getAttribute('auths', []);
        $auths['passwordHistory'] = $limit;

-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
+        $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('auths', $auths)
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/password-dictionary')
+Http::patch('/v1/projects/:projectId/auth/password-dictionary')
    ->desc('Update authentication password dictionary status. Use this endpoint to enable or disable the dicitonary check for user password')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -780,7 +801,6 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, bool $enabled, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -790,13 +810,17 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
        $auths = $project->getAttribute('auths', []);
        $auths['passwordDictionary'] = $enabled;

-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
+        $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('auths', $auths)
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/personal-data')
+Http::patch('/v1/projects/:projectId/auth/personal-data')
    ->desc('Enable or disable checking user passwords for similarity with their personal data.')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -811,7 +835,6 @@ App::patch('/v1/projects/:projectId/auth/personal-data')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, bool $enabled, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -821,13 +844,17 @@ App::patch('/v1/projects/:projectId/auth/personal-data')
        $auths = $project->getAttribute('auths', []);
        $auths['personalDataCheck'] = $enabled;

-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
+        $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('auths', $auths)
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/max-sessions')
+Http::patch('/v1/projects/:projectId/auth/max-sessions')
    ->desc('Update project user sessions limit')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -842,7 +869,6 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -852,13 +878,17 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
        $auths = $project->getAttribute('auths', []);
        $auths['maxSessions'] = $limit;

-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
+        $dbForConsole->updateDocument(
+            'projects',
+            $project->getId(),
+            $project
+                ->setAttribute('auths', $auths)
+        );

        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/mock-numbers')
+Http::patch('/v1/projects/:projectId/auth/mock-numbers')
    ->desc('Update the mock numbers for the project')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -874,6 +904,14 @@ App::patch('/v1/projects/:projectId/auth/mock-numbers')
    ->inject('dbForConsole')
    ->action(function (string $projectId, array $numbers, Response $response, Database $dbForConsole) {

+        $uniqueNumbers = [];
+        foreach ($numbers as $number) {
+            if (isset($uniqueNumbers[$number['phone']])) {
+                throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Duplicate phone numbers are not allowed.');
+            }
+            $uniqueNumbers[$number['phone']] = $number['otp'];
+        }
+
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -889,9 +927,10 @@ App::patch('/v1/projects/:projectId/auth/mock-numbers')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::delete('/v1/projects/:projectId')
+Http::delete('/v1/projects/:projectId')
    ->desc('Delete project')
    ->groups(['api', 'projects'])
+    ->label('audits.event', 'projects.delete')
    ->label('scope', 'projects.write')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'projects')
@@ -923,7 +962,7 @@ App::delete('/v1/projects/:projectId')

 // Webhooks

-App::post('/v1/projects/:projectId/webhooks')
+Http::post('/v1/projects/:projectId/webhooks')
    ->desc('Create webhook')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -944,14 +983,13 @@ App::post('/v1/projects/:projectId/webhooks')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $name, bool $enabled, array $events, string $url, bool $security, string $httpUser, string $httpPass, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
            throw new Exception(Exception::PROJECT_NOT_FOUND);
        }

-        $security = (bool) filter_var($security, FILTER_VALIDATE_BOOLEAN);
+        $security = (bool)filter_var($security, FILTER_VALIDATE_BOOLEAN);

        $webhook = new Document([
            '$id' => ID::unique(),
@@ -981,7 +1019,7 @@ App::post('/v1/projects/:projectId/webhooks')
            ->dynamic($webhook, Response::MODEL_WEBHOOK);
    });

-App::get('/v1/projects/:projectId/webhooks')
+Http::get('/v1/projects/:projectId/webhooks')
    ->desc('List webhooks')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -995,7 +1033,6 @@ App::get('/v1/projects/:projectId/webhooks')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1013,7 +1050,7 @@ App::get('/v1/projects/:projectId/webhooks')
        ]), Response::MODEL_WEBHOOK_LIST);
    });

-App::get('/v1/projects/:projectId/webhooks/:webhookId')
+Http::get('/v1/projects/:projectId/webhooks/:webhookId')
    ->desc('Get webhook')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -1028,7 +1065,6 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1047,7 +1083,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
    });

-App::put('/v1/projects/:projectId/webhooks/:webhookId')
+Http::put('/v1/projects/:projectId/webhooks/:webhookId')
    ->desc('Update webhook')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1069,7 +1105,6 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $webhookId, string $name, bool $enabled, array $events, string $url, bool $security, string $httpUser, string $httpPass, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1106,7 +1141,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
    });

-App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
+Http::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
    ->desc('Update webhook signature key')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1121,7 +1156,6 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1145,7 +1179,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
    });

-App::delete('/v1/projects/:projectId/webhooks/:webhookId')
+Http::delete('/v1/projects/:projectId/webhooks/:webhookId')
    ->desc('Delete webhook')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1159,7 +1193,6 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1184,7 +1217,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')

 // Keys

-App::post('/v1/projects/:projectId/keys')
+Http::post('/v1/projects/:projectId/keys')
    ->desc('Create key')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1201,7 +1234,6 @@ App::post('/v1/projects/:projectId/keys')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $name, array $scopes, ?string $expire, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1234,7 +1266,7 @@ App::post('/v1/projects/:projectId/keys')
            ->dynamic($key, Response::MODEL_KEY);
    });

-App::get('/v1/projects/:projectId/keys')
+Http::get('/v1/projects/:projectId/keys')
    ->desc('List keys')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -1248,7 +1280,6 @@ App::get('/v1/projects/:projectId/keys')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1266,7 +1297,7 @@ App::get('/v1/projects/:projectId/keys')
        ]), Response::MODEL_KEY_LIST);
    });

-App::get('/v1/projects/:projectId/keys/:keyId')
+Http::get('/v1/projects/:projectId/keys/:keyId')
    ->desc('Get key')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -1281,7 +1312,6 @@ App::get('/v1/projects/:projectId/keys/:keyId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $keyId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1300,7 +1330,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
        $response->dynamic($key, Response::MODEL_KEY);
    });

-App::put('/v1/projects/:projectId/keys/:keyId')
+Http::put('/v1/projects/:projectId/keys/:keyId')
    ->desc('Update key')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1318,7 +1348,6 @@ App::put('/v1/projects/:projectId/keys/:keyId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $keyId, string $name, array $scopes, ?string $expire, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1346,7 +1375,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
        $response->dynamic($key, Response::MODEL_KEY);
    });

-App::delete('/v1/projects/:projectId/keys/:keyId')
+Http::delete('/v1/projects/:projectId/keys/:keyId')
    ->desc('Delete key')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1360,7 +1389,6 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $keyId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1385,7 +1413,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')

 // JWT Keys

-App::post('/v1/projects/:projectId/jwts')
+Http::post('/v1/projects/:projectId/jwts')
    ->groups(['api', 'projects'])
    ->desc('Create JWT')
    ->label('scope', 'projects.write')
@@ -1420,9 +1448,10 @@ App::post('/v1/projects/:projectId/jwts')

 // Platforms

-App::post('/v1/projects/:projectId/platforms')
+Http::post('/v1/projects/:projectId/platforms')
    ->desc('Create platform')
    ->groups(['api', 'projects'])
+    ->label('audits.event', 'platforms.create')
    ->label('scope', 'projects.write')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'projects')
@@ -1431,7 +1460,7 @@ App::post('/v1/projects/:projectId/platforms')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_PLATFORM)
    ->param('projectId', '', new UID(), 'Project unique ID.')
-    ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS,  Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY], true), 'Platform type.')
+    ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS,  Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY, Origin::CLIENT_TYPE_REACT_NATIVE_IOS, Origin::CLIENT_TYPE_REACT_NATIVE_ANDROID], true), 'Platform type.')
    ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
    ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true)
    ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
@@ -1470,7 +1499,7 @@ App::post('/v1/projects/:projectId/platforms')
            ->dynamic($platform, Response::MODEL_PLATFORM);
    });

-App::get('/v1/projects/:projectId/platforms')
+Http::get('/v1/projects/:projectId/platforms')
    ->desc('List platforms')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -1484,7 +1513,6 @@ App::get('/v1/projects/:projectId/platforms')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1502,7 +1530,7 @@ App::get('/v1/projects/:projectId/platforms')
        ]), Response::MODEL_PLATFORM_LIST);
    });

-App::get('/v1/projects/:projectId/platforms/:platformId')
+Http::get('/v1/projects/:projectId/platforms/:platformId')
    ->desc('Get platform')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
@@ -1517,7 +1545,6 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $platformId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1536,7 +1563,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
        $response->dynamic($platform, Response::MODEL_PLATFORM);
    });

-App::put('/v1/projects/:projectId/platforms/:platformId')
+Http::put('/v1/projects/:projectId/platforms/:platformId')
    ->desc('Update platform')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1583,9 +1610,10 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
        $response->dynamic($platform, Response::MODEL_PLATFORM);
    });

-App::delete('/v1/projects/:projectId/platforms/:platformId')
+Http::delete('/v1/projects/:projectId/platforms/:platformId')
    ->desc('Delete platform')
    ->groups(['api', 'projects'])
+    ->label('audits.event', 'platforms.delete')
    ->label('scope', 'projects.write')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'projects')
@@ -1597,7 +1625,6 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $platformId, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1622,7 +1649,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')


 // CUSTOM SMTP and Templates
-App::patch('/v1/projects/:projectId/smtp')
+Http::patch('/v1/projects/:projectId/smtp')
    ->desc('Update SMTP')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1645,7 +1672,6 @@ App::patch('/v1/projects/:projectId/smtp')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, bool $enabled, string $senderName, string $senderEmail, string $replyTo, string $host, int $port, string $username, string $password, string $secure, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1712,7 +1738,7 @@ App::patch('/v1/projects/:projectId/smtp')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::post('/v1/projects/:projectId/smtp/tests')
+Http::post('/v1/projects/:projectId/smtp/tests')
    ->desc('Create SMTP test')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1771,7 +1797,7 @@ App::post('/v1/projects/:projectId/smtp/tests')
        return $response->noContent();
    });

-App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
+Http::get('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->desc('Get custom SMS template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1787,7 +1813,6 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $type, string $locale, Response $response, Database $dbForConsole) {
-
        throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED);

        $project = $dbForConsole->getDocument('projects', $projectId);
@@ -1797,7 +1822,7 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
        }

        $templates = $project->getAttribute('templates', []);
-        $template  = $templates['sms.' . $type . '-' . $locale] ?? null;
+        $template = $templates['sms.' . $type . '-' . $locale] ?? null;

        if (is_null($template)) {
            $template = [
@@ -1812,7 +1837,7 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
    });


-App::get('/v1/projects/:projectId/templates/email/:type/:locale')
+Http::get('/v1/projects/:projectId/templates/email/:type/:locale')
    ->desc('Get custom email template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1828,7 +1853,6 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $type, string $locale, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1836,7 +1860,7 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
        }

        $templates = $project->getAttribute('templates', []);
-        $template  = $templates['email.' . $type . '-' . $locale] ?? null;
+        $template = $templates['email.' . $type . '-' . $locale] ?? null;

        $localeObj = new Locale($locale);
        if (is_null($template)) {
@@ -1844,7 +1868,7 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
            $message
                ->setParam('{{hello}}', $localeObj->getText("emails.{$type}.hello"))
                ->setParam('{{footer}}', $localeObj->getText("emails.{$type}.footer"))
-                ->setParam('{{body}}', $localeObj->getText('emails.' . $type . '.body'), escapeHtml: false)
+                ->setParam('{{body}}', $localeObj->getText('emails.' . $type . '.body'), escape: false)
                ->setParam('{{thanks}}', $localeObj->getText("emails.{$type}.thanks"))
                ->setParam('{{signature}}', $localeObj->getText("emails.{$type}.signature"))
                ->setParam('{{direction}}', $localeObj->getText('settings.direction'));
@@ -1864,7 +1888,7 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
        $response->dynamic(new Document($template), Response::MODEL_EMAIL_TEMPLATE);
    });

-App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
+Http::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->desc('Update custom SMS template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1881,7 +1905,6 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $type, string $locale, string $message, Response $response, Database $dbForConsole) {
-
        throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED);

        $project = $dbForConsole->getDocument('projects', $projectId);
@@ -1904,7 +1927,7 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
        ]), Response::MODEL_SMS_TEMPLATE);
    });

-App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
+Http::patch('/v1/projects/:projectId/templates/email/:type/:locale')
    ->desc('Update custom email templates')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1925,7 +1948,6 @@ App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $type, string $locale, string $subject, string $message, string $senderName, string $senderEmail, string $replyTo, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -1954,7 +1976,7 @@ App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
        ]), Response::MODEL_EMAIL_TEMPLATE);
    });

-App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
+Http::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->desc('Reset custom SMS template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -1970,7 +1992,6 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $type, string $locale, Response $response, Database $dbForConsole) {
-
        throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED);

        $project = $dbForConsole->getDocument('projects', $projectId);
@@ -1980,7 +2001,7 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
        }

        $templates = $project->getAttribute('templates', []);
-        $template  = $templates['sms.' . $type . '-' . $locale] ?? null;
+        $template = $templates['sms.' . $type . '-' . $locale] ?? null;

        if (is_null($template)) {
            throw new Exception(Exception::PROJECT_TEMPLATE_DEFAULT_DELETION);
@@ -1997,7 +2018,7 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
        ]), Response::MODEL_SMS_TEMPLATE);
    });

-App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
+Http::delete('/v1/projects/:projectId/templates/email/:type/:locale')
    ->desc('Reset custom email template')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.write')
@@ -2013,7 +2034,6 @@ App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
    ->inject('response')
    ->inject('dbForConsole')
    ->action(function (string $projectId, string $type, string $locale, Response $response, Database $dbForConsole) {
-
        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
@@ -2021,7 +2041,7 @@ App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
        }

        $templates = $project->getAttribute('templates', []);
-        $template  = $templates['email.' . $type . '-' . $locale] ?? null;
+        $template = $templates['email.' . $type . '-' . $locale] ?? null;

        if (is_null($template)) {
            throw new Exception(Exception::PROJECT_TEMPLATE_DEFAULT_DELETION);
@@ -7,7 +7,6 @@ use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\CNAME;
 use Appwrite\Utopia\Database\Validator\Queries\Rules;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Query as QueryException;
@@ -15,13 +14,14 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\Domain as ValidatorDomain;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Logger\Log;
 use Utopia\System\System;
-use Utopia\Validator\Domain as ValidatorDomain;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;

-App::post('/v1/proxy/rules')
+Http::post('/v1/proxy/rules')
    ->groups(['api', 'proxy'])
    ->desc('Create Rule')
    ->label('scope', 'rules.write')
@@ -51,7 +51,7 @@ App::post('/v1/proxy/rules')
        }

        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-        if (str_ends_with($domain, $functionsDomain)) {
+        if ($functionsDomain != '' && str_ends_with($domain, $functionsDomain)) {
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or it\'s subdomain to specific resource. Please use different domain.');
        }

@@ -147,7 +147,7 @@ App::post('/v1/proxy/rules')
            ->dynamic($rule, Response::MODEL_PROXY_RULE);
    });

-App::get('/v1/proxy/rules')
+Http::get('/v1/proxy/rules')
    ->groups(['api', 'proxy'])
    ->desc('List Rules')
    ->label('scope', 'rules.read')
@@ -210,7 +210,7 @@ App::get('/v1/proxy/rules')
        ]), Response::MODEL_PROXY_RULE_LIST);
    });

-App::get('/v1/proxy/rules/:ruleId')
+Http::get('/v1/proxy/rules/:ruleId')
    ->groups(['api', 'proxy'])
    ->desc('Get Rule')
    ->label('scope', 'rules.read')
@@ -239,7 +239,7 @@ App::get('/v1/proxy/rules/:ruleId')
        $response->dynamic($rule, Response::MODEL_PROXY_RULE);
    });

-App::delete('/v1/proxy/rules/:ruleId')
+Http::delete('/v1/proxy/rules/:ruleId')
    ->groups(['api', 'proxy'])
    ->desc('Delete Rule')
    ->label('scope', 'rules.write')
@@ -276,7 +276,7 @@ App::delete('/v1/proxy/rules/:ruleId')
        $response->noContent();
    });

-App::patch('/v1/proxy/rules/:ruleId/verification')
+Http::patch('/v1/proxy/rules/:ruleId/verification')
    ->desc('Update Rule Verification Status')
    ->groups(['api', 'proxy'])
    ->label('scope', 'rules.write')
@@ -11,8 +11,8 @@ use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Buckets;
 use Appwrite\Utopia\Database\Validator\Queries\Files;
+use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -23,8 +23,16 @@ use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\UID;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\ArrayList;
+use Utopia\Http\Validator\Boolean;
+use Utopia\Http\Validator\HexColor;
+use Utopia\Http\Validator\Range;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Image\Image;
 use Utopia\Storage\Compression\Algorithms\GZIP;
 use Utopia\Storage\Compression\Algorithms\Zstd;
@@ -35,16 +43,9 @@ use Utopia\Storage\Validator\File;
 use Utopia\Storage\Validator\FileExt;
 use Utopia\Storage\Validator\FileSize;
 use Utopia\Storage\Validator\Upload;
-use Utopia\Swoole\Request;
 use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\HexColor;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;

-App::post('/v1/storage/buckets')
+Http::post('/v1/storage/buckets')
    ->desc('Create bucket')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.write')
@@ -63,7 +64,7 @@ App::post('/v1/storage/buckets')
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, no user is granted with any permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
-    ->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1024 * 1024, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1024 * 1024), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
+    ->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
    ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ',  [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
    ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
@@ -142,7 +143,7 @@ App::post('/v1/storage/buckets')
            ->dynamic($bucket, Response::MODEL_BUCKET);
    });

-App::get('/v1/storage/buckets')
+Http::get('/v1/storage/buckets')
    ->desc('List buckets')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.read')
@@ -196,7 +197,7 @@ App::get('/v1/storage/buckets')
        ]), Response::MODEL_BUCKET_LIST);
    });

-App::get('/v1/storage/buckets/:bucketId')
+Http::get('/v1/storage/buckets/:bucketId')
    ->desc('Get bucket')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.read')
@@ -221,7 +222,7 @@ App::get('/v1/storage/buckets/:bucketId')
        $response->dynamic($bucket, Response::MODEL_BUCKET);
    });

-App::put('/v1/storage/buckets/:bucketId')
+Http::put('/v1/storage/buckets/:bucketId')
    ->desc('Update bucket')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.write')
@@ -240,7 +241,7 @@ App::put('/v1/storage/buckets/:bucketId')
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
-    ->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1024 * 1024, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1024 * 1024), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
+    ->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
    ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
    ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
@@ -288,7 +289,7 @@ App::put('/v1/storage/buckets/:bucketId')
        $response->dynamic($bucket, Response::MODEL_BUCKET);
    });

-App::delete('/v1/storage/buckets/:bucketId')
+Http::delete('/v1/storage/buckets/:bucketId')
    ->desc('Delete bucket')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.write')
@@ -329,7 +330,7 @@ App::delete('/v1/storage/buckets/:bucketId')
        $response->noContent();
    });

-App::post('/v1/storage/buckets/:bucketId/files')
+Http::post('/v1/storage/buckets/:bucketId/files')
    ->alias('/v1/storage/files', ['bucketId' => 'default'])
    ->desc('Create file')
    ->groups(['api', 'storage'])
@@ -361,19 +362,19 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->inject('mode')
    ->inject('deviceForFiles')
    ->inject('deviceForLocal')
-    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode, Device $deviceForFiles, Device $deviceForLocal) {
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode, Device $deviceForFiles, Device $deviceForLocal, Authorization $authorization) {

-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $validator = new Authorization(Database::PERMISSION_CREATE);
-        if (!$validator->isValid($bucket->getCreate())) {
+        if (!$authorization->isValid(new Input(Database::PERMISSION_CREATE, $bucket->getCreate()))) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

@@ -397,7 +398,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
        }

        // Users can only manage their own roles, API keys and Admin users can manage any
-        $roles = Authorization::getRoles();
+        $roles = $authorization->getRoles();
        if (!Auth::isAppUser($roles) && !Auth::isPrivilegedUser($roles)) {
            foreach (Database::PERMISSIONS as $type) {
                foreach ($permissions as $permission) {
@@ -410,7 +411,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                        $permission->getIdentifier(),
                        $permission->getDimension()
                    ))->toString();
-                    if (!Authorization::isRole($role)) {
+                    if (!$authorization->isRole($role)) {
                        throw new Exception(Exception::USER_UNAUTHORIZED, 'Permissions must be one of: (' . \implode(', ', $roles) . ')');
                    }
                }
@@ -630,11 +631,10 @@ App::post('/v1/storage/buckets/:bucketId/files')
                 * However as with chunk upload even if we are updating, we are essentially creating a file
                 * adding it's new chunk so we validate create permission instead of update
                 */
-                $validator = new Authorization(Database::PERMISSION_CREATE);
-                if (!$validator->isValid($bucket->getCreate())) {
+                if (!$authorization->isValid(new Input(Database::PERMISSION_CREATE, $bucket->getCreate()))) {
                    throw new Exception(Exception::USER_UNAUTHORIZED);
                }
-                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+                $file = $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
            }
        } else {
            if ($file->isEmpty()) {
@@ -669,11 +669,10 @@ App::post('/v1/storage/buckets/:bucketId/files')
                 * However as with chunk upload even if we are updating, we are essentially creating a file
                 * adding it's new chunk so we validate create permission instead of update
                 */
-                $validator = new Authorization(Database::PERMISSION_CREATE);
-                if (!$validator->isValid($bucket->getCreate())) {
+                if (!$authorization->isValid(new Input(Database::PERMISSION_CREATE, $bucket->getCreate()))) {
                    throw new Exception(Exception::USER_UNAUTHORIZED);
                }
-                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+                $file = $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
            }
        }

@@ -690,7 +689,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
            ->dynamic($file, Response::MODEL_FILE);
    });

-App::get('/v1/storage/buckets/:bucketId/files')
+Http::get('/v1/storage/buckets/:bucketId/files')
    ->alias('/v1/storage/files', ['bucketId' => 'default'])
    ->desc('List files')
    ->groups(['api', 'storage'])
@@ -708,19 +707,19 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('mode')
-    ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, string $mode) {
-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->inject('authorization')
+    ->action(function (string $bucketId, array $queries, string $search, Response $response, Database $dbForProject, string $mode, Authorization $authorization) {
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_READ);
-        $valid = $validator->isValid($bucket->getRead());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }
@@ -749,7 +748,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
            if ($fileSecurity && !$valid) {
                $cursorDocument = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
            } else {
-                $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
            }

            if ($cursorDocument->isEmpty()) {
@@ -765,8 +764,8 @@ App::get('/v1/storage/buckets/:bucketId/files')
            $files = $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries);
            $total = $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
        } else {
-            $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries));
-            $total = Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
+            $files = $authorization->skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries));
+            $total = $authorization->skip(fn () => $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
        }

        $response->dynamic(new Document([
@@ -775,7 +774,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
        ]), Response::MODEL_FILE_LIST);
    });

-App::get('/v1/storage/buckets/:bucketId/files/:fileId')
+Http::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->alias('/v1/storage/files/:fileId', ['bucketId' => 'default'])
    ->desc('Get file')
    ->groups(['api', 'storage'])
@@ -792,19 +791,19 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('mode')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, string $mode) {
-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, string $mode, Authorization $authorization) {
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_READ);
-        $valid = $validator->isValid($bucket->getRead());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }
@@ -812,7 +811,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
        if ($fileSecurity && !$valid) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
        }

        if ($file->isEmpty()) {
@@ -822,7 +821,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
        $response->dynamic($file, Response::MODEL_FILE);
    });

-App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
+Http::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->alias('/v1/storage/files/:fileId/preview', ['bucketId' => 'default'])
    ->desc('Get file preview')
    ->groups(['api', 'storage'])
@@ -857,24 +856,24 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->inject('mode')
    ->inject('deviceForFiles')
    ->inject('deviceForLocal')
-    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Request $request, Response $response, Document $project, Database $dbForProject, string $mode, Device $deviceForFiles, Device $deviceForLocal) {
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Request $request, Response $response, Document $project, Database $dbForProject, string $mode, Device $deviceForFiles, Device $deviceForLocal, Authorization $authorization) {

        if (!\extension_loaded('imagick')) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
        }

-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_READ);
-        $valid = $validator->isValid($bucket->getRead());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }
@@ -882,7 +881,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
        if ($fileSecurity && !$valid) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
        }

        if ($file->isEmpty()) {
@@ -998,7 +997,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
        unset($image);
    });

-App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
+Http::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->alias('/v1/storage/files/:fileId/download', ['bucketId' => 'default'])
    ->desc('Get file for download')
    ->groups(['api', 'storage'])
@@ -1017,20 +1016,20 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->inject('dbForProject')
    ->inject('mode')
    ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, Request $request, Response $response, Database $dbForProject, string $mode, Device $deviceForFiles) {
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, Request $request, Response $response, Database $dbForProject, string $mode, Device $deviceForFiles, Authorization $authorization) {

-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_READ);
-        $valid = $validator->isValid($bucket->getRead());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }
@@ -1038,7 +1037,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
        if ($fileSecurity && !$valid) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
        }

        if ($file->isEmpty()) {
@@ -1138,7 +1137,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
        }
    });

-App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
+Http::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->alias('/v1/storage/files/:fileId/view', ['bucketId' => 'default'])
    ->desc('Get file for view')
    ->groups(['api', 'storage'])
@@ -1157,19 +1156,19 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->inject('dbForProject')
    ->inject('mode')
    ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, Response $response, Request $request, Database $dbForProject, string $mode, Device $deviceForFiles) {
-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, Response $response, Request $request, Database $dbForProject, string $mode, Device $deviceForFiles, Authorization $authorization) {
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_READ);
-        $valid = $validator->isValid($bucket->getRead());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }
@@ -1177,7 +1176,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
        if ($fileSecurity && !$valid) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
        }

        if ($file->isEmpty()) {
@@ -1290,7 +1289,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
        }
    });

-App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
+Http::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
    ->desc('Get file for push notification')
    ->groups(['api', 'storage'])
    ->label('scope', 'public')
@@ -1306,8 +1305,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
    ->inject('project')
    ->inject('mode')
    ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, string $jwt, Response $response, Request $request, Database $dbForProject, Document $project, string $mode, Device $deviceForFiles) {
-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, string $jwt, Response $response, Request $request, Database $dbForProject, Document $project, string $mode, Device $deviceForFiles, Authorization $authorization) {
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

        $decoder = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);

@@ -1325,14 +1325,14 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -1443,7 +1443,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
        }
    });

-App::put('/v1/storage/buckets/:bucketId/files/:fileId')
+Http::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->alias('/v1/storage/files/:fileId', ['bucketId' => 'default'])
    ->desc('Update file')
    ->groups(['api', 'storage'])
@@ -1470,26 +1470,26 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->inject('user')
    ->inject('mode')
    ->inject('queueForEvents')
-    ->action(function (string $bucketId, string $fileId, ?string $name, ?array $permissions, Response $response, Database $dbForProject, Document $user, string $mode, Event $queueForEvents) {
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, ?string $name, ?array $permissions, Response $response, Database $dbForProject, Document $user, string $mode, Event $queueForEvents, Authorization $authorization) {

-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_UPDATE);
-        $valid = $validator->isValid($bucket->getUpdate());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_UPDATE, $bucket->getUpdate()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        // Read permission should not be required for update
-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -1503,7 +1503,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        ]);

        // Users can only manage their own roles, API keys and Admin users can manage any
-        $roles = Authorization::getRoles();
+        $roles = $authorization->getRoles();
        if (!Auth::isAppUser($roles) && !Auth::isPrivilegedUser($roles) && !\is_null($permissions)) {
            foreach (Database::PERMISSIONS as $type) {
                foreach ($permissions as $permission) {
@@ -1516,7 +1516,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
                        $permission->getIdentifier(),
                        $permission->getDimension()
                    ))->toString();
-                    if (!Authorization::isRole($role)) {
+                    if (!$authorization->isRole($role)) {
                        throw new Exception(Exception::USER_UNAUTHORIZED, 'Permissions must be one of: (' . \implode(', ', $roles) . ')');
                    }
                }
@@ -1536,7 +1536,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        if ($fileSecurity && !$valid) {
            $file = $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file);
        } else {
-            $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+            $file = $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
        }

        $queueForEvents
@@ -1548,7 +1548,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        $response->dynamic($file, Response::MODEL_FILE);
    });

-App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
+Http::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->desc('Delete File')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.write')
@@ -1572,32 +1572,32 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->inject('mode')
    ->inject('deviceForFiles')
    ->inject('queueForDeletes')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $queueForEvents, string $mode, Device $deviceForFiles, Delete $queueForDeletes) {
-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $queueForEvents, string $mode, Device $deviceForFiles, Delete $queueForDeletes, Authorization $authorization) {
+        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $validator = new Authorization(Database::PERMISSION_DELETE);
-        $valid = $validator->isValid($bucket->getDelete());
+        $valid = $authorization->isValid(new Input(Database::PERMISSION_DELETE, $bucket->getDelete()));
        if (!$fileSecurity && !$valid) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        // Read permission should not be required for delete
-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
        }

        // Make sure we don't delete the file before the document permission check occurs
-        if ($fileSecurity && !$valid && !$validator->isValid($file->getDelete())) {
+        if ($fileSecurity && !$valid && !$authorization->isValid(new Input(Database::PERMISSION_DELETE, $file->getDelete()))) {
            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

@@ -1621,7 +1621,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
            if ($fileSecurity && !$valid) {
                $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId);
            } else {
-                $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                $deleted = $authorization->skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
            }

            if (!$deleted) {
@@ -1641,7 +1641,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
        $response->noContent();
    });

-App::get('/v1/storage/usage')
+Http::get('/v1/storage/usage')
    ->desc('Get storage usage stats')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
@@ -1654,7 +1654,8 @@ App::get('/v1/storage/usage')
    ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $range, Response $response, Database $dbForProject) {
+    ->inject('authorization')
+    ->action(function (string $range, Response $response, Database $dbForProject, Authorization $authorization) {

        $periods = Config::getParam('usage', []);
        $stats = $usage = [];
@@ -1666,7 +1667,7 @@ App::get('/v1/storage/usage')
        ];

        $total = [];
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+        $authorization->skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
            foreach ($metrics as $metric) {
                $result =  $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
@@ -1720,7 +1721,7 @@ App::get('/v1/storage/usage')
        ]), Response::MODEL_USAGE_STORAGE);
    });

-App::get('/v1/storage/:bucketId/usage')
+Http::get('/v1/storage/:bucketId/usage')
    ->desc('Get bucket usage stats')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
@@ -1734,7 +1735,8 @@ App::get('/v1/storage/:bucketId/usage')
    ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->action(function (string $bucketId, string $range, Response $response, Database $dbForProject) {
+    ->inject('authorization')
+    ->action(function (string $bucketId, string $range, Response $response, Database $dbForProject, Authorization $authorization) {

        $bucket = $dbForProject->getDocument('buckets', $bucketId);

@@ -1750,8 +1752,7 @@ App::get('/v1/storage/:bucketId/usage')
            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE),
        ];

-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+        $authorization->skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
            foreach ($metrics as $metric) {
                $result =  $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
@@ -1,6 +1,7 @@
 <?php

 use Appwrite\Auth\Auth;
+use Appwrite\Auth\Authentication;
 use Appwrite\Auth\MFA\Type\TOTP;
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
@@ -10,6 +11,7 @@ use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
+use Appwrite\Platform\Workers\Deletes;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Memberships;
@@ -17,7 +19,6 @@ use Appwrite\Utopia\Database\Validator\Queries\Teams;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
-use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -36,14 +37,15 @@ use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\UID;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\ArrayList;
+use Utopia\Http\Validator\Assoc;
+use Utopia\Http\Validator\Host;
+use Utopia\Http\Validator\Text;
 use Utopia\Locale\Locale;
 use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Assoc;
-use Utopia\Validator\Host;
-use Utopia\Validator\Text;

-App::post('/v1/teams')
+Http::post('/v1/teams')
    ->desc('Create team')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].create')
@@ -64,15 +66,16 @@ App::post('/v1/teams')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {
+    ->inject('authorization')
+    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Authorization $authorization) {

-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-        $isAppUser = Auth::isAppUser(Authorization::getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());
+        $isAppUser = Auth::isAppUser($authorization->getRoles());

        $teamId = $teamId == 'unique()' ? ID::unique() : $teamId;

        try {
-            $team = Authorization::skip(fn () => $dbForProject->createDocument('teams', new Document([
+            $team = $authorization->skip(fn () => $dbForProject->createDocument('teams', new Document([
                '$id' => $teamId,
                '$permissions' => [
                    Permission::read(Role::team($teamId)),
@@ -131,7 +134,7 @@ App::post('/v1/teams')
            ->dynamic($team, Response::MODEL_TEAM);
    });

-App::get('/v1/teams')
+Http::get('/v1/teams')
    ->desc('List teams')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
@@ -189,7 +192,7 @@ App::get('/v1/teams')
        ]), Response::MODEL_TEAM_LIST);
    });

-App::get('/v1/teams/:teamId')
+Http::get('/v1/teams/:teamId')
    ->desc('Get team')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
@@ -216,7 +219,7 @@ App::get('/v1/teams/:teamId')
        $response->dynamic($team, Response::MODEL_TEAM);
    });

-App::get('/v1/teams/:teamId/prefs')
+Http::get('/v1/teams/:teamId/prefs')
    ->desc('Get team preferences')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
@@ -244,7 +247,7 @@ App::get('/v1/teams/:teamId/prefs')
        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });

-App::put('/v1/teams/:teamId')
+Http::put('/v1/teams/:teamId')
    ->desc('Update name')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].update')
@@ -287,7 +290,7 @@ App::put('/v1/teams/:teamId')
        $response->dynamic($team, Response::MODEL_TEAM);
    });

-App::put('/v1/teams/:teamId/prefs')
+Http::put('/v1/teams/:teamId/prefs')
    ->desc('Update preferences')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].update.prefs')
@@ -323,7 +326,7 @@ App::put('/v1/teams/:teamId/prefs')
        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });

-App::delete('/v1/teams/:teamId')
+Http::delete('/v1/teams/:teamId')
    ->desc('Delete team')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].delete')
@@ -338,10 +341,12 @@ App::delete('/v1/teams/:teamId')
    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->inject('response')
+    ->inject('getProjectDB')
    ->inject('dbForProject')
-    ->inject('queueForEvents')
    ->inject('queueForDeletes')
-    ->action(function (string $teamId, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {
+    ->inject('queueForEvents')
+    ->inject('project')
+    ->action(function (string $teamId, Response $response, callable $getProjectDB, Database $dbForProject, Delete $queueForDeletes, Event $queueForEvents, Document $project) {

        $team = $dbForProject->getDocument('teams', $teamId);

@@ -353,9 +358,14 @@ App::delete('/v1/teams/:teamId')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove team from DB');
        }

-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($team);
+        $deletes = new Deletes();
+        $deletes->deleteMemberships($getProjectDB, $team, $project);
+
+        if ($project->getId() === 'console') {
+            $queueForDeletes
+                ->setType(DELETE_TYPE_TEAM_PROJECTS)
+                ->setDocument($team);
+        }

        $queueForEvents
            ->setParam('teamId', $team->getId())
@@ -365,7 +375,7 @@ App::delete('/v1/teams/:teamId')
        $response->noContent();
    });

-App::post('/v1/teams/:teamId/memberships')
+Http::post('/v1/teams/:teamId/memberships')
    ->desc('Create team membership')
    ->groups(['api', 'teams', 'auth'])
    ->label('event', 'teams.[teamId].memberships.[membershipId].create')
@@ -397,10 +407,12 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('queueForMails')
    ->inject('queueForMessaging')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents) {
-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+    ->inject('authorization')
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents, Authorization $authorization) {
+        $isAPIKey = Auth::isAppUser($authorization->getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

+        $url = htmlentities($url);
        if (empty($url)) {
            if (!$isAPIKey && !$isPrivilegedUser) {
                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'URL is required');
@@ -410,8 +422,8 @@ App::post('/v1/teams/:teamId/memberships')
        if (empty($userId) && empty($email) && empty($phone)) {
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'At least one of userId, email, or phone is required');
        }
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-        $isAppUser = Auth::isAppUser(Authorization::getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());
+        $isAppUser = Auth::isAppUser($authorization->getRoles());

        if (!$isPrivilegedUser && !$isAppUser && empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED);
@@ -471,7 +483,7 @@ App::post('/v1/teams/:teamId/memberships')

            try {
                $userId = ID::unique();
-                $invitee = Authorization::skip(fn () => $dbForProject->createDocument('users', new Document([
+                $invitee = $authorization->skip(fn () => $dbForProject->createDocument('users', new Document([
                    '$id' => $userId,
                    '$permissions' => [
                        Permission::read(Role::any()),
@@ -507,7 +519,7 @@ App::post('/v1/teams/:teamId/memberships')
            }
        }

-        $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');
+        $isOwner = $authorization->isRole('team:' . $team->getId() . '/owner');

        if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
            throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to send invitations for this team');
@@ -539,12 +551,12 @@ App::post('/v1/teams/:teamId/memberships')

        if ($isPrivilegedUser || $isAppUser) { // Allow admin to create membership
            try {
-                $membership = Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership));
+                $membership = $authorization->skip(fn () => $dbForProject->createDocument('memberships', $membership));
            } catch (Duplicate $th) {
                throw new Exception(Exception::TEAM_INVITE_ALREADY_EXISTS);
            }

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

            $dbForProject->purgeCachedDocument('users', $invitee->getId());
        } else {
@@ -566,7 +578,7 @@ App::post('/v1/teams/:teamId/memberships')

                $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl');
                $message
-                    ->setParam('{{body}}', $body, escapeHtml: false)
+                    ->setParam('{{body}}', $body, escape: false)
                    ->setParam('{{hello}}', $locale->getText("emails.invitation.hello"))
                    ->setParam('{{footer}}', $locale->getText("emails.invitation.footer"))
                    ->setParam('{{thanks}}', $locale->getText("emails.invitation.thanks"))
@@ -668,6 +680,7 @@ App::post('/v1/teams/:teamId/memberships')
        }

        $queueForEvents
+            ->setParam('userId', $invitee->getId())
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId())
        ;
@@ -683,7 +696,7 @@ App::post('/v1/teams/:teamId/memberships')
            );
    });

-App::get('/v1/teams/:teamId/memberships')
+Http::get('/v1/teams/:teamId/memberships')
    ->desc('List team memberships')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
@@ -786,7 +799,7 @@ App::get('/v1/teams/:teamId/memberships')
        ]), Response::MODEL_MEMBERSHIP_LIST);
    });

-App::get('/v1/teams/:teamId/memberships/:membershipId')
+Http::get('/v1/teams/:teamId/memberships/:membershipId')
    ->desc('Get team membership')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
@@ -842,7 +855,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
        $response->dynamic($membership, Response::MODEL_MEMBERSHIP);
    });

-App::patch('/v1/teams/:teamId/memberships/:membershipId')
+Http::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->desc('Update membership')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].memberships.[membershipId].update')
@@ -864,7 +877,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {
+    ->inject('authorization')
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Authorization $authorization) {

        $team = $dbForProject->getDocument('teams', $teamId);
        if ($team->isEmpty()) {
@@ -881,9 +895,9 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
            throw new Exception(Exception::USER_NOT_FOUND);
        }

-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-        $isAppUser = Auth::isAppUser(Authorization::getRoles());
-        $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());
+        $isAppUser = Auth::isAppUser($authorization->getRoles());
+        $isOwner = $authorization->isRole('team:' . $team->getId() . '/owner');

        if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
            throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to modify roles');
@@ -901,6 +915,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
        $dbForProject->purgeCachedDocument('users', $profile->getId());

        $queueForEvents
+            ->setParam('userId', $profile->getId())
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId());

@@ -913,7 +928,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
        );
    });

-App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
+Http::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->desc('Update team membership status')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].memberships.[membershipId].update.status')
@@ -939,7 +954,9 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->inject('project')
    ->inject('geodb')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $queueForEvents) {
+    ->inject('authorization')
+    ->inject('authentication')
+    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $queueForEvents, Authorization $authorization, Authentication $authentication) {
        $protocol = $request->getProtocol();

        $membership = $dbForProject->getDocument('memberships', $membershipId);
@@ -948,7 +965,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            throw new Exception(Exception::MEMBERSHIP_NOT_FOUND);
        }

-        $team = Authorization::skip(fn () => $dbForProject->getDocument('teams', $teamId));
+        $team = $authorization->skip(fn () => $dbForProject->getDocument('teams', $teamId));

        if ($team->isEmpty()) {
            throw new Exception(Exception::TEAM_NOT_FOUND);
@@ -983,11 +1000,11 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            ->setAttribute('confirm', true)
        ;

-        Authorization::skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));
+        $authorization->skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));

        // Log user in

-        Authorization::setRole(Role::user($user->getId())->toString());
+        $authorization->addRole(Role::user($user->getId())->toString());

        $detector = new Detector($request->getUserAgent('UNKNOWN'));
        $record = $geodb->get($request->getIP());
@@ -1017,28 +1034,29 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')

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

-        Authorization::setRole(Role::user($userId)->toString());
+        $authorization->addRole(Role::user($userId)->toString());

        $membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);

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

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

        $queueForEvents
+            ->setParam('userId', $user->getId())
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId())
        ;

        if (!Config::getParam('domainVerification')) {
            $response
-                ->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
+                ->addHeader('X-Fallback-Cookies', \json_encode([$authentication->getCookieName() => Auth::encodeSession($user->getId(), $secret)]))
            ;
        }

        $response
-            ->addCookie(Auth::$cookieName . '_legacy', Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
-            ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($authentication->getCookieName() . '_legacy', Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($authentication->getCookieName(), Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
        ;

        $response->dynamic(
@@ -1050,7 +1068,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
        );
    });

-App::delete('/v1/teams/:teamId/memberships/:membershipId')
+Http::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->desc('Delete team membership')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].memberships.[membershipId].delete')
@@ -1068,7 +1086,8 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject, Event $queueForEvents) {
+    ->inject('authorization')
+    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject, Event $queueForEvents, Authorization $authorization) {

        $membership = $dbForProject->getDocument('memberships', $membershipId);

@@ -1103,10 +1122,11 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
        $dbForProject->purgeCachedDocument('users', $user->getId());

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

        $queueForEvents
+            ->setParam('userId', $user->getId())
            ->setParam('teamId', $team->getId())
            ->setParam('membershipId', $membership->getId())
            ->setPayload($response->output($membership, Response::MODEL_MEMBERSHIP))
@@ -1115,7 +1135,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
        $response->noContent();
    });

-App::get('/v1/teams/:teamId/logs')
+Http::get('/v1/teams/:teamId/logs')
    ->desc('List team logs')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
@@ -1132,7 +1152,8 @@ App::get('/v1/teams/:teamId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $teamId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (string $teamId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Authorization $authorization) {

        $team = $dbForProject->getDocument('teams', $teamId);

@@ -22,7 +22,6 @@ use Appwrite\Utopia\Database\Validator\Queries\Users;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
-use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -39,15 +38,16 @@ use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\UID;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\ArrayList;
+use Utopia\Http\Validator\Assoc;
+use Utopia\Http\Validator\Boolean;
+use Utopia\Http\Validator\Integer;
+use Utopia\Http\Validator\Range;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\Locale\Locale;
 use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Assoc;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Integer;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;

 /** TODO: Remove function when we move to using utopia/platform */
 function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks): Document
@@ -140,7 +140,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
                $existingTarget = $dbForProject->findOne('targets', [
                    Query::equal('identifier', [$email]),
                ]);
-                if($existingTarget) {
+                if ($existingTarget) {
                    $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
                }
            }
@@ -164,7 +164,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
                $existingTarget = $dbForProject->findOne('targets', [
                    Query::equal('identifier', [$phone]),
                ]);
-                if($existingTarget) {
+                if ($existingTarget) {
                    $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
                }
            }
@@ -180,7 +180,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
    return $user;
 }

-App::post('/v1/users')
+Http::post('/v1/users')
    ->desc('Create user')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -211,7 +211,7 @@ App::post('/v1/users')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/bcrypt')
+Http::post('/v1/users/bcrypt')
    ->desc('Create user with bcrypt password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -242,7 +242,7 @@ App::post('/v1/users/bcrypt')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/md5')
+Http::post('/v1/users/md5')
    ->desc('Create user with MD5 password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -273,7 +273,7 @@ App::post('/v1/users/md5')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/argon2')
+Http::post('/v1/users/argon2')
    ->desc('Create user with Argon2 password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -304,7 +304,7 @@ App::post('/v1/users/argon2')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/sha')
+Http::post('/v1/users/sha')
    ->desc('Create user with SHA password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -342,7 +342,7 @@ App::post('/v1/users/sha')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/phpass')
+Http::post('/v1/users/phpass')
    ->desc('Create user with PHPass password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -373,7 +373,7 @@ App::post('/v1/users/phpass')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/scrypt')
+Http::post('/v1/users/scrypt')
    ->desc('Create user with Scrypt password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -417,7 +417,7 @@ App::post('/v1/users/scrypt')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/scrypt-modified')
+Http::post('/v1/users/scrypt-modified')
    ->desc('Create user with Scrypt modified password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create')
@@ -451,7 +451,7 @@ App::post('/v1/users/scrypt-modified')
            ->dynamic($user, Response::MODEL_USER);
    });

-App::post('/v1/users/:userId/targets')
+Http::post('/v1/users/:userId/targets')
    ->desc('Create User Target')
    ->groups(['api', 'users'])
    ->label('audits.event', 'target.create')
@@ -540,7 +540,7 @@ App::post('/v1/users/:userId/targets')
            ->dynamic($target, Response::MODEL_TARGET);
    });

-App::get('/v1/users')
+Http::get('/v1/users')
    ->desc('List users')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -594,7 +594,7 @@ App::get('/v1/users')
        ]), Response::MODEL_USER_LIST);
    });

-App::get('/v1/users/:userId')
+Http::get('/v1/users/:userId')
    ->desc('Get user')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -619,7 +619,7 @@ App::get('/v1/users/:userId')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::get('/v1/users/:userId/prefs')
+Http::get('/v1/users/:userId/prefs')
    ->desc('Get user preferences')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -646,7 +646,7 @@ App::get('/v1/users/:userId/prefs')
        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });

-App::get('/v1/users/:userId/targets/:targetId')
+Http::get('/v1/users/:userId/targets/:targetId')
    ->desc('Get User Target')
    ->groups(['api', 'users'])
    ->label('scope', 'targets.read')
@@ -678,7 +678,7 @@ App::get('/v1/users/:userId/targets/:targetId')
        $response->dynamic($target, Response::MODEL_TARGET);
    });

-App::get('/v1/users/:userId/sessions')
+Http::get('/v1/users/:userId/sessions')
    ->desc('List user sessions')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -719,7 +719,7 @@ App::get('/v1/users/:userId/sessions')
        ]), Response::MODEL_SESSION_LIST);
    });

-App::get('/v1/users/:userId/memberships')
+Http::get('/v1/users/:userId/memberships')
    ->desc('List user memberships')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -758,7 +758,7 @@ App::get('/v1/users/:userId/memberships')
        ]), Response::MODEL_MEMBERSHIP_LIST);
    });

-App::get('/v1/users/:userId/logs')
+Http::get('/v1/users/:userId/logs')
    ->desc('List user logs')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -775,7 +775,8 @@ App::get('/v1/users/:userId/logs')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('geodb')
-    ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb, Authorization $authorization) {

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

@@ -847,7 +848,7 @@ App::get('/v1/users/:userId/logs')
        ]), Response::MODEL_LOG_LIST);
    });

-App::get('/v1/users/:userId/targets')
+Http::get('/v1/users/:userId/targets')
    ->desc('List User Targets')
    ->groups(['api', 'users'])
    ->label('scope', 'targets.read')
@@ -902,7 +903,7 @@ App::get('/v1/users/:userId/targets')
        ]), Response::MODEL_TARGET_LIST);
    });

-App::get('/v1/users/identities')
+Http::get('/v1/users/identities')
    ->desc('List Identities')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -956,7 +957,7 @@ App::get('/v1/users/identities')
        ]), Response::MODEL_IDENTITY_LIST);
    });

-App::patch('/v1/users/:userId/status')
+Http::patch('/v1/users/:userId/status')
    ->desc('Update user status')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.status')
@@ -992,7 +993,7 @@ App::patch('/v1/users/:userId/status')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::put('/v1/users/:userId/labels')
+Http::put('/v1/users/:userId/labels')
    ->desc('Update user labels')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.labels')
@@ -1029,7 +1030,7 @@ App::put('/v1/users/:userId/labels')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/verification/phone')
+Http::patch('/v1/users/:userId/verification/phone')
    ->desc('Update phone verification')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.verification')
@@ -1064,7 +1065,7 @@ App::patch('/v1/users/:userId/verification/phone')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/name')
+Http::patch('/v1/users/:userId/name')
    ->desc('Update name')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.name')
@@ -1101,7 +1102,7 @@ App::patch('/v1/users/:userId/name')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/password')
+Http::patch('/v1/users/:userId/password')
    ->desc('Update password')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.password')
@@ -1178,7 +1179,7 @@ App::patch('/v1/users/:userId/password')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/email')
+Http::patch('/v1/users/:userId/email')
    ->desc('Update email')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.email')
@@ -1273,7 +1274,7 @@ App::patch('/v1/users/:userId/email')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/phone')
+Http::patch('/v1/users/:userId/phone')
    ->desc('Update phone')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.phone')
@@ -1356,7 +1357,7 @@ App::patch('/v1/users/:userId/phone')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/verification')
+Http::patch('/v1/users/:userId/verification')
    ->desc('Update email verification')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.verification')
@@ -1391,7 +1392,7 @@ App::patch('/v1/users/:userId/verification')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::patch('/v1/users/:userId/prefs')
+Http::patch('/v1/users/:userId/prefs')
    ->desc('Update user preferences')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.prefs')
@@ -1424,7 +1425,7 @@ App::patch('/v1/users/:userId/prefs')
        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });

-App::patch('/v1/users/:userId/targets/:targetId')
+Http::patch('/v1/users/:userId/targets/:targetId')
    ->desc('Update User target')
    ->groups(['api', 'users'])
    ->label('audits.event', 'target.update')
@@ -1518,7 +1519,7 @@ App::patch('/v1/users/:userId/targets/:targetId')
            ->dynamic($target, Response::MODEL_TARGET);
    });

-App::patch('/v1/users/:userId/mfa')
+Http::patch('/v1/users/:userId/mfa')
    ->desc('Update MFA')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.mfa')
@@ -1556,7 +1557,7 @@ App::patch('/v1/users/:userId/mfa')
        $response->dynamic($user, Response::MODEL_USER);
    });

-App::get('/v1/users/:userId/mfa/factors')
+Http::get('/v1/users/:userId/mfa/factors')
    ->desc('List Factors')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -1589,7 +1590,7 @@ App::get('/v1/users/:userId/mfa/factors')
        $response->dynamic($factors, Response::MODEL_MFA_FACTORS);
    });

-App::get('/v1/users/:userId/mfa/recovery-codes')
+Http::get('/v1/users/:userId/mfa/recovery-codes')
    ->desc('Get MFA Recovery Codes')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -1624,7 +1625,7 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
        $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES);
    });

-App::patch('/v1/users/:userId/mfa/recovery-codes')
+Http::patch('/v1/users/:userId/mfa/recovery-codes')
    ->desc('Create MFA Recovery Codes')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].create.mfa.recovery-codes')
@@ -1670,7 +1671,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
        $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES);
    });

-App::put('/v1/users/:userId/mfa/recovery-codes')
+Http::put('/v1/users/:userId/mfa/recovery-codes')
    ->desc('Regenerate MFA Recovery Codes')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].update.mfa.recovery-codes')
@@ -1715,7 +1716,7 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
        $response->dynamic($document, Response::MODEL_MFA_RECOVERY_CODES);
    });

-App::delete('/v1/users/:userId/mfa/authenticators/:type')
+Http::delete('/v1/users/:userId/mfa/authenticators/:type')
    ->desc('Delete Authenticator')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].delete.mfa')
@@ -1757,7 +1758,7 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
        $response->noContent();
    });

-App::post('/v1/users/:userId/sessions')
+Http::post('/v1/users/:userId/sessions')
    ->desc('Create session')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -1786,7 +1787,7 @@ App::post('/v1/users/:userId/sessions')
            throw new Exception(Exception::USER_NOT_FOUND);
        }

-        $secret = Auth::codeGenerator();
+        $secret = Auth::tokenGenerator(Auth::TOKEN_LENGTH_SESSION);
        $detector = new Detector($request->getUserAgent('UNKNOWN'));
        $record = $geodb->get($request->getIP());

@@ -1803,6 +1804,7 @@ App::post('/v1/users/:userId/sessions')
                'userAgent' => $request->getUserAgent('UNKNOWN'),
                'ip' => $request->getIP(),
                'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+                'expire' => $expire,
            ],
            $detector->getOS(),
            $detector->getClient(),
@@ -1814,7 +1816,6 @@ App::post('/v1/users/:userId/sessions')
        $session = $dbForProject->createDocument('sessions', $session);
        $session
            ->setAttribute('secret', $secret)
-            ->setAttribute('expire', $expire)
            ->setAttribute('countryName', $countryName);

        $queueForEvents
@@ -1827,7 +1828,7 @@ App::post('/v1/users/:userId/sessions')
            ->dynamic($session, Response::MODEL_SESSION);
    });

-App::post('/v1/users/:userId/tokens')
+Http::post('/v1/users/:userId/tokens')
    ->desc('Create token')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].tokens.[tokenId].create')
@@ -1884,7 +1885,7 @@ App::post('/v1/users/:userId/tokens')
            ->dynamic($token, Response::MODEL_TOKEN);
    });

-App::delete('/v1/users/:userId/sessions/:sessionId')
+Http::delete('/v1/users/:userId/sessions/:sessionId')
    ->desc('Delete user session')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].sessions.[sessionId].delete')
@@ -1927,7 +1928,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
        $response->noContent();
    });

-App::delete('/v1/users/:userId/sessions')
+Http::delete('/v1/users/:userId/sessions')
    ->desc('Delete user sessions')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].sessions.delete')
@@ -1969,7 +1970,7 @@ App::delete('/v1/users/:userId/sessions')
        $response->noContent();
    });

-App::delete('/v1/users/:userId')
+Http::delete('/v1/users/:userId')
    ->desc('Delete user')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].delete')
@@ -2011,7 +2012,7 @@ App::delete('/v1/users/:userId')
        $response->noContent();
    });

-App::delete('/v1/users/:userId/targets/:targetId')
+Http::delete('/v1/users/:userId/targets/:targetId')
    ->desc('Delete user target')
    ->groups(['api', 'users'])
    ->label('audits.event', 'target.delete')
@@ -2062,7 +2063,7 @@ App::delete('/v1/users/:userId/targets/:targetId')
        $response->noContent();
    });

-App::delete('/v1/users/identities/:identityId')
+Http::delete('/v1/users/identities/:identityId')
    ->desc('Delete identity')
    ->groups(['api', 'users'])
    ->label('event', 'users.[userId].identities.[identityId].delete')
@@ -2097,7 +2098,7 @@ App::delete('/v1/users/identities/:identityId')
        return $response->noContent();
    });

-App::post('/v1/users/:userId/jwts')
+Http::post('/v1/users/:userId/jwts')
    ->desc('Create user JWT')
    ->groups(['api', 'users'])
    ->label('scope', 'users.write')
@@ -2109,7 +2110,7 @@ App::post('/v1/users/:userId/jwts')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_JWT)
    ->param('userId', '', new UID(), 'User ID.')
-    ->param('sessionId', 'recent', new UID(), 'Session ID. Use the string \'recent\' to use the most recent session. Defaults to the most recent session.', true)
+    ->param('sessionId', '', new UID(), 'Session ID. Use the string \'recent\' to use the most recent session. Defaults to the most recent session.', true)
    ->param('duration', 900, new Range(0, 3600), 'Time in seconds before JWT expires. Default duration is 900 seconds, and maximum is 3600 seconds.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -2124,7 +2125,7 @@ App::post('/v1/users/:userId/jwts')
        $sessions = $user->getAttribute('sessions', []);
        $session = new Document();

-        if($sessionId === 'recent') {
+        if ($sessionId === 'recent') {
            // Get most recent
            $session = \count($sessions) > 0 ? $sessions[\count($sessions) - 1] : new Document();
        } else {
@@ -2137,21 +2138,17 @@ App::post('/v1/users/:userId/jwts')
            }
        }

-        if ($session->isEmpty()) {
-            throw new Exception(Exception::USER_SESSION_NOT_FOUND);
-        }
-
        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $duration, 0);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
            ->dynamic(new Document(['jwt' => $jwt->encode([
                'userId' => $user->getId(),
-                'sessionId' => $session->getId()
+                'sessionId' => $session->isEmpty() ? '' : $session->getId()
            ])]), Response::MODEL_JWT);
    });

-App::get('/v1/users/usage')
+Http::get('/v1/users/usage')
    ->desc('Get users usage stats')
    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
@@ -2164,8 +2161,8 @@ App::get('/v1/users/usage')
    ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('register')
-    ->action(function (string $range, Response $response, Database $dbForProject) {
+    ->inject('authorization')
+    ->action(function (string $range, Response $response, Database $dbForProject, Authorization $authorization) {

        $periods = Config::getParam('usage', []);
        $stats = $usage = [];
@@ -2175,7 +2172,7 @@ App::get('/v1/users/usage')
            METRIC_SESSIONS,
        ];

-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
+        $authorization->skip(function () use ($dbForProject, $days, $metrics, &$stats) {
            foreach ($metrics as $count => $metric) {
                $result =  $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
@@ -8,7 +8,6 @@ use Appwrite\Utopia\Database\Validator\Queries\Installations;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Vcs\Comment;
-use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -32,17 +31,17 @@ use Utopia\Detector\Adapter\Python;
 use Utopia\Detector\Adapter\Ruby;
 use Utopia\Detector\Adapter\Swift;
 use Utopia\Detector\Detector;
+use Utopia\Http\Http;
+use Utopia\Http\Validator\Boolean;
+use Utopia\Http\Validator\Host;
+use Utopia\Http\Validator\Text;
 use Utopia\System\System;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Host;
-use Utopia\Validator\Text;
 use Utopia\VCS\Adapter\Git\GitHub;
 use Utopia\VCS\Exception\RepositoryNotFound;

 use function Swoole\Coroutine\batch;

-$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForConsole, Build $queueForBuilds, callable $getProjectDB, Request $request) {
-    $errors = [];
+$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForConsole, Build $queueForBuilds, callable $getProjectDB, Request $request, Authorization $auth) {
    foreach ($repositories as $resource) {
        try {
            $resourceType = $resource->getAttribute('resourceType');
@@ -52,11 +51,11 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            }

            $projectId = $resource->getAttribute('projectId');
-            $project = Authorization::skip(fn () => $dbForConsole->getDocument('projects', $projectId));
+            $project = $auth->skip(fn () => $dbForConsole->getDocument('projects', $projectId));
            $dbForProject = $getProjectDB($project);

            $functionId = $resource->getAttribute('resourceId');
-            $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+            $function = $auth->skip(fn () => $dbForProject->getDocument('functions', $functionId));
            $functionInternalId = $function->getInternalId();

            $deploymentId = ID::unique();
@@ -96,14 +95,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

            $commentStatus = $isAuthorized ? 'waiting' : 'failed';

-            $authorizeUrl = $request->getProtocol() . '://' . $request->getHostname() . "/git/authorize-contributor?projectId={$projectId}&installationId={$installationId}&repositoryId={$repositoryId}&providerPullRequestId={$providerPullRequestId}";
+            $authorizeUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/git/authorize-contributor?projectId={$projectId}&installationId={$installationId}&repositoryId={$repositoryId}&providerPullRequestId={$providerPullRequestId}";

            $action = $isAuthorized ? ['type' => 'logs'] : ['type' => 'authorize', 'url' => $authorizeUrl];

            $latestCommentId = '';

-            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
-                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
+            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false)) {
+                $latestComment = $auth->skip(fn () => $dbForConsole->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
                    Query::orderDesc('$createdAt'),
@@ -124,7 +123,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    if (!empty($latestCommentId)) {
                        $teamId = $project->getAttribute('teamId', '');

-                        $latestComment = Authorization::skip(fn () => $dbForConsole->createDocument('vcsComments', new Document([
+                        $latestComment = $auth->skip(fn () => $dbForConsole->createDocument('vcsComments', new Document([
                            '$id' => ID::unique(),
                            '$permissions' => [
                                Permission::read(Role::team(ID::custom($teamId))),
@@ -145,7 +144,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    }
                }
            } elseif (!empty($providerBranch)) {
-                $latestComments = Authorization::skip(fn () => $dbForConsole->find('vcsComments', [
+                $latestComments = $auth->skip(fn () => $dbForConsole->find('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerBranch', [$providerBranch]),
                    Query::orderDesc('$createdAt'),
@@ -262,7 +261,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
    }
 };

-App::get('/v1/vcs/github/authorize')
+Http::get('/v1/vcs/github/authorize')
    ->desc('Install GitHub App')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -304,7 +303,7 @@ App::get('/v1/vcs/github/authorize')
            ->redirect($url);
    });

-App::get('/v1/vcs/github/callback')
+Http::get('/v1/vcs/github/callback')
    ->desc('Capture installation and authorization from GitHub App')
    ->groups(['api', 'vcs'])
    ->label('scope', 'public')
@@ -464,7 +463,7 @@ App::get('/v1/vcs/github/callback')
            ->redirect($redirectSuccess);
    });

-App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/contents')
+Http::get('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/contents')
    ->desc('Get files and directories of a VCS repository')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -509,7 +508,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
        $vcsContents = [];
        foreach ($contents as $content) {
            $isDirectory = false;
-            if($content['type'] === GitHub::CONTENTS_DIRECTORY) {
+            if ($content['type'] === GitHub::CONTENTS_DIRECTORY) {
                $isDirectory = true;
            }

@@ -525,7 +524,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
        ]), Response::MODEL_VCS_CONTENT_LIST);
    });

-App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
+Http::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
    ->desc('Detect runtime settings from source code')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
@@ -597,7 +596,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:pr
        $response->dynamic(new Document($detection), Response::MODEL_DETECTION);
    });

-App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
+Http::get('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->desc('List Repositories')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -692,7 +691,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
        ]), Response::MODEL_PROVIDER_REPOSITORY_LIST);
    });

-App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
+Http::post('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->desc('Create repository')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
@@ -793,7 +792,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
        $response->dynamic(new Document($repository), Response::MODEL_PROVIDER_REPOSITORY);
    });

-App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId')
+Http::get('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId')
    ->desc('Get repository')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -842,7 +841,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
        $response->dynamic(new Document($repository), Response::MODEL_PROVIDER_REPOSITORY);
    });

-App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/branches')
+Http::get('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/branches')
    ->desc('List Repository Branches')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -891,7 +890,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
        ]), Response::MODEL_BRANCH_LIST);
    });

-App::post('/v1/vcs/github/events')
+Http::post('/v1/vcs/github/events')
    ->desc('Create Event')
    ->groups(['api', 'vcs'])
    ->label('scope', 'public')
@@ -901,8 +900,9 @@ App::post('/v1/vcs/github/events')
    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForBuilds')
+    ->inject('authorization')
    ->action(
-        function (GitHub $github, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
+        function (GitHub $github, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Build $queueForBuilds, Authorization $authorization) use ($createGitDeployments) {
            $payload = $request->getRawPayload();
            $signatureRemote = $request->getHeader('x-hub-signature-256', '');
            $signatureLocal = System::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', '');
@@ -936,14 +936,14 @@ App::post('/v1/vcs/github/events')
                $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);

                //find functionId from functions table
-                $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
+                $repositories = $authorization->skip(fn () => $dbForConsole->find('repositories', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::limit(100),
                ]));

                // create new deployment only on push and not when branch is created
                if (!$providerBranchCreated) {
-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForConsole, $queueForBuilds, $getProjectDB, $request, $authorization);
                }
            } elseif ($event == $github::EVENT_INSTALLATION) {
                if ($parsedPayload["action"] == "deleted") {
@@ -956,13 +956,13 @@ App::post('/v1/vcs/github/events')
                    ]);

                    foreach ($installations as $installation) {
-                        $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
+                        $repositories = $authorization->skip(fn () => $dbForConsole->find('repositories', [
                            Query::equal('installationInternalId', [$installation->getInternalId()]),
                            Query::limit(1000)
                        ]));

                        foreach ($repositories as $repository) {
-                            Authorization::skip(fn () => $dbForConsole->deleteDocument('repositories', $repository->getId()));
+                            $authorization->skip(fn () => $dbForConsole->deleteDocument('repositories', $repository->getId()));
                        }

                        $dbForConsole->deleteDocument('installations', $installation->getId());
@@ -994,12 +994,12 @@ App::post('/v1/vcs/github/events')
                    $providerCommitAuthor = $commitDetails["commitAuthor"] ?? '';
                    $providerCommitMessage = $commitDetails["commitMessage"] ?? '';

-                    $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
+                    $repositories = $authorization->skip(fn () => $dbForConsole->find('repositories', [
                        Query::equal('providerRepositoryId', [$providerRepositoryId]),
                        Query::orderDesc('$createdAt')
                    ]));

-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForConsole, $queueForBuilds, $getProjectDB, $request, $authorization);
                } elseif ($parsedPayload["action"] == "closed") {
                    // Allowed external contributions cleanup

@@ -1008,7 +1008,7 @@ App::post('/v1/vcs/github/events')
                    $external = $parsedPayload["external"] ?? true;

                    if ($external) {
-                        $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
+                        $repositories = $authorization->skip(fn () => $dbForConsole->find('repositories', [
                            Query::equal('providerRepositoryId', [$providerRepositoryId]),
                            Query::orderDesc('$createdAt')
                        ]));
@@ -1019,7 +1019,7 @@ App::post('/v1/vcs/github/events')
                            if (\in_array($providerPullRequestId, $providerPullRequestIds)) {
                                $providerPullRequestIds = \array_diff($providerPullRequestIds, [$providerPullRequestId]);
                                $repository = $repository->setAttribute('providerPullRequestIds', $providerPullRequestIds);
-                                $repository = Authorization::skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));
+                                $repository = $authorization->skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));
                            }
                        }
                    }
@@ -1030,7 +1030,7 @@ App::post('/v1/vcs/github/events')
        }
    );

-App::get('/v1/vcs/installations')
+Http::get('/v1/vcs/installations')
    ->desc('List installations')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -1090,7 +1090,7 @@ App::get('/v1/vcs/installations')
        ]), Response::MODEL_INSTALLATION_LIST);
    });

-App::get('/v1/vcs/installations/:installationId')
+Http::get('/v1/vcs/installations/:installationId')
    ->desc('Get installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
@@ -1119,7 +1119,7 @@ App::get('/v1/vcs/installations/:installationId')
        $response->dynamic($installation, Response::MODEL_INSTALLATION);
    });

-App::delete('/v1/vcs/installations/:installationId')
+Http::delete('/v1/vcs/installations/:installationId')
    ->desc('Delete Installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
@@ -1152,7 +1152,7 @@ App::delete('/v1/vcs/installations/:installationId')
        $response->noContent();
    });

-App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
+Http::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
    ->desc('Authorize external deployment')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
@@ -1172,14 +1172,15 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForBuilds')
-    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForConsole, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
+    ->inject('authorization')
+    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForConsole, callable $getProjectDB, Build $queueForBuilds, Authorization $authorization) use ($createGitDeployments) {
        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
        }

-        $repository = Authorization::skip(fn () => $dbForConsole->getDocument('repositories', $repositoryId, [
+        $repository = $authorization->skip(fn () => $dbForConsole->getDocument('repositories', $repositoryId, [
            Query::equal('projectInternalId', [$project->getInternalId()])
        ]));

@@ -1196,7 +1197,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor

        // TODO: Delete from array when PR is closed

-        $repository = Authorization::skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));
+        $repository = $authorization->skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));

        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
@@ -1220,7 +1221,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
        $providerBranch = \explode(':', $pullRequestResponse['head']['label'])[1] ?? '';
        $providerCommitHash = $pullRequestResponse['head']['sha'] ?? '';

-        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerCommitHash, $providerPullRequestId, true, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
+        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerCommitHash, $providerPullRequestId, true, $dbForConsole, $queueForBuilds, $getProjectDB, $request, $authorization);

        $response->noContent();
    });
@@ -1,24 +1,24 @@
 <?php

-require_once __DIR__ . '/../init.php';
-
+use Ahc\Jwt\JWT;
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Event;
 use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Validator\Origin;
+use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
 use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
+use Appwrite\Utopia\Request\Filters\V18 as RequestV18;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
+use Appwrite\Utopia\Response\Filters\V18 as ResponseV18;
 use Appwrite\Utopia\View;
 use Executor\Executor;
 use MaxMind\Db\Reader;
-use Swoole\Http\Request as SwooleRequest;
-use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -28,32 +28,35 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Domains\Domain;
 use Utopia\DSN\DSN;
+use Utopia\Http\Http;
+use Utopia\Http\Route;
+use Utopia\Http\Validator\Hostname;
+use Utopia\Http\Validator\Text;
 use Utopia\Locale\Locale;
+use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Logger\Logger;
 use Utopia\System\System;
-use Utopia\Validator\Hostname;
-use Utopia\Validator\Text;

 Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

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

    $host = $request->getHostname() ?? '';

-    $route = Authorization::skip(
+    $rule = $auth->skip(
        fn () => $dbForConsole->find('rules', [
            Query::equal('domain', [$host]),
            Query::limit(1)
        ])
    )[0] ?? null;

-    if ($route === null) {
+    if ($rule === null) {
        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.');
        }
@@ -69,12 +72,12 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
        }

        // Act as API - no Proxy logic
-        $utopia->getRoute()?->label('error', '');
+        $route?->label('error', '');
        return false;
    }

-    $projectId = $route->getAttribute('projectId');
-    $project = Authorization::skip(
+    $projectId = $rule->getAttribute('projectId');
+    $project = $auth->skip(
        fn () => $dbForConsole->getDocument('projects', $projectId)
    );
    if (array_key_exists('proxy', $project->getAttribute('services', []))) {
@@ -85,14 +88,17 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
    }

    // Skip Appwrite Router for ACME challenge. Nessessary for certificate generation
-    $path = ($swooleRequest->server['request_uri'] ?? '/');
+    $path = ($request->getURI() ?? '/');
    if (\str_starts_with($path, '/.well-known/acme-challenge')) {
        return false;
    }

-    $type = $route->getAttribute('resourceType');
+    $type = $rule->getAttribute('resourceType');

    if ($type === 'function') {
+        $route->label('sdk.namespace', 'functions');
+        $route->label('sdk.method', 'createExecution');
+
        if (System::getEnv('_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
            if ($request->getProtocol() !== 'https') {
                if ($request->getMethod() !== Request::METHOD_GET) {
@@ -103,26 +109,25 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            }
        }

-        $functionId = $route->getAttribute('resourceId');
-        $projectId = $route->getAttribute('projectId');
+        $functionId = $rule->getAttribute('resourceId');
+        $projectId = $rule->getAttribute('projectId');

-        $path = ($swooleRequest->server['request_uri'] ?? '/');
-        $query = ($swooleRequest->server['query_string'] ?? '');
+        $path = ($request->getURI() ?? '/');
+        $query = ($request->getQueryString() ?? '');
        if (!empty($query)) {
            $path .= '?' . $query;
        }

-
-        $body = $swooleRequest->getContent() ?? '';
-        $method = $swooleRequest->server['request_method'];
+        $body = $request->getRawPayload() ?? '';
+        $method = $request->getMethod();

        $requestHeaders = $request->getHeaders();

-        $project = Authorization::skip(fn () => $dbForConsole->getDocument('projects', $projectId));
+        $project = $auth->skip(fn () => $dbForConsole->getDocument('projects', $projectId));

        $dbForProject = $getProjectDB($project);

-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+        $function = $auth->skip(fn () => $dbForProject->getDocument('functions', $functionId));

        if ($function->isEmpty() || !$function->getAttribute('enabled')) {
            throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
@@ -130,6 +135,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo

        $version = $function->getAttribute('version', 'v2');
        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
+        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];

        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;

@@ -137,7 +143,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
        }

-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
+        $deployment = $auth->skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));

        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
@@ -148,7 +154,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
        }

        /** Check if build has completed */
-        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
+        $build = $auth->skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
        if ($build->isEmpty()) {
            throw new AppwriteException(AppwriteException::BUILD_NOT_FOUND);
        }
@@ -163,7 +169,15 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
        }

+        $jwtExpiry = $function->getAttribute('timeout', 900);
+        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+        $apiKey = $jwtObj->encode([
+            'projectId' => $project->getId(),
+            'scopes' => $function->getAttribute('scopes', [])
+        ]);
+
        $headers = \array_merge([], $requestHeaders);
+        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
        $headers['x-appwrite-trigger'] = 'http';
        $headers['x-appwrite-user-id'] = '';
        $headers['x-appwrite-user-jwt'] = '';
@@ -201,7 +215,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            'deploymentInternalId' => $deployment->getInternalId(),
            'deploymentId' => $deployment->getId(),
            'trigger' => 'http', // http / schedule / event
-            'status' =>  'processing', // waiting / processing / completed / failed
+            'status' => 'processing', // waiting / processing / completed / failed
            'responseStatusCode' => 0,
            'responseHeaders' => [],
            'requestPath' => $path,
@@ -242,15 +256,36 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
        }

+        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
+        $hostname = System::getEnv('_APP_DOMAIN');
+        $endpoint = $protocol . '://' . $hostname . "/v1";
+
        // Appwrite vars
        $vars = \array_merge($vars, [
+            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
            'APPWRITE_FUNCTION_ID' => $functionId,
            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_VERSION' => APP_VERSION_STABLE
+            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
+            'APPWRITE_VERSION' => APP_VERSION_STABLE,
+            'APPWRITE_REGION' => $project->getAttribute('region'),
+            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
+            'APPWRITE_VCS_REPOSITORY_ID' => $deployment->getAttribute('providerRepositoryId', ''),
+            'APPWRITE_VCS_REPOSITORY_NAME' => $deployment->getAttribute('providerRepositoryName', ''),
+            'APPWRITE_VCS_REPOSITORY_OWNER' => $deployment->getAttribute('providerRepositoryOwner', ''),
+            'APPWRITE_VCS_REPOSITORY_URL' => $deployment->getAttribute('providerRepositoryUrl', ''),
+            'APPWRITE_VCS_REPOSITORY_BRANCH' => $deployment->getAttribute('providerBranch', ''),
+            'APPWRITE_VCS_REPOSITORY_BRANCH_URL' => $deployment->getAttribute('providerBranchUrl', ''),
+            'APPWRITE_VCS_COMMIT_HASH' => $deployment->getAttribute('providerCommitHash', ''),
+            'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
+            'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
+            'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
+            'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
+            'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
        ]);

        /** Execute function */
@@ -273,8 +308,9 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
                method: $method,
                headers: $headers,
                runtimeEntrypoint: $command,
+                cpus: $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+                memory: $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
                logging: $function->getAttribute('logging', true),
-                requestTimeout: 30
            );

            $headersFiltered = [];
@@ -285,14 +321,13 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
            }

            /** Update execution status */
-            $status = $executionResponse['statusCode'] >= 400 ? 'failed' : 'completed';
+            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
            $execution->setAttribute('status', $status);
            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
            $execution->setAttribute('responseHeaders', $headersFiltered);
            $execution->setAttribute('logs', $executionResponse['logs']);
            $execution->setAttribute('errors', $executionResponse['errors']);
            $execution->setAttribute('duration', $executionResponse['duration']);
-
        } catch (\Throwable $th) {
            $durationEnd = \microtime(true);

@@ -307,17 +342,28 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
                throw $th;
            }
        } finally {
+            $fileSize = 0;
+            $file = $request->getFiles('file');
+            if (!empty($file)) {
+                $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
+            }
+
            $queueForUsage
+                ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+                ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
+                ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
                ->addMetric(METRIC_EXECUTIONS, 1)
                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
                ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
+                ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+                ->setProject($project)
+                ->trigger()
            ;

-            if ($function->getAttribute('logging')) {
-                /** @var Document $execution */
-                $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
-            }
+            /** @var Document $execution */
+            $execution = $auth->skip(fn () => $dbForProject->createDocument('executions', $execution));
        }

        $execution->setAttribute('logs', '');
@@ -349,18 +395,15 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo

        return true;
    } elseif ($type === 'api') {
-        $utopia->getRoute()?->label('error', '');
+        $route?->label('error', '');
        return false;
    } else {
        throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Unknown resource type ' . $type);
    }
-
-    $utopia->getRoute()?->label('error', '');
-    return false;
 }

 /*
-App::init()
+Http::init()
    ->groups(['api'])
    ->inject('project')
    ->inject('mode')
@@ -371,7 +414,7 @@ App::init()
    });
 */

-App::init()
+Http::init()
    ->groups(['database', 'functions', 'storage', 'messaging'])
    ->inject('project')
    ->inject('request')
@@ -384,12 +427,11 @@ App::init()
        }
    });

-App::init()
+Http::init()
    ->groups(['api', 'web'])
-    ->inject('utopia')
-    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
+    ->inject('route')
    ->inject('console')
    ->inject('project')
    ->inject('dbForConsole')
@@ -401,7 +443,27 @@ App::init()
    ->inject('queueForUsage')
    ->inject('queueForEvents')
    ->inject('queueForCertificates')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates) {
+    ->inject('authorization')
+    ->action(function (
+        Request $request,
+        Response $response,
+        Route $route,
+        Document $console,
+        Document $project,
+        Database $dbForConsole,
+        $getProjectDB,
+        Locale $locale,
+        array $localeCodes,
+        array $clients,
+        /**
+         * @disregard P1009 Undefined type
+         */
+        Reader $geodb,
+        Usage $queueForUsage,
+        Event $queueForEvents,
+        Certificate $queueForCertificates,
+        Authorization $authorization
+    ) {
        /*
        * Appwrite Router
        */
@@ -409,7 +471,7 @@ App::init()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain) {
-            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb)) {
+            if (router($dbForConsole, $getProjectDB, $request, $response, $route, $queueForEvents, $queueForUsage, $geodb, $authorization)) {
                return;
            }
        }
@@ -417,8 +479,8 @@ App::init()
        /*
        * Request format
        */
-        $route = $utopia->getRoute();
-        Request::setRoute($route);
+        //$route = $utopia->getRoute();
+        //Request::setRoute($route);

        if ($route === null) {
            return $response
@@ -434,6 +496,9 @@ App::init()
            if (version_compare($requestFormat, '1.5.0', '<')) {
                $request->addFilter(new RequestV17());
            }
+            if (version_compare($requestFormat, '1.6.0', '<')) {
+                $request->addFilter(new RequestV18());
+            }
        }

        $domain = $request->getHostname();
@@ -447,7 +512,7 @@ App::init()
            } elseif (str_starts_with($request->getURI(), '/.well-known/acme-challenge')) {
                Console::warning('Skipping SSL certificates generation on ACME challenge.');
            } else {
-                Authorization::disable();
+                $authorization->disable();

                $envDomain = System::getEnv('_APP_DOMAIN', '');
                $mainDomain = null;
@@ -486,12 +551,12 @@ App::init()
                }
                $domains[$domain->get()] = true;

-                Authorization::reset(); // ensure authorization is re-enabled
+                $authorization->reset(); // ensure authorization is re-enabled
            }
            Config::setParam('domains', $domains);
        }

-        $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
+        $localeParam = (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
        if (\in_array($localeParam, $localeCodes)) {
            $locale->setDefault($localeParam);
        }
@@ -519,7 +584,7 @@ App::init()
        Config::setParam(
            'domainVerification',
            ($selfDomain->getRegisterable() === $endDomain->getRegisterable()) &&
-                $endDomain->getRegisterable() !== ''
+            $endDomain->getRegisterable() !== ''
        );

        $isLocalHost = $request->getHostname() === 'localhost' || $request->getHostname() === 'localhost:' . $request->getPort();
@@ -534,8 +599,8 @@ App::init()
                ? null
                : (
                    $isConsoleProject && $isConsoleRootSession
-                    ? '.' . $selfDomain->getRegisterable()
-                    : '.' . $request->getHostname()
+                ? '.' . $selfDomain->getRegisterable()
+                : '.' . $request->getHostname()
                )
        );

@@ -550,8 +615,11 @@ App::init()
            if (version_compare($responseFormat, '1.5.0', '<')) {
                $response->addFilter(new ResponseV17());
            }
+            if (version_compare($responseFormat, '1.6.0', '<')) {
+                $response->addFilter(new ResponseV18());
+            }
            if (version_compare($responseFormat, APP_VERSION_STABLE, '>')) {
-                $response->addHeader('X-Appwrite-Warning', "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is ". APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks");
+                $response->addHeader('X-Appwrite-Warning', "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is " . APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks");
            }
        }

@@ -562,7 +630,9 @@ App::init()
        * @see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
        */
        if (System::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https' && ($swooleRequest->header['host'] ?? '') !== 'localhost' && ($swooleRequest->header['host'] ?? '') !== APP_HOSTNAME_INTERNAL) { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
+            if ($request->getProtocol() !== 'https' // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
+                && ($request->getHeader('host') ?? '') !== 'localhost'
+                && ($request->getHeader('host') ?? '') !== APP_HOSTNAME_INTERNAL) {
                if ($request->getMethod() !== Request::METHOD_GET) {
                    throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                }
@@ -602,9 +672,8 @@ App::init()
        }
    });

-App::options()
-    ->inject('utopia')
-    ->inject('swooleRequest')
+Http::options()
+    ->inject('route')
    ->inject('request')
    ->inject('response')
    ->inject('dbForConsole')
@@ -612,7 +681,8 @@ App::options()
    ->inject('queueForEvents')
    ->inject('queueForUsage')
    ->inject('geodb')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (Route $route, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb, Authorization $authorization) {
        /*
        * Appwrite Router
        */
@@ -620,7 +690,7 @@ App::options()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain) {
-            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb)) {
+            if (router($dbForConsole, $getProjectDB, $request, $response, $route, $queueForEvents, $queueForUsage, $geodb, $authorization)) {
                return;
            }
        }
@@ -637,18 +707,25 @@ App::options()
            ->noContent();
    });

-App::error()
+Http::error()
    ->inject('error')
-    ->inject('utopia')
+    ->inject('user')
+    ->inject('route')
    ->inject('request')
    ->inject('response')
    ->inject('project')
    ->inject('logger')
    ->inject('log')
+    ->inject('authorization')
+    ->inject('connections')
    ->inject('queueForUsage')
-    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, Usage $queueForUsage) {
+    ->action(function (Throwable $error, Document $user, ?Route $route, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, Authorization $authorization, Connections $connections, Usage $queueForUsage) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
-        $route = $utopia->getRoute();
+
+        if (is_null($route)) {
+            $route = new Route($request->getMethod(), $request->getURI());
+        }
+
        $class = \get_class($error);
        $code = $error->getCode();
        $message = $error->getMessage();
@@ -669,9 +746,9 @@ App::error()
            Console::error('[Error] File: ' . $file);
            Console::error('[Error] Line: ' . $line);
        }
-
        switch ($class) {
-            case 'Utopia\Exception':
+            case 'Utopia\Servers\Exception':
+            case 'Utopia\Http\Exception':
                $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
                switch ($code) {
                    case 400:
@@ -716,27 +793,36 @@ App::error()
        } else {
            $publish = $error->getCode() === 0 || $error->getCode() >= 500;
        }
-
        if ($error->getCode() >= 400 && $error->getCode() < 500) {
            // Register error logger
            $providerName = System::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
            $providerConfig = System::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');

            if (!(empty($providerName) || empty($providerConfig))) {
-                if (!Logger::hasProvider($providerName)) {
-                    throw new Exception("Logging provider not supported. Logging is disabled");
-                }
+                try {
+                    $loggingProvider = new DSN($providerConfig);
+                    $providerName = $loggingProvider->getScheme();

-                $classname = '\\Utopia\\Logger\\Adapter\\' . \ucfirst($providerName);
-                $adapter = new $classname($providerConfig);
-                $logger = new Logger($adapter);
-                $logger->setSample(0.04);
-                $publish = true;
+                    if (!empty($providerName) && $providerName === 'sentry') {
+                        $key = $loggingProvider->getPassword();
+                        $projectId = $loggingProvider->getUser() ?? '';
+                        $host = 'https://' . $loggingProvider->getHost();
+
+                        $adapter = new Sentry($projectId, $key, $host);
+                        $logger = new Logger($adapter);
+                        $logger->setSample(0.04);
+                        $publish = true;
+                    } else {
+                        throw new \Exception('Invalid experimental logging provider');
+                    }
+                } catch (\Throwable $th) {
+                    Console::warning('Failed to initialize logging provider: ' . $th->getMessage());
+                }
            }
        }

        if ($publish && $project->getId() !== 'console') {
-            if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
+            if (!Auth::isPrivilegedUser($authorization->getRoles())) {
                $fileSize = 0;
                $file = $request->getFiles('file');
                if (!empty($file)) {
@@ -755,14 +841,7 @@ App::error()
        }


-        if ($logger && $publish) {
-            try {
-                /** @var Utopia\Database\Document $user */
-                $user = $utopia->getResource('user');
-            } catch (\Throwable) {
-                // All good, user is optional information for logger
-            }
-
+        if ($logger && ($publish || $error->getCode() === 0)) {
            if (isset($user) && !$user->isEmpty()) {
                $log->setUser(new User($user->getId()));
            }
@@ -792,8 +871,7 @@ App::error()
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());
-            $log->addExtra('roles', Authorization::getRoles());
+            $log->addExtra('roles', $authorization->getRoles());

            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
            $log->setAction($action);
@@ -807,7 +885,7 @@ App::error()

        /** Wrap all exceptions inside Appwrite\Extend\Exception */
        if (!($error instanceof AppwriteException)) {
-            $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error);
+            $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, (int)$code, $error);
        }

        switch ($code) { // Don't show 500 errors!
@@ -827,14 +905,14 @@ App::error()
                break;
            default:
                $code = 500; // All other errors get the generic 500 server error status code
-                $message = 'Server Error';
+                $message = (Http::getMode() === Http::MODE_TYPE_DEVELOPMENT) ? $message : 'Server Error';
        }

        //$_SERVER = []; // Reset before reporting to error log to avoid keys being compromised

        $type = $error->getType();

-        $output = ((App::isDevelopment())) ? [
+        $output = ((Http::isDevelopment())) ? [
            'message' => $message,
            'code' => $code,
            'file' => $file,
@@ -862,7 +940,7 @@ App::error()

            $layout
                ->setParam('title', $project->getAttribute('name') . ' - Error')
-                ->setParam('development', App::isDevelopment())
+                ->setParam('development', Http::isDevelopment())
                ->setParam('projectName', $project->getAttribute('name'))
                ->setParam('projectURL', $project->getAttribute('url'))
                ->setParam('message', $output['message'] ?? '')
@@ -873,18 +951,18 @@ App::error()
            $response->html($layout->render());
        }

+        $connections->reclaim();
+
        $response->dynamic(
            new Document($output),
-            $utopia->isDevelopment() ? Response::MODEL_ERROR_DEV : Response::MODEL_ERROR
+            Http::isDevelopment() ? Response::MODEL_ERROR_DEV : Response::MODEL_ERROR
        );
    });

-App::get('/robots.txt')
+Http::get('/robots.txt')
    ->desc('Robots.txt File')
    ->label('scope', 'public')
    ->label('docs', false)
-    ->inject('utopia')
-    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
    ->inject('dbForConsole')
@@ -892,7 +970,9 @@ App::get('/robots.txt')
    ->inject('queueForEvents')
    ->inject('queueForUsage')
    ->inject('geodb')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+    ->inject('route')
+    ->inject('authorization')
+    ->action(function (Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb, ?Route $route, Authorization $authorization) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

@@ -900,16 +980,17 @@ App::get('/robots.txt')
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb);
+            if (is_null($route)) {
+                $route = new Route($request->getMethod(), $request->getURI());
+            }
+            router($dbForConsole, $getProjectDB, $request, $response, $route, $queueForEvents, $queueForUsage, $geodb, $authorization);
        }
    });

-App::get('/humans.txt')
+Http::get('/humans.txt')
    ->desc('Humans.txt File')
    ->label('scope', 'public')
    ->label('docs', false)
-    ->inject('utopia')
-    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
    ->inject('dbForConsole')
@@ -917,7 +998,9 @@ App::get('/humans.txt')
    ->inject('queueForEvents')
    ->inject('queueForUsage')
    ->inject('geodb')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+    ->inject('route')
+    ->inject('authorization')
+    ->action(function (Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb, Route $route, Authorization $authorization) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

@@ -925,11 +1008,11 @@ App::get('/humans.txt')
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb);
+            router($dbForConsole, $getProjectDB, $request, $response, $route, $queueForEvents, $queueForUsage, $geodb, $authorization);
        }
    });

-App::get('/.well-known/acme-challenge/*')
+Http::get('/.well-known/acme-challenge/*')
    ->desc('SSL Verification')
    ->label('scope', 'public')
    ->label('docs', false)
@@ -979,16 +1062,32 @@ App::get('/.well-known/acme-challenge/*')
        $response->text($content);
    });

-include_once __DIR__ . '/shared/api.php';
-include_once __DIR__ . '/shared/api/auth.php';
-
-App::wildcard()
+Http::wildcard()
    ->groups(['api'])
    ->label('scope', 'global')
    ->action(function () {
        throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
    });

-foreach (Config::getParam('services', []) as $service) {
-    include_once $service['controller'];
-}
+include_once 'mock.php';
+include_once 'shared/api.php';
+include_once 'shared/api/auth.php';
+include_once 'api/account.php';
+include_once 'api/avatars.php';
+include_once 'api/console.php';
+include_once 'api/databases.php';
+include_once 'api/functions.php';
+include_once 'api/graphql.php';
+include_once 'api/health.php';
+include_once 'api/locale.php';
+include_once 'api/messaging.php';
+include_once 'api/migrations.php';
+include_once 'api/project.php';
+include_once 'api/projects.php';
+include_once 'api/proxy.php';
+include_once 'api/storage.php';
+include_once 'api/teams.php';
+include_once 'api/users.php';
+include_once 'api/vcs.php';
+include_once 'web/console.php';
+include_once 'web/home.php';
@@ -3,9 +3,7 @@
 global $utopia, $request, $response;

 use Appwrite\Extend\Exception;
-use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -13,13 +11,15 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\UID;
+use Utopia\Http\Http;
+use Utopia\Http\Route;
+use Utopia\Http\Validator\Host;
+use Utopia\Http\Validator\Text;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\System\System;
-use Utopia\Validator\Host;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub;

-App::get('/v1/mock/tests/general/oauth2')
+Http::get('/v1/mock/tests/general/oauth2')
    ->desc('OAuth Login')
    ->groups(['mock'])
    ->label('scope', 'public')
@@ -35,7 +35,7 @@ App::get('/v1/mock/tests/general/oauth2')
        $response->redirect($redirectURI . '?' . \http_build_query(['code' => 'abcdef', 'state' => $state]));
    });

-App::get('/v1/mock/tests/general/oauth2/token')
+Http::get('/v1/mock/tests/general/oauth2/token')
    ->desc('OAuth2 Token')
    ->groups(['mock'])
    ->label('scope', 'public')
@@ -81,7 +81,7 @@ App::get('/v1/mock/tests/general/oauth2/token')
        }
    });

-App::get('/v1/mock/tests/general/oauth2/user')
+Http::get('/v1/mock/tests/general/oauth2/user')
    ->desc('OAuth2 User')
    ->groups(['mock'])
    ->label('scope', 'public')
@@ -101,7 +101,7 @@ App::get('/v1/mock/tests/general/oauth2/user')
        ]);
    });

-App::get('/v1/mock/tests/general/oauth2/success')
+Http::get('/v1/mock/tests/general/oauth2/success')
    ->desc('OAuth2 Success')
    ->groups(['mock'])
    ->label('scope', 'public')
@@ -114,7 +114,7 @@ App::get('/v1/mock/tests/general/oauth2/success')
        ]);
    });

-App::get('/v1/mock/tests/general/oauth2/failure')
+Http::get('/v1/mock/tests/general/oauth2/failure')
    ->desc('OAuth2 Failure')
    ->groups(['mock'])
    ->label('scope', 'public')
@@ -129,7 +129,7 @@ App::get('/v1/mock/tests/general/oauth2/failure')
            ]);
    });

-App::patch('/v1/mock/functions-v2')
+Http::patch('/v1/mock/functions-v2')
    ->desc('Update Function Version to V2 (outdated code syntax)')
    ->groups(['mock', 'api', 'functions'])
    ->label('scope', 'functions.write')
@@ -155,7 +155,7 @@ App::patch('/v1/mock/functions-v2')
        $response->noContent();
    });

-App::post('/v1/mock/api-key-unprefixed')
+Http::post('/v1/mock/api-key-unprefixed')
    ->desc('Create API Key (without standard prefix)')
    ->groups(['mock', 'api', 'projects'])
    ->label('scope', 'projects.write')
@@ -204,7 +204,7 @@ App::post('/v1/mock/api-key-unprefixed')
            ->dynamic($key, Response::MODEL_KEY);
    });

-App::get('/v1/mock/github/callback')
+Http::get('/v1/mock/github/callback')
    ->desc('Create installation document using GitHub installation id')
    ->groups(['mock', 'api', 'vcs'])
    ->label('scope', 'public')
@@ -264,15 +264,13 @@ App::get('/v1/mock/github/callback')
        ]);
    });

-App::shutdown()
+Http::shutdown()
    ->groups(['mock'])
-    ->inject('utopia')
+    ->inject('route')
    ->inject('response')
-    ->inject('request')
-    ->action(function (App $utopia, Response $response, Request $request) {
+    ->action(function (Route $route, Response $response) {

        $result = [];
-        $route  = $utopia->getRoute();
        $path   = APP_STORAGE_CACHE . '/tests.json';
        $tests  = (\file_exists($path)) ? \json_decode(\file_get_contents($path), true) : [];

@@ -15,11 +15,11 @@ use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Messaging\Adapter\Realtime;
+use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Utopia\Abuse\Abuse;
-use Utopia\Abuse\Adapters\TimeLimit;
-use Utopia\App;
+use Utopia\Abuse\Adapters\Database\TimeLimit;
 use Utopia\Cache\Adapter\Filesystem;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
@@ -28,8 +28,11 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Authorization\Input;
+use Utopia\Http\Http;
+use Utopia\Http\Route;
+use Utopia\Http\Validator\WhiteList;
 use Utopia\System\System;
-use Utopia\Validator\WhiteList;

 $parseLabel = function (string $label, array $responsePayload, array $requestParams, Document $user) {
    preg_match_all('/{(.*?)}/', $label, $matches);
@@ -150,9 +153,9 @@ $databaseListener = function (string $event, Document $document, Document $proje
    }
 };

-App::init()
+Http::init()
    ->groups(['api'])
-    ->inject('utopia')
+    ->inject('route')
    ->inject('request')
    ->inject('dbForConsole')
    ->inject('project')
@@ -160,9 +163,8 @@ App::init()
    ->inject('session')
    ->inject('servers')
    ->inject('mode')
-    ->action(function (App $utopia, Request $request, Database $dbForConsole, Document $project, Document $user, ?Document $session, array $servers, string $mode) {
-        $route = $utopia->getRoute();
-
+    ->inject('authorization')
+    ->action(function (Route $route, Request $request, Database $dbForConsole, Document $project, Document $user, ?Document $session, array $servers, string $mode, Authorization $authorization) {
        if ($project->isEmpty()) {
            throw new Exception(Exception::PROJECT_NOT_FOUND);
        }
@@ -206,14 +208,15 @@ App::init()
                throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
            }

-            if(!\str_contains($apiKey, '_')) {
+            // Remove after migration
+            if (!\str_contains($apiKey, '_')) {
                $keyType = API_KEY_STANDARD;
                $authKey = $apiKey;
            } else {
                [ $keyType, $authKey ] = \explode('_', $apiKey, 2);
            }

-            if($keyType === API_KEY_DYNAMIC) {
+            if ($keyType === API_KEY_DYNAMIC) {
                // Dynamic key

                $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
@@ -240,10 +243,10 @@ App::init()
                    $role = Auth::USER_ROLE_APPS;
                    $scopes = \array_merge($roles[$role]['scopes'], $tokenScopes);

-                    Authorization::setRole(Auth::USER_ROLE_APPS);
-                    Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
+                    $authorization->addRole(Auth::USER_ROLE_APPS);
+                    $authorization->setDefaultStatus(false);  // Cancel security segmentation for API keys.
                }
-            } elseif($keyType === API_KEY_STANDARD) {
+            } elseif ($keyType === API_KEY_STANDARD) {
                // No underline means no prefix. Backwards compatibility.
                // Regular key

@@ -266,11 +269,11 @@ App::init()
                        throw new Exception(Exception::PROJECT_KEY_EXPIRED);
                    }

-                    Authorization::setRole(Auth::USER_ROLE_APPS);
-                    Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
+                    $authorization->addRole(Auth::USER_ROLE_APPS);
+                    $authorization->setDefaultStatus(false);  // Cancel security segmentation for API keys.

                    $accessedAt = $key->getAttribute('accessedAt', '');
-                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCCESS)) > $accessedAt) {
+                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
                        $key->setAttribute('accessedAt', DateTime::now());
                        $dbForConsole->updateDocument('keys', $key->getId(), $key);
                        $dbForConsole->purgeCachedDocument('projects', $project->getId());
@@ -294,10 +297,10 @@ App::init()
            }
        }

-        Authorization::setRole($role);
+        $authorization->addRole($role);

-        foreach (Auth::getRoles($user) as $authRole) {
-            Authorization::setRole($authRole);
+        foreach (Auth::getRoles($user, $authorization) as $authRole) {
+            $authorization->addRole($authRole);
        }

        $service = $route->getLabel('sdk.namespace', '');
@@ -305,7 +308,7 @@ App::init()
            if (
                array_key_exists($service, $project->getAttribute('services', []))
                && !$project->getAttribute('services', [])[$service]
-                && !(Auth::isPrivilegedUser(Authorization::getRoles()) || Auth::isAppUser(Authorization::getRoles()))
+                && !(Auth::isPrivilegedUser($authorization->getRoles()) || Auth::isAppUser($authorization->getRoles()))
            ) {
                throw new Exception(Exception::GENERAL_SERVICE_DISABLED);
            }
@@ -340,9 +343,9 @@ App::init()
        }
    });

-App::init()
+Http::init()
    ->groups(['api'])
-    ->inject('utopia')
+    ->inject('route')
    ->inject('request')
    ->inject('response')
    ->inject('project')
@@ -356,14 +359,12 @@ App::init()
    ->inject('queueForUsage')
    ->inject('dbForProject')
    ->inject('mode')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, string $mode) use ($databaseListener) {
-
-        $route = $utopia->getRoute();
-
+    ->inject('authorization')
+    ->action(function (Route $route, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, string $mode, Authorization $authorization) use ($databaseListener) {
        if (
            array_key_exists('rest', $project->getAttribute('apis', []))
            && !$project->getAttribute('apis', [])['rest']
-            && !(Auth::isPrivilegedUser(Authorization::getRoles()) || Auth::isAppUser(Authorization::getRoles()))
+            && !(Auth::isPrivilegedUser($authorization->getRoles()) || Auth::isAppUser($authorization->getRoles()))
        ) {
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }
@@ -393,7 +394,7 @@ App::init()

        $closestLimit = null;

-        $roles = Authorization::getRoles();
+        $roles = $authorization->getRoles();
        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
        $isAppUser = Auth::isAppUser($roles);

@@ -457,7 +458,7 @@ App::init()
        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
            $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
-            $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
+            $cacheLog  = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
            $cache = new Cache(
                new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
            );
@@ -470,19 +471,18 @@ App::init()

                if ($type === 'bucket') {
                    $bucketId = $parts[1] ?? null;
-                    $bucket   = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-                    $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-                    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+                    $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+
+                    $isAPIKey = Auth::isAppUser($authorization->getRoles());
+                    $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());

                    if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
                        throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                    }

                    $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-                    $validator = new Authorization(Database::PERMISSION_READ);
-                    $valid = $validator->isValid($bucket->getRead());
-
+                    $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
                    if (!$fileSecurity && !$valid) {
                        throw new Exception(Exception::USER_UNAUTHORIZED);
                    }
@@ -493,7 +493,7 @@ App::init()
                    if ($fileSecurity && !$valid) {
                        $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
                    } else {
-                        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
                    }

                    if ($file->isEmpty()) {
@@ -507,12 +507,17 @@ App::init()
                    ->setContentType($cacheLog->getAttribute('mimeType'))
                    ->send($data);
            } else {
-                $response->addHeader('X-Appwrite-Cache', 'miss');
+                $response
+                    ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
+                    ->addHeader('Pragma', 'no-cache')
+                    ->addHeader('Expires', 0)
+                    ->addHeader('X-Appwrite-Cache', 'miss')
+                ;
            }
        }
    });

-App::init()
+Http::init()
    ->groups(['session'])
    ->inject('user')
    ->inject('request')
@@ -532,14 +537,12 @@ App::init()
 * Delete older sessions if the number of sessions have crossed
 * the session limit set for the project
 */
-App::shutdown()
+Http::shutdown()
    ->groups(['session'])
-    ->inject('utopia')
-    ->inject('request')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Database $dbForProject) {
+    ->action(function (Response $response, Document $project, Database $dbForProject) {
        $sessionLimit = $project->getAttribute('auths', [])['maxSessions'] ?? APP_LIMIT_USER_SESSIONS_DEFAULT;
        $session = $response->getPayload();
        $userId = $session['userId'] ?? '';
@@ -566,9 +569,9 @@ App::shutdown()
        $dbForProject->purgeCachedDocument('users', $userId);
    });

-App::shutdown()
+Http::shutdown()
    ->groups(['api'])
-    ->inject('utopia')
+    ->inject('route')
    ->inject('request')
    ->inject('response')
    ->inject('project')
@@ -584,7 +587,29 @@ App::shutdown()
    ->inject('queueForFunctions')
    ->inject('mode')
    ->inject('dbForConsole')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, Usage $queueForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Database $dbForProject, Func $queueForFunctions, string $mode, Database $dbForConsole) use ($parseLabel) {
+    ->inject('authorization')
+    ->action(function (
+        Route $route,
+        Request $request,
+        Response $response,
+        Document $project,
+        Document $user,
+        Event $queueForEvents,
+        Audit $queueForAudits,
+        Usage $queueForUsage,
+        Delete $queueForDeletes,
+        EventDatabase $queueForDatabase,
+        Build $queueForBuilds,
+        Messaging $queueForMessaging,
+        Database $dbForProject,
+        Func $queueForFunctions,
+        string $mode,
+        Database $dbForConsole,
+        Authorization $authorization,
+    ) use ($parseLabel) {
+        if (!empty($user) && !$user->isEmpty() && empty($user->getInternalId())) {
+            $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $user->getId()));
+        }

        $responsePayload = $response->getPayload();

@@ -596,10 +621,11 @@ App::shutdown()
            /**
             * Trigger functions.
             */
-            $queueForFunctions
-                ->from($queueForEvents)
-                ->trigger();
-
+            if (!$queueForEvents->isPaused()) {
+                $queueForFunctions
+                    ->from($queueForEvents)
+                    ->trigger();
+            }
            /**
             * Trigger webhooks.
             */
@@ -643,7 +669,6 @@ App::shutdown()
            }
        }

-        $route = $utopia->getRoute();
        $requestParams = $route->getParamsValues();

        /**
@@ -713,11 +738,11 @@ App::shutdown()

                $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
                $signature = md5($data['payload']);
-                $cacheLog  =  Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
+                $cacheLog  =  $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
                $accessedAt = $cacheLog->getAttribute('accessedAt', '');
                $now = DateTime::now();
                if ($cacheLog->isEmpty()) {
-                    Authorization::skip(fn () => $dbForProject->createDocument('cache', new Document([
+                    $authorization->skip(fn () => $dbForProject->createDocument('cache', new Document([
                        '$id' => $key,
                        'resource' => $resource,
                        'resourceType' => $resourceType,
@@ -727,7 +752,7 @@ App::shutdown()
                    ])));
                } elseif (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
                    $cacheLog->setAttribute('accessedAt', $now);
-                    Authorization::skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));
+                    $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));
                }

                if ($signature !== $cacheLog->getAttribute('signature')) {
@@ -739,10 +764,8 @@ App::shutdown()
            }
        }

-
-
        if ($project->getId() !== 'console') {
-            if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
+            if (!Auth::isPrivilegedUser($authorization->getRoles())) {
                $fileSize = 0;
                $file = $request->getFiles('file');
                if (!empty($file)) {
@@ -760,12 +783,23 @@ App::shutdown()
                ->trigger();
        }

+        /**
+         * Update project last activity
+         */
+        if (!$project->isEmpty() && $project->getId() !== 'console') {
+            $accessedAt = $project->getAttribute('accessedAt', '');
+            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
+                $project->setAttribute('accessedAt', DateTime::now());
+                $authorization->skip(fn () => $dbForConsole->updateDocument('projects', $project->getId(), $project));
+            }
+        }
+
        /**
         * Update user last activity
         */
        if (!$user->isEmpty()) {
            $accessedAt = $user->getAttribute('accessedAt', '');
-            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCCESS)) > $accessedAt) {
+            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
                $user->setAttribute('accessedAt', DateTime::now());

                if (APP_MODE_ADMIN !== $mode) {
@@ -777,10 +811,16 @@ App::shutdown()
        }
    });

-App::init()
+Http::init()
    ->groups(['usage'])
    ->action(function () {
        if (System::getEnv('_APP_USAGE_STATS', 'enabled') !== 'enabled') {
            throw new Exception(Exception::GENERAL_USAGE_DISABLED);
        }
    });
+
+Http::shutdown()
+    ->inject('connections')
+    ->action(function (Connections $connections) {
+        $connections->reclaim();
+    });
@@ -4,13 +4,14 @@ use Appwrite\Auth\Auth;
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Request;
 use MaxMind\Db\Reader;
-use Utopia\App;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Http\Http;
+use Utopia\Http\Route;
 use Utopia\System\System;

-App::init()
+Http::init()
    ->groups(['mfaProtected'])
    ->inject('session')
    ->action(function (Document $session) {
@@ -29,13 +30,14 @@ App::init()
        }
    });

-App::init()
+Http::init()
    ->groups(['auth'])
-    ->inject('utopia')
+    ->inject('route')
    ->inject('request')
    ->inject('project')
    ->inject('geodb')
-    ->action(function (App $utopia, Request $request, Document $project, Reader $geodb) {
+    ->inject('authorization')
+    ->action(function (Route $route, Request $request, Document $project, Reader $geodb, Authorization $authorization) {
        $denylist = System::getEnv('_APP_CONSOLE_COUNTRIES_DENYLIST', '');
        if (!empty($denylist && $project->getId() === 'console')) {
            $countries = explode(',', $denylist);
@@ -46,15 +48,17 @@ App::init()
            }
        }

-        $route = $utopia->match($request);
-
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-        $isAppUser = Auth::isAppUser(Authorization::getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser($authorization->getRoles());
+        $isAppUser = Auth::isAppUser($authorization->getRoles());

        if ($isAppUser || $isPrivilegedUser) { // Skip limits for app and console devs
            return;
        }

+        if ($route->getLabel('sdk.namespace', '') === 'graphql') { // Skip for graphQL recursive call
+            return;
+        }
+
        $auths = $project->getAttribute('auths', []);
        switch ($route->getLabel('auth.type', '')) {
            case 'emailPassword':
@@ -2,9 +2,9 @@

 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Utopia\App;
+use Utopia\Http\Http;

-App::init()
+Http::init()
    ->groups(['web'])
    ->inject('request')
    ->inject('response')
@@ -16,8 +16,7 @@ App::init()
        ;
    });

-App::get('/console/*')
-    ->alias('/')
+Http::get('/')
    ->alias('auth/*')
    ->alias('/invite')
    ->alias('/login')
@@ -31,45 +30,14 @@ App::get('/console/*')
    ->inject('request')
    ->inject('response')
    ->action(function (Request $request, Response $response) {
-        $fallback = file_get_contents(__DIR__ . '/../../../console/index.html');
-
-        // Card SSR
-        if (\str_starts_with($request->getURI(), '/card')) {
-            $urlCunks = \explode('/', $request->getURI());
-            $userId = $urlCunks[\count($urlCunks) - 1] ?? '';
-
-            $domain = $request->getProtocol() . '://' . $request->getHostname();
-
-            if (!empty($userId)) {
-                $ogImageUrl = $domain . '/v1/cards/cloud-og?userId=' . $userId;
-            } else {
-                $ogImageUrl = $domain . '/v1/cards/cloud-og?mock=normal';
-            }
-
-            $ogTags = [
-                '<title>Appwrite Cloud Card</title>',
-                '<meta name="description" content="Appwrite Cloud is now LIVE! Share your Cloud card for a chance to win an exclusive Cloud hoodie!">',
-                '<meta property="og:url" content="' . $domain . $request->getURI() . '">',
-                '<meta name="og:image:type" content="image/png">',
-                '<meta name="og:image:width" content="1008">',
-                '<meta name="og:image:height" content="1008">',
-                '<meta property="og:type" content="website">',
-                '<meta property="og:title" content="Appwrite Cloud Card">',
-                '<meta property="og:description" content="Appwrite Cloud is now LIVE! Share your Cloud card for a chance to win an exclusive Cloud hoodie!">',
-                '<meta property="og:image" content="' . $ogImageUrl . '">',
-                '<meta name="twitter:card" content="summary_large_image">',
-                '<meta property="twitter:domain" content="' . $request->getHostname() . '">',
-                '<meta property="twitter:url" content="' . $domain . $request->getURI() . '">',
-                '<meta name="twitter:title" content="Appwrite Cloud Card">',
-                '<meta name="twitter:image:type" content="image/png">',
-                '<meta name="twitter:image:width" content="1008">',
-                '<meta name="twitter:image:height" content="1008">',
-                '<meta name="twitter:description" content="Appwrite Cloud is now LIVE! Share your Cloud card for a chance to win an exclusive Cloud hoodie!">',
-                '<meta name="twitter:image" content="' . $ogImageUrl . '">',
-            ];
-
-            $fallback = \str_replace('<!-- {{CLOUD_OG}} -->', \implode('', $ogTags), $fallback);
+        $url = parse_url($request->getURI());
+        $target = "/console{$url['path']}";
+        $params = $request->getParams();
+        if (!empty($params)) {
+            $target .= "?" . \http_build_query($params);
        }
-
-        $response->html($fallback);
+        if ($url['fragment'] ?? false) {
+            $target .= "#{$url['fragment']}";
+        }
+        $response->redirect($target);
    });
@@ -1,10 +1,10 @@
 <?php

 use Appwrite\Utopia\Response;
-use Utopia\App;
 use Utopia\Config\Config;
+use Utopia\Http\Http;

-App::get('/versions')
+Http::get('/versions')
    ->desc('Get Version')
    ->groups(['home', 'web'])
    ->label('scope', 'public')
@@ -1,334 +1,242 @@
 <?php

-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/init.php';
+require_once __DIR__ . '/controllers/general.php';

+use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Swoole\Constant;
-use Swoole\Http\Request as SwooleRequest;
-use Swoole\Http\Response as SwooleResponse;
-use Swoole\Http\Server;
-use Swoole\Process;
-use Utopia\Abuse\Adapters\TimeLimit;
-use Utopia\App;
+use Utopia\Abuse\Adapters\Database\TimeLimit;
 use Utopia\Audit\Audit;
+use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Logger\Log;
-use Utopia\Logger\Log\User;
-use Utopia\Pools\Group;
-use Utopia\Swoole\Files;
+use Utopia\Http\Adapter\Swoole\Server;
+use Utopia\Http\Http;
 use Utopia\System\System;

-$http = new Server(
-    host: "0.0.0.0",
-    port: System::getEnv('PORT', 80),
-    mode: SWOOLE_PROCESS,
-);
+global $registry, $container;

 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

-$http
-    ->set([
-        'worker_num' => $workerNumber,
-        'open_http2_protocol' => true,
-        'http_compression' => true,
-        'http_compression_level' => 6,
-        'package_max_length' => $payloadSize,
-        'buffer_output_size' => $payloadSize,
-    ]);
+$server = new Server('0.0.0.0', '80', [
+    'open_http2_protocol' => true,
+    'http_compression' => true,
+    'http_compression_level' => 6,
+    'package_max_length' => $payloadSize,
+    'buffer_output_size' => $payloadSize,
+    // Server
+    // 'log_level' => 0,
+    'dispatch_mode' => 2,
+    'worker_num' => $workerNumber,
+    'reactor_num' => swoole_cpu_num() * 2,
+    'open_cpu_affinity' => true,
+    // Coroutine
+    'enable_coroutine' => true,
+    'send_yield' => true,
+    'tcp_fastopen' => true,
+]);

-$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
-    Console::success('Worker ' . ++$workerId . ' started successfully');
-});
-
-$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
-    Console::success('Starting reload...');
-});
-
-$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
-    Console::success('Reload completed...');
-});
-
-Files::load(__DIR__ . '/../console');
-
-include __DIR__ . '/controllers/general.php';
-
-$http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $register) {
-    $app = new App('UTC');
-
-    go(function () use ($register, $app) {
-        $pools = $register->get('pools');
-        /** @var Group $pools */
-        App::setResource('pools', fn () => $pools);
-
-        // wait for database to be ready
-        $attempts = 0;
-        $max = 10;
-        $sleep = 1;
-
-        do {
-            try {
-                $attempts++;
-                $dbForConsole = $app->getResource('dbForConsole');
-                /** @var Utopia\Database\Database $dbForConsole */
-                break; // leave the do-while if successful
-            } catch (\Throwable $e) {
-                Console::warning("Database not ready. Retrying connection ({$attempts})...");
-                if ($attempts >= $max) {
-                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-                }
-                sleep($sleep);
-            }
-        } while ($attempts < $max);
-
-        Console::success('[Setup] - Server database init started...');
+$http = new Http($server, $container, 'UTC');
+$http->setRequestClass(Request::class);
+$http->setResponseClass(Response::class);

+Http::onStart()
+    ->inject('authorization')
+    ->inject('cache')
+    ->inject('pools')
+    ->inject('connections')
+    ->action(function (Authorization $authorization, Cache $cache, array $pools, Connections $connections) {
        try {
-            Console::success('[Setup] - Creating database: appwrite...');
-            $dbForConsole->create();
-        } catch (\Throwable $e) {
-            Console::success('[Setup] - Skip: metadata table already exists');
-        }
+            // wait for database to be ready
+            $attempts = 0;
+            $max = 15;
+            $sleep = 2;

-        if ($dbForConsole->getCollection(Audit::COLLECTION)->isEmpty()) {
-            $audit = new Audit($dbForConsole);
-            $audit->setup();
-        }
+            do {
+                try {
+                    $attempts++;
+                    $pool = $pools['pools-console-console']['pool'];
+                    $dsn = $pools['pools-console-console']['dsn'];
+                    $connection = $pool->get();
+                    $connections->add($connection, $pool);

-        if ($dbForConsole->getCollection(TimeLimit::COLLECTION)->isEmpty()) {
-            $adapter = new TimeLimit("", 0, 1, $dbForConsole);
-            $adapter->setup();
-        }
+                    $adapter = match ($dsn->getScheme()) {
+                        'mariadb' => new MariaDB($connection),
+                        'mysql' => new MySQL($connection),
+                        default => null
+                    };

-        /** @var array $collections */
-        $collections = Config::getParam('collections', []);
-        $consoleCollections = $collections['console'];
-        foreach ($consoleCollections as $key => $collection) {
-            if (($collection['$collection'] ?? '') !== Database::METADATA) {
-                continue;
-            }
-            if (!$dbForConsole->getCollection($key)->isEmpty()) {
-                continue;
-            }
+                    $adapter->setDatabase($dsn->getPath());

-            Console::success('[Setup] - Creating collection: ' . $collection['$id'] . '...');
+                    $dbForConsole = new Database($adapter, $cache);
+                    $dbForConsole->setAuthorization($authorization);

-            $attributes = [];
-            $indexes = [];
+                    $dbForConsole
+                        ->setNamespace('_console')
+                        ->setMetadata('host', \gethostname())
+                        ->setMetadata('project', 'console')
+                        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);

-            foreach ($collection['attributes'] as $attribute) {
-                $attributes[] = new Document([
-                    '$id' => ID::custom($attribute['$id']),
-                    'type' => $attribute['type'],
-                    'size' => $attribute['size'],
-                    'required' => $attribute['required'],
-                    'signed' => $attribute['signed'],
-                    'array' => $attribute['array'],
-                    'filters' => $attribute['filters'],
-                    'default' => $attribute['default'] ?? null,
-                    'format' => $attribute['format'] ?? ''
-                ]);
-            }
+                    $dbForConsole->ping();
+                    break; // leave the do-while if successful
+                } catch (\Throwable $e) {
+                    Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                    if ($attempts >= $max) {
+                        throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+                    }
+                    sleep($sleep);
+                }
+            } while ($attempts < $max);

-            foreach ($collection['indexes'] as $index) {
-                $indexes[] = new Document([
-                    '$id' => ID::custom($index['$id']),
-                    'type' => $index['type'],
-                    'attributes' => $index['attributes'],
-                    'lengths' => $index['lengths'],
-                    'orders' => $index['orders'],
-                ]);
-            }
+            Console::success('[Setup] - Server database init started...');

-            $dbForConsole->createCollection($key, $attributes, $indexes);
-        }
-
-        if ($dbForConsole->getDocument('buckets', 'default')->isEmpty() && !$dbForConsole->exists($dbForConsole->getDatabase(), 'bucket_1')) {
-            Console::success('[Setup] - Creating default bucket...');
-            $dbForConsole->createDocument('buckets', new Document([
-                '$id' => ID::custom('default'),
-                '$collection' => ID::custom('buckets'),
-                'name' => 'Default',
-                'maximumFileSize' => (int) System::getEnv('_APP_STORAGE_LIMIT', 0), // 10MB
-                'allowedFileExtensions' => [],
-                'enabled' => true,
-                'compression' => 'gzip',
-                'encryption' => true,
-                'antivirus' => true,
-                'fileSecurity' => true,
-                '$permissions' => [
-                    Permission::create(Role::any()),
-                    Permission::read(Role::any()),
-                    Permission::update(Role::any()),
-                    Permission::delete(Role::any()),
-                ],
-                'search' => 'buckets Default',
-            ]));
-
-            $bucket = $dbForConsole->getDocument('buckets', 'default');
-
-            Console::success('[Setup] - Creating files collection for default bucket...');
-            $files = $collections['buckets']['files'] ?? [];
-            if (empty($files)) {
-                throw new Exception('Files collection is not configured.');
-            }
-
-            $attributes = [];
-            $indexes = [];
-
-            foreach ($files['attributes'] as $attribute) {
-                $attributes[] = new Document([
-                    '$id' => ID::custom($attribute['$id']),
-                    'type' => $attribute['type'],
-                    'size' => $attribute['size'],
-                    'required' => $attribute['required'],
-                    'signed' => $attribute['signed'],
-                    'array' => $attribute['array'],
-                    'filters' => $attribute['filters'],
-                    'default' => $attribute['default'] ?? null,
-                    'format' => $attribute['format'] ?? ''
-                ]);
-            }
-
-            foreach ($files['indexes'] as $index) {
-                $indexes[] = new Document([
-                    '$id' => ID::custom($index['$id']),
-                    'type' => $index['type'],
-                    'attributes' => $index['attributes'],
-                    'lengths' => $index['lengths'],
-                    'orders' => $index['orders'],
-                ]);
-            }
-
-            $dbForConsole->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
-        }
-
-        $pools->reclaim();
-
-        Console::success('[Setup] - Server database init completed...');
-    });
-
-    Console::success('Server started successfully (max payload is ' . number_format($payloadSize) . ' bytes)');
-    Console::info("Master pid {$http->master_pid}, manager pid {$http->manager_pid}");
-
-    // listen ctrl + c
-    Process::signal(2, function () use ($http) {
-        Console::log('Stop by Ctrl+C');
-        $http->shutdown();
-    });
-});
-
-$http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register) {
-    App::setResource('swooleRequest', fn () => $swooleRequest);
-    App::setResource('swooleResponse', fn () => $swooleResponse);
-
-    $request = new Request($swooleRequest);
-    $response = new Response($swooleResponse);
-
-    if (Files::isFileLoaded($request->getURI())) {
-        $time = (60 * 60 * 24 * 365 * 2); // 45 days cache
-
-        $response
-            ->setContentType(Files::getFileMimeType($request->getURI()))
-            ->addHeader('Cache-Control', 'public, max-age=' . $time)
-            ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time) . ' GMT') // 45 days cache
-            ->send(Files::getFileContents($request->getURI()));
-
-        return;
-    }
-
-    $app = new App('UTC');
-
-    $pools = $register->get('pools');
-    App::setResource('pools', fn () => $pools);
-
-    try {
-        Authorization::cleanRoles();
-        Authorization::setRole(Role::any()->toString());
-
-        $app->run($request, $response);
-    } catch (\Throwable $th) {
-        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
-
-        $logger = $app->getResource("logger");
-        if ($logger) {
            try {
-                /** @var Utopia\Database\Document $user */
-                $user = $app->getResource('user');
-            } catch (\Throwable $_th) {
-                // All good, user is optional information for logger
+                Console::success('[Setup] - Creating database: appwrite...');
+                $dbForConsole->create();
+            } catch (\Throwable $e) {
+                Console::success('[Setup] - Skip: metadata table already exists');
+                return true;
            }

-            $route = $app->getRoute();
-
-            $log = $app->getResource("log");
-
-            if (isset($user) && !$user->isEmpty()) {
-                $log->setUser(new User($user->getId()));
+            if ($dbForConsole->getCollection(Audit::COLLECTION)->isEmpty()) {
+                $audit = new Audit($dbForConsole);
+                $audit->setup();
            }

-            $log->setNamespace("http");
-            $log->setServer(\gethostname());
-            $log->setVersion($version);
-            $log->setType(Log::TYPE_ERROR);
-            $log->setMessage($th->getMessage());
+            if ($dbForConsole->getCollection(TimeLimit::COLLECTION)->isEmpty()) {
+                $abuse = new TimeLimit("", 0, 1, $dbForConsole);
+                $abuse->setup();
+            }

-            $log->addTag('method', $route->getMethod());
-            $log->addTag('url', $route->getPath());
-            $log->addTag('verboseType', get_class($th));
-            $log->addTag('code', $th->getCode());
-            // $log->addTag('projectId', $project->getId()); // TODO: Figure out how to get ProjectID, if it becomes relevant
-            $log->addTag('hostname', $request->getHostname());
-            $log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));
+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $consoleCollections = $collections['console'];
+            foreach ($consoleCollections as $key => $collection) {
+                if (($collection['$collection'] ?? '') !== Database::METADATA) {
+                    continue;
+                }
+                if (!$dbForConsole->getCollection($key)->isEmpty()) {
+                    continue;
+                }

-            $log->addExtra('file', $th->getFile());
-            $log->addExtra('line', $th->getLine());
-            $log->addExtra('trace', $th->getTraceAsString());
-            $log->addExtra('detailedTrace', $th->getTrace());
-            $log->addExtra('roles', Authorization::getRoles());
+                Console::success('[Setup] - Creating collection: ' . $collection['$id'] . '...');

-            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
-            $log->setAction($action);
+                $attributes = [];
+                $indexes = [];

-            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
-            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+                foreach ($collection['attributes'] as $attribute) {
+                    $attributes[] = new Document([
+                        '$id' => ID::custom($attribute['$id']),
+                        'type' => $attribute['type'],
+                        'size' => $attribute['size'],
+                        'required' => $attribute['required'],
+                        'signed' => $attribute['signed'],
+                        'array' => $attribute['array'],
+                        'filters' => $attribute['filters'],
+                        'default' => $attribute['default'] ?? null,
+                        'format' => $attribute['format'] ?? ''
+                    ]);
+                }

-            $responseCode = $logger->addLog($log);
-            Console::info('Log pushed with status code: ' . $responseCode);
+                foreach ($collection['indexes'] as $index) {
+                    $indexes[] = new Document([
+                        '$id' => ID::custom($index['$id']),
+                        'type' => $index['type'],
+                        'attributes' => $index['attributes'],
+                        'lengths' => $index['lengths'],
+                        'orders' => $index['orders'],
+                    ]);
+                }
+
+                $dbForConsole->createCollection($key, $attributes, $indexes);
+            }
+
+            if ($dbForConsole->getDocument('buckets', 'default')->isEmpty() && !$dbForConsole->exists($dbForConsole->getDatabase(), 'bucket_1')) {
+                Console::success('[Setup] - Creating default bucket...');
+                $dbForConsole->createDocument('buckets', new Document([
+                    '$id' => ID::custom('default'),
+                    '$collection' => ID::custom('buckets'),
+                    'name' => 'Default',
+                    'maximumFileSize' => (int) System::getEnv('_APP_STORAGE_LIMIT', 0), // 10MB
+                    'allowedFileExtensions' => [],
+                    'enabled' => true,
+                    'compression' => 'gzip',
+                    'encryption' => true,
+                    'antivirus' => true,
+                    'fileSecurity' => true,
+                    '$permissions' => [
+                        Permission::create(Role::any()),
+                        Permission::read(Role::any()),
+                        Permission::update(Role::any()),
+                        Permission::delete(Role::any()),
+                    ],
+                    'search' => 'buckets Default',
+                ]));
+
+                $bucket = $dbForConsole->getDocument('buckets', 'default');
+
+                Console::success('[Setup] - Creating files collection for default bucket...');
+
+                $files = $collections['buckets']['files'] ?? [];
+                if (empty($files)) {
+                    throw new Exception('Files collection is not configured.');
+                }
+
+                $attributes = [];
+                $indexes = [];
+
+                foreach ($files['attributes'] as $attribute) {
+                    $attributes[] = new Document([
+                        '$id' => ID::custom($attribute['$id']),
+                        'type' => $attribute['type'],
+                        'size' => $attribute['size'],
+                        'required' => $attribute['required'],
+                        'signed' => $attribute['signed'],
+                        'array' => $attribute['array'],
+                        'filters' => $attribute['filters'],
+                        'default' => $attribute['default'] ?? null,
+                        'format' => $attribute['format'] ?? ''
+                    ]);
+                }
+
+                foreach ($files['indexes'] as $index) {
+                    $indexes[] = new Document([
+                        '$id' => ID::custom($index['$id']),
+                        'type' => $index['type'],
+                        'attributes' => $index['attributes'],
+                        'lengths' => $index['lengths'],
+                        'orders' => $index['orders'],
+                    ]);
+                }
+
+                $dbForConsole->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
+            }
+
+            $connections->reclaim();
+
+            Console::success('[Setup] - Server database init completed...');
+            Console::success('Server started successfully');
+        } catch (\Throwable $e) {
+            Console::warning('Database not ready: ' . $e->getMessage());
+            exit(1);
        }
+    });

-        Console::error('[Error] Type: ' . get_class($th));
-        Console::error('[Error] Message: ' . $th->getMessage());
-        Console::error('[Error] File: ' . $th->getFile());
-        Console::error('[Error] Line: ' . $th->getLine());
-
-        $swooleResponse->setStatusCode(500);
-
-        $output = ((App::isDevelopment())) ? [
-            'message' => 'Error: ' . $th->getMessage(),
-            'code' => 500,
-            'file' => $th->getFile(),
-            'line' => $th->getLine(),
-            'trace' => $th->getTrace(),
-            'version' => $version,
-        ] : [
-            'message' => 'Error: Server Error',
-            'code' => 500,
-            'version' => $version,
-        ];
-
-        $swooleResponse->end(\json_encode($output));
-    } finally {
-        $pools->reclaim();
-    }
-});
+Http::init()
+    ->inject('authorization')
+    ->action(function (Authorization $authorization) {
+        $authorization->cleanRoles();
+        $authorization->addRole(Role::any()->toString());
+    });

 $http->start();
@@ -0,0 +1,37 @@
+<?php
+
+
+use Utopia\Config\Config;
+
+Config::load('events', __DIR__ . '/../config/events.php');
+Config::load('auth', __DIR__ . '/../config/auth.php');
+Config::load('apis', __DIR__ . '/../config/apis.php');
+Config::load('errors', __DIR__ . '/../config/errors.php');
+Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php');
+Config::load('platforms', __DIR__ . '/../config/platforms.php');
+Config::load('collections', __DIR__ . '/../config/collections.php');
+Config::load('runtimes', __DIR__ . '/../config/runtimes.php');
+Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php');
+Config::load('usage', __DIR__ . '/../config/usage.php');
+Config::load('roles', __DIR__ . '/../config/roles.php');  // User roles and scopes
+Config::load('scopes', __DIR__ . '/../config/scopes.php');  // User roles and scopes
+Config::load('services', __DIR__ . '/../config/services.php');  // List of services
+Config::load('variables', __DIR__ . '/../config/variables.php');  // List of env variables
+Config::load('regions', __DIR__ . '/../config/regions.php'); // List of available regions
+Config::load('avatar-browsers', __DIR__ . '/../config/avatars/browsers.php');
+Config::load('avatar-credit-cards', __DIR__ . '/../config/avatars/credit-cards.php');
+Config::load('avatar-flags', __DIR__ . '/../config/avatars/flags.php');
+Config::load('locale-codes', __DIR__ . '/../config/locale/codes.php');
+Config::load('locale-currencies', __DIR__ . '/../config/locale/currencies.php');
+Config::load('locale-eu', __DIR__ . '/../config/locale/eu.php');
+Config::load('locale-languages', __DIR__ . '/../config/locale/languages.php');
+Config::load('locale-phones', __DIR__ . '/../config/locale/phones.php');
+Config::load('locale-countries', __DIR__ . '/../config/locale/countries.php');
+Config::load('locale-continents', __DIR__ . '/../config/locale/continents.php');
+Config::load('locale-templates', __DIR__ . '/../config/locale/templates.php');
+Config::load('storage-logos', __DIR__ . '/../config/storage/logos.php');
+Config::load('storage-mimes', __DIR__ . '/../config/storage/mimes.php');
+Config::load('storage-inputs', __DIR__ . '/../config/storage/inputs.php');
+Config::load('storage-outputs', __DIR__ . '/../config/storage/outputs.php');
+Config::load('runtime-specifications', __DIR__ . '/../config/runtimes/specifications.php');
+Config::load('function-templates', __DIR__ . '/../config/function-templates.php');
@@ -0,0 +1,194 @@
+<?php
+
+use Appwrite\Functions\Specification;
+
+const APP_NAME = 'Appwrite';
+const APP_DOMAIN = 'appwrite.io';
+const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
+const APP_EMAIL_SECURITY = ''; // Default security email address
+const APP_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
+const APP_MODE_DEFAULT = 'default';
+const APP_MODE_ADMIN = 'admin';
+const APP_PAGING_LIMIT = 12;
+const APP_LIMIT_COUNT = 5000;
+const APP_LIMIT_USERS = 10_000;
+const APP_LIMIT_USER_PASSWORD_HISTORY = 20;
+const APP_LIMIT_USER_SESSIONS_MAX = 100;
+const APP_LIMIT_USER_SESSIONS_DEFAULT = 10;
+const APP_LIMIT_ANTIVIRUS = 20_000_000; //20MB
+const APP_LIMIT_ENCRYPTION = 20_000_000; //20MB
+const APP_LIMIT_COMPRESSION = 20_000_000; //20MB
+const APP_LIMIT_ARRAY_PARAMS_SIZE = 100; // Default maximum of how many elements can there be in API parameter that expects array value
+const APP_LIMIT_ARRAY_LABELS_SIZE = 1000; // Default maximum of how many labels elements can there be in API parameter that expects array value
+const APP_LIMIT_ARRAY_ELEMENT_SIZE = 4096; // Default maximum length of element in array parameter represented by maximum URL length.
+const APP_LIMIT_SUBQUERY = 1000;
+const APP_LIMIT_SUBSCRIBERS_SUBQUERY = 1_000_000;
+const APP_LIMIT_WRITE_RATE_DEFAULT = 60; // Default maximum write rate per rate period
+const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate period in seconds
+const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
+const APP_KEY_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
+const APP_CACHE_BUSTER = 4318;
+const APP_VERSION_STABLE = '1.6.0';
+const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
+const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
+const APP_DATABASE_ATTRIBUTE_IP = 'ip';
+const APP_DATABASE_ATTRIBUTE_DATETIME = 'datetime';
+const APP_DATABASE_ATTRIBUTE_URL = 'url';
+const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
+const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
+const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4 bits per char
+const APP_DATABASE_TIMEOUT_MILLISECONDS = 15_000;
+const APP_STORAGE_UPLOADS = '/storage/uploads';
+const APP_STORAGE_FUNCTIONS = '/storage/functions';
+const APP_STORAGE_BUILDS = '/storage/builds';
+const APP_STORAGE_CACHE = '/storage/cache';
+const APP_STORAGE_CERTIFICATES = '/storage/certificates';
+const APP_STORAGE_CONFIG = '/storage/config';
+const APP_STORAGE_READ_BUFFER = 20 * (1000 * 1000); //20MB other names `APP_STORAGE_MEMORY_LIMIT`, `APP_STORAGE_MEMORY_BUFFER`, `APP_STORAGE_READ_LIMIT`, `APP_STORAGE_BUFFER_LIMIT`
+const APP_SOCIAL_TWITTER = 'https://twitter.com/appwrite';
+const APP_SOCIAL_TWITTER_HANDLE = 'appwrite';
+const APP_SOCIAL_FACEBOOK = 'https://www.facebook.com/appwrite.io';
+const APP_SOCIAL_LINKEDIN = 'https://www.linkedin.com/company/appwrite';
+const APP_SOCIAL_INSTAGRAM = 'https://www.instagram.com/appwrite.io';
+const APP_SOCIAL_GITHUB = 'https://github.com/appwrite';
+const APP_SOCIAL_DISCORD = 'https://appwrite.io/discord';
+const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
+const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
+const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
+const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
+const APP_HOSTNAME_INTERNAL = 'appwrite';
+const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_05VCPU_512MB;
+const APP_FUNCTION_CPUS_DEFAULT = 0.5;
+const APP_FUNCTION_MEMORY_DEFAULT = 512;
+const DATABASE_SHARED_TABLES = 'database_db_fra1_self_hosted_16_0';
+// Database Reconnect
+const DATABASE_RECONNECT_SLEEP = 2;
+const DATABASE_RECONNECT_MAX_ATTEMPTS = 10;
+
+// Database Worker Types
+const DATABASE_TYPE_CREATE_ATTRIBUTE = 'createAttribute';
+const DATABASE_TYPE_CREATE_INDEX = 'createIndex';
+const DATABASE_TYPE_DELETE_ATTRIBUTE = 'deleteAttribute';
+const DATABASE_TYPE_DELETE_INDEX = 'deleteIndex';
+const DATABASE_TYPE_DELETE_COLLECTION = 'deleteCollection';
+const DATABASE_TYPE_DELETE_DATABASE = 'deleteDatabase';
+
+// Build Worker Types
+const BUILD_TYPE_DEPLOYMENT = 'deployment';
+const BUILD_TYPE_RETRY = 'retry';
+
+// Deletion Types
+const DELETE_TYPE_DATABASES = 'databases';
+const DELETE_TYPE_DOCUMENT = 'document';
+const DELETE_TYPE_COLLECTIONS = 'collections';
+const DELETE_TYPE_PROJECTS = 'projects';
+const DELETE_TYPE_FUNCTIONS = 'functions';
+const DELETE_TYPE_DEPLOYMENTS = 'deployments';
+const DELETE_TYPE_USERS = 'users';
+const DELETE_TYPE_TEAM_PROJECTS = 'teams_projects';
+const DELETE_TYPE_EXECUTIONS = 'executions';
+const DELETE_TYPE_AUDIT = 'audit';
+const DELETE_TYPE_ABUSE = 'abuse';
+const DELETE_TYPE_USAGE = 'usage';
+const DELETE_TYPE_REALTIME = 'realtime';
+const DELETE_TYPE_BUCKETS = 'buckets';
+const DELETE_TYPE_INSTALLATIONS = 'installations';
+const DELETE_TYPE_RULES = 'rules';
+const DELETE_TYPE_SESSIONS = 'sessions';
+const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp';
+const DELETE_TYPE_CACHE_BY_RESOURCE  = 'cacheByResource';
+const DELETE_TYPE_SCHEDULES = 'schedules';
+const DELETE_TYPE_TOPIC = 'topic';
+const DELETE_TYPE_TARGET = 'target';
+const DELETE_TYPE_EXPIRED_TARGETS = 'invalid_targets';
+const DELETE_TYPE_SESSION_TARGETS = 'session_targets';
+
+// Message types
+const MESSAGE_SEND_TYPE_INTERNAL = 'internal';
+const MESSAGE_SEND_TYPE_EXTERNAL = 'external';
+// Mail Types
+const MAIL_TYPE_VERIFICATION = 'verification';
+const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
+const MAIL_TYPE_RECOVERY = 'recovery';
+const MAIL_TYPE_INVITATION = 'invitation';
+const MAIL_TYPE_CERTIFICATE = 'certificate';
+// Auth Types
+const APP_AUTH_TYPE_SESSION = 'Session';
+const APP_AUTH_TYPE_JWT = 'JWT';
+const APP_AUTH_TYPE_KEY = 'Key';
+const APP_AUTH_TYPE_ADMIN = 'Admin';
+// Response related
+const MAX_OUTPUT_CHUNK_SIZE = 2 * 1024 * 1024; // 2MB
+// Function headers
+const FUNCTION_ALLOWLIST_HEADERS_REQUEST = ['content-type', 'agent', 'content-length', 'host'];
+const FUNCTION_ALLOWLIST_HEADERS_RESPONSE = ['content-type', 'content-length'];
+// Message types
+const MESSAGE_TYPE_EMAIL = 'email';
+const MESSAGE_TYPE_SMS = 'sms';
+const MESSAGE_TYPE_PUSH = 'push';
+// API key types
+const API_KEY_STANDARD = 'standard';
+const API_KEY_DYNAMIC = 'dynamic';
+// Usage metrics
+const METRIC_TEAMS = 'teams';
+const METRIC_USERS = 'users';
+const METRIC_AUTH_METHOD_PHONE  = 'auth.method.phone';
+const METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE  = METRIC_AUTH_METHOD_PHONE . '.{countryCode}';
+const METRIC_MESSAGES = 'messages';
+const METRIC_MESSAGES_SENT = METRIC_MESSAGES . '.sent';
+const METRIC_MESSAGES_FAILED = METRIC_MESSAGES . '.failed';
+const METRIC_MESSAGES_TYPE = METRIC_MESSAGES . '.{type}';
+const METRIC_MESSAGES_TYPE_SENT  = METRIC_MESSAGES . '.{type}.sent';
+const METRIC_MESSAGES_TYPE_FAILED  = METRIC_MESSAGES . '.{type}.failed';
+const METRIC_MESSAGES_TYPE_PROVIDER = METRIC_MESSAGES . '.{type}.{provider}';
+const METRIC_MESSAGES_TYPE_PROVIDER_SENT  = METRIC_MESSAGES . '.{type}.{provider}.sent';
+const METRIC_MESSAGES_TYPE_PROVIDER_FAILED  = METRIC_MESSAGES . '.{type}.{provider}.failed';
+const METRIC_SESSIONS  = 'sessions';
+const METRIC_DATABASES = 'databases';
+const METRIC_COLLECTIONS = 'collections';
+const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections';
+const METRIC_DOCUMENTS = 'documents';
+const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents';
+const METRIC_BUCKETS = 'buckets';
+const METRIC_FILES  = 'files';
+const METRIC_FILES_STORAGE  = 'files.storage';
+const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files';
+const METRIC_BUCKET_ID_FILES_STORAGE  = '{bucketInternalId}.files.storage';
+const METRIC_FUNCTIONS  = 'functions';
+const METRIC_DEPLOYMENTS  = 'deployments';
+const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
+const METRIC_BUILDS  = 'builds';
+const METRIC_BUILDS_SUCCESS  = 'builds.success';
+const METRIC_BUILDS_FAILED  = 'builds.failed';
+
+const METRIC_BUILDS_STORAGE  = 'builds.storage';
+const METRIC_BUILDS_COMPUTE  = 'builds.compute';
+const METRIC_BUILDS_COMPUTE_SUCCESS  = 'builds.compute.success';
+const METRIC_BUILDS_COMPUTE_FAILED  = 'builds.compute.failed';
+const METRIC_BUILDS_MB_SECONDS = 'builds.mbSeconds';
+
+const METRIC_FUNCTION_ID_BUILDS_COMPUTE_SUCCESS  = '{functionInternalId}.builds.compute.success';
+const METRIC_FUNCTION_ID_BUILDS_COMPUTE_FAILED  = '{functionInternalId}.builds.compute.failed';
+const METRIC_FUNCTION_ID_BUILDS  = '{functionInternalId}.builds';
+const METRIC_FUNCTION_ID_BUILDS_SUCCESS  = '{functionInternalId}.builds.success';
+const METRIC_FUNCTION_ID_BUILDS_FAILED  = '{functionInternalId}.builds.failed';
+
+const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage';
+const METRIC_FUNCTION_ID_BUILDS_COMPUTE  = '{functionInternalId}.builds.compute';
+const METRIC_FUNCTION_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
+const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
+const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
+
+const METRIC_EXECUTIONS  = 'executions';
+const METRIC_EXECUTIONS_COMPUTE  = 'executions.compute';
+const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
+const METRIC_FUNCTION_ID_EXECUTIONS  = '{functionInternalId}.executions';
+const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE  = '{functionInternalId}.executions.compute';
+const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds';
+const METRIC_NETWORK_REQUESTS  = 'network.requests';
+const METRIC_NETWORK_INBOUND  = 'network.inbound';
+const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
@@ -0,0 +1,397 @@
+<?php
+
+use Appwrite\OpenSSL\OpenSSL;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\System\System;
+
+Database::addFilter(
+    'casting',
+    function (mixed $value) {
+        return json_encode(['value' => $value], JSON_PRESERVE_ZERO_FRACTION);
+    },
+    function (mixed $value) {
+        if (is_null($value)) {
+            return;
+        }
+
+        return json_decode($value, true)['value'];
+    }
+);
+
+Database::addFilter(
+    'enum',
+    function (mixed $value, Document $attribute) {
+        if ($attribute->isSet('elements')) {
+            $attribute->removeAttribute('elements');
+        }
+
+        return $value;
+    },
+    function (mixed $value, Document $attribute) {
+        $formatOptions = \json_decode($attribute->getAttribute('formatOptions', '[]'), true);
+        if (isset($formatOptions['elements'])) {
+            $attribute->setAttribute('elements', $formatOptions['elements']);
+        }
+
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'range',
+    function (mixed $value, Document $attribute) {
+        if ($attribute->isSet('min')) {
+            $attribute->removeAttribute('min');
+        }
+        if ($attribute->isSet('max')) {
+            $attribute->removeAttribute('max');
+        }
+
+        return $value;
+    },
+    function (mixed $value, Document $attribute) {
+        $formatOptions = json_decode($attribute->getAttribute('formatOptions', '[]'), true);
+        if (isset($formatOptions['min']) || isset($formatOptions['max'])) {
+            $attribute
+                ->setAttribute('min', $formatOptions['min'])
+                ->setAttribute('max', $formatOptions['max'])
+            ;
+        }
+
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'subQueryAttributes',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        $attributes = $database->find('attributes', [
+            Query::equal('collectionInternalId', [$document->getInternalId()]),
+            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
+            Query::limit($database->getLimitForAttributes()),
+        ]);
+
+        foreach ($attributes as $attribute) {
+            if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
+                $options = $attribute->getAttribute('options');
+                foreach ($options as $key => $value) {
+                    $attribute->setAttribute($key, $value);
+                }
+                $attribute->removeAttribute('options');
+            }
+        }
+
+        return $attributes;
+    }
+);
+
+Database::addFilter(
+    'subQueryIndexes',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('indexes', [
+                Query::equal('collectionInternalId', [$document->getInternalId()]),
+                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
+                Query::limit($database->getLimitForIndexes()),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQueryPlatforms',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('platforms', [
+                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQueryKeys',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('keys', [
+                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQueryWebhooks',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('webhooks', [
+                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQuerySessions',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database->find('sessions', [
+            Query::equal('userInternalId', [$document->getInternalId()]),
+            Query::limit(APP_LIMIT_SUBQUERY),
+        ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryTokens',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('tokens', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryChallenges',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('challenges', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryAuthenticators',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('authenticators', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryMemberships',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('memberships', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryVariables',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('variables', [
+                Query::equal('resourceInternalId', [$document->getInternalId()]),
+                Query::equal('resourceType', ['function']),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'encrypt',
+    function (mixed $value) {
+        $key = System::getEnv('_APP_OPENSSL_KEY_V1');
+        $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
+        $tag = null;
+
+        return json_encode([
+            'data' => OpenSSL::encrypt($value, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag),
+            'method' => OpenSSL::CIPHER_AES_128_GCM,
+            'iv' => \bin2hex($iv),
+            'tag' => \bin2hex($tag ?? ''),
+            'version' => '1',
+        ]);
+    },
+    function (mixed $value) {
+        if (is_null($value)) {
+            return;
+        }
+        $value = json_decode($value, true);
+        $key = System::getEnv('_APP_OPENSSL_KEY_V' . $value['version']);
+
+        return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
+    }
+);
+
+Database::addFilter(
+    'subQueryProjectVariables',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('variables', [
+                Query::equal('resourceType', ['project']),
+                Query::limit(APP_LIMIT_SUBQUERY)
+            ]);
+    }
+);
+
+Database::addFilter(
+    'userSearch',
+    function (mixed $value, Document $user) {
+        $searchValues = [
+            $user->getId(),
+            $user->getAttribute('email', ''),
+            $user->getAttribute('name', ''),
+            $user->getAttribute('phone', '')
+        ];
+
+        foreach ($user->getAttribute('labels', []) as $label) {
+            $searchValues[] = 'label:' . $label;
+        }
+
+        $search = implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'subQueryTargets',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database->getAuthorization()->skip(fn () => $database
+            ->find('targets', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY)
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryTopicTargets',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        $targetIds = $database->getAuthorization()->skip(fn () => \array_map(
+            fn ($document) => $document->getAttribute('targetInternalId'),
+            $database->find('subscribers', [
+                Query::equal('topicInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY)
+            ])
+        ));
+        if (\count($targetIds) > 0) {
+            return $database->find('targets', [
+                Query::equal('$internalId', $targetIds)
+            ]);
+        }
+        return [];
+    }
+);
+
+Database::addFilter(
+    'providerSearch',
+    function (mixed $value, Document $provider) {
+        $searchValues = [
+            $provider->getId(),
+            $provider->getAttribute('name', ''),
+            $provider->getAttribute('provider', ''),
+            $provider->getAttribute('type', '')
+        ];
+
+        $search = \implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'topicSearch',
+    function (mixed $value, Document $topic) {
+        $searchValues = [
+            $topic->getId(),
+            $topic->getAttribute('name', ''),
+            $topic->getAttribute('description', ''),
+        ];
+
+        $search = \implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'messageSearch',
+    function (mixed $value, Document $message) {
+        $searchValues = [
+            $message->getId(),
+            $message->getAttribute('description', ''),
+            $message->getAttribute('status', ''),
+        ];
+
+        $data = \json_decode($message->getAttribute('data', []), true);
+        $providerType = $message->getAttribute('providerType', '');
+
+        if ($providerType === MESSAGE_TYPE_EMAIL) {
+            $searchValues = \array_merge($searchValues, [$data['subject'], MESSAGE_TYPE_EMAIL]);
+        } elseif ($providerType === MESSAGE_TYPE_SMS) {
+            $searchValues = \array_merge($searchValues, [$data['content'], MESSAGE_TYPE_SMS]);
+        } else {
+            $searchValues = \array_merge($searchValues, [$data['title'], MESSAGE_TYPE_PUSH]);
+        }
+
+        $search = \implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
@@ -0,0 +1,43 @@
+<?php
+
+use Appwrite\Network\Validator\Email;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\Structure;
+use Utopia\Http\Validator\IP;
+use Utopia\Http\Validator\Range;
+use Utopia\Http\Validator\URL;
+use Utopia\Http\Validator\WhiteList;
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_EMAIL, function () {
+    return new Email();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_DATETIME, function () {
+    return new DatetimeValidator();
+}, Database::VAR_DATETIME);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) {
+    $elements = $attribute['formatOptions']['elements'];
+    return new WhiteList($elements, true);
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_IP, function () {
+    return new IP();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_URL, function () {
+    return new URL();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_INTEGER);
+}, Database::VAR_INTEGER);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_FLOAT);
+}, Database::VAR_FLOAT);
@@ -0,0 +1,23 @@
+<?php
+
+use Utopia\Config\Config;
+use Utopia\Locale\Locale;
+
+Locale::$exceptions = false;
+
+$locales = Config::getParam('locale-codes', []);
+
+foreach ($locales as $locale) {
+    $code = $locale['code'];
+
+    $path = __DIR__ . '/../config/locale/translations/' . $code . '.json';
+
+    if (!\file_exists($path)) {
+        $path = __DIR__ . '/../config/locale/translations/' . \substr($code, 0, 2) . '.json'; // if `ar-ae` doesn't exist, look for `ar`
+        if (!\file_exists($path)) {
+            $path = __DIR__ . '/../config/locale/translations/en.json'; // if none translation exists, use default from `en.json`
+        }
+    }
+
+    Locale::setLanguageFromJSON($code, $path);
+}
@@ -5,136 +5,47 @@ use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Network\Validator\Origin;
+use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Swoole\Http\Request as SwooleRequest;
+use Swoole\Http\Response as SwooleHttpResponse;
 use Swoole\Http\Response as SwooleResponse;
 use Swoole\Runtime;
 use Swoole\Table;
 use Swoole\Timer;
 use Utopia\Abuse\Abuse;
-use Utopia\Abuse\Adapters\TimeLimit;
-use Utopia\App;
-use Utopia\Cache\Adapter\Sharding;
-use Utopia\Cache\Cache;
+use Utopia\Abuse\Adapters\Database\TimeLimit;
 use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DSN\DSN;
+use Utopia\DI\Container;
+use Utopia\DI\Dependency;
+use Utopia\Http\Adapter\Swoole\Request as UtopiaRequest;
+use Utopia\Http\Adapter\Swoole\Response as HttpResponse;
+use Utopia\Http\Adapter\Swoole\Response as UtopiaResponse;
+use Utopia\Http\Http;
 use Utopia\Logger\Log;
+use Utopia\Pools\Connection;
+use Utopia\Registry\Registry;
 use Utopia\System\System;
 use Utopia\WebSocket\Adapter;
 use Utopia\WebSocket\Server;

 /**
- * @var \Utopia\Registry\Registry $register
+ * @var Registry $registry
+ * @var Container $container
 */
+global $registry, $container;
+
+
 require_once __DIR__ . '/init.php';

 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);

-// Allows overriding
-if (!function_exists("getConsoleDB")) {
-    function getConsoleDB(): Database
-    {
-        global $register;
-
-        /** @var \Utopia\Pools\Group $pools */
-        $pools = $register->get('pools');
-
-        $dbAdapter = $pools
-            ->get('console')
-            ->pop()
-            ->getResource()
-        ;
-
-        $database = new Database($dbAdapter, getCache());
-
-        $database
-            ->setNamespace('_console')
-            ->setMetadata('host', \gethostname())
-            ->setMetadata('project', '_console');
-
-        return $database;
-    }
-}
-
-// Allows overriding
-if (!function_exists("getProjectDB")) {
-    function getProjectDB(Document $project): Database
-    {
-        global $register;
-
-        /** @var \Utopia\Pools\Group $pools */
-        $pools = $register->get('pools');
-
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return getConsoleDB();
-        }
-
-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
-
-        $adapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($adapter, getCache());
-
-        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
-            $database
-                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
-        }
-
-        $database
-            ->setMetadata('host', \gethostname())
-            ->setMetadata('project', $project->getId());
-
-        return $database;
-    }
-}
-
-// Allows overriding
-if (!function_exists("getCache")) {
-    function getCache(): Cache
-    {
-        global $register;
-
-        $pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
-
-        $list = Config::getParam('pools-cache', []);
-        $adapters = [];
-
-        foreach ($list as $value) {
-            $adapters[] = $pools
-                ->get($value)
-                ->pop()
-                ->getResource()
-            ;
-        }
-
-        return new Cache(new Sharding($adapters));
-    }
-}
-
 $realtime = new Realtime();

 /**
@@ -159,8 +70,8 @@ $adapter

 $server = new Server($adapter);

-$logError = function (Throwable $error, string $action) use ($register) {
-    $logger = $register->get('logger');
+$logError = function (Throwable $error, string $action) use ($registry) {
+    $logger = $registry->get('logger');

    if ($logger && !$error instanceof Exception) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
@@ -178,7 +89,6 @@ $logError = function (Throwable $error, string $action) use ($register) {
        $log->addExtra('file', $error->getFile());
        $log->addExtra('line', $error->getLine());
        $log->addExtra('trace', $error->getTraceAsString());
-        $log->addExtra('detailedTrace', $error->getTrace());

        $log->setAction($action);

@@ -197,16 +107,16 @@ $logError = function (Throwable $error, string $action) use ($register) {

 $server->error($logError);

-$server->onStart(function () use ($stats, $register, $containerId, &$statsDocument, $logError) {
+$server->onStart(function () use ($stats, $container, $containerId, &$statsDocument, $logError) {
    sleep(5); // wait for the initial database schema to be ready
    Console::success('Server started successfully');
-
+    $authorization = $container->get('authorization');
    /**
     * Create document for this worker to share stats across Containers.
     */
-    go(function () use ($register, $containerId, &$statsDocument) {
+    go(function () use ($container, $containerId, &$statsDocument) {
        $attempts = 0;
-        $database = getConsoleDB();
+        $database = $container->get('dbForConsole');

        do {
            try {
@@ -220,14 +130,15 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
                    'value' => '{}'
                ]);

-                $statsDocument = Authorization::skip(fn () => $database->createDocument('realtime', $document));
+                $authorization = $container->get('authorization');
+                $statsDocument = $authorization->skip(fn () => $database->createDocument('realtime', $document));
                break;
            } catch (Throwable) {
                Console::warning("Collection not ready. Retrying connection ({$attempts})...");
                sleep(DATABASE_RECONNECT_SLEEP);
            }
        } while (true);
-        $register->get('pools')->reclaim();
+        ($container->get('connections'))->reclaim();
    });

    /**
@@ -235,7 +146,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
     */
    // TODO: Remove this if check once it doesn't cause issues for cloud
    if (System::getEnv('_APP_EDITION', 'self-hosted') === 'self-hosted') {
-        Timer::tick(5000, function () use ($register, $stats, &$statsDocument, $logError) {
+        Timer::tick(5000, function () use ($container, $stats, &$statsDocument, $logError, $authorization) {
            $payload = [];
            foreach ($stats as $projectId => $value) {
                $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
@@ -245,40 +156,43 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
            }

            try {
-                $database = getConsoleDB();
+                $database = $container->get('dbForConsole');

                $statsDocument
                    ->setAttribute('timestamp', DateTime::now())
                    ->setAttribute('value', json_encode($payload));

-                Authorization::skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
+                $authorization->skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
            } catch (Throwable $th) {
                call_user_func($logError, $th, "updateWorkerDocument");
            } finally {
-                $register->get('pools')->reclaim();
+                ($container->get('connections'))->reclaim();
+                $container->refresh('dbForConsole');
            }
        });
    }
 });

-$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime, $logError) {
+$server->onWorkerStart(function (int $workerId) use ($server, $container, $stats, $realtime, $logError) {
    Console::success('Worker ' . $workerId . ' started successfully');

    $attempts = 0;
    $start = time();

-    Timer::tick(5000, function () use ($server, $register, $realtime, $stats, $logError) {
+    $authorization = $container->get('authorization');
+
+    Timer::tick(5000, function () use ($server, $container, $realtime, $stats, $logError, $authorization) {
        /**
         * Sending current connections to project channels on the console project every 5 seconds.
         */
        // TODO: Remove this if check once it doesn't cause issues for cloud
        if (System::getEnv('_APP_EDITION', 'self-hosted') === 'self-hosted') {
            if ($realtime->hasSubscriber('console', Role::users()->toString(), 'project')) {
-                $database = getConsoleDB();
+                $database = $container->get('dbForConsole');

                $payload = [];

-                $list = Authorization::skip(fn () => $database->find('realtime', [
+                $list = $authorization->skip(fn () => $database->find('realtime', [
                    Query::greaterThan('timestamp', DateTime::addSeconds(new \DateTime(), -15)),
                ]));

@@ -318,8 +232,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                        'data' => $event['data']
                    ]));
                }
-
-                $register->get('pools')->reclaim();
+                ($container->get('connections'))->reclaim();
+                $container->refresh('dbForConsole');
            }
        }
        /**
@@ -349,13 +263,26 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
    while ($attempts < 300) {
        try {
            if ($attempts > 0) {
-                Console::error('Pub/sub connection lost (lasted ' . (time() - $start) . ' seconds, worker: ' . $workerId . ').
-                    Attempting restart in 5 seconds (attempt #' . $attempts . ')');
+                Console::error(
+                    'Pub/sub connection lost (lasted ' . (time() - $start) . ' seconds, worker: ' . $workerId . ').
+                    Attempting restart in 5 seconds (attempt #' . $attempts . ')'
+                );
                sleep(5); // 5 sec delay between connection attempts
            }
+
            $start = time();

-            $redis = $register->get('pools')->get('pubsub')->pop()->getResource(); /** @var Redis $redis */
+            $pools = $container->get('pools');
+            $pool = $pools['pools-pubsub-pubsub']['pool'];
+
+            /** @var Connections $connections */
+            $connections = $container->get('connections');
+            $connection = $pool->get();
+            $connections->add($connection, $pool);
+
+            $redis = $connection;
+
+            /** @var Redis $redis */
            $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);

            if ($redis->ping(true)) {
@@ -365,7 +292,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                Console::error('Pub/sub failed (worker: ' . $workerId . ')');
            }

-            $redis->subscribe(['realtime'], function (Redis $redis, string $channel, string $payload) use ($server, $workerId, $stats, $register, $realtime) {
+            $redis->subscribe(['realtime'], function (Redis $redis, string $channel, string $payload) use ($server, $workerId, $stats, $realtime, $authorization, $container) {
                $event = json_decode($payload, true);

                if ($event['permissionsChanged'] && isset($event['userId'])) {
@@ -374,23 +301,24 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,

                    if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
                        $connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
-                        $consoleDatabase = getConsoleDB();
-                        $project = Authorization::skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
-                        $database = getProjectDB($project);
+                        $dbForConsole = $container->get('dbForConsole');

-                        $user = $database->getDocument('users', $userId);
+                        $project = $authorization->skip(fn () => $dbForConsole->getDocument('projects', $projectId));
+                        $dbForProject = $container->get('getProjectDB')($project);

-                        $roles = Auth::getRoles($user);
+                        $user = $dbForProject->getDocument('users', $userId);

-                        $realtime->subscribe($projectId, $connection, $roles, $realtime->connections[$connection]['channels']);
+                        $roles = Auth::getRoles($user, $authorization);
+                        $channels = $realtime->connections[$connection]['channels'];

-                        $register->get('pools')->reclaim();
+                        $realtime->unsubscribe($connection);
+                        $realtime->subscribe($projectId, $connection, $roles, $channels);
                    }
                }

                $receivers = $realtime->getSubscribers($event);

-                if (App::isDevelopment() && !empty($receivers)) {
+                if (Http::isDevelopment() && !empty($receivers)) {
                    Console::log("[Debug][Worker {$workerId}] Receivers: " . count($receivers));
                    Console::log("[Debug][Worker {$workerId}] Receivers Connection IDs: " . json_encode($receivers));
                    Console::log("[Debug][Worker {$workerId}] Event: " . $payload);
@@ -416,30 +344,40 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
            sleep(DATABASE_RECONNECT_SLEEP);
            continue;
        } finally {
-            $register->get('pools')->reclaim();
+            ($container->get('connections'))->reclaim();
+            $container->refresh('dbForConsole');
        }
    }

    Console::error('Failed to restart pub/sub...');
 });

-$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $logError) {
-    $app = new App('UTC');
-    $request = new Request($request);
-    $response = new Response(new SwooleResponse());
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $container, $stats, &$realtime, $logError) {
+    $authorization = $container->get('authorization');
+
+    $request = new Request(new UtopiaRequest($request));
+    $response = new Response(new UtopiaResponse(new SwooleResponse()));
+
+    $requestInjection = new Dependency();
+    $responseInjection = new Dependency();
+
+    $requestInjection->setName('request')->setCallback(fn () => $request);
+    $responseInjection->setName('response')->setCallback(fn () => $response);
+
+    $container->set($requestInjection);
+    $container->set($responseInjection);

    Console::info("Connection open (user: {$connection})");

-    App::setResource('pools', fn () => $register->get('pools'));
-    App::setResource('request', fn () => $request);
-    App::setResource('response', fn () => $response);
-
    try {
+
        /** @var Document $project */
-        $project = $app->getResource('project');
+        $project = $container->refresh('project')->get('project');
+
+        $container->refresh('dbForProject');

        /*
-         *  Project Check
+         * Project Check
         */
        if (empty($project->getId())) {
            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing or unknown project ID');
@@ -448,15 +386,16 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
        if (
            array_key_exists('realtime', $project->getAttribute('apis', []))
            && !$project->getAttribute('apis', [])['realtime']
-            && !(Auth::isPrivilegedUser(Authorization::getRoles()) || Auth::isAppUser(Authorization::getRoles()))
+            && !(Auth::isPrivilegedUser($authorization->getRoles()) || Auth::isAppUser($authorization->getRoles()))
        ) {
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }

-        $dbForProject = getProjectDB($project);
-        $console = $app->getResource('console'); /** @var Document $console */
-        $user = $app->getResource('user'); /** @var Document $user */
-
+        $dbForProject = $container->get('getProjectDB')($project);
+        /** @var Document $console */
+        $console = $container->get('console');
+        /** @var Document $user */
+        $user = $container->refresh('user')->get('user');
        /*
         * Abuse Check
         *
@@ -485,7 +424,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription());
        }

-        $roles = Auth::getRoles($user);
+        $authorization = $container->get('authorization');
+        $roles = Auth::getRoles($user, $authorization);

        $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());

@@ -534,25 +474,33 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
        $server->send([$connection], json_encode($response));
        $server->close($connection, $code);

-        if (App::isDevelopment()) {
+        if (Http::isDevelopment()) {
            Console::error('[Error] Connection Error');
            Console::error('[Error] Code: ' . $response['data']['code']);
            Console::error('[Error] Message: ' . $response['data']['message']);
        }
    } finally {
-        $register->get('pools')->reclaim();
+        $connections = $container->get('connections');
+        $connections->reclaim();
    }
 });

-$server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
+$server->onWorkerStop(function (int $workerId) use ($container) {
+    $connections = $container->get('connections');
+    $connections->reclaim();
+});
+
+$server->onMessage(function (int $connection, string $message) use ($server, $container, $realtime, $containerId) {
    try {
-        $response = new Response(new SwooleResponse());
+        $response = new Response(new HttpResponse(new SwooleHttpResponse()));
        $projectId = $realtime->connections[$connection]['projectId'];
-        $database = getConsoleDB();
+        $database = $container->get('dbForConsole');
+        $authorization = $container->get('authorization');
+        $authentication = $container->get('authentication');

        if ($projectId !== 'console') {
-            $project = Authorization::skip(fn () => $database->getDocument('projects', $projectId));
-            $database = getProjectDB($project);
+            $project = $authorization->skip(fn () => $database->getDocument('projects', $projectId));
+            $database = $container->get('getProjectDB')($project);
        } else {
            $project = null;
        }
@@ -590,20 +538,21 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                }

                $session = Auth::decodeSession($message['data']['session']);
-                Auth::$unique = $session['id'] ?? '';
-                Auth::$secret = $session['secret'] ?? '';

-                $user = $database->getDocument('users', Auth::$unique);
+                $authentication->setUnique($session['id'] ?? '');
+                $authentication->setSecret($session['secret'] ?? '');
+
+                $user = $database->getDocument('users', $authentication->getUnique());

                if (
                    empty($user->getId()) // Check a document has been found in the DB
-                    || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret) // Validate user has valid login token
+                    || !Auth::sessionVerify($user->getAttribute('sessions', []), $authentication->getSecret()) // Validate user has valid login token
                ) {
                    // cookie not valid
                    throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Session is not valid.');
                }

-                $roles = Auth::getRoles($user);
+                $roles = Auth::getRoles($user, $authorization);
                $channels = Realtime::convertChannels(array_flip($realtime->connections[$connection]['channels']), $user->getId());
                $realtime->subscribe($realtime->connections[$connection]['projectId'], $connection, $roles, $channels);

@@ -637,7 +586,8 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
            $server->close($connection, $th->getCode());
        }
    } finally {
-        $register->get('pools')->reclaim();
+        ($container->get('connections'))->reclaim();
+        $container->refresh('dbForConsole');
    }
 });

@@ -11,7 +11,8 @@ $httpsPort = $this->getParam('httpsPort', '');
 $version = $this->getParam('version', '');
 $organization = $this->getParam('organization', '');
 $image = $this->getParam('image', '');
-?>services:
+?>
+services:
  traefik:
    image: traefik:2.11
    container_name: appwrite-traefik
@@ -163,6 +164,28 @@ $image = $this->getParam('image', '');
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_ASSISTANT_OPENAI_API_KEY

+  appwrite-console:
+    <<: *x-logging
+    container_name: appwrite-console
+    image: <?php echo $organization; ?>/console:5.0.12
+    restart: unless-stopped
+    networks:
+      - appwrite
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_console.loadbalancer.server.port=80"
+      #ws
+      - traefik.http.routers.appwrite_console_http.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_console_http.rule=PathPrefix(`/console`)
+      - traefik.http.routers.appwrite_console_http.service=appwrite_console
+      # wss
+      - traefik.http.routers.appwrite_console_https.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_console_https.rule=PathPrefix(`/console`)
+      - traefik.http.routers.appwrite_console_https.service=appwrite_console
+      - traefik.http.routers.appwrite_console_https.tls=true
+
  appwrite-realtime:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
    entrypoint: realtime
@@ -314,6 +337,9 @@ $image = $this->getParam('image', '');
      - _APP_LOGGING_CONFIG
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_EXECUTION

  appwrite-worker-databases:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -453,6 +479,8 @@ $image = $this->getParam('image', '');
      - _APP_ENV
      - _APP_WORKER_PER_CORE
      - _APP_OPENSSL_KEY_V1
+      - _APP_DOMAIN
+      - _APP_OPTIONS_FORCE_HTTPS
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
      - _APP_REDIS_USER
@@ -652,6 +680,7 @@ $image = $this->getParam('image', '');
    entrypoint: worker-usage-dump
    <<: *x-logging
    container_name: appwrite-worker-usage-dump
+    restart: unless-stopped
    networks:
      - appwrite
    depends_on:
@@ -765,7 +794,7 @@ $image = $this->getParam('image', '');
    <<: *x-logging
    restart: unless-stopped
    stop_signal: SIGINT
-    image: openruntimes/executor:0.5.5
+    image: openruntimes/executor:0.6.11
    networks:
      - appwrite
      - runtimes
@@ -823,7 +852,7 @@ $image = $this->getParam('image', '');
      - MYSQL_USER=${_APP_DB_USER}
      - MYSQL_PASSWORD=${_APP_DB_PASS}
      - MARIADB_AUTO_UPGRADE=1
-    command: 'mysqld --innodb-flush-method=fsync'
+    command: 'mysqld --innodb-flush-method=fsync --max_connections=5000'

  redis:
    image: redis:7.2.4-alpine
@@ -2,278 +2,107 @@

 require_once __DIR__ . '/init.php';

-use Appwrite\Event\Audit;
-use Appwrite\Event\Build;
-use Appwrite\Event\Certificate;
-use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-use Appwrite\Event\Func;
-use Appwrite\Event\Mail;
-use Appwrite\Event\Messaging;
-use Appwrite\Event\Migration;
-use Appwrite\Event\Usage;
 use Appwrite\Event\UsageDump;
 use Appwrite\Platform\Appwrite;
+use Appwrite\Utopia\Queue\Connections;
 use Swoole\Runtime;
-use Utopia\App;
-use Utopia\Cache\Adapter\Sharding;
-use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
-use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DSN\DSN;
+use Utopia\DI\Dependency;
 use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
-use Utopia\Pools\Group;
 use Utopia\Queue\Connection;
 use Utopia\Queue\Message;
-use Utopia\Queue\Server;
-use Utopia\Registry\Registry;
+use Utopia\Queue\Worker;
+use Utopia\Storage\Device\Local;
 use Utopia\System\System;

-Authorization::disable();
+global $registry, $container;
+
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);

-Server::setResource('register', fn () => $register);
+$project = new Dependency();
+$register = new Dependency();
+$dbForProject = new Dependency();
+$abuseRetention = new Dependency();
+$deviceForCache = new Dependency();
+$auditRetention = new Dependency();
+$queueForUsageDump = new Dependency();
+$executionRetention = new Dependency();
+$deviceForLocalFiles = new Dependency();

-Server::setResource('dbForConsole', function (Cache $cache, Registry $register) {
-    $pools = $register->get('pools');
-    $database = $pools
-        ->get('console')
-        ->pop()
-        ->getResource();
+$register
+    ->setName('register')
+    ->setCallback(fn () => $registry);

-    $adapter = new Database($database, $cache);
-    $adapter->setNamespace('_console');
+$project
+    ->setName('project')
+    ->inject('message')
+    ->inject('dbForConsole')
+    ->setCallback(function (Message $message, Database $dbForConsole) {
+        $payload = $message->getPayload() ?? [];
+        $project = new Document($payload['project'] ?? []);

-    return $adapter;
-}, ['cache', 'register']);
-
-Server::setResource('project', function (Message $message, Database $dbForConsole) {
-    $payload = $message->getPayload() ?? [];
-    $project = new Document($payload['project'] ?? []);
-
-    if ($project->getId() === 'console') {
-        return $project;
-    }
-
-    return $dbForConsole->getDocument('projects', $project->getId());
-}, ['message', 'dbForConsole']);
-
-Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForConsole) {
-    if ($project->isEmpty() || $project->getId() === 'console') {
-        return $dbForConsole;
-    }
-
-    $pools = $register->get('pools');
-
-    try {
-        $dsn = new DSN($project->getAttribute('database'));
-    } catch (\InvalidArgumentException) {
-        // TODO: Temporary until all projects are using shared tables
-        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-    }
-
-    $adapter = $pools
-        ->get($dsn->getHost())
-        ->pop()
-        ->getResource();
-
-    $database = new Database($adapter, $cache);
-
-    try {
-        $dsn = new DSN($project->getAttribute('database'));
-    } catch (\InvalidArgumentException) {
-        // TODO: Temporary until all projects are using shared tables
-        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-    }
-
-    if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
-        $database
-            ->setSharedTables(true)
-            ->setTenant($project->getInternalId())
-            ->setNamespace($dsn->getParam('namespace'));
-    } else {
-        $database
-            ->setSharedTables(false)
-            ->setTenant(null)
-            ->setNamespace('_' . $project->getInternalId());
-    }
-
-    return $database;
-}, ['cache', 'register', 'message', 'project', 'dbForConsole']);
-
-Server::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
-    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
-
-    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases): Database {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForConsole;
+        if ($project->getId() === 'console') {
+            return $project;
        }

-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
+        return $dbForConsole->getDocument('projects', $project->getId());
+    });

-        if (isset($databases[$dsn->getHost()])) {
-            $database = $databases[$dsn->getHost()];
+$abuseRetention
+    ->setName('abuseRetention')
+    ->setCallback(function () {
+        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400));
+    });

-            if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
+$auditRetention
+    ->setName('auditRetention')
+    ->setCallback(function () {
+        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
+    });

-            return $database;
-        }
+$executionRetention
+    ->setName('executionRetention')
+    ->setCallback(function () {
+        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
+    });

-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
+$queueForUsageDump
+    ->setName('queueForUsageDump')
+    ->inject('queue')
+    ->setCallback(function (Connection $queue) {
+        return new UsageDump($queue);
+    });

-        $database = new Database($dbAdapter, $cache);
+$deviceForCache
+    ->setName('deviceForCache')
+    ->inject('project')
+    ->setCallback(function (Document $project) {
+        return getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId());
+    });

-        $databases[$dsn->getHost()] = $database;
+$deviceForLocalFiles
+    ->setName('deviceForLocalFiles')
+    ->inject('project')
+    ->setCallback(function (Document $project) {
+        return new Local(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
+    });

-        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
-            $database
-                ->setSharedTables(true)
-                ->setTenant($project->getInternalId())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getInternalId());
-        }
+$container->set($project);
+$container->set($register);
+$container->set($dbForProject);
+$container->set($abuseRetention);
+$container->set($auditRetention);
+$container->set($deviceForCache);
+$container->set($queueForUsageDump);
+$container->set($executionRetention);
+$container->set($deviceForLocalFiles);

-        return $database;
-    };
-}, ['pools', 'dbForConsole', 'cache']);
-
-Server::setResource('abuseRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400));
-});
-
-Server::setResource('auditRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
-});
-
-Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
-});
-
-Server::setResource('cache', function (Registry $register) {
-    $pools = $register->get('pools');
-    $list = Config::getParam('pools-cache', []);
-    $adapters = [];
-
-    foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource()
-        ;
-    }
-
-    return new Cache(new Sharding($adapters));
-}, ['register']);
-
-Server::setResource('log', fn () => new Log());
-
-Server::setResource('queueForUsage', function (Connection $queue) {
-    return new Usage($queue);
-}, ['queue']);
-
-Server::setResource('queueForUsageDump', function (Connection $queue) {
-    return new UsageDump($queue);
-}, ['queue']);
-
-Server::setResource('queue', function (Group $pools) {
-    return $pools->get('queue')->pop()->getResource();
-}, ['pools']);
-
-Server::setResource('queueForDatabase', function (Connection $queue) {
-    return new EventDatabase($queue);
-}, ['queue']);
-
-Server::setResource('queueForMessaging', function (Connection $queue) {
-    return new Messaging($queue);
-}, ['queue']);
-
-Server::setResource('queueForMails', function (Connection $queue) {
-    return new Mail($queue);
-}, ['queue']);
-
-Server::setResource('queueForBuilds', function (Connection $queue) {
-    return new Build($queue);
-}, ['queue']);
-
-Server::setResource('queueForDeletes', function (Connection $queue) {
-    return new Delete($queue);
-}, ['queue']);
-
-Server::setResource('queueForEvents', function (Connection $queue) {
-    return new Event($queue);
-}, ['queue']);
-
-Server::setResource('queueForAudits', function (Connection $queue) {
-    return new Audit($queue);
-}, ['queue']);
-
-Server::setResource('queueForFunctions', function (Connection $queue) {
-    return new Func($queue);
-}, ['queue']);
-
-Server::setResource('queueForCertificates', function (Connection $queue) {
-    return new Certificate($queue);
-}, ['queue']);
-
-Server::setResource('queueForMigrations', function (Connection $queue) {
-    return new Migration($queue);
-}, ['queue']);
-
-Server::setResource('logger', function (Registry $register) {
-    return $register->get('logger');
-}, ['register']);
-
-Server::setResource('pools', function (Registry $register) {
-    return $register->get('pools');
-}, ['register']);
-
-Server::setResource('deviceForFunctions', function (Document $project) {
-    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
-}, ['project']);
-
-Server::setResource('deviceForFiles', function (Document $project) {
-    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
-}, ['project']);
-
-Server::setResource('deviceForBuilds', function (Document $project) {
-    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
-}, ['project']);
-
-Server::setResource('deviceForCache', function (Document $project) {
-    return getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId());
-}, ['project']);
-
-
-$pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');

@@ -292,6 +121,13 @@ if (\str_starts_with($workerName, 'databases')) {
 }

 try {
+    $connection = new Connection\Redis(
+        System::getEnv('_APP_REDIS_HOST', 'redis'),
+        System::getEnv('_APP_REDIS_PORT', '6379'),
+        System::getEnv('_APP_REDIS_USER', ''),
+        System::getEnv('_APP_REDIS_PASS', '')
+    );
+
    /**
     * Any worker can be configured with the following env vars:
     * - _APP_WORKERS_NUM           The total number of worker processes
@@ -300,32 +136,35 @@ try {
     */
    $platform->init(Service::TYPE_WORKER, [
        'workersNum' => System::getEnv('_APP_WORKERS_NUM', 1),
-        'connection' => $pools->get('queue')->pop()->getResource(),
+        'connection' => $connection,
        'workerName' => strtolower($workerName) ?? null,
        'queueName' => $queueName
    ]);
 } catch (\Throwable $e) {
-    Console::error($e->getMessage() . ', File: ' . $e->getFile() .  ', Line: ' . $e->getLine());
+    Console::error($e->getMessage() . ', File: ' . $e->getFile() . ', Line: ' . $e->getLine());
 }

-$worker = $platform->getWorker();
-
-$worker
-    ->shutdown()
-    ->inject('pools')
-    ->action(function (Group $pools) {
-        $pools->reclaim();
+Worker::init()
+    ->inject('authorization')
+    ->action(function (Authorization $authorization) {
+        $authorization->disable();
    });

-$worker
-    ->error()
+Worker::shutdown()
+    ->inject('connections')
+    ->action(function (Connections $connections) {
+        $connections->reclaim();
+    });
+
+Worker::error()
    ->inject('error')
    ->inject('logger')
    ->inject('log')
-    ->inject('pools')
+    ->inject('connections')
    ->inject('project')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project) use ($queueName) {
-        $pools->reclaim();
+    ->inject('authorization')
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Connections $connections, Document $project, Authorization $authorization) use ($queueName) {
+        $connections->reclaim();
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');

        if ($logger) {
@@ -341,8 +180,7 @@ $worker
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());
-            $log->addExtra('roles', Authorization::getRoles());
+            $log->addExtra('roles', $authorization->getRoles());

            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
@@ -357,9 +195,7 @@ $worker
        Console::error('[Error] Line: ' . $error->getLine());
    });

-$worker->workerStart()
-    ->action(function () use ($workerName) {
-        Console::info("Worker $workerName  started");
-    });
-
-$worker->start();
+$platform
+    ->getWorker()
+    ->setContainer($container)
+    ->start();
@@ -4,6 +4,7 @@
    "description": "End to end backend server for frontend and mobile apps.",
    "type": "project",
    "license": "BSD-3-Clause",
+    "minimum-stability": "stable",
    "authors": [
        {
            "name": "Eldad Fux",
@@ -13,7 +14,9 @@
    "scripts": {
        "test": "vendor/bin/phpunit",
        "lint": "vendor/bin/pint --test",
-        "format": "vendor/bin/pint"
+        "format": "vendor/bin/pint",
+        "bench": "vendor/bin/phpbench run --report=benchmark",
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit 1G app src tests"
    },
    "autoload": {
        "psr-4": {
@@ -42,35 +45,35 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.14.*",
+        "appwrite/php-runtimes": "0.15.*",
        "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.37.*",
-        "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.39.*",
+        "utopia-php/abuse": "0.44.*",
+        "utopia-php/analytics": "0.13.*",
+        "utopia-php/audit": "0.44.*",
        "utopia-php/cache": "0.10.*",
-        "utopia-php/cli": "0.15.*",
+        "utopia-php/cli": "0.19.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.49.*",
-        "utopia-php/domains": "0.5.*",
-        "utopia-php/dsn": "0.2.1",
-        "utopia-php/framework": "0.33.*",
+        "utopia-php/database": "0.54.*",
+        "utopia-php/domains": "0.6.*",
+        "utopia-php/dsn": "0.2.*",
+        "utopia-php/framework": "1.0.*",
        "utopia-php/fetch": "0.2.*",
        "utopia-php/image": "0.6.*",
        "utopia-php/locale": "0.4.*",
-        "utopia-php/logger": "0.5.*",
+        "utopia-php/logger": "0.6.*",
        "utopia-php/messaging": "0.12.*",
        "utopia-php/migration": "0.4.*",
-        "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.*",
+        "utopia-php/orchestration": "0.15.*",
+        "utopia-php/platform": "0.8.*",
+        "utopia-php/view": "0.2.*",
        "utopia-php/pools": "0.5.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.7.*",
+        "utopia-php/queue": "0.8.*",
        "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "0.18.*",
-        "utopia-php/swoole": "0.8.*",
+        "utopia-php/storage": "0.19.*",
        "utopia-php/system": "0.8.*",
-        "utopia-php/vcs": "0.7.*",
-        "utopia-php/websocket": "0.1.*",
+        "utopia-php/vcs": "0.9.*",
+        "utopia-php/websocket": "0.2.*",
        "matomo/device-detector": "6.1.*",
        "dragonmantank/cron-expression": "3.3.2",
        "phpmailer/phpmailer": "6.9.1",
@@ -82,11 +85,13 @@
    },
    "require-dev": {
        "ext-fileinfo": "*",
-        "appwrite/sdk-generator": "0.38.*",
+        "appwrite/sdk-generator": "0.39.*",
        "phpunit/phpunit": "9.5.20",
        "swoole/ide-helper": "5.1.2",
        "textalk/websocket": "1.5.7",
-        "laravel/pint": "^1.14"
+        "laravel/pint": "^1.14",
+        "phpbench/phpbench": "^1.2",
+        "phpstan/phpstan": "1.8.*"
    },
    "provide": {
        "ext-phpiredis": "*"
@@ -1,6 +1,8 @@
 zend_extension=xdebug

 [xdebug]
-xdebug.mode=develop,debug
+xdebug.mode=develop,debug,profile
 xdebug.client_host=host.docker.internal
-xdebug.start_with_request=yes
+xdebug.start_with_request=yes
+xdebug.output_dir=/tmp/xdebug
+xdebug.use_compression=false
@@ -52,7 +52,7 @@ services:
        DEBUG: false
        TESTING: true
        VERSION: dev
-    ports: 
+    ports:
      - 9501:80
    networks:
      - appwrite
@@ -103,6 +103,7 @@ services:
      - _APP_CONSOLE_HOSTNAMES
      - _APP_SYSTEM_EMAIL_NAME
      - _APP_SYSTEM_EMAIL_ADDRESS
+      - _APP_SYSTEM_TEAM_EMAIL
      - _APP_EMAIL_SECURITY
      - _APP_SYSTEM_RESPONSE_FORMAT
      - _APP_OPTIONS_ABUSE
@@ -192,6 +193,28 @@ services:
      - _APP_EXPERIMENT_LOGGING_CONFIG
      - _APP_DATABASE_SHARED_TABLES

+  appwrite-console:
+    <<: *x-logging
+    container_name: appwrite-console
+    image: appwrite/console:5.0.12
+    restart: unless-stopped
+    networks:
+      - appwrite
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_console.loadbalancer.server.port=80"
+      #ws
+      - traefik.http.routers.appwrite_console_http.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_console_http.rule=PathPrefix(`/console`)
+      - traefik.http.routers.appwrite_console_http.service=appwrite_console
+      # wss
+      - traefik.http.routers.appwrite_console_https.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_console_https.rule=PathPrefix(`/console`)
+      - traefik.http.routers.appwrite_console_https.service=appwrite_console
+      - traefik.http.routers.appwrite_console_https.tls=true
+
  appwrite-realtime:
    entrypoint: realtime
    <<: *x-logging
@@ -659,6 +682,7 @@ services:
    entrypoint: maintenance
    <<: *x-logging
    container_name: appwrite-task-maintenance
+    restart: unless-stopped
    image: appwrite-dev
    networks:
      - appwrite
@@ -759,6 +783,7 @@ services:
    entrypoint: schedule-functions
    <<: *x-logging
    container_name: appwrite-task-scheduler-functions
+    restart: unless-stopped
    image: appwrite-dev
    networks:
      - appwrite
@@ -787,6 +812,7 @@ services:
    entrypoint: schedule-executions
    <<: *x-logging
    container_name: appwrite-task-scheduler-executions
+    restart: unless-stopped
    image: appwrite-dev
    networks:
      - appwrite
@@ -814,6 +840,7 @@ services:
    entrypoint: schedule-messages
    <<: *x-logging
    container_name: appwrite-task-scheduler-messages
+    restart: unless-stopped
    image: appwrite-dev
    networks:
      - appwrite
@@ -851,7 +878,7 @@ services:
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.1
+    image: openruntimes/executor:0.6.11
    restart: unless-stopped
    networks:
      - appwrite
@@ -901,7 +928,7 @@ services:
    hostname: proxy
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/proxy:0.3.1
+    image: openruntimes/proxy:0.5.5
    networks:
      - appwrite
      - runtimes
@@ -933,7 +960,7 @@ services:
      - MYSQL_USER=${_APP_DB_USER}
      - MYSQL_PASSWORD=${_APP_DB_PASS}
      - MARIADB_AUTO_UPGRADE=1
-    command: "mysqld --innodb-flush-method=fsync"
+    command: 'mysqld --innodb-flush-method=fsync --max_connections=5000'

  redis:
    image: redis:7.2.4-alpine
@@ -8,4 +8,4 @@ X-Appwrite-JWT: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...

 {
  "otp": "<OTP>"
-}
+}
@@ -0,0 +1,18 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createAnonymousSession(new CoroutineCallback<>((result, error) -> {
+    if (error != null) {
+        error.printStackTrace();
+        return;
+    }
+
+    Log.d("Appwrite", result.toString());
+}));
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createEmailPasswordSession(
+    "email@example.com", // email 
+    "password", // password 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,24 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createEmailToken(
+    "<USER_ID>", // userId 
+    "email@example.com", // email 
+    false, // phrase (optional)
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,18 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createJWT(new CoroutineCallback<>((result, error) -> {
+    if (error != null) {
+        error.printStackTrace();
+        return;
+    }
+
+    Log.d("Appwrite", result.toString());
+}));
@@ -0,0 +1,25 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createMagicURLToken(
+    "<USER_ID>", // userId 
+    "email@example.com", // email 
+    "https://example.com", // url (optional)
+    false, // phrase (optional)
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+import io.appwrite.enums.AuthenticatorType;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createMfaAuthenticator(
+    AuthenticatorType.TOTP, // type 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+import io.appwrite.enums.AuthenticationFactor;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createMfaChallenge(
+    AuthenticationFactor.EMAIL, // factor 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,18 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createMfaRecoveryCodes(new CoroutineCallback<>((result, error) -> {
+    if (error != null) {
+        error.printStackTrace();
+        return;
+    }
+
+    Log.d("Appwrite", result.toString());
+}));
@@ -0,0 +1,26 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+import io.appwrite.enums.OAuthProvider;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createOAuth2Session(
+    OAuthProvider.AMAZON, // provider 
+    "https://example.com", // success (optional)
+    "https://example.com", // failure (optional)
+    listOf(), // scopes (optional)
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,26 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+import io.appwrite.enums.OAuthProvider;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createOAuth2Token(
+    OAuthProvider.AMAZON, // provider 
+    "https://example.com", // success (optional)
+    "https://example.com", // failure (optional)
+    listOf(), // scopes (optional)
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createPhoneToken(
+    "<USER_ID>", // userId 
+    "+12065550100", // phone 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,18 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createPhoneVerification(new CoroutineCallback<>((result, error) -> {
+    if (error != null) {
+        error.printStackTrace();
+        return;
+    }
+
+    Log.d("Appwrite", result.toString());
+}));
@@ -0,0 +1,24 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createPushTarget(
+    "<TARGET_ID>", // targetId 
+    "<IDENTIFIER>", // identifier 
+    "<PROVIDER_ID>", // providerId (optional)
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createRecovery(
+    "email@example.com", // email 
+    "https://example.com", // url 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createSession(
+    "<USER_ID>", // userId 
+    "<SECRET>", // secret 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,22 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Account;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Account account = new Account(client);
+
+account.createVerification(
+    "https://example.com", // url 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
--- a/Show More
+++ b/Show More