added logging

.claude/parallel-chunk-upload-storage-plan.md

@@ -1,174 +0,0 @@
-# Parallel Chunk Upload Support for utopia-php/storage
-
-## Context
-
-The Appwrite API now supports out-of-order chunked uploads (chunks can arrive in any sequence). The next step is **parallel uploads** — multiple chunks uploaded simultaneously via separate HTTP requests. The SDK guarantees the first chunk is sent before any parallel chunks, so the document creation race is handled at the API layer. However, the storage device layer has a race condition that must be fixed.
-
-## Problem: `Local::joinChunks()` Race
-
-When two requests upload the final missing chunks in parallel, both can observe `countChunks() == $chunks` and call `joinChunks()` simultaneously.
-
-### Current behavior (loser throws)
-
-```php
-// Local::joinChunks()
-$dest = \fopen($tmpAssemble, 'wb');
-// ... stream all parts into $tmpAssemble ...
-
-if (! \rename($tmpAssemble, $path)) {
-    \unlink($tmpAssemble);
-    throw new Exception('Failed to finalize assembled file '.$path);
-}
-```
-
-The winner succeeds with `rename()`. The loser gets `false` from `rename()` (file already exists at `$path`) and throws a 500-error exception. The client that lost the race receives an error even though the file is fully assembled.
-
-### Required behavior
-
-If `$path` already exists, another request already assembled the file. The loser should **silently succeed** — the file is complete, nothing more to do.
-
-## Proposed Changes
-
-### 1. `Local::joinChunks()` — Handle assembly race
-
-Before opening `$tmpAssemble`, check if the final file already exists. If it does, skip assembly entirely.
-
-```php
-private function joinChunks(string $path, int $chunks): void
-{
-    // Race winner already assembled the file
-    if (\file_exists($path)) {
-        return;
-    }
-
-    $tmp = \dirname($path).DIRECTORY_SEPARATOR.'tmp_'.asename($path);
-    $tmpAssemble = \dirname($path).DIRECTORY_SEPARATOR.'tmp_assemble_'.asename($path);
-
-    // ... rest of assembly logic ...
-
-    if (! \rename($tmpAssemble, $path)) {
-        // Another request may have won the race between fclose and rename
-        if (\file_exists($path)) {
-            \unlink($tmpAssemble);
-            return;
-        }
-        \unlink($tmpAssemble);
-        throw new Exception('Failed to finalize assembled file '.$path);
-    }
-
-    // ... cleanup ...
-}
-```
-
-### 2. `Local::countChunks()` — Reliability under concurrent writes
-
-`countChunks()` uses `glob()` on the temp directory. Under heavy parallel load, `glob()` might miss files or return inconsistent counts. The current implementation is already fairly robust (it validates `.part.\d+` suffix), but we should document that the return value is a best-effort snapshot.
-
-No code change needed here unless tests reveal issues.
-
-### 3. Tests — Concurrent chunk uploads
-
-Add a test that simulates two parallel requests completing a multi-chunk upload:
-
-```php
-public function testParallelChunkUpload(): void
-{
-    $storage = $this->makeJoinTestStorage();
-    $dest = $storage->getRoot().DIRECTORY_SEPARATOR.'parallel.dat';
-
-    // Upload chunk 1 (creates temp directory)
-    $storage->uploadData('AAAA', $dest, 'application/octet-stream', 1, 2);
-
-    // Simulate two parallel requests uploading the last chunk
-    // In a real test, use pcntl_fork() or pthreads for true concurrency
-    // For the test suite, sequential calls are sufficient if we verify
-    // the second call doesn't throw after the first completed assembly
-    $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
-
-    // Verify file exists and is correct
-    $this->assertTrue(\file_exists($dest));
-    $this->assertSame('AAAABBBB', \file_get_contents($dest));
-
-    // Verify second assembly attempt doesn't throw
-    // (This simulates the race where another request already assembled)
-    try {
-        $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
-    } catch (\Exception $e) {
-        $this->fail('Duplicate assembly should not throw: '.$e->getMessage());
-    }
-
-    $storage->delete($storage->getRoot(), true);
-}
-```
-
-A more realistic concurrent test using `pcntl_fork()`:
-
-```php
-public function testParallelChunkUploadWithFork(): void
-{
-    if (!\function_exists('pcntl_fork')) {
-        $this->markTestSkipped('pcntl extension required for fork-based concurrency test');
-    }
-
-    $storage = $this->makeJoinTestStorage();
-    $dest = $storage->getRoot().DIRECTORY_SEPARATOR.'parallel-fork.dat';
-
-    // Pre-upload chunk 1
-    $storage->uploadData('AAAA', $dest, 'application/octet-stream', 1, 2);
-
-    $pid = pcntl_fork();
-    if ($pid === -1) {
-        $this->fail('Failed to fork');
-    } elseif ($pid === 0) {
-        // Child process: upload chunk 2
-        try {
-            $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
-            exit(0);
-        } catch (\Exception $e) {
-            exit(1);
-        }
-    }
-
-    // Parent process: also upload chunk 2 (race condition)
-    $parentSuccess = true;
-    try {
-        $storage->uploadData('BBBB', $dest, 'application/octet-stream', 2, 2);
-    } catch (\Exception $e) {
-        $parentSuccess = false;
-    }
-
-    pcntl_waitpid($pid, $status);
-    $childSuccess = pcntl_wexitstatus($status) === 0;
-
-    // At least one should succeed
-    $this->assertTrue($parentSuccess || $childSuccess, 'At least one parallel upload should succeed');
-
-    // File should be correctly assembled
-    $this->assertTrue(\file_exists($dest));
-    $this->assertSame('AAAABBBB', \file_get_contents($dest));
-
-    $storage->delete($storage->getRoot(), true);
-}
-```
-
-## S3 Device
-
-S3 already handles out-of-order multipart uploads natively. The `completeMultipartUpload` call with `ksort()` sorts parts by number regardless of upload order. However, parallel `completeMultipartUpload` calls for the same `uploadId` would still be problematic.
-
-This is an **API-layer concern** — the Appwrite API should ensure only one request calls `completeMultipartUpload` per upload. The S3 device itself does not need changes.
-
-## Files to Change
-
-| File | Change |
-|------|--------|
-| `src/Storage/Device/Local.php` | Add `file_exists($path)` guard at start of `joinChunks()` and in `rename()` failure handler |
-| `tests/Storage/Device/LocalTest.php` | Add `testParallelChunkUpload` and `testParallelChunkUploadWithFork` |
-
-## Backwards Compatibility
-
-Fully backwards compatible. The change only affects the error path when `rename()` fails due to an existing file. Previously it threw; now it returns silently. No public API signatures change.
-
-## Related PRs
-
-- Appwrite server PR: https://github.com/appwrite/appwrite/pull/12138 (out-of-order upload support)
-- This storage PR is a prerequisite for the follow-up Appwrite PR that enables parallel chunk uploads at the API level.

.claude/skills/patch-release-checklist/SKILL.md

@@ -1,29 +0,0 @@
-# Patch Release Checklist for Appwrite
-
-When bumping a patch version (e.g., `1.9.0` -> `1.9.1`), follow this checklist.
-
-## Checklist
-
-### Bump console image
-
-Update the console Docker image tag in both files:
-- [ ] `docker-compose.yml` -- update `image: appwrite/console:X.Y.Z`
-- [ ] `app/views/install/compose.phtml` -- update `image: <?php echo $organization; ?>/console:X.Y.Z`
-
-### Bump Appwrite version
-
-- [ ] **`app/init/constants.php`** -- update `APP_VERSION_STABLE` to the new version (e.g., `'1.9.1'`). In same file, increment `APP_CACHE_BUSTER` by 1.
-- [ ] **`README.md`** -- update the Docker image tag `appwrite/appwrite:X.Y.Z` in all 3 install code blocks (Unix, Windows CMD, PowerShell).
-- [ ] **`README-CN.md`** -- same Docker image tag update in all 3 install code blocks.
-- [ ] **`src/Appwrite/Migration/Migration.php`** -- add the new version to the `$versions` array, mapping it to a migration class. If new class exists, use that, otherwise use sle same class as previous version
-
-### Update CHANGES.md
-
-- [ ] Add a new `# Version X.Y.Z` section at the top of `CHANGES.md` with subsections: `### Notable changes`, `### Fixes`, `### Miscellaneous`
-
-## Final review
-
-- [ ] Ask user to review changes before commiting
-- [ ] Ask user to update `CHANGES.md` with PRs
-- [ ] Ask user to generate specs, if needed
-- [ ] Ask user to add request and response filters, if needed

.env

@@ -47,8 +47,6 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_DATABASE_SHARED_TABLES=
-_APP_DATABASE_SHARED_NAMESPACE=
 _APP_DB_ADAPTER_DOCUMENTSDB=mongodb
 _APP_DB_HOST_DOCUMENTSDB=mongodb
 _APP_DB_PORT_DOCUMENTSDB=27017
@@ -148,5 +146,3 @@ _APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main
 _APP_TRUSTED_HEADERS=x-forwarded-for
 _APP_POOL_ADAPTER=stack
 _APP_WORKER_SCREENSHOTS_ROUTER=http://appwrite
-_TESTS_OAUTH2_GITHUB_CLIENT_ID=
-_TESTS_OAUTH2_GITHUB_CLIENT_SECRET=

.github/workflows/benchmark-comment.js

@@ -1,349 +0,0 @@
-const fs = require('fs');
-
-const marker = '<!-- appwrite-benchmark-results -->';
-const serviceLabels = ['Account', 'TablesDB', 'Storage', 'Functions'];
-
-module.exports = async ({ github, context, core }) => {
-    const body = buildComment(core);
-    fs.writeFileSync('benchmark-comment.txt', body);
-
-    const pullRequest = context.payload.pull_request;
-    if (!pullRequest || pullRequest.head.repo.full_name !== `${context.repo.owner}/${context.repo.repo}`) {
-        return;
-    }
-
-    const comments = await github.paginate(github.rest.issues.listComments, {
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        issue_number: pullRequest.number,
-        per_page: 100,
-    });
-
-    const existing = comments.find((comment) => {
-        return comment.user?.type === 'Bot' && comment.body?.includes(marker);
-    }) || comments.find((comment) => {
-        return comment.user?.type === 'Bot' && comment.body?.includes('Benchmark results');
-    });
-
-    if (existing) {
-        await github.rest.issues.updateComment({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            comment_id: existing.id,
-            body,
-        });
-        return;
-    }
-
-    await github.rest.issues.createComment({
-        owner: context.repo.owner,
-        repo: context.repo.repo,
-        issue_number: pullRequest.number,
-        body,
-    });
-};
-
-function buildComment(core) {
-    const before = readSummary('benchmark-before-summary.json', core);
-    const after = readSummary('benchmark-after-summary.json', core);
-    const beforeSamples = readSamples('benchmark-before-samples.json', core);
-    const afterSamples = readSamples('benchmark-after-samples.json', core);
-    const baseRef = markdownText(process.env.BENCHMARK_BASE_REF || 'base');
-    const headRef = markdownText(process.env.BENCHMARK_HEAD_REF || 'head');
-    const rows = benchmarkRows(before, after, beforeSamples, afterSamples);
-    const topWaits = topSamples(afterSamples, 'appwrite_api_waiting', 3);
-    const lines = [
-        marker,
-        '## :sparkles: Benchmark results',
-        '',
-        `Comparing ${baseRef} (before) to ${headRef} (after).`,
-        '',
-    ];
-
-    if (before === null) {
-        lines.push('> Before benchmark did not complete; showing current branch metrics only.', '');
-    }
-    if (after === null) {
-        lines.push('> Current branch benchmark did not complete; showing available metrics only.', '');
-    }
-
-    lines.push(
-        '**Before**',
-        '',
-        metricTable(rows, 'before'),
-        '',
-        '**After**',
-        '',
-        metricTable(rows, 'after'),
-        '',
-        '**Delta**',
-        '',
-        '| Scenario | P95 delta (ms) |',
-        '| --- | ---: |',
-        ...rows.map(deltaRow),
-        '',
-        '<details>',
-        '<summary><strong>Top API waits</strong></summary>',
-        '',
-        '<br>',
-        '',
-        '| API request | Max wait (ms) |',
-        '| --- | ---: |',
-        ...topWaitRows(topWaits),
-        '',
-        '</details>',
-    );
-
-    return `${lines.join('\n')}\n`;
-}
-
-function readSummary(path, core) {
-    if (!fs.existsSync(path)) {
-        return null;
-    }
-
-    try {
-        return JSON.parse(fs.readFileSync(path, 'utf8'));
-    } catch (error) {
-        core?.warning(`Invalid benchmark summary ${path}: ${error.message}`);
-        return null;
-    }
-}
-
-function readSamples(path, core) {
-    if (!fs.existsSync(path)) {
-        return [];
-    }
-
-    const contents = fs.readFileSync(path, 'utf8').trim();
-    if (contents === '') {
-        return [];
-    }
-
-    return contents
-        .split('\n')
-        .filter(Boolean)
-        .flatMap((line) => {
-            try {
-                return [JSON.parse(line)];
-            } catch (error) {
-                core?.warning(`Invalid benchmark sample in ${path}: ${error.message}`);
-                return [];
-            }
-        });
-}
-
-function benchmarkRows(before, after, beforeSamples, afterSamples) {
-    const beforeServices = serviceStats(beforeSamples);
-    const afterServices = serviceStats(afterSamples);
-    return [
-        {
-            label: 'API total',
-            before: apiSampleStats(beforeSamples) || summaryStats(before, 'appwrite_api_duration'),
-            after: apiSampleStats(afterSamples) || summaryStats(after, 'appwrite_api_duration'),
-        },
-        ...serviceLabels.map((label) => ({
-            label,
-            before: beforeServices.get(label) || null,
-            after: afterServices.get(label) || null,
-        })),
-    ];
-}
-
-function summaryStats(summary, durationMetric, iterationsMetric = null, rpsMetric = null) {
-    const values = metricValues(summary, durationMetric);
-    if (!values) {
-        return null;
-    }
-
-    return {
-        p50: values.med ?? null,
-        p95: values['p(95)'] ?? null,
-        iterations: iterationsMetric ? metricValue(summary, iterationsMetric, 'count') : values.count ?? null,
-        rps: rpsMetric ? metricValue(summary, rpsMetric, 'rate') : null,
-    };
-}
-
-function serviceStats(samples) {
-    const apiSamples = samples.filter((sample) => {
-        return sample.metric === 'appwrite_api_duration' && typeof sample.data?.value === 'number';
-    });
-    const groups = new Map();
-
-    for (const sample of apiSamples) {
-        const service = serviceFromName(sample.data.tags?.name || '');
-        if (!service) {
-            continue;
-        }
-
-        const serviceSamples = groups.get(service) || [];
-        serviceSamples.push(sample);
-        groups.set(service, serviceSamples);
-    }
-
-    return new Map([...groups.entries()].map(([service, serviceSamples]) => {
-        const values = serviceSamples.map((sample) => sample.data.value);
-        const durationSeconds = sampleWindowSeconds(serviceSamples);
-        return [service, {
-            p50: percentile(values, 50),
-            p95: percentile(values, 95),
-            iterations: values.length,
-            rps: durationSeconds ? values.length / durationSeconds : null,
-        }];
-    }));
-}
-
-function apiSampleStats(samples) {
-    const apiSamples = samples.filter((sample) => {
-        return sample.metric === 'appwrite_api_duration' && typeof sample.data?.value === 'number';
-    });
-    const values = apiSamples.map((sample) => sample.data.value);
-    if (values.length === 0) {
-        return null;
-    }
-
-    const durationSeconds = sampleWindowSeconds(apiSamples);
-    return {
-        p50: percentile(values, 50),
-        p95: percentile(values, 95),
-        iterations: values.length,
-        rps: durationSeconds ? values.length / durationSeconds : null,
-    };
-}
-
-function serviceFromName(name) {
-    if (name.startsWith('account.')) {
-        return 'Account';
-    }
-    if (name.startsWith('tablesdb.')) {
-        return 'TablesDB';
-    }
-    if (name.startsWith('storage.') || name.startsWith('tokens.')) {
-        return 'Storage';
-    }
-    if (name.startsWith('functions.')) {
-        return 'Functions';
-    }
-    return null;
-}
-
-function sampleWindowSeconds(samples) {
-    const times = samples
-        .map((sample) => Date.parse(sample.data?.time))
-        .filter((value) => !Number.isNaN(value));
-    if (times.length < 2) {
-        return null;
-    }
-
-    return Math.max((Math.max(...times) - Math.min(...times)) / 1000, 1);
-}
-
-function percentile(values, percentileValue) {
-    if (values.length === 0) {
-        return null;
-    }
-
-    const sorted = [...values].sort((left, right) => left - right);
-    const index = Math.ceil((percentileValue / 100) * sorted.length) - 1;
-    return sorted[Math.max(0, Math.min(index, sorted.length - 1))];
-}
-
-function metricValues(data, metric) {
-    return data?.metrics?.[metric]?.values ?? null;
-}
-
-function metricValue(data, metric, stat) {
-    return metricValues(data, metric)?.[stat] ?? null;
-}
-
-function metricTable(rows, side) {
-    return [
-        '| Scenario | P50 (ms) | P95 (ms) | Requests | RPS |',
-        '| --- | ---: | ---: | ---: | ---: |',
-        ...rows.map((row) => metricRow(row, side)),
-    ].join('\n');
-}
-
-function metricRow(row, side) {
-    const values = row[side];
-    return `| ${row.label} | ${formatMs(values?.p50)} | ${formatMs(values?.p95)} | ${formatCount(values?.iterations)} | ${formatRate(values?.rps)} |`;
-}
-
-function deltaRow(row) {
-    return `| ${row.label} | ${formatDelta(row.before?.p95, row.after?.p95)} |`;
-}
-
-function topSamples(samples, metric, limit) {
-    const byName = samples.reduce((result, sample) => {
-        if (sample.metric !== metric || typeof sample.data?.value !== 'number') {
-            return result;
-        }
-
-        const name = sample.data.tags?.name || 'unknown';
-        const current = result.get(name);
-        if (!current || sample.data.value > current.value) {
-            result.set(name, { name, value: sample.data.value });
-        }
-
-        return result;
-    }, new Map());
-
-    return [...byName.values()]
-        .sort((left, right) => right.value - left.value)
-        .slice(0, limit);
-}
-
-function topWaitRows(samples) {
-    if (samples.length === 0) {
-        return ['| n/a | n/a |'];
-    }
-
-    return samples.map((sample) => {
-        return `| ${markdownText(sample.name).replace(/\|/g, '\\|')} | ${formatMs(sample.value)} |`;
-    });
-}
-
-function markdownText(value) {
-    return String(value || '').replace(/[\r\n]/g, ' ').replace(/[&<>"']/g, (char) => {
-        return ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;' })[char];
-    });
-}
-
-function formatMs(value) {
-    return formatNumber(value, 2);
-}
-
-function formatRate(value) {
-    return formatNumber(value, 2);
-}
-
-function formatCount(value) {
-    if (value === null || value === undefined || Number.isNaN(value)) {
-        return 'n/a';
-    }
-
-    return `${Math.round(value)}`;
-}
-
-function formatDelta(before, after) {
-    if (before === null || before === undefined || after === null || after === undefined || Number.isNaN(before) || Number.isNaN(after)) {
-        return 'n/a';
-    }
-
-    const difference = Number((after - before).toFixed(2));
-    return `${difference > 0 ? '+' : ''}${trimNumber(difference)}`;
-}
-
-function formatNumber(value, decimals) {
-    if (value === null || value === undefined || Number.isNaN(value)) {
-        return 'n/a';
-    }
-
-    return trimNumber(Number(value).toFixed(decimals));
-}
-
-function trimNumber(value) {
-    const text = String(value);
-    const trimmed = text.includes('.') ? text.replace(/\.?0+$/, '') : text;
-    return trimmed === '' ? '0' : trimmed;
-}

.github/workflows/ci.yml

@@ -7,8 +7,6 @@ concurrency:
 env:
   COMPOSE_FILE: docker-compose.yml
   IMAGE: appwrite-dev
-  REGISTRY_IMAGE: ghcr.io/${{ github.repository }}/appwrite-dev
-  K6_VERSION: '0.53.0'
 
 on:
   pull_request:
@@ -20,10 +18,6 @@ on:
         type: string
         default: ''
 
-permissions:
-  contents: read
-  packages: write
-
 jobs:
   dependencies:
     name: Checks / Dependencies
@@ -167,27 +161,6 @@ jobs:
       - name: Run PHPStan
         run: composer analyze -- --no-progress
 
-  specs:
-    name: Checks / Specs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v6
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: swoole
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs
-
-      - name: Generate specs
-        run: _APP_STORAGE_LIMIT=5368709120 php app/cli.php specs --version=latest --git=no
-
   locale:
     name: Checks / Locale
     runs-on: ubuntu-latest
@@ -216,7 +189,7 @@ jobs:
         with:
           script: |
             const allDatabases = ['MariaDB', 'PostgreSQL', 'MongoDB'];
-            const allModes = ['dedicated', 'shared'];
+            const allModes = ['dedicated', 'shared_v1', 'shared_v2'];
 
             const defaultDatabases = ['MongoDB'];
             const defaultModes = ['dedicated'];
@@ -263,30 +236,32 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Build and push Appwrite
+      - name: Build Appwrite
         uses: docker/build-push-action@v6
         with:
           context: .
-          push: true
-          tags: ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
+          push: false
+          tags: ${{ env.IMAGE }}
+          load: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
+          outputs: type=docker,dest=/tmp/${{ env.IMAGE }}.tar
           target: development
           build-args: |
             DEBUG=false
             TESTING=true
             VERSION=dev
 
+      - name: Upload Docker Image
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.IMAGE }}
+          path: /tmp/${{ env.IMAGE }}.tar
+          retention-days: 1
+
   unit:
     name: Tests / Unit
     runs-on: ubuntu-latest
@@ -294,32 +269,26 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-      packages: read
     steps:
       - name: checkout
         uses: actions/checkout@v6
 
+      - name: Download Docker Image
+        uses: actions/download-artifact@v7
+        with:
+          name: ${{ env.IMAGE }}
+          path: /tmp
+
       - name: Login to Docker Hub
         uses: docker/login-action@v4
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Docker Image
-        run: |
-          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
-
       - name: Load and Start Appwrite
         timeout-minutes: 5
         run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
           docker compose up -d --quiet-pull --wait
 
@@ -347,32 +316,26 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-      packages: read
     steps:
       - name: checkout
         uses: actions/checkout@v6
 
+      - name: Download Docker Image
+        uses: actions/download-artifact@v7
+        with:
+          name: ${{ env.IMAGE }}
+          path: /tmp
+
       - name: Login to Docker Hub
         uses: docker/login-action@v4
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Docker Image
-        run: |
-          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
-
       - name: Load and Start Appwrite
         timeout-minutes: 5
         run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
           docker compose up -d --quiet-pull --wait
 
@@ -411,7 +374,6 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-      packages: read
     strategy:
       fail-fast: false
       matrix:
@@ -446,8 +408,6 @@ jobs:
         include:
           - service: Databases
             runner: blacksmith-4vcpu-ubuntu-2404
-            paratest_processes: 3
-            timeout_minutes: 30
           - service: Sites
             runner: blacksmith-4vcpu-ubuntu-2404
           - service: Functions
@@ -458,18 +418,18 @@ jobs:
             runner: blacksmith-4vcpu-ubuntu-2404
           - service: TablesDB
             runner: blacksmith-4vcpu-ubuntu-2404
-            paratest_processes: 3
-            timeout_minutes: 30
-          - service: Migrations
-            paratest_processes: 1
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
 
-      - name: Set environment
-        run: |
-          echo "_APP_OPTIONS_ROUTER_PROTECTION=enabled" >> $GITHUB_ENV
+      - name: Download Docker Image
+        uses: actions/download-artifact@v7
+        with:
+          name: ${{ env.IMAGE }}
+          path: /tmp
 
+      - name: Set database environment
+        run: |
           if [ "${{ matrix.database }}" = "MariaDB" ]; then
             echo "COMPOSE_PROFILES=mariadb" >> $GITHUB_ENV
             echo "_APP_DB_ADAPTER=mariadb" >> $GITHUB_ENV
@@ -493,26 +453,14 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Docker Image
-        run: |
-          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
-
       - name: Load and Start Appwrite
         timeout-minutes: 5
         env:
           _APP_BROWSER_HOST: http://invalid-browser/v1
           _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
+          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
         run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
           docker compose up -d --quiet-pull --wait
 
@@ -529,7 +477,7 @@ jobs:
         with:
           max_attempts: 2
           retry_wait_seconds: 60
-          timeout_minutes: ${{ matrix.timeout_minutes || 20 }}
+          timeout_minutes: 20
           job_id: ${{ job.check_run_id }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           test_dir: tests/e2e/Services/${{ matrix.service }}
@@ -539,19 +487,12 @@ jobs:
             # Services that rely on sequential test method execution (shared static state)
             FUNCTIONAL_FLAG="--functional"
             case "${{ matrix.service }}" in
-              Databases|TablesDB|Functions|Realtime|GraphQL|ProjectWebhooks) FUNCTIONAL_FLAG="" ;;
+              Databases|TablesDB|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
             esac
 
-            PARATEST_PROCESSES="${{ matrix.paratest_processes }}"
-            if [ -z "$PARATEST_PROCESSES" ]; then
-              PARATEST_PROCESSES="$(nproc)"
-            fi
-
             docker compose exec -T \
               -e _APP_E2E_RESPONSE_FORMAT="${{ github.event.inputs.response_format }}" \
-              -e _TESTS_OAUTH2_GITHUB_CLIENT_ID="${{ secrets.TESTS_OAUTH2_GITHUB_CLIENT_ID }}" \
-              -e _TESTS_OAUTH2_GITHUB_CLIENT_SECRET="${{ secrets.TESTS_OAUTH2_GITHUB_CLIENT_SECRET }}" \
-              appwrite vendor/bin/paratest --processes "$PARATEST_PROCESSES" $FUNCTIONAL_FLAG "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots --log-junit tests/e2e/Services/${{ matrix.service }}/junit.xml
+              appwrite vendor/bin/paratest --processes $(nproc) $FUNCTIONAL_FLAG "$SERVICE_PATH" --exclude-group abuseEnabled --exclude-group screenshots --log-junit tests/e2e/Services/${{ matrix.service }}/junit.xml
 
       - name: Failure Logs
         if: failure()
@@ -566,7 +507,6 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-      packages: read
     strategy:
       fail-fast: false
       matrix:
@@ -574,8 +514,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
+
+      - name: Download Docker Image
+        uses: actions/download-artifact@v7
         with:
-          fetch-depth: 1
+          name: ${{ env.IMAGE }}
+          path: /tmp
 
       - name: Login to Docker Hub
         uses: docker/login-action@v4
@@ -583,26 +527,14 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Docker Image
-        run: |
-          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
-
       - name: Load and Start Appwrite
         timeout-minutes: 5
         env:
           _APP_OPTIONS_ABUSE: enabled
           _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
+          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
         run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
           docker compose up -d --quiet-pull --wait
 
@@ -633,7 +565,6 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
-      packages: read
     strategy:
       fail-fast: false
       matrix:
@@ -642,31 +573,25 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v6
 
+      - name: Download Docker Image
+        uses: actions/download-artifact@v7
+        with:
+          name: ${{ env.IMAGE }}
+          path: /tmp
+
       - name: Login to Docker Hub
         uses: docker/login-action@v4
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Docker Image
-        run: |
-          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
-
       - name: Load and Start Appwrite
         timeout-minutes: 5
         env:
           _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
+          _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
         run: |
+          docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
           docker compose up -d --quiet-pull --wait
 
@@ -700,20 +625,19 @@ jobs:
 
   benchmark:
     name: Benchmark
-    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     needs: build
     permissions:
-      actions: read
-      contents: read
-      issues: write
       pull-requests: write
-      packages: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
+
+      - name: Download Docker Image
+        uses: actions/download-artifact@v7
         with:
-          fetch-depth: 1
+          name: ${{ env.IMAGE }}
+          path: /tmp
 
       - name: Login to Docker Hub
         uses: docker/login-action@v4
@@ -721,153 +645,79 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GHCR
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull Appwrite image
+      - name: Load and Start Appwrite
         run: |
-          docker pull ${{ env.REGISTRY_IMAGE }}:${{ github.sha }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}
-          docker tag ${{ env.REGISTRY_IMAGE }}:${{ github.sha }} ${{ env.IMAGE }}:after
+          sed -i 's/traefik/localhost/g' .env
+          docker load --input /tmp/${{ env.IMAGE }}.tar
+          docker compose up -d
+          sleep 10
 
-      - name: Setup k6
-        uses: grafana/setup-k6-action@ffe7d7290dfa715e48c2ccc924d068444c94bde2
-        with:
-          k6-version: ${{ env.K6_VERSION }}
-
-      - name: Prepare benchmark before
-        id: benchmark_before_prepare
-        continue-on-error: true
+      - name: Install Oha
         run: |
-          git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }}
-          git worktree add --detach /tmp/appwrite-benchmark-before ${{ github.event.pull_request.base.sha }}
-          docker build \
-            --cache-from ${{ env.IMAGE }}:after \
-            --target development \
-            --build-arg DEBUG=false \
-            --build-arg TESTING=true \
-            --build-arg VERSION=dev \
-            --tag ${{ env.IMAGE }}:before \
-            /tmp/appwrite-benchmark-before
+          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
+          oha --version
 
-      - name: Start before Appwrite
-        id: benchmark_before_start
-        if: steps.benchmark_before_prepare.outcome == 'success'
-        continue-on-error: true
-        working-directory: /tmp/appwrite-benchmark-before
-        env:
-          _APP_DOMAIN: localhost
-          _APP_CONSOLE_DOMAIN: localhost
-          _APP_DOMAIN_FUNCTIONS: functions.localhost
-          _APP_OPTIONS_ABUSE: disabled
+      - name: Benchmark PR
+        run: 'oha -z 180s http://localhost/v1/health/version --output-format json > benchmark.json'
+
+      - name: Cleaning
+        run: docker compose down -v
+
+      - name: Installing latest version
         run: |
-          docker tag ${{ env.IMAGE }}:before ${{ env.IMAGE }}
-          docker compose up -d --wait --no-build
+          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: Prepare benchmark files
-        run: rm -f benchmark-before-summary.json benchmark-after-summary.json benchmark-before-samples.json benchmark-after-samples.json
+      - name: Benchmark Latest
+        run: oha -z 180s http://localhost/v1/health/version --output-format json > benchmark-latest.json
 
-      - name: Benchmark before
-        if: steps.benchmark_before_start.outcome == 'success'
-        continue-on-error: true
-        uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d
-        env:
-          APPWRITE_ENDPOINT: 'http://localhost/v1'
-          APPWRITE_BENCHMARK_ITERATIONS: '5'
-          APPWRITE_BENCHMARK_VUS: '1'
-          APPWRITE_WORKER_TIMEOUT_MS: '120000'
-          APPWRITE_BENCHMARK_SUMMARY_PATH: 'benchmark-before-summary.json'
-        with:
-          path: tests/benchmarks/http.js
-          flags: --quiet --out json=benchmark-before-samples.json
-          cloud-comment-on-pr: false
-          debug: true
-
-      - name: Stop before Appwrite
-        if: always()
+      - name: Prepare comment
         run: |
-          if [ -d /tmp/appwrite-benchmark-before ]; then
-            cd /tmp/appwrite-benchmark-before
-            docker compose down -v || true
-          fi
-
-      - name: Wait for benchmark ports
-        if: always()
-        run: |
-          for port in 80 443 8080 9503; do
-            for attempt in $(seq 1 30); do
-              if ! ss -ltn | awk '{print $4}' | grep -Eq "[:.]${port}$"; then
-                break
-              fi
-              sleep 1
-            done
-
-            if ss -ltn | awk '{print $4}' | grep -Eq "[:.]${port}$"; then
-              echo "Port ${port} is still in use after stopping the before stack"
-              ss -ltn
-              exit 1
-            fi
-          done
-
-      - name: Start after Appwrite
-        env:
-          _APP_DOMAIN: localhost
-          _APP_CONSOLE_DOMAIN: localhost
-          _APP_DOMAIN_FUNCTIONS: functions.localhost
-          _APP_OPTIONS_ABUSE: disabled
-        run: |
-          docker tag ${{ env.IMAGE }}:after ${{ env.IMAGE }}
-          docker compose up -d --wait --no-build
-
-      - name: Benchmark after
-        id: benchmark_after
-        continue-on-error: true
-        uses: grafana/run-k6-action@a15e2072ede004e8d46141e33d7f7dad8ad08d9d
-        env:
-          APPWRITE_ENDPOINT: 'http://localhost/v1'
-          APPWRITE_BENCHMARK_ITERATIONS: '5'
-          APPWRITE_BENCHMARK_VUS: '1'
-          APPWRITE_WORKER_TIMEOUT_MS: '120000'
-          APPWRITE_BENCHMARK_PREVIOUS_SUMMARY_PATH: '../../benchmark-before-summary.json'
-          APPWRITE_BENCHMARK_SUMMARY_PATH: 'benchmark-after-summary.json'
-        with:
-          path: tests/benchmarks/http.js
-          flags: --quiet --out json=benchmark-after-samples.json
-          cloud-comment-on-pr: false
-          debug: true
-
-      - name: Stop after Appwrite
-        if: always()
-        run: docker compose down -v || true
-
-      - name: Comment on PR
-        if: always()
-        uses: actions/github-script@v8
-        env:
-          BENCHMARK_BASE_REF: ${{ github.event.pull_request.base.ref }}
-          BENCHMARK_HEAD_REF: ${{ github.event.pull_request.head.ref }}
-        with:
-          script: |
-            const comment = require('./.github/workflows/benchmark-comment.js');
-            await comment({ github, context, core });
+          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@v7
         if: ${{ !cancelled() }}
         with:
-          name: benchmark-results
-          path: |
-            benchmark-comment.txt
-            benchmark-before-summary.json
-            benchmark-after-summary.json
-            benchmark-before-samples.json
-            benchmark-after-samples.json
+          name: benchmark.json
+          path: benchmark.json
           retention-days: 7
 
-      - name: Fail benchmark
-        if: always() && steps.benchmark_after.outcome != 'success'
-        run: exit 1
+      - name: Find Comment
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        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
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        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

.github/workflows/cleanup-cache.yml

@@ -5,11 +5,6 @@ on:
     types:
       - closed
 
-permissions:
-  actions: write
-  contents: read
-  packages: write
-
 jobs:
   cleanup:
     runs-on: ubuntu-latest
@@ -41,29 +36,4 @@ jobs:
             done
           done
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Cleanup GHCR image
-        continue-on-error: true
-        run: |
-          package_path="${GITHUB_REPOSITORY#*/}/appwrite-dev"
-          encoded_path="$(printf '%s' "$package_path" | jq -Rr @uri)"
-
-          gh api --paginate "/repos/${GITHUB_REPOSITORY}/pulls/${{ github.event.pull_request.number }}/commits" --jq '.[].sha' | while read -r sha; do
-            version_ids=$(gh api --paginate -H "Accept: application/vnd.github+json" \
-              "/orgs/${GITHUB_REPOSITORY_OWNER}/packages/container/${encoded_path}/versions" \
-              --jq ".[] | select(.metadata.container.tags | index(\"${sha}\")) | .id")
-
-            if [ -z "$version_ids" ]; then
-              echo "No GHCR version found for SHA ${sha}"
-              continue
-            fi
-
-            echo "$version_ids" | while read -r version_id; do
-              gh api --method DELETE -H "Accept: application/vnd.github+json" \
-                "/orgs/${GITHUB_REPOSITORY_OWNER}/packages/container/${encoded_path}/versions/${version_id}"
-              echo "Deleted ${package_path}:${sha} (version ${version_id})"
-            done
-          done
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nightly.yml

@@ -24,11 +24,9 @@ jobs:
           ignore-unfixed: 'false'
           severity: 'CRITICAL,HIGH'
       - name: Upload Docker Image Scan Results
-        uses: github/codeql-action/upload-sarif@v4
-        if: always() && hashFiles('trivy-image-results.sarif') != ''
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-image-results.sarif'
-          category: 'trivy-image'
 
   scan-code:
     name: Scan Code
@@ -44,8 +42,6 @@ jobs:
           output: 'trivy-fs-results.sarif'
           severity: 'CRITICAL,HIGH'
       - name: Upload Code Scan Results
-        uses: github/codeql-action/upload-sarif@v4
-        if: always() && hashFiles('trivy-fs-results.sarif') != ''
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: 'trivy-fs-results.sarif'
-          category: 'trivy-source'

AGENTS.md

@@ -115,10 +115,6 @@ Common injections: `$response`, `$request`, `$dbForProject`, `$dbForPlatform`, `
 - Never hardcode credentials -- use environment variables.
 - Code changes may require container restart. No central log location -- check relevant containers.
 
-## Patch release process
-
-For bumping patch versions (e.g., `1.9.0` -> `1.9.1`), follow the checklist in `.claude/skills/patch-release-checklist/SKILL.md`. It covers the 4 files that must be updated, console image bumps, CHANGES.md updates, and common pitfalls to avoid.
-
 ## Cross-repo context
 
 Appwrite is the base server for `appwrite/cloud`. Changes to the Action pattern, module structure, DI system, or response models affect cloud. The `feat-dedicated-db` feature spans cloud, edge, and console.

CHANGES.md

@@ -892,7 +892,7 @@
 * Unset index length by @fogelito in https://github.com/appwrite/appwrite/pull/8978
 * Update base to 0.9.5 by @basert in https://github.com/appwrite/appwrite/pull/9005
 * Sync main into 1.6.x by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9011
-* Improved shared tables by @abnegate in https://github.com/appwrite/appwrite/pull/9013
+* Improved shared tables V2 by @abnegate in https://github.com/appwrite/appwrite/pull/9013
 * Ensure backwards compatibility for 1.6.x by @christyjacob4 in https://github.com/appwrite/appwrite/pull/9018
 
 # Version 1.6.0

Dockerfile

@@ -12,7 +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 appwrite/base:1.4.1 AS base
+FROM appwrite/base:1.0.1 AS base
 
 LABEL maintainer="team@appwrite.io"
 
@@ -24,10 +24,6 @@ ENV _APP_VERSION=$VERSION \
     _APP_HOME=https://appwrite.io
 
 RUN \
-    if [ "$DEBUG" != "true" ]; then \
-    rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
-    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-*/xdebug.so; \
-    fi && \
     if [ "$DEBUG" == "true" ]; then \
     apk add boost boost-dev; \
     fi
@@ -104,8 +100,7 @@ RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 FROM base AS production
 
 RUN rm -rf /usr/src/code/app/config/specs && \
-    rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \
-    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-*/xdebug.so && \
+    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20240924/xdebug.so && \
     find /usr -name '*.a' -delete 2>/dev/null || true && \
     find /usr -type d -name '__pycache__' -exec rm -rf {} + 2>/dev/null || true && \
     find /usr -name '*.pyc' -delete 2>/dev/null || true

README.md

@@ -44,7 +44,7 @@ Table of Contents:
 
 ## Products
 
-- **[Appwrite Auth](https://appwrite.io/docs/products/auth)** - Secure user authentication with multiple login methods including email/password, SMS, OAuth, anonymous sessions, and magic links. Includes session management, multi-factor authentication, and user verification flows.
+- **[Appwrite Auth](https://appwrite.io/docs/products/authentication)** - Secure user authentication with multiple login methods including email/password, SMS, OAuth, anonymous sessions, and magic links. Includes session management, multi-factor authentication, and user verification flows.
 
 - **[Appwrite Databases](https://appwrite.io/docs/products/databases)** - Scalable structured data storage with support for databases, tables, and rows. Includes querying, pagination, indexing, and relationships to model complex application data.
 

app/cli.php

@@ -2,12 +2,12 @@
 
 require_once __DIR__ . '/init.php';
 
+use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\Publisher\Certificate as CertificatePublisher;
-use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
+use Appwrite\Event\StatsResources;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
 use Appwrite\Usage\Context as UsageContext;
@@ -18,15 +18,13 @@ use Swoole\Timer;
 use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
-use Utopia\CLI\Adapters\Generic;
-use Utopia\CLI\CLI;
 use Utopia\Config\Config;
 use Utopia\Console;
 use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
+use Utopia\DI\Dependency;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
@@ -49,7 +47,7 @@ require_once __DIR__ . '/controllers/general.php';
 global $register;
 
 $platform = new Appwrite();
-$args = $_SERVER['argv'] ?? [];
+$args = $platform->getEnv('argv');
 
 \array_shift($args);
 if (! isset($args[0])) {
@@ -58,15 +56,21 @@ if (! isset($args[0])) {
 }
 
 $taskName = $args[0];
-$container = new Container();
-$cli = new CLI(new Generic(), $_SERVER['argv'] ?? [], $container);
-
-$platform->setCli($cli);
 $platform->init(Service::TYPE_TASK);
+$cli = $platform->getCli();
 
-$container->set('register', fn () => $register, []);
+$setResource = function (string $name, callable $callback, array $injections = []) use ($cli) {
+    $dependency = new Dependency();
+    $dependency->setName($name)->setCallback($callback);
+    foreach ($injections as $injection) {
+        $dependency->inject($injection);
+    }
+    $cli->setResource($dependency);
+};
 
-$container->set('cache', function ($pools) {
+$setResource('register', fn () => $register, []);
+
+$setResource('cache', function ($pools) {
     $list = Config::getParam('pools-cache', []);
     $adapters = [];
 
@@ -77,18 +81,18 @@ $container->set('cache', function ($pools) {
     return new Cache(new Sharding($adapters));
 }, ['pools']);
 
-$container->set('pools', function (Registry $register) {
+$setResource('pools', function (Registry $register) {
     return $register->get('pools');
 }, ['register']);
 
-$container->set('authorization', function () {
+$setResource('authorization', function () {
     $authorization = new Authorization();
     $authorization->disable();
 
     return $authorization;
 }, []);
 
-$container->set('dbForPlatform', function ($pools, $cache, $authorization) {
+$setResource('dbForPlatform', function ($pools, $cache, $authorization) {
     $sleep = 3;
     $maxAttempts = 5;
     $attempts = 0;
@@ -131,17 +135,17 @@ $container->set('dbForPlatform', function ($pools, $cache, $authorization) {
     return $dbForPlatform;
 }, ['pools', 'cache', 'authorization']);
 
-$container->set('console', function () {
+$setResource('console', function () {
     return new Document(Config::getParam('console'));
 }, []);
 
-$container->set(
+$setResource(
     'isResourceBlocked',
     fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false,
     []
 );
 
-$container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
+$setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
     return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases) {
@@ -157,19 +161,12 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
         }
 
         if (isset($databases[$dsn->getHost()])) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
             $database = $databases[$dsn->getHost()];
             $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
             if (\in_array($dsn->getHost(), $sharedTables)) {
                 $database
                     ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
                     ->setTenant($project->getSequence())
                     ->setNamespace($dsn->getParam('namespace'));
             } else {
@@ -189,16 +186,9 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
         if (\in_array($dsn->getHost(), $sharedTables)) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
             $database
                 ->setSharedTables(true)
                 ->setTenant($project->getSequence())
-                ->setGlobalCollections($projectsGlobalCollections)
                 ->setNamespace($dsn->getParam('namespace'));
         } else {
             $database
@@ -217,20 +207,15 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
     };
 }, ['pools', 'dbForPlatform', 'cache', 'authorization']);
 
-$container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+$setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
     $database = null;
 
-    return function (?Document $project = null) use ($pools, $cache, &$database, $authorization) {
+    return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
         if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
             $database->setTenant($project->getSequence());
             return $database;
         }
 
-        /** @var array $collections */
-        $collections = Config::getParam('collections', []);
-        $logsCollections = $collections['logs'] ?? [];
-        $logsCollections = array_keys($logsCollections);
-
         $adapter = new DatabasePool($pools->get('logs'));
         $database = new Database($adapter, $cache);
 
@@ -239,7 +224,6 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
             ->setAuthorization($authorization)
             ->setSharedTables(true)
             ->setNamespace('logsV1')
-            ->setGlobalCollections($logsCollections)
             ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
             ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
 
@@ -251,43 +235,41 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
         return $database;
     };
 }, ['pools', 'cache', 'authorization']);
-$container->set('publisher', function (Group $pools) {
+$setResource('publisher', function (Group $pools) {
     return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
-$container->set('publisherDatabases', function (BrokerPool $publisher) {
+$setResource('publisherDatabases', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('publisherFunctions', function (BrokerPool $publisher) {
+$setResource('publisherFunctions', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('publisherMigrations', function (BrokerPool $publisher) {
+$setResource('publisherMigrations', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('publisherMessaging', function (BrokerPool $publisher) {
+$setResource('publisherMessaging', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('usage', function () {
+$setResource('usage', function () {
     return new UsageContext();
 }, []);
-$container->set('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
+$setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
     $publisher,
     new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
 ), ['publisher']);
-$container->set('publisherForCertificates', fn (Publisher $publisher) => new CertificatePublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME))
-), ['publisher']);
-$container->set('publisherForStatsResources', fn (Publisher $publisher) => new StatsResourcesPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME))
-), ['publisher']);
-$container->set('queueForFunctions', function (Publisher $publisher) {
+$setResource('queueForStatsResources', function (Publisher $publisher) {
+    return new StatsResources($publisher);
+}, ['publisher']);
+$setResource('queueForFunctions', function (Publisher $publisher) {
     return new Func($publisher);
 }, ['publisher']);
-$container->set('queueForDeletes', function (Publisher $publisher) {
+$setResource('queueForDeletes', function (Publisher $publisher) {
     return new Delete($publisher);
 }, ['publisher']);
-$container->set('logError', function (Registry $register) {
+$setResource('queueForCertificates', function (Publisher $publisher) {
+    return new Certificate($publisher);
+}, ['publisher']);
+$setResource('logError', function (Registry $register) {
     return function (Throwable $error, string $namespace, string $action) use ($register) {
         Console::error('[Error] Timestamp: ' . date('c', time()));
         Console::error('[Error] Type: ' . get_class($error));
@@ -339,13 +321,13 @@ $container->set('logError', function (Registry $register) {
     };
 }, ['register']);
 
-$container->set('executor', fn () => new Executor(), []);
+$setResource('executor', fn () => new Executor(), []);
 
-$container->set('bus', function (Registry $register) use ($container) {
-    return $register->get('bus')->setResolver(fn (string $name) => $container->get($name));
+$setResource('bus', function (Registry $register) use ($cli) {
+    return $register->get('bus')->setResolver(fn (string $name) => $cli->getResource($name));
 }, ['register']);
 
-$container->set('telemetry', fn () => new NoTelemetry(), []);
+$setResource('telemetry', fn () => new NoTelemetry(), []);
 
 $exitCode = 0;
 

app/config/apis.php

@@ -9,8 +9,8 @@ return [
         'key' => 'graphql',
         'name' => 'GraphQL',
     ],
-    'websocket' => [
-        'key' => 'websocket',
-        'name' => 'Websocket',
+    'realtime' => [
+        'key' => 'realtime',
+        'name' => 'Realtime',
     ],
 ];

app/config/collections/platform.php

@@ -594,7 +594,7 @@ $platformCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('key'), // For app platforms
+                '$id' => ID::custom('key'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
@@ -605,7 +605,7 @@ $platformCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('store'), // Unused at the moment
+                '$id' => ID::custom('store'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => 256,
@@ -616,7 +616,7 @@ $platformCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('hostname'), // For web platforms
+                '$id' => ID::custom('hostname'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => 256,

app/config/console.php

@@ -34,11 +34,6 @@ $console = [
     'legalAddress' => '',
     'legalTaxId' => '',
     'auths' => [
-        'membershipsUserName' => true,
-        'membershipsUserEmail' => true,
-        'membershipsMfa' => true,
-        'membershipsUserId' => true,
-        'membershipsUserPhone' => true,
         'mockNumbers' => [],
         'invites' => System::getEnv('_APP_CONSOLE_INVITES', 'enabled') === 'enabled',
         'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user

app/config/errors.php

@@ -384,7 +384,7 @@ return [
     ],
     Exception::API_KEY_EXPIRED => [
         'name' => Exception::API_KEY_EXPIRED,
-        'description' => 'The ephemeral API key has expired. Please don\'t use ephemeral API keys for more than duration of the execution.',
+        'description' => 'The dynamic API key has expired. Please don\'t use dynamic API keys for more than duration of the execution.',
         'code' => 401,
     ],
 
@@ -1179,16 +1179,6 @@ return [
         'description' => 'Platform with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::PLATFORM_METHOD_UNSUPPORTED => [
-        'name' => Exception::PLATFORM_METHOD_UNSUPPORTED,
-        'description' => 'The requested platform has invalid type. Please use corresponding update method for the platform type.',
-        'code' => 400,
-    ],
-    Exception::PLATFORM_ALREADY_EXISTS => [
-        'name' => Exception::PLATFORM_ALREADY_EXISTS,
-        'description' => 'Platform with the same ID already exists in this project. Try again with a different ID.',
-        'code' => 409,
-    ],
     Exception::VARIABLE_NOT_FOUND => [
         'name' => Exception::VARIABLE_NOT_FOUND,
         'description' => 'Variable with the requested ID could not be found.',
@@ -1408,19 +1398,4 @@ return [
         'description' => 'When using project API key, make sure to pass x-appwrite-project header with your project ID.',
         'code' => 403,
     ],
-    Exception::MOCK_NUMBER_ALREADY_EXISTS => [
-        'name' => Exception::MOCK_NUMBER_ALREADY_EXISTS,
-        'description' => 'Mock number with the requested number already exists. Try again with a different number. or update OTP of existing mock number.',
-        'code' => 409,
-    ],
-    Exception::MOCK_NUMBER_NOT_FOUND => [
-        'name' => Exception::MOCK_NUMBER_NOT_FOUND,
-        'description' => 'Mock number with the requested number could not be found.',
-        'code' => 404,
-    ],
-    Exception::MOCK_NUMBER_LIMIT_EXCEEDED => [
-        'name' => Exception::MOCK_NUMBER_LIMIT_EXCEEDED,
-        'description' => 'The maximum number of mock phones for this project has been reached.',
-        'code' => 400,
-    ],
 ];

app/config/locale/templates.php

@@ -9,5 +9,11 @@ return [
         'mfaChallenge',
         'sessionAlert',
         'otpSession'
+    ],
+    'sms' => [
+        'verification',
+        'login',
+        'invitation',
+        'mfaChallenge'
     ]
 ];

app/config/locale/translations/es.json

@@ -28,16 +28,6 @@
     "emails.invitation.thanks": "Gracias.,",
     "emails.invitation.buttonText": "Aceptar invitación a {{team}}",
     "emails.invitation.signature": "El equipo de {{project}}",
-    "emails.sessionAlert.subject": "Alerta de seguridad: nueva sesión en tu cuenta de {{project}}",
-    "emails.sessionAlert.preview": "Nuevo inicio de sesión detectado en {{project}} a las {{time}} UTC.",
-    "emails.sessionAlert.hello": "Hola {{user}},",
-    "emails.sessionAlert.body": "Se ha creado una nueva sesión en tu cuenta de {{b}}{{project}}{{/b}}, {{b}}el {{date}} de {{year}} a las {{time}} UTC{{/b}}.\nEstos son los detalles de la nueva sesión:",
-    "emails.sessionAlert.listDevice": "Dispositivo: {{b}}{{device}}{{/b}}",
-    "emails.sessionAlert.listIpAddress": "Dirección IP: {{b}}{{ipAddress}}{{/b}}",
-    "emails.sessionAlert.listCountry": "País: {{b}}{{country}}{{/b}}",
-    "emails.sessionAlert.footer": "Si has sido tú, no tienes que hacer nada más.\nSi no has iniciado esta sesión o sospechas actividad no autorizada, protege tu cuenta.",
-    "emails.sessionAlert.thanks": "Gracias,",
-    "emails.sessionAlert.signature": "El equipo de {{project}}",
     "locale.country.unknown": "Desconocido",
     "countries.af": "Afganistán",
     "countries.ao": "Angola",

app/config/oAuthProviders.php

@@ -167,17 +167,6 @@ return [
         'mock' => false,
         'class' => 'Appwrite\\Auth\\OAuth2\\Figma',
     ],
-    'fusionauth' => [
-        'name' => 'FusionAuth',
-        'developers' => 'https://fusionauth.io/docs/',
-        'icon' => 'icon-fusionauth',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => 'fusionauth.phtml',
-        'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\FusionAuth',
-    ],
     'github' => [
         'name' => 'GitHub',
         'developers' => 'https://developer.github.com/',
@@ -211,28 +200,6 @@ return [
         'mock' => false,
         'class' => 'Appwrite\\Auth\\OAuth2\\Google',
     ],
-    'keycloak' => [
-        'name' => 'Keycloak',
-        'developers' => 'https://www.keycloak.org/documentation',
-        'icon' => 'icon-keycloak',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => 'keycloak.phtml',
-        'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Keycloak',
-    ],
-    'kick' => [
-        'name' => 'Kick',
-        'developers' => 'https://docs.kick.com/',
-        'icon' => 'icon-kick',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => false,
-        'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Kick',
-    ],
     'linkedin' => [
         'name' => 'LinkedIn',
         'developers' => 'https://developer.linkedin.com/',
@@ -409,17 +376,6 @@ return [
         'mock' => false,
         'class' => 'Appwrite\\Auth\\OAuth2\\Wordpress',
     ],
-    'x' => [
-        'name' => 'X',
-        'developers' => 'https://docs.x.com/fundamentals/authentication/oauth-2-0/authorization-code',
-        'icon' => 'icon-twitter',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => false,
-        'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\X',
-    ],
     'yahoo' => [
         'name' => 'Yahoo',
         'developers' => 'https://developer.yahoo.com/oauth2/guide/flows_authcode/',

app/config/roles.php

@@ -21,8 +21,8 @@ $member = [
     'projects.read',
     'locale.read',
     'avatars.read',
-    'executions.read',
-    'executions.write',
+    'execution.read',
+    'execution.write',
     'targets.read',
     'targets.write',
     'subscribers.write',
@@ -55,14 +55,6 @@ $admins = [
     'tables.write',
     'platforms.read',
     'platforms.write',
-    'oauth2.read',
-    'oauth2.write',
-    'mocks.read',
-    'mocks.write',
-    'policies.read',
-    'policies.write',
-    'templates.read',
-    'templates.write',
     'projects.write',
     'keys.read',
     'keys.write',
@@ -81,8 +73,8 @@ $admins = [
     'sites.write',
     'log.read',
     'log.write',
-    'executions.read',
-    'executions.write',
+    'execution.read',
+    'execution.write',
     'rules.read',
     'rules.write',
     'migrations.read',
@@ -123,7 +115,7 @@ return [
             'files.write',
             'locale.read',
             'avatars.read',
-            'executions.write',
+            'execution.write',
         ],
     ],
     User::ROLE_USERS => [

app/config/scopes/organization.php

@@ -3,6 +3,13 @@
 // List of scopes for organization (teams) API keys
 
 return [
+    "platforms.read" => [
+        "description" => 'Access to read project\'s platforms',
+    ],
+    "platforms.write" => [
+        "description" =>
+            'Access to create, update, and delete project\'s platforms',
+    ],
     "projects.read" => [
         "description" => 'Access to read organization\'s projects',
     ],
@@ -10,6 +17,13 @@ return [
         "description" =>
             "Access to create, update, and delete projects in organization",
     ],
+    "keys.read" => [
+        "description" => 'Access to read project\'s API keys',
+    ],
+    "keys.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s API keys",
+    ],
     "devKeys.read" => [
         "description" => 'Access to read project\'s development keys',
     ],

app/config/scopes/project.php

@@ -1,350 +1,191 @@
 <?php
 
-// List of publicly visible scopes
-return [
-    // Project
+return [ // List of publicly visible scopes
+    'sessions.write' => [
+        'description' => 'Access to create, update, and delete user sessions',
+    ],
+    'users.read' => [
+        'description' => 'Access to read your project\'s users',
+    ],
+    'users.write' => [
+        'description' => 'Access to create, update, and delete your project\'s users',
+    ],
+    'teams.read' => [
+        'description' => 'Access to read your project\'s teams',
+    ],
+    'teams.write' => [
+        'description' => 'Access to create, update, and delete your project\'s teams',
+    ],
+    'databases.read' => [
+        'description' => 'Access to read your project\'s databases',
+    ],
+    'databases.write' => [
+        'description' => 'Access to create, update, and delete your project\'s databases',
+    ],
+    'collections.read' => [
+        'description' => 'Access to read your project\'s database collections',
+    ],
+    'collections.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database collections',
+    ],
+    'tables.read' => [
+        'description' => 'Access to read your project\'s database tables',
+    ],
+    'tables.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database tables',
+    ],
+    'attributes.read' => [
+        'description' => 'Access to read your project\'s database collection\'s attributes',
+    ],
+    'attributes.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database collection\'s attributes',
+    ],
+    'columns.read' => [
+        'description' => 'Access to read your project\'s database table\'s columns',
+    ],
+    'columns.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database table\'s columns',
+    ],
+    'indexes.read' => [
+        'description' => 'Access to read your project\'s database table\'s indexes',
+    ],
+    'indexes.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database table\'s indexes',
+    ],
+    'documents.read'  => [
+        'description' => 'Access to read your project\'s database documents',
+    ],
+    'documents.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database documents',
+    ],
+    'rows.read'  => [
+        'description' => 'Access to read your project\'s database rows',
+    ],
+    'rows.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database rows',
+    ],
+    'files.read' => [
+        'description' => 'Access to read your project\'s storage files and preview images',
+    ],
+    'files.write' => [
+        'description' => 'Access to create, update, and delete your project\'s storage files',
+    ],
+    'buckets.read' => [
+        'description' => 'Access to read your project\'s storage buckets',
+    ],
+    'buckets.write' => [
+        'description' => 'Access to create, update, and delete your project\'s storage buckets',
+    ],
+    'functions.read' => [
+        'description' => 'Access to read your project\'s functions and code deployments',
+    ],
+    'functions.write' => [
+        'description' => 'Access to create, update, and delete your project\'s functions and code deployments',
+    ],
+    'sites.read' => [
+        'description' => 'Access to read your project\'s sites and deployments',
+    ],
+    'sites.write' => [
+        'description' => 'Access to create, update, and delete your project\'s sites and deployments',
+    ],
+    'log.read' => [
+        'description' => 'Access to read your site\'s logs',
+    ],
+    'log.write' => [
+        'description' => 'Access to update, and delete your site\'s logs',
+    ],
+    'execution.read' => [
+        'description' => 'Access to read your project\'s execution logs',
+    ],
+    'execution.write' => [
+        'description' => 'Access to execute your project\'s functions',
+    ],
+    'locale.read' => [
+        'description' => 'Access to access your project\'s Locale service',
+    ],
+    'avatars.read' => [
+        'description' => 'Access to access your project\'s Avatars service',
+    ],
+    'health.read' => [
+        'description' => 'Access to read your project\'s health status',
+    ],
+    'providers.read' => [
+        'description' => 'Access to read your project\'s providers',
+    ],
+    'providers.write' => [
+        'description' => 'Access to create, update, and delete your project\'s providers',
+    ],
+    'messages.read' => [
+        'description' => 'Access to read your project\'s messages',
+    ],
+    'messages.write' => [
+        'description' => 'Access to create, update, and delete your project\'s messages',
+    ],
+    'topics.read' => [
+        'description' => 'Access to read your project\'s topics',
+    ],
+    'topics.write' => [
+        'description' => 'Access to create, update, and delete your project\'s topics',
+    ],
+    'subscribers.read' => [
+        'description' => 'Access to read your project\'s subscribers',
+    ],
+    'subscribers.write' => [
+        'description' => 'Access to create, update, and delete your project\'s subscribers',
+    ],
+    'targets.read' => [
+        'description' => 'Access to read your project\'s targets',
+    ],
+    'targets.write' => [
+        'description' => 'Access to create, update, and delete your project\'s targets',
+    ],
+    'rules.read' => [
+        'description' => 'Access to read your project\'s proxy rules',
+    ],
+    'rules.write' => [
+        'description' => 'Access to create, update, and delete your project\'s proxy rules',
+    ],
+    'schedules.read' => [
+        'description' => 'Access to read your project\'s schedules',
+    ],
+    'schedules.write' => [
+        'description' => 'Access to create, update, and delete your project\'s schedules',
+    ],
+    'migrations.read' => [
+        'description' => 'Access to read your project\'s migrations',
+    ],
+    'migrations.write' => [
+        'description' => 'Access to create, update, and delete your project\'s migrations.',
+    ],
+    'vcs.read' => [
+        'description' => 'Access to read your project\'s VCS repositories',
+    ],
+    'vcs.write' => [
+        'description' => 'Access to create, update, and delete your project\'s VCS repositories',
+    ],
+    'assistant.read' => [
+        'description' => 'Access to read the Assistant service',
+    ],
+    'tokens.read' => [
+        'description' => 'Access to read your project\'s tokens',
+    ],
+    'tokens.write' => [
+        'description' => 'Access to create, update, and delete your project\'s tokens',
+    ],
+    "webhooks.read" => [
+        "description" =>
+            "Access to read project\'s webhooks",
+    ],
+    "webhooks.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s webhooks",
+    ],
     "project.read" => [
         "description" =>
             "Access to read project\'s information",
-        "category" => "Project",
     ],
     "project.write" => [
         "description" =>
             "Access to update project\'s information",
-        "category" => "Project",
-    ],
-    "keys.read" => [
-        "description" =>
-            "Access to read project\'s keys",
-        "category" => "Project",
-    ],
-    "keys.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s keys",
-        "category" => "Project",
-    ],
-    "platforms.read" => [
-        "description" =>
-            "Access to read project\'s platforms",
-        "category" => "Project",
-    ],
-    "platforms.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s platforms",
-        "category" => "Project",
-    ],
-    "mocks.read" => [
-        "description" =>
-            "Access to read project\'s mocks",
-        "category" => "Project",
-    ],
-    "mocks.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s mocks",
-        "category" => "Project",
-    ],
-    "policies.read" => [
-        "description" =>
-            "Access to read project\'s policies",
-        "category" => "Project",
-    ],
-    "policies.write" => [
-        "description" =>
-            "Access to update project\'s policies",
-        "category" => "Project",
-    ],
-    "templates.read" => [
-        "description" =>
-            "Access to read project\'s templates",
-        "category" => "Project",
-    ],
-    "templates.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s templates",
-        "category" => "Project",
-    ],
-    "oauth2.read" => [
-        "description" =>
-            "Access to read project\'s OAuth2 configuration",
-        "category" => "Project",
-    ],
-    "oauth2.write" => [
-        "description" =>
-            "Access to update project\'s OAuth2 configuration",
-        "category" => "Project",
-    ],
-
-    // Auth
-    'users.read' => [
-        'description' => 'Access to read users',
-        'category' => 'Auth',
-    ],
-    'users.write' => [
-        'description' => 'Access to create, update, and delete users',
-        'category' => 'Auth',
-    ],
-    'sessions.read' => [
-        'description' => 'Access to read user sessions',
-        'category' => 'Auth',
-    ],
-    'sessions.write' => [
-        'description' => 'Access to create, update, and delete user sessions',
-        'category' => 'Auth',
-    ],
-    'teams.read' => [
-        'description' => 'Access to read teams',
-        'category' => 'Auth',
-    ],
-    'teams.write' => [
-        'description' => 'Access to create, update, and delete teams',
-        'category' => 'Auth',
-    ],
-
-    // Databases
-    'databases.read' => [
-        'description' => 'Access to read databases',
-        'category' => 'Databases',
-    ],
-    'databases.write' => [
-        'description' => 'Access to create, update, and delete databases',
-        'category' => 'Databases',
-    ],
-    'tables.read' => [
-        'description' => 'Access to read database tables',
-        'category' => 'Databases',
-    ],
-    'tables.write' => [
-        'description' => 'Access to create, update, and delete database tables',
-        'category' => 'Databases',
-    ],
-    'columns.read' => [
-        'description' => 'Access to read database table columns',
-        'category' => 'Databases',
-    ],
-    'columns.write' => [
-        'description' => 'Access to create, update, and delete database table columns',
-        'category' => 'Databases',
-    ],
-    'indexes.read' => [
-        'description' => 'Access to read database table indexes',
-        'category' => 'Databases',
-    ],
-    'indexes.write' => [
-        'description' => 'Access to create, update, and delete database table indexes',
-        'category' => 'Databases',
-    ],
-    'rows.read'  => [
-        'description' => 'Access to read database table rows',
-        'category' => 'Databases',
-    ],
-    'rows.write' => [
-        'description' => 'Access to create, update, and delete database table rows',
-        'category' => 'Databases',
-    ],
-    'collections.read' => [
-        'description' => 'Access to read database collections',
-        'category' => 'Databases',
-        'deprecated' => true,
-    ],
-    'collections.write' => [
-        'description' => 'Access to create, update, and delete database collections',
-        'category' => 'Databases',
-        'deprecated' => true,
-    ],
-    'attributes.read' => [
-        'description' => 'Access to read database collection attributes',
-        'category' => 'Databases',
-        'deprecated' => true,
-    ],
-    'attributes.write' => [
-        'description' => 'Access to create, update, and delete database collection attributes',
-        'category' => 'Databases',
-        'deprecated' => true,
-    ],
-    'documents.read'  => [
-        'description' => 'Access to read database collection documents',
-        'category' => 'Databases',
-        'deprecated' => true,
-    ],
-    'documents.write' => [
-        'description' => 'Access to create, update, and delete database collection documents',
-        'category' => 'Databases',
-        'deprecated' => true,
-    ],
-
-    // Storage
-    'buckets.read' => [
-        'description' => 'Access to read storage buckets',
-        'category' => 'Storage',
-    ],
-    'buckets.write' => [
-        'description' => 'Access to create, update, and delete storage buckets',
-        'category' => 'Storage',
-    ],
-    'files.read' => [
-        'description' => 'Access to read storage files and preview images',
-        'category' => 'Storage',
-    ],
-    'files.write' => [
-        'description' => 'Access to create, update, and delete storage files',
-        'category' => 'Storage',
-    ],
-    'tokens.read' => [
-        'description' => 'Access to read storage file tokens',
-        'category' => 'Storage',
-    ],
-    'tokens.write' => [
-        'description' => 'Access to create, update, and delete storage file tokens',
-        'category' => 'Storage',
-    ],
-
-    // Functions
-    'functions.read' => [
-        'description' => 'Access to read functions and deployments',
-        'category' => 'Functions',
-    ],
-    'functions.write' => [
-        'description' => 'Access to create, update, and delete functions and deployments',
-        'category' => 'Functions',
-    ],
-    'executions.read' => [
-        'description' => 'Access to read function executions',
-        'category' => 'Functions',
-    ],
-    'executions.write' => [
-        'description' => 'Access to create function executions',
-        'category' => 'Functions',
-    ],
-    'execution.read' => [
-        'description' => 'Access to read function executions. This scope is deprecated for consistency purposes, and replaced by `executions.read`.',
-        'category' => 'Functions',
-        'deprecated' => true,
-    ],
-    'execution.write' => [
-        'description' => 'Access to create function executions. This scope is deprecated for consistency purposes, and replaced by `executions.write`.',
-        'category' => 'Functions',
-        'deprecated' => true,
-    ],
-
-    // Sites
-    'sites.read' => [
-        'description' => 'Access to read sites and deployments',
-        'category' => 'Sites',
-    ],
-    'sites.write' => [
-        'description' => 'Access to create, update, and delete sites and deployments',
-        'category' => 'Sites',
-    ],
-    'log.read' => [
-        'description' => 'Access to read site logs',
-        'category' => 'Sites',
-    ],
-    'log.write' => [
-        'description' => 'Access to update, and delete site logs',
-        'category' => 'Sites',
-    ],
-
-    // Messaging
-    'providers.read' => [
-        'description' => 'Access to read messaging providers',
-        'category' => 'Messaging',
-    ],
-    'providers.write' => [
-        'description' => 'Access to create, update, and delete messaging providers',
-        'category' => 'Messaging',
-    ],
-    'topics.read' => [
-        'description' => 'Access to read messaging topics',
-        'category' => 'Messaging',
-    ],
-    'topics.write' => [
-        'description' => 'Access to create, update, and delete messaging topics',
-        'category' => 'Messaging',
-    ],
-    'subscribers.read' => [
-        'description' => 'Access to read messaging subscribers',
-        'category' => 'Messaging',
-    ],
-    'subscribers.write' => [
-        'description' => 'Access to create, update, and delete messaging subscribers',
-        'category' => 'Messaging',
-    ],
-    'targets.read' => [
-        'description' => 'Access to read messaging targets',
-        'category' => 'Messaging',
-    ],
-    'targets.write' => [
-        'description' => 'Access to create, update, and delete messaging targets',
-        'category' => 'Messaging',
-    ],
-    'messages.read' => [
-        'description' => 'Access to read messaging messages',
-        'category' => 'Messaging',
-    ],
-    'messages.write' => [
-        'description' => 'Access to create, update, and delete messaging messages',
-        'category' => 'Messaging',
-    ],
-
-    // Other
-    "webhooks.read" => [
-        "description" =>
-            "Access to read webhooks",
-        'category' => 'Other',
-    ],
-    "webhooks.write" => [
-        "description" =>
-            "Access to create, update, and delete webhooks",
-        'category' => 'Other',
-    ],
-    'locale.read' => [
-        'description' => 'Access to use Locale service',
-        'category' => 'Other',
-    ],
-    'avatars.read' => [
-        'description' => 'Access to use Avatars service',
-        'category' => 'Other',
-    ],
-    'health.read' => [
-        'description' => 'Access to use Health service',
-        'category' => 'Other',
-    ],
-    'assistant.read' => [
-        'description' => 'Access to use Assistant service',
-        'category' => 'Other',
-    ],
-    'migrations.read' => [
-        'description' => 'Access to read migrations',
-        'category' => 'Other',
-    ],
-    'migrations.write' => [
-        'description' => 'Access to create, update, and delete migrations.',
-        'category' => 'Other',
-    ],
-
-    // TODO: Figure out where to move those
-    'schedules.read' => [
-        'description' => 'Access to read schedules.',
-        'category' => 'Other',
-    ],
-    'schedules.write' => [
-        'description' => 'Access to create, update, and delete schedules.',
-        'category' => 'Other',
-    ],
-    'vcs.read' => [
-        'description' => 'Access to read resources under VCS service.',
-        'category' => 'Other',
-    ],
-    'vcs.write' => [
-        'description' => 'Access to create, update, and delete resources under VCS service.',
-        'category' => 'Other',
-    ],
-    'rules.read' => [
-        'description' => 'Access to read proxy rules.',
-        'category' => 'Other',
-    ],
-    'rules.write' => [
-        'description' => 'Access to create, update, and delete proxy rules.',
-        'category' => 'Other',
     ],
 ];

app/config/sdks.php

@@ -300,26 +300,6 @@ return [
                 'repoBranch' => 'main',
                 'changelog' => \realpath(__DIR__ . '/../../docs/sdks/cursor-plugin/CHANGELOG.md'),
             ],
-            [
-                'key' => 'claude-plugin',
-                'name' => 'ClaudePlugin',
-                'version' => '0.1.0',
-                'url' => 'https://github.com/appwrite/claude-plugin.git',
-                'enabled' => true,
-                'beta' => false,
-                'dev' => false,
-                'hidden' => false,
-                'spec' => 'static',
-                'family' => APP_SDK_PLATFORM_STATIC,
-                'prism' => 'claude-plugin',
-                'source' => \realpath(__DIR__ . '/../sdks/static-claude-plugin'),
-                'gitUrl' => 'git@github.com:appwrite/claude-plugin.git',
-                'gitRepoName' => 'claude-plugin',
-                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
-                'repoBranch' => 'main',
-                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/claude-plugin/CHANGELOG.md'),
-            ],
         ],
     ],
 

app/config/services.php

@@ -137,7 +137,7 @@ return [
         'docs' => true,
         'docsUrl' => '',
         'tests' => false,
-        'optional' => true,
+        'optional' => false,
         'icon' => '',
         'platforms' => ['client', 'server', 'console'],
     ],
@@ -193,7 +193,7 @@ return [
         'docs' => false,
         'docsUrl' => '',
         'tests' => false,
-        'optional' => true,
+        'optional' => false,
         'icon' => '',
         'platforms' => ['client', 'server', 'console'],
     ],
@@ -235,7 +235,7 @@ return [
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/proxy',
         'tests' => false,
-        'optional' => true,
+        'optional' => false,
         'icon' => '/images/services/proxy.png',
         'platforms' => ['client', 'server', 'console'],
     ],
@@ -286,12 +286,12 @@ return [
         'name' => 'Migrations',
         'subtitle' => 'The Migrations service allows you to migrate third-party data to your Appwrite project.',
         'description' => '/docs/services/migrations.md',
-        'controller' => '', // Uses modules
+        'controller' => 'api/migrations.php',
         'sdk' => true,
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/migrations',
         'tests' => true,
-        'optional' => true,
+        'optional' => false,
         'icon' => '/images/services/migrations.png',
         'platforms' => ['client', 'server', 'console'],
     ],

app/config/templates/function.php

@@ -79,13 +79,12 @@ return [
             ...getRuntimes($templateRuntimes['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter', $allowList),
             ...getRuntimes($templateRuntimes['BUN'], 'bun install', 'src/main.ts', 'bun/starter', $allowList),
             ...getRuntimes($templateRuntimes['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter', $allowList),
-            ...getRuntimes($templateRuntimes['RUST'], '', 'main.rs', 'rust/starter', $allowList),
         ],
-        'instructions' => 'For documentation and instructions check out the <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates">templates repository</a>.',
+        'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.',
         'vcsProvider' => 'github',
         'providerRepositoryId' => 'templates',
         'providerOwner' => 'appwrite',
-        'providerVersion' => '0.3.*',
+        'providerVersion' => '0.2.*',
         'variables' => [],
         'scopes' => ['users.read']
     ],

app/config/templates/site.php

@@ -1487,13 +1487,13 @@ return [
         ]
     ],
     [
-        'key' => 'dashboard-react-admin',
-        'name' => 'E-commerce dashboard with React Admin',
-        'tagline' => 'A React-based admin dashboard template with e-commerce features.',
+        'key' => 'crm-dashboard-react-admin',
+        'name' => 'CRM dashboard with React Admin',
+        'tagline' => 'A React-based admin dashboard template with CRM features.',
         'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [SiteUseCases::DASHBOARD, SiteUseCases::ECOMMERCE],
-        'screenshotDark' => $url . '/images/sites/templates/dashboard-react-admin-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/dashboard-react-admin-light.png',
+        'useCases' => [SiteUseCases::DASHBOARD],
+        'screenshotDark' => $url . '/images/sites/templates/crm-dashboard-react-admin-dark.png',
+        'screenshotLight' => $url . '/images/sites/templates/crm-dashboard-react-admin-light.png',
         'frameworks' => [
             getFramework('REACT', [
                 'providerRootDirectory' => './react/react-admin',

app/config/variables.php

@@ -872,18 +872,18 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_BUILD_TIMEOUT',
-                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 2700 seconds.',
+                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 900 seconds.',
                 'introduction' => '0.13.0',
-                'default' => '2700',
+                'default' => '900',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
             [
                 'name' => '_APP_COMPUTE_BUILD_TIMEOUT',
-                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 2700 seconds.',
+                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 900 seconds.',
                 'introduction' => '1.7.0',
-                'default' => '2700',
+                'default' => '900',
                 'required' => false,
                 'question' => '',
                 'filter' => ''

app/controllers/api/account.php

@@ -9,7 +9,6 @@ use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PasswordHistory;
 use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
-use Appwrite\Bus\Events\SessionCreated;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
@@ -42,7 +41,6 @@ use Utopia\Auth\Proofs\Code as ProofsCode;
 use Utopia\Auth\Proofs\Password as ProofsPassword;
 use Utopia\Auth\Proofs\Token as ProofsToken;
 use Utopia\Auth\Store;
-use Utopia\Bus\Bus;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -77,8 +75,139 @@ use Utopia\Validator\WhiteList;
 $oauthDefaultSuccess = '/console/auth/oauth2/success';
 $oauthDefaultFailure = '/console/auth/oauth2/failure';
 
+function sendSessionAlert(Locale $locale, Document $user, Document $project, array $platform, Document $session, Mail $queueForMails)
+{
+    $subject = $locale->getText("emails.sessionAlert.subject");
+    $preview = $locale->getText("emails.sessionAlert.preview");
+    $customTemplate = $project->getAttribute('templates', [])['email.sessionAlert-' . $locale->default] ?? [];
+    $smtpBaseTemplate = $project->getAttribute('smtpBaseTemplate', 'email-base');
 
-$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Bus $bus, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
+    $validator = new FileName();
+    if (!$validator->isValid($smtpBaseTemplate)) {
+        throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Invalid template path');
+    }
+
+    $bodyTemplate = __DIR__ . '/../../config/locale/templates/' . $smtpBaseTemplate . '.tpl';
+
+    $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-session-alert.tpl');
+    $message
+        ->setParam('{{hello}}', $locale->getText("emails.sessionAlert.hello"))
+        ->setParam('{{body}}', $locale->getText("emails.sessionAlert.body"))
+        ->setParam('{{listDevice}}', $locale->getText("emails.sessionAlert.listDevice"))
+        ->setParam('{{listIpAddress}}', $locale->getText("emails.sessionAlert.listIpAddress"))
+        ->setParam('{{listCountry}}', $locale->getText("emails.sessionAlert.listCountry"))
+        ->setParam('{{footer}}', $locale->getText("emails.sessionAlert.footer"))
+        ->setParam('{{thanks}}', $locale->getText("emails.sessionAlert.thanks"))
+        ->setParam('{{signature}}', $locale->getText("emails.sessionAlert.signature"));
+
+    $body = $message->render();
+
+    $smtp = $project->getAttribute('smtp', []);
+    $smtpEnabled = $smtp['enabled'] ?? false;
+
+    $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+    $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+    $replyTo = "";
+
+    if ($smtpEnabled) {
+        if (!empty($smtp['senderEmail'])) {
+            $senderEmail = $smtp['senderEmail'];
+        }
+        if (!empty($smtp['senderName'])) {
+            $senderName = $smtp['senderName'];
+        }
+        if (!empty($smtp['replyTo'])) {
+            $replyTo = $smtp['replyTo'];
+        }
+
+        $queueForMails
+            ->setSmtpHost($smtp['host'] ?? '')
+            ->setSmtpPort($smtp['port'] ?? '')
+            ->setSmtpUsername($smtp['username'] ?? '')
+            ->setSmtpPassword($smtp['password'] ?? '')
+            ->setSmtpSecure($smtp['secure'] ?? '');
+
+        if (!empty($customTemplate)) {
+            if (!empty($customTemplate['senderEmail'])) {
+                $senderEmail = $customTemplate['senderEmail'];
+            }
+            if (!empty($customTemplate['senderName'])) {
+                $senderName = $customTemplate['senderName'];
+            }
+            if (!empty($customTemplate['replyTo'])) {
+                $replyTo = $customTemplate['replyTo'];
+            }
+
+            $body = $customTemplate['message'] ?? '';
+            $subject = $customTemplate['subject'] ?? $subject;
+        }
+
+        $queueForMails
+            ->setSmtpReplyTo($replyTo)
+            ->setSmtpSenderEmail($senderEmail)
+            ->setSmtpSenderName($senderName);
+    }
+
+    // session alerts should always have a client name!
+    $clientName = $session->getAttribute('clientName');
+    if (empty($clientName)) {
+        // fallback to the user agent and then unknown!
+        $userAgent = $session->getAttribute('userAgent');
+        $clientName = !empty($userAgent) ? $userAgent : 'UNKNOWN';
+
+        $session->setAttribute('clientName', $clientName);
+    }
+
+    $projectName = $project->getAttribute('name');
+    if ($project->getId() === 'console') {
+        $projectName = $platform['platformName'];
+    }
+
+    $emailVariables = [
+        'direction' => $locale->getText('settings.direction'),
+        'date' => (new \DateTime())->format('F j'),
+        'year' => (new \DateTime())->format('YYYY'),
+        'time' => (new \DateTime())->format('H:i:s'),
+        'user' => $user->getAttribute('name'),
+        'project' => $projectName,
+        'device' => $session->getAttribute('clientName'),
+        'ipAddress' => $session->getAttribute('ip'),
+        'country' => $locale->getText('countries.' . $session->getAttribute('countryCode'), $locale->getText('locale.country.unknown')),
+    ];
+
+    if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
+        $emailVariables = array_merge($emailVariables, [
+            'accentColor' => $platform['accentColor'],
+            'logoUrl' => $platform['logoUrl'],
+            'twitter' => $platform['twitterUrl'],
+            'discord' => $platform['discordUrl'],
+            'github' => $platform['githubUrl'],
+            'terms' => $platform['termsUrl'],
+            'privacy' => $platform['privacyUrl'],
+            'platform' => $platform['platformName'],
+        ]);
+    }
+
+    $email = $user->getAttribute('email');
+
+    $queueForMails
+        ->setSubject($subject)
+        ->setPreview($preview)
+        ->setBody($body)
+        ->setBodyTemplate($bodyTemplate)
+        ->appendVariables($emailVariables)
+        ->setRecipient($email);
+
+    // since this is console project, set email sender name!
+    if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
+        $queueForMails->setSenderName($platform['emailSenderName']);
+    }
+
+    $queueForMails->trigger();
+}
+
+
+$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, Authorization $authorization) {
 
     // Attempt to decode secret as a JWT (used by OAuth2 token flow to carry provider info)
     $oauthProvider = null;
@@ -133,6 +262,9 @@ $createSession = function (string $userId, string $secret, Request $request, Res
     });
 
     $provider = match ($verifiedToken->getAttribute('type')) {
+        TOKEN_TYPE_VERIFICATION,
+        TOKEN_TYPE_RECOVERY,
+        TOKEN_TYPE_INVITE => SESSION_PROVIDER_EMAIL,
         TOKEN_TYPE_MAGIC_URL => SESSION_PROVIDER_MAGIC_URL,
         TOKEN_TYPE_PHONE => SESSION_PROVIDER_PHONE,
         TOKEN_TYPE_OAUTH2 => $oauthProvider,
@@ -186,12 +318,23 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed saving user to DB');
     }
 
-    $bus->dispatch(new SessionCreated(
-        user: $user->getArrayCopy(),
-        project: $project->getArrayCopy(),
-        session: $session->getArrayCopy(),
-        locale: $locale->default,
-    ));
+    $isAllowedTokenType = match ($verifiedToken->getAttribute('type')) {
+        TOKEN_TYPE_MAGIC_URL,
+        TOKEN_TYPE_EMAIL => false,
+        default => true
+    };
+
+    $hasUserEmail = $user->getAttribute('email', false) !== false;
+
+    $isSessionAlertsEnabled = $project->getAttribute('auths', [])['sessionAlerts'] ?? false;
+
+    $isNotFirstSession = $dbForProject->count('sessions', [
+        Query::equal('userId', [$user->getId()]),
+    ]) !== 1;
+
+    if ($isAllowedTokenType && $hasUserEmail && $isSessionAlertsEnabled && $isNotFirstSession) {
+        sendSessionAlert($locale, $user, $project, $platform, $session, $queueForMails);
+    }
 
     $queueForEvents
         ->setParam('userId', $user->getId())
@@ -202,7 +345,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         ->setProperty('secret', $sessionSecret)
         ->encode();
 
-    if (!$domainVerification) {
+    if (!Config::getParam('domainVerification')) {
         $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
     }
 
@@ -210,8 +353,8 @@ $createSession = function (string $userId, string $secret, Request $request, Res
     $protocol = $request->getProtocol();
 
     $response
-        ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-        ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+        ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+        ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
         ->setStatusCode(Response::STATUS_CODE_CREATED);
 
     $countryName = $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown'));
@@ -332,15 +475,15 @@ Http::post('/v1/account')
             throw new Exception(Exception::GENERAL_INVALID_EMAIL);
         }
 
-        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
             throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
         }
 
-        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
             throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
         }
 
-        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
             throw new Exception(Exception::USER_EMAIL_FREE);
         }
 
@@ -450,7 +593,7 @@ Http::delete('/v1/account')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('audits.event', 'user.delete')
-    ->label('audits.resource', 'user/{user.$id}')
+    ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
         group: 'account',
@@ -471,26 +614,19 @@ Http::delete('/v1/account')
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->inject('queueForDeletes')
-    ->inject('authorization')
-    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes, Authorization $authorization) {
+    ->action(function (Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {
         if ($user->isEmpty()) {
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
         if ($project->getId() === 'console') {
+            // get all memberships
             $memberships = $user->getAttribute('memberships', []);
             foreach ($memberships as $membership) {
-                if (!$membership->getAttribute('confirm', false)) {
-                    continue;
+                // prevent deletion if at least one active membership
+                if ($membership->getAttribute('confirm', false)) {
+                    throw new Exception(Exception::USER_DELETION_PROHIBITED);
                 }
-
-                $team = $dbForProject->getDocument('teams', $membership->getAttribute('teamId'));
-                if ($team->isEmpty()) {
-                    continue;
-                }
-
-                // Team is left as-is — we don't promote non-owner members to owner.
-                // Orphan teams are cleaned up later by Cloud's inactive project cleanup.
             }
         }
 
@@ -583,9 +719,7 @@ Http::delete('/v1/account/sessions')
     ->inject('queueForDeletes')
     ->inject('store')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken) {
 
         $protocol = $request->getProtocol();
         $sessions = $user->getAttribute('sessions', []);
@@ -594,7 +728,7 @@ Http::delete('/v1/account/sessions')
         foreach ($sessions as $session) {/** @var Document $session */
             $dbForProject->deleteDocument('sessions', $session->getId());
 
-            if (!$domainVerification) {
+            if (!Config::getParam('domainVerification')) {
                 $response->addHeader('X-Fallback-Cookies', \json_encode([]));
             }
 
@@ -607,8 +741,8 @@ Http::delete('/v1/account/sessions')
 
                 // If current session delete the cookies too
                 $response
-                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
-                    ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+                    ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
 
                 // Use current session for events.
                 $currentSession = $session;
@@ -715,9 +849,7 @@ Http::delete('/v1/account/sessions/:sessionId')
     ->inject('queueForDeletes')
     ->inject('store')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken) {
 
         $protocol = $request->getProtocol();
         $sessionId = ($sessionId === 'current')
@@ -743,13 +875,13 @@ Http::delete('/v1/account/sessions/:sessionId')
                     ->setAttribute('current', true)
                     ->setAttribute('countryName', $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown')));
 
-                if (!$domainVerification) {
+                if (!Config::getParam('domainVerification')) {
                     $response->addHeader('X-Fallback-Cookies', \json_encode([]));
                 }
 
                 $response
-                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
-                    ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+                    ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
             }
 
             $dbForProject->purgeCachedDocument('users', $user->getId());
@@ -834,7 +966,7 @@ Http::patch('/v1/account/sessions/:sessionId')
             throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
         }
 
-        if (!empty($provider) && \class_exists($className)) {
+        if (!empty($provider) && $className !== null && \class_exists($className)) {
             $appId = $project->getAttribute('oAuthProviders', [])[$provider . 'Appid'] ?? '';
             $appSecret = $project->getAttribute('oAuthProviders', [])[$provider . 'Secret'] ?? '{}';
 
@@ -898,15 +1030,13 @@ Http::post('/v1/account/sessions/email')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('hooks')
     ->inject('store')
     ->inject('proofForPassword')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Bus $bus, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
+    ->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) {
         $email = \strtolower($email);
         $protocol = $request->getProtocol();
 
@@ -967,28 +1097,28 @@ Http::post('/v1/account/sessions/email')
             ]));
         }
 
+        $dbForProject->purgeCachedDocument('users', $user->getId());
+
         $session = $dbForProject->createDocument('sessions', $session->setAttribute('$permissions', [
             Permission::read(Role::user($user->getId())),
             Permission::update(Role::user($user->getId())),
             Permission::delete(Role::user($user->getId())),
         ]));
 
-        $dbForProject->purgeCachedDocument('users', $user->getId());
-
         $encoded = $store
             ->setProperty('id', $user->getId())
             ->setProperty('secret', $secret)
             ->encode();
 
-        if (!$domainVerification) {
+        if (!Config::getParam('domainVerification')) {
             $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
         }
 
         $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
 
         $response
-            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
             ->setStatusCode(Response::STATUS_CODE_CREATED)
         ;
 
@@ -1005,12 +1135,15 @@ Http::post('/v1/account/sessions/email')
             ->setParam('sessionId', $session->getId())
         ;
 
-        $bus->dispatch(new SessionCreated(
-            user: $user->getArrayCopy(),
-            project: $project->getArrayCopy(),
-            session: $session->getArrayCopy(),
-            locale: $locale->default,
-        ));
+        if ($project->getAttribute('auths', [])['sessionAlerts'] ?? false) {
+            if (
+                $dbForProject->count('sessions', [
+                    Query::equal('userId', [$user->getId()]),
+                ]) !== 1
+            ) {
+                sendSessionAlert($locale, $user, $project, $platform, $session, $queueForMails);
+            }
+        }
 
         $response->dynamic($session, Response::MODEL_SESSION);
     });
@@ -1051,10 +1184,8 @@ Http::post('/v1/account/sessions/anonymous')
     ->inject('store')
     ->inject('proofForPassword')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
+    ->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) {
         $protocol = $request->getProtocol();
 
         if ('console' === $project->getId()) {
@@ -1145,15 +1276,15 @@ Http::post('/v1/account/sessions/anonymous')
             ->setProperty('secret', $secret)
             ->encode();
 
-        if (!$domainVerification) {
+        if (!Config::getParam('domainVerification')) {
             $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
         }
 
         $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
 
         $response
-            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
             ->setStatusCode(Response::STATUS_CODE_CREATED)
         ;
 
@@ -1204,13 +1335,11 @@ Http::post('/v1/account/sessions/token')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('store')
     ->inject('proofForToken')
     ->inject('proofForCode')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->inject('authorization')
+->inject('authorization')
     ->action($createSession);
 
 Http::get('/v1/account/sessions/oauth2/:provider')
@@ -1409,10 +1538,8 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->inject('proofForPassword')
     ->inject('proofForToken')
     ->inject('plan')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Database $dbForPlatform, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, array $plan, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) use ($oauthDefaultSuccess) {
+    ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Database $dbForPlatform, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, array $plan, Authorization $authorization) use ($oauthDefaultSuccess) {
         $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
         $port = $request->getPort();
         $callbackBase = $protocol . '://' . $request->getHostname();
@@ -1601,7 +1728,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
             }
         }
 
-        if ($user->isEmpty()) { // No user logged in or with OAuth2 provider ID, create new one or connect with account with same email
+        if ($user === false || $user->isEmpty()) { // No user logged in or with OAuth2 provider ID, create new one or connect with account with same email
             if (empty($email)) {
                 $failureRedirect(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
             }
@@ -1618,7 +1745,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
             }
 
             // If user is not found, check if there is a user with the same email
-            if ($user->isEmpty()) {
+            if ($user === false || $user->isEmpty()) {
                 $userWithEmail = $dbForProject->findOne('users', [
                     Query::equal('email', [$email]),
                 ]);
@@ -1631,7 +1758,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
             }
 
             // If user is not found, check if there is an identity with the same email
-            if ($user->isEmpty()) {
+            if ($user === false || $user->isEmpty()) {
                 $identityWithMatchingEmail = $dbForProject->findOne('identities', [
                     Query::equal('providerEmail', [$email]),
                 ]);
@@ -1643,7 +1770,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 }
             }
 
-            if ($user->isEmpty()) { // Last option -> create the user
+            if ($user === false || $user->isEmpty()) { // Last option -> create the user
                 $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
 
                 if ($limit !== 0) {
@@ -1676,15 +1803,15 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                     $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
                 }
 
-                if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+                if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
                     $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
                 }
 
-                if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+                if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
                     $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
                 }
 
-                if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+                if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
                     $failureRedirect(Exception::USER_EMAIL_FREE);
                 }
 
@@ -1817,15 +1944,15 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
             }
 
-            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
                 $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
             }
 
-            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
                 $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
             }
 
-            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
                 $failureRedirect(Exception::USER_EMAIL_FREE);
             }
 
@@ -1928,7 +2055,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->setProperty('secret', $secret)
                 ->encode();
 
-            if (!$domainVerification) {
+            if (!Config::getParam('domainVerification')) {
                 $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
             }
 
@@ -1941,17 +2068,17 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
             // TODO: Remove this deprecated workaround - support only token
             if ($state['success']['path'] == $oauthDefaultSuccess) {
                 $query['project'] = $project->getId();
-                $query['domain'] = $cookieDomain;
+                $query['domain'] = Config::getParam('cookieDomain');
                 $query['key'] = $store->getKey();
                 $query['secret'] = $encoded;
             }
 
             $response
-                ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-                ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+                ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+                ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
         }
 
-        if (isset($sessionUpgrade) && isset($session)) {
+        if (isset($sessionUpgrade) && $sessionUpgrade && isset($session)) {
             foreach ($user->getAttribute('targets', []) as $target) {
                 if ($target->getAttribute('providerType') !== MESSAGE_TYPE_PUSH) {
                     continue;
@@ -2046,7 +2173,7 @@ Http::get('/v1/account/tokens/oauth2/:provider')
         }
 
         $host = $platform['consoleHostname'] ?? '';
-        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
         $port = $request->getPort();
         $redirectBase = $protocol . '://' . $host;
         if ($protocol === 'https' && $port !== '443') {
@@ -2069,12 +2196,10 @@ Http::get('/v1/account/tokens/oauth2/:provider')
             'token' => true,
         ], $scopes);
 
-        $loginURL = $oauth2->getLoginURL();
-
         $response
             ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
             ->addHeader('Pragma', 'no-cache')
-            ->redirect($loginURL);
+            ->redirect($oauth2->getLoginURL());
     });
 
 Http::post('/v1/account/tokens/magic-url')
@@ -2175,15 +2300,15 @@ Http::post('/v1/account/tokens/magic-url')
                 throw new Exception(Exception::GENERAL_INVALID_EMAIL);
             }
 
-            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
                 throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
             }
 
-            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
                 throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
             }
 
-            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
                 throw new Exception(Exception::USER_EMAIL_FREE);
             }
 
@@ -2269,10 +2394,7 @@ Http::post('/v1/account/tokens/magic-url')
 
         $subject = $locale->getText("emails.magicSession.subject");
         $preview = $locale->getText("emails.magicSession.preview");
-
-        $customTemplate =
-            $project->getAttribute('templates', [])['email.magicSession-' . $locale->default] ??
-            $project->getAttribute('templates', [])['email.magicSession-' . $locale->fallback] ?? [];
+        $customTemplate = $project->getAttribute('templates', [])['email.magicSession-' . $locale->default] ?? [];
 
         $detector = new Detector($request->getUserAgent('UNKNOWN'));
         $agentOs = $detector->getOS();
@@ -2302,8 +2424,8 @@ Http::post('/v1/account/tokens/magic-url')
 
         $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
         $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
-        $replyToEmail = '';
-        $replyToName = '';
+
+        $replyTo = "";
 
         if ($smtpEnabled) {
             if (!empty($smtp['senderEmail'])) {
@@ -2312,13 +2434,8 @@ Http::post('/v1/account/tokens/magic-url')
             if (!empty($smtp['senderName'])) {
                 $senderName = $smtp['senderName'];
             }
-            // Includes backwards compatibility: fall back to legacy `replyTo` key
-            $smtpReplyToEmail = $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '';
-            if (!empty($smtpReplyToEmail)) {
-                $replyToEmail = $smtpReplyToEmail;
-            }
-            if (!empty($smtp['replyToName'])) {
-                $replyToName = $smtp['replyToName'];
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
             }
 
             $queueForMails
@@ -2335,13 +2452,8 @@ Http::post('/v1/account/tokens/magic-url')
                 if (!empty($customTemplate['senderName'])) {
                     $senderName = $customTemplate['senderName'];
                 }
-                // Includes backwards compatibility: fall back to legacy `replyTo` key
-                $customReplyToEmail = $customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? '';
-                if (!empty($customReplyToEmail)) {
-                    $replyToEmail = $customReplyToEmail;
-                }
-                if (!empty($customTemplate['replyToName'])) {
-                    $replyToName = $customTemplate['replyToName'];
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
                 }
 
                 $body = $customTemplate['message'] ?? '';
@@ -2349,8 +2461,7 @@ Http::post('/v1/account/tokens/magic-url')
             }
 
             $queueForMails
-                ->setSmtpReplyToEmail($replyToEmail)
-                ->setSmtpReplyToName($replyToName)
+                ->setSmtpReplyTo($replyTo)
                 ->setSmtpSenderEmail($senderEmail)
                 ->setSmtpSenderName($senderName);
         }
@@ -2496,15 +2607,15 @@ Http::post('/v1/account/tokens/email')
                 throw new Exception(Exception::GENERAL_INVALID_EMAIL);
             }
 
-            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
                 throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
             }
 
-            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
                 throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
             }
 
-            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
                 throw new Exception(Exception::USER_EMAIL_FREE);
             }
 
@@ -2593,9 +2704,7 @@ Http::post('/v1/account/tokens/email')
         $preview = $locale->getText("emails.otpSession.preview");
         $heading = $locale->getText("emails.otpSession.heading");
 
-        $customTemplate =
-            $project->getAttribute('templates', [])['email.otpSession-' . $locale->default] ??
-            $project->getAttribute('templates', [])['email.otpSession-' . $locale->fallback] ?? [];
+        $customTemplate = $project->getAttribute('templates', [])['email.otpSession-' . $locale->default] ?? [];
         $smtpBaseTemplate = $project->getAttribute('smtpBaseTemplate', 'email-base');
 
         $validator = new FileName();
@@ -2631,8 +2740,7 @@ Http::post('/v1/account/tokens/email')
 
         $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
         $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
-        $replyToEmail = '';
-        $replyToName = '';
+        $replyTo = "";
 
         if ($smtpEnabled) {
             if (!empty($smtp['senderEmail'])) {
@@ -2641,13 +2749,8 @@ Http::post('/v1/account/tokens/email')
             if (!empty($smtp['senderName'])) {
                 $senderName = $smtp['senderName'];
             }
-            // Includes backwards compatibility: fall back to legacy `replyTo` key
-            $smtpReplyToEmail = $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '';
-            if (!empty($smtpReplyToEmail)) {
-                $replyToEmail = $smtpReplyToEmail;
-            }
-            if (!empty($smtp['replyToName'])) {
-                $replyToName = $smtp['replyToName'];
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
             }
 
             $queueForMails
@@ -2664,13 +2767,8 @@ Http::post('/v1/account/tokens/email')
                 if (!empty($customTemplate['senderName'])) {
                     $senderName = $customTemplate['senderName'];
                 }
-                // Includes backwards compatibility: fall back to legacy `replyTo` key
-                $customReplyToEmail = $customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? '';
-                if (!empty($customReplyToEmail)) {
-                    $replyToEmail = $customReplyToEmail;
-                }
-                if (!empty($customTemplate['replyToName'])) {
-                    $replyToName = $customTemplate['replyToName'];
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
                 }
 
                 $body = $customTemplate['message'] ?? '';
@@ -2678,8 +2776,7 @@ Http::post('/v1/account/tokens/email')
             }
 
             $queueForMails
-                ->setSmtpReplyToEmail($replyToEmail)
-                ->setSmtpReplyToName($replyToName)
+                ->setSmtpReplyTo($replyTo)
                 ->setSmtpSenderEmail($senderEmail)
                 ->setSmtpSenderName($senderName);
         }
@@ -2786,16 +2883,14 @@ Http::put('/v1/account/sessions/magic-url')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('store')
     ->inject('proofForCode')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $bus, $store, $proofForCode, $domainVerification, $cookieDomain, $authorization) use ($createSession) {
+    ->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForCode, $authorization) use ($createSession) {
         $proofForToken = new ProofsToken(TOKEN_LENGTH_MAGIC_URL);
         $proofForToken->setHash(new Sha());
-        $createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $bus, $store, $proofForToken, $proofForCode, $domainVerification, $cookieDomain, $authorization);
+        $createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForToken, $proofForCode, $authorization);
     });
 
 Http::put('/v1/account/sessions/phone')
@@ -2837,12 +2932,10 @@ Http::put('/v1/account/sessions/phone')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('store')
     ->inject('proofForToken')
     ->inject('proofForCode')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
     ->action($createSession);
 
@@ -3000,6 +3093,11 @@ Http::post('/v1/account/tokens/phone')
         if ($sendSMS) {
             $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/sms-base.tpl');
 
+            $customTemplate = $project->getAttribute('templates', [])['sms.login-' . $locale->default] ?? [];
+            if (!empty($customTemplate)) {
+                $message = $customTemplate['message'] ?? $message;
+            }
+
             $projectName = $project->getAttribute('name');
             if ($project->getId() === 'console') {
                 $projectName = $platform['platformName'];
@@ -3294,7 +3392,7 @@ Http::patch('/v1/account/password')
             }
 
             $history[] = $newPassword;
-            $history = array_slice($history, -$historyLimit);
+            $history = array_slice($history, (count($history) - $historyLimit), $historyLimit);
         }
 
         if ($project->getAttribute('auths', [])['personalDataCheck'] ?? false) {
@@ -3417,15 +3515,15 @@ Http::patch('/v1/account/email')
             throw new Exception(Exception::GENERAL_INVALID_EMAIL);
         }
 
-        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && $emailMetadata['emailIsDisposable']) {
+        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
             throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
         }
 
-        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && $emailMetadata['emailIsCanonical'] === false) {
+        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
             throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
         }
 
-        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && $emailMetadata['emailIsFree']) {
+        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
             throw new Exception(Exception::USER_EMAIL_FREE);
         }
 
@@ -3457,6 +3555,9 @@ Http::patch('/v1/account/email')
 
         try {
             $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+            /**
+             * @var Document $oldTarget
+             */
             $oldTarget = $user->find('identifier', $oldEmail, 'targets');
 
             if ($oldTarget instanceof Document && !$oldTarget->isEmpty()) {
@@ -3543,6 +3644,9 @@ Http::patch('/v1/account/phone')
 
         try {
             $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+            /**
+             * @var Document $oldTarget
+             */
             $oldTarget = $user->find('identifier', $oldPhone, 'targets');
 
             if ($oldTarget instanceof Document && !$oldTarget->isEmpty()) {
@@ -3623,9 +3727,7 @@ Http::patch('/v1/account/status')
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->inject('store')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Store $store, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Store $store) {
 
         $user->setAttribute('status', false);
 
@@ -3635,14 +3737,14 @@ Http::patch('/v1/account/status')
             ->setParam('userId', $user->getId())
             ->setPayload($response->output($user, Response::MODEL_ACCOUNT));
 
-        if (!$domainVerification) {
+        if (!Config::getParam('domainVerification')) {
             $response->addHeader('X-Fallback-Cookies', \json_encode([]));
         }
 
         $protocol = $request->getProtocol();
         $response
-            ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
-            ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
         ;
 
         $response->dynamic($user, Response::MODEL_ACCOUNT);
@@ -3747,9 +3849,7 @@ Http::post('/v1/account/recovery')
         $body = $locale->getText("emails.recovery.body");
         $subject = $locale->getText("emails.recovery.subject");
         $preview = $locale->getText("emails.recovery.preview");
-        $customTemplate =
-            $project->getAttribute('templates', [])['email.recovery-' . $locale->default] ??
-            $project->getAttribute('templates', [])['email.recovery-' . $locale->fallback] ?? [];
+        $customTemplate = $project->getAttribute('templates', [])['email.recovery-' . $locale->default] ?? [];
 
         $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl');
         $message
@@ -3766,8 +3866,7 @@ Http::post('/v1/account/recovery')
 
         $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
         $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
-        $replyToEmail = '';
-        $replyToName = '';
+        $replyTo = "";
 
         if ($smtpEnabled) {
             if (!empty($smtp['senderEmail'])) {
@@ -3776,13 +3875,8 @@ Http::post('/v1/account/recovery')
             if (!empty($smtp['senderName'])) {
                 $senderName = $smtp['senderName'];
             }
-            // Includes backwards compatibility: fall back to legacy `replyTo` key
-            $smtpReplyToEmail = $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '';
-            if (!empty($smtpReplyToEmail)) {
-                $replyToEmail = $smtpReplyToEmail;
-            }
-            if (!empty($smtp['replyToName'])) {
-                $replyToName = $smtp['replyToName'];
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
             }
 
             $queueForMails
@@ -3799,13 +3893,8 @@ Http::post('/v1/account/recovery')
                 if (!empty($customTemplate['senderName'])) {
                     $senderName = $customTemplate['senderName'];
                 }
-                // Includes backwards compatibility: fall back to legacy `replyTo` key
-                $customReplyToEmail = $customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? '';
-                if (!empty($customReplyToEmail)) {
-                    $replyToEmail = $customReplyToEmail;
-                }
-                if (!empty($customTemplate['replyToName'])) {
-                    $replyToName = $customTemplate['replyToName'];
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
                 }
 
                 $body = $customTemplate['message'] ?? '';
@@ -3813,8 +3902,7 @@ Http::post('/v1/account/recovery')
             }
 
             $queueForMails
-                ->setSmtpReplyToEmail($replyToEmail)
-                ->setSmtpReplyToName($replyToName)
+                ->setSmtpReplyTo($replyTo)
                 ->setSmtpSenderEmail($senderEmail)
                 ->setSmtpSenderName($senderName);
         }
@@ -4069,9 +4157,7 @@ Http::post('/v1/account/verifications/email')
         $subject = $locale->getText("emails.verification.subject");
         $heading = $locale->getText("emails.verification.heading");
 
-        $customTemplate =
-            $project->getAttribute('templates', [])['email.verification-' . $locale->default] ??
-            $project->getAttribute('templates', [])['email.verification-' . $locale->fallback] ?? [];
+        $customTemplate = $project->getAttribute('templates', [])['email.verification-' . $locale->default] ?? [];
         $smtpBaseTemplate = $project->getAttribute('smtpBaseTemplate', 'email-base');
 
         $validator = new FileName();
@@ -4097,8 +4183,7 @@ Http::post('/v1/account/verifications/email')
 
         $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
         $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
-        $replyToEmail = '';
-        $replyToName = '';
+        $replyTo = "";
 
         if ($smtpEnabled) {
             if (!empty($smtp['senderEmail'])) {
@@ -4107,13 +4192,8 @@ Http::post('/v1/account/verifications/email')
             if (!empty($smtp['senderName'])) {
                 $senderName = $smtp['senderName'];
             }
-            // Includes backwards compatibility: fall back to legacy `replyTo` key
-            $smtpReplyToEmail = $smtp['replyToEmail'] ?? $smtp['replyTo'] ?? '';
-            if (!empty($smtpReplyToEmail)) {
-                $replyToEmail = $smtpReplyToEmail;
-            }
-            if (!empty($smtp['replyToName'])) {
-                $replyToName = $smtp['replyToName'];
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
             }
 
             $queueForMails
@@ -4130,13 +4210,8 @@ Http::post('/v1/account/verifications/email')
                 if (!empty($customTemplate['senderName'])) {
                     $senderName = $customTemplate['senderName'];
                 }
-                // Includes backwards compatibility: fall back to legacy `replyTo` key
-                $customReplyToEmail = $customTemplate['replyToEmail'] ?? $customTemplate['replyTo'] ?? '';
-                if (!empty($customReplyToEmail)) {
-                    $replyToEmail = $customReplyToEmail;
-                }
-                if (!empty($customTemplate['replyToName'])) {
-                    $replyToName = $customTemplate['replyToName'];
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
                 }
 
                 $body = $customTemplate['message'] ?? '';
@@ -4144,8 +4219,7 @@ Http::post('/v1/account/verifications/email')
             }
 
             $queueForMails
-                ->setSmtpReplyToEmail($replyToEmail)
-                ->setSmtpReplyToName($replyToName)
+                ->setSmtpReplyTo($replyTo)
                 ->setSmtpSenderEmail($senderEmail)
                 ->setSmtpSenderName($senderName);
         }
@@ -4382,6 +4456,11 @@ Http::post('/v1/account/verifications/phone')
         if ($sendSMS) {
             $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/sms-base.tpl');
 
+            $customTemplate = $project->getAttribute('templates', [])['sms.verification-' . $locale->default] ?? [];
+            if (!empty($customTemplate)) {
+                $message = $customTemplate['message'] ?? $message;
+            }
+
             $messageContent = Template::fromString($locale->getText("sms.verification.body"));
             $messageContent
                 ->setParam('{{project}}', $project->getAttribute('name'))
@@ -4656,7 +4735,7 @@ Http::delete('/v1/account/targets/:targetId/push')
     ->groups(['api', 'account'])
     ->label('scope', 'targets.write')
     ->label('audits.event', 'target.delete')
-    ->label('audits.resource', 'target/{request.targetId}')
+    ->label('audits.resource', 'target/response.$id')
     ->label('event', 'users.[userId].targets.[targetId].delete')
     ->label('sdk', new Method(
         namespace: 'account',

app/controllers/api/graphql.php

@@ -231,7 +231,7 @@ function execute(
     $validations = GraphQL::getStandardValidationRules();
 
     if (System::getEnv('_APP_GRAPHQL_INTROSPECTION', 'enabled') === 'disabled') {
-        $validations[] = new DisableIntrospection(DisableIntrospection::ENABLED);
+        $validations[] = new DisableIntrospection();
     }
 
     if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {

app/controllers/api/messaging.php

@@ -482,6 +482,7 @@ Http::post('/v1/messaging/providers/msg91')
             $enabled === true
             && \array_key_exists('senderId', $credentials)
             && \array_key_exists('authKey', $credentials)
+            && \array_key_exists('from', $options)
         ) {
             $enabled = true;
         } else {
@@ -1179,7 +1180,6 @@ Http::get('/v1/messaging/providers/:providerId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -2585,7 +2585,6 @@ Http::get('/v1/messaging/topics/:topicId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -3001,7 +3000,6 @@ Http::get('/v1/messaging/subscribers/:subscriberId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -3206,6 +3204,10 @@ Http::post('/v1/messaging/messages/email')
             throw new Exception(Exception::MESSAGE_MISSING_TARGET);
         }
 
+        if ($status === MessageStatus::SCHEDULED && \is_null($scheduledAt)) {
+            throw new Exception(Exception::MESSAGE_MISSING_SCHEDULE);
+        }
+
         $mergedTargets = \array_merge($targets, $cc, $bcc);
 
         if (!empty($mergedTargets)) {
@@ -3381,6 +3383,10 @@ Http::post('/v1/messaging/messages/sms')
             throw new Exception(Exception::MESSAGE_MISSING_TARGET);
         }
 
+        if ($status === MessageStatus::SCHEDULED && \is_null($scheduledAt)) {
+            throw new Exception(Exception::MESSAGE_MISSING_SCHEDULE);
+        }
+
         if (!empty($targets)) {
             $foundTargets = $dbForProject->find('targets', [
                 Query::equal('$id', $targets),
@@ -3518,6 +3524,10 @@ Http::post('/v1/messaging/messages/push')
             throw new Exception(Exception::MESSAGE_MISSING_TARGET);
         }
 
+        if ($status === MessageStatus::SCHEDULED && \is_null($scheduledAt)) {
+            throw new Exception(Exception::MESSAGE_MISSING_SCHEDULE);
+        }
+
         if (!empty($targets)) {
             $foundTargets = $dbForProject->find('targets', [
                 Query::equal('$id', $targets),
@@ -3803,7 +3813,6 @@ Http::get('/v1/messaging/messages/:messageId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -4647,7 +4656,7 @@ Http::delete('/v1/messaging/messages/:messageId')
                 if (!empty($scheduleId)) {
                     try {
                         $dbForPlatform->deleteDocument('schedules', $scheduleId);
-                    } catch (\Throwable) {
+                    } catch (Exception) {
                         // Ignore
                     }
                 }

app/controllers/api/project.php

@@ -113,12 +113,11 @@ Http::get('/v1/project/usage')
         $factor = match ($period) {
             '1h' => 3600,
             '1d' => 86400,
-            default => throw new \LogicException('Unsupported period: ' . $period),
         };
 
         $limit = match ($period) {
             '1h' => (new DateTime($startDate))->diff(new DateTime($endDate))->days * 24,
-            '1d' => (new DateTime($startDate))->diff(new DateTime($endDate))->days,
+            '1d' => (new DateTime($startDate))->diff(new DateTime($endDate))->days
         };
 
         $format = match ($period) {

app/controllers/api/users.php

@@ -856,7 +856,7 @@ Http::get('/v1/users/:userId/targets/:targetId')
 Http::get('/v1/users/:userId/sessions')
     ->desc('List user sessions')
     ->groups(['api', 'users'])
-    ->label('scope', ['users.read', 'sessions.read'])
+    ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
         group: 'sessions',
@@ -1008,8 +1008,6 @@ Http::get('/v1/users/:userId/logs')
                 'userId' => ID::custom($log['data']['userId']),
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
-                'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -1535,7 +1533,7 @@ Http::patch('/v1/users/:userId/email')
                 Query::equal('identifier', [$email]),
             ]);
 
-            if (!$target->isEmpty()) {
+            if ($target instanceof Document && !$target->isEmpty()) {
                 throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
             }
         }
@@ -1595,6 +1593,9 @@ Http::patch('/v1/users/:userId/email')
                 'emailIsDisposable' => $user->getAttribute('emailIsDisposable'),
                 'emailIsFree' => $user->getAttribute('emailIsFree'),
             ]));
+            /**
+             * @var Document $oldTarget
+             */
             $oldTarget = $user->find('identifier', $oldEmail, 'targets');
 
             if ($oldTarget instanceof Document && !$oldTarget->isEmpty()) {
@@ -1678,7 +1679,7 @@ Http::patch('/v1/users/:userId/phone')
                 Query::equal('identifier', [$number]),
             ]);
 
-            if (!$target->isEmpty()) {
+            if ($target instanceof Document && !$target->isEmpty()) {
                 throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
             }
         }
@@ -1688,6 +1689,9 @@ Http::patch('/v1/users/:userId/phone')
                 'phone' => $phoneValue,
                 'phoneVerification' => $user->getAttribute('phoneVerification'),
             ]));
+            /**
+             * @var Document $oldTarget
+             */
             $oldTarget = $user->find('identifier', $oldPhone, 'targets');
 
             if ($oldTarget instanceof Document && !$oldTarget->isEmpty()) {
@@ -2246,8 +2250,8 @@ Http::delete('/v1/users/:userId/mfa/authenticators/:type')
     ->label('event', 'users.[userId].delete.mfa')
     ->label('scope', 'users.write')
     ->label('audits.event', 'user.update')
-    ->label('audits.resource', 'user/{request.userId}')
-    ->label('audits.userId', '{request.userId}')
+    ->label('audits.resource', 'user/{response.$id}')
+    ->label('audits.userId', '{response.$id}')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', [
         new Method(
@@ -2314,7 +2318,7 @@ Http::post('/v1/users/:userId/sessions')
     ->desc('Create session')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.[sessionId].create')
-    ->label('scope', ['users.write', 'sessions.write'])
+    ->label('scope', 'users.write')
     ->label('audits.event', 'session.create')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('usage.metric', 'sessions.{scope}.requests.create')
@@ -2470,7 +2474,7 @@ Http::delete('/v1/users/:userId/sessions/:sessionId')
     ->desc('Delete user session')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
-    ->label('scope', ['users.write', 'sessions.write'])
+    ->label('scope', 'users.write')
     ->label('audits.event', 'session.delete')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
@@ -2521,7 +2525,7 @@ Http::delete('/v1/users/:userId/sessions')
     ->desc('Delete user sessions')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.delete')
-    ->label('scope', ['users.write', 'sessions.write'])
+    ->label('scope', 'users.write')
     ->label('audits.event', 'session.delete')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
@@ -2836,7 +2840,6 @@ Http::get('/v1/users/usage')
         $format = match ($days['period']) {
             '1h' => 'Y-m-d\TH:00:00.000P',
             '1d' => 'Y-m-d\T00:00:00.000P',
-            default => throw new \LogicException('Unsupported period: ' . $days['period']),
         };
 
         foreach ($metrics as $metric) {

app/controllers/general.php

@@ -7,9 +7,9 @@ use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Key;
 use Appwrite\Bus\Events\ExecutionCompleted;
 use Appwrite\Bus\Events\RequestCompleted;
+use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete as DeleteEvent;
 use Appwrite\Event\Event;
-use Appwrite\Event\Publisher\Certificate;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Cors;
 use Appwrite\Platform\Appwrite;
@@ -25,9 +25,6 @@ use Appwrite\Utopia\Request\Filters\V18 as RequestV18;
 use Appwrite\Utopia\Request\Filters\V19 as RequestV19;
 use Appwrite\Utopia\Request\Filters\V20 as RequestV20;
 use Appwrite\Utopia\Request\Filters\V21 as RequestV21;
-use Appwrite\Utopia\Request\Filters\V22 as RequestV22;
-use Appwrite\Utopia\Request\Filters\V23 as RequestV23;
-use Appwrite\Utopia\Request\Filters\V24 as RequestV24;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
@@ -35,9 +32,6 @@ use Appwrite\Utopia\Response\Filters\V18 as ResponseV18;
 use Appwrite\Utopia\Response\Filters\V19 as ResponseV19;
 use Appwrite\Utopia\Response\Filters\V20 as ResponseV20;
 use Appwrite\Utopia\Response\Filters\V21 as ResponseV21;
-use Appwrite\Utopia\Response\Filters\V22 as ResponseV22;
-use Appwrite\Utopia\Response\Filters\V23 as ResponseV23;
-use Appwrite\Utopia\Response\Filters\V24 as ResponseV24;
 use Appwrite\Utopia\View;
 use Executor\Executor;
 use MaxMind\Db\Reader;
@@ -67,11 +61,13 @@ use Utopia\System\System;
 use Utopia\Validator;
 use Utopia\Validator\Text;
 
+Config::setParam('domainVerification', false);
+Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
 function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
 {
-    $host = $request->getHostname();
+    $host = $request->getHostname() ?? '';
     if (!empty($previewHostname)) {
         $host = $previewHostname;
     }
@@ -122,7 +118,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
         }
 
-        if (!in_array($host, $platformHostnames) && System::getEnv('_APP_OPTIONS_ROUTER_PROTECTION', 'enabled') === 'enabled') {
+        if (!in_array($host, $platformHostnames)) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.', view: $errorView);
         }
 
@@ -204,6 +200,12 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             $deployment = $authorization->skip(fn () => $dbForProject->getDocument('deployments', $activeDeploymentId));
         }
 
+        if ($deployment->getAttribute('resourceType', '') === 'functions') {
+            $type = 'function';
+        } elseif ($deployment->getAttribute('resourceType', '') === 'sites') {
+            $type = 'site';
+        }
+
         if ($deployment->isEmpty()) {
             $resourceType = $rule->getAttribute('deploymentResourceType', '');
             $resourceId = $rule->getAttribute('deploymentResourceId', '');
@@ -213,14 +215,6 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             throw $exception;
         }
 
-        if ($deployment->getAttribute('resourceType', '') === 'functions') {
-            $type = 'function';
-        } elseif ($deployment->getAttribute('resourceType', '') === 'sites') {
-            $type = 'site';
-        } else {
-            throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Unknown deployment resource type', view: $errorView);
-        }
-
         $resource = $type === 'function' ?
             $authorization->skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
             $authorization->skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));
@@ -308,13 +302,13 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
         }
 
-        $body = $swooleRequest->getContent() ?: '';
+        $body = $swooleRequest->getContent() ?? '';
         $method = $swooleRequest->server['request_method'];
 
         $requestHeaders = $request->getHeaders();
 
         if ($resource->isEmpty() || !$resource->getAttribute('enabled')) {
-            if ($type === 'function') {
+            if ($type === 'functions') {
                 throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND, view: $errorView);
             } else {
                 throw new AppwriteException(AppwriteException::SITE_NOT_FOUND, view: $errorView);
@@ -336,6 +330,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         $runtime = match ($type) {
             'function' => $runtimes[$resource->getAttribute('runtime')] ?? null,
             'site' => $runtimes[$resource->getAttribute('buildRuntime')] ?? null,
+            default => null
         };
 
         // Static site enforced runtime
@@ -399,7 +394,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             'projectId' => $project->getId(),
             'scopes' => $resource->getAttribute('scopes', [])
         ]);
-        $headers['x-appwrite-key'] = API_KEY_EPHEMERAL . '_' . $jwtKey;
+        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $jwtKey;
         $headers['x-appwrite-trigger'] = 'http';
         $headers['x-appwrite-user-jwt'] = '';
 
@@ -464,10 +459,10 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         // V2 vars
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
-                'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'],
+                'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
                 'APPWRITE_FUNCTION_DATA' => $body,
-                'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'],
-                'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt']
+                'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
+                'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
             ]);
         }
 
@@ -683,8 +678,9 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
 
             if (\is_string($logs) && \strlen($logs) > $maxLogLength) {
                 $warningMessage = "[WARNING] Logs truncated. The output exceeded {$maxLogLength} characters.\n";
-                $maxContentLength = $maxLogLength - \strlen($warningMessage);
-                $logs = $warningMessage . \substr($logs, -$maxContentLength);
+                $warningLength = \strlen($warningMessage);
+                $maxContentLength = max(0, $maxLogLength - $warningLength);
+                $logs = $warningMessage . ($maxContentLength > 0 ? \substr($logs, -$maxContentLength) : '');
             }
 
             // Truncate errors if they exceed the limit
@@ -693,8 +689,9 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
 
             if (\is_string($errors) && \strlen($errors) > $maxErrorLength) {
                 $warningMessage = "[WARNING] Errors truncated. The output exceeded {$maxErrorLength} characters.\n";
-                $maxContentLength = $maxErrorLength - \strlen($warningMessage);
-                $errors = $warningMessage . \substr($errors, -$maxContentLength);
+                $warningLength = \strlen($warningMessage);
+                $maxContentLength = max(0, $maxErrorLength - $warningLength);
+                $errors = $warningMessage . ($maxContentLength > 0 ? \substr($errors, -$maxContentLength) : '');
             }
             /** Update execution status */
             $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
@@ -722,12 +719,14 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                 throw $th;
             }
         } finally {
-            $bus->dispatch(new ExecutionCompleted(
-                execution: $execution->getArrayCopy(),
-                project: $project->getArrayCopy(),
-                spec: $spec,
-                resource: $resource->getArrayCopy(),
-            ));
+            if ($type === 'function' || $type === 'site') {
+                $bus->dispatch(new ExecutionCompleted(
+                    execution: $execution->getArrayCopy(),
+                    project: $project->getArrayCopy(),
+                    spec: $spec,
+                    resource: $resource->getArrayCopy(),
+                ));
+            }
         }
 
         $execution->setAttribute('logs', '');
@@ -755,8 +754,11 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
 
             if (\is_array($values)) {
+                $count = 0;
                 foreach ($values as $value) {
-                    $response->addHeader($name, $value);
+                    $override = $count === 0;
+                    $response->addHeader($name, $value, override: $override);
+                    $count++;
                 }
             } else {
                 $response->addHeader($name, $values);
@@ -853,7 +855,7 @@ Http::init()
         /*
         * Appwrite Router
         */
-        $hostname = $request->getHostname();
+        $hostname = $request->getHostname() ?? '';
         $platformHostnames = $platform['hostnames'] ?? [];
         // Only run Router when external domain
         if (!\in_array($hostname, $platformHostnames) || !empty($previewHostname)) {
@@ -895,15 +897,6 @@ Http::init()
             if (version_compare($requestFormat, '1.9.0', '<')) {
                 $request->addFilter(new RequestV21());
             }
-            if (version_compare($requestFormat, '1.9.1', '<')) {
-                $request->addFilter(new RequestV22());
-            }
-            if (version_compare($requestFormat, '1.9.2', '<')) {
-                $request->addFilter(new RequestV23());
-            }
-            if (version_compare($requestFormat, '1.9.3', '<')) {
-                $request->addFilter(new RequestV24());
-            }
         }
 
         $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
@@ -911,16 +904,40 @@ Http::init()
             $locale->setDefault($localeParam);
         }
 
+        $origin = \parse_url($request->getOrigin($request->getReferer('')), PHP_URL_HOST);
+        $selfDomain = new Domain($request->getHostname());
+        $endDomain = new Domain((string)$origin);
+        Config::setParam(
+            'domainVerification',
+            ($selfDomain->getRegisterable() === $endDomain->getRegisterable()) &&
+                $endDomain->getRegisterable() !== ''
+        );
+
         $localHosts = ['localhost','localhost:'.$request->getPort()];
 
         $migrationHost = System::getEnv('_APP_MIGRATION_HOST');
         if (!empty($migrationHost)) {
-            // Treat the migration host like localhost because internal migration and
-            // CI traffic may use it before a public domain is configured.
             $localHosts[] = $migrationHost;
             $localHosts[] = $migrationHost.':'.$request->getPort();
         }
 
+        $isLocalHost = in_array($request->getHostname(), $localHosts);
+        $isIpAddress = filter_var($request->getHostname(), FILTER_VALIDATE_IP) !== false;
+
+        $isConsoleProject = $project->getAttribute('$id', '') === 'console';
+        $isConsoleRootSession = System::getEnv('_APP_CONSOLE_ROOT_SESSION', 'disabled') === 'enabled';
+
+        Config::setParam(
+            'cookieDomain',
+            $isLocalHost || $isIpAddress
+                ? null
+                : (
+                    $isConsoleProject && $isConsoleRootSession
+                    ? '.' . $selfDomain->getRegisterable()
+                    : '.' . $request->getHostname()
+                )
+        );
+
         $warnings = [];
 
         /*
@@ -928,15 +945,6 @@ Http::init()
          */
         $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
         if ($responseFormat) {
-            if (version_compare($responseFormat, '1.9.3', '<')) {
-                $response->addFilter(new ResponseV24());
-            }
-            if (version_compare($responseFormat, '1.9.2', '<')) {
-                $response->addFilter(new ResponseV23());
-            }
-            if (version_compare($responseFormat, '1.9.1', '<')) {
-                $response->addFilter(new ResponseV22());
-            }
             if (version_compare($responseFormat, '1.9.0', '<')) {
                 $response->addFilter(new ResponseV21());
             }
@@ -1027,11 +1035,11 @@ Http::init()
    ->inject('request')
    ->inject('console')
    ->inject('dbForPlatform')
-   ->inject('publisherForCertificates')
+   ->inject('queueForCertificates')
    ->inject('platform')
     ->inject('authorization')
     ->inject('certifiedDomains')
-   ->action(function (Request $request, Document $console, Database $dbForPlatform, Certificate $publisherForCertificates, array $platform, Authorization $authorization, Table $certifiedDomains) {
+   ->action(function (Request $request, Document $console, Database $dbForPlatform, Certificate $queueForCertificates, array $platform, Authorization $authorization, Table $certifiedDomains) {
        $hostname = $request->getHostname();
        $platformHostnames = $platform['hostnames'] ?? [];
 
@@ -1057,7 +1065,7 @@ Http::init()
        }
 
        // 4. Check/create rule (requires DB access)
-       $authorization->skip(function () use ($dbForPlatform, $domain, $console, $publisherForCertificates, $certifiedDomains) {
+       $authorization->skip(function () use ($dbForPlatform, $domain, $console, $queueForCertificates, $certifiedDomains) {
            try {
                // TODO: (@Meldiron) Remove after 1.7.x migration
                $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
@@ -1113,11 +1121,10 @@ Http::init()
                $dbForPlatform->createDocument('rules', $document);
 
                Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
-               $publisherForCertificates->enqueue(new \Appwrite\Event\Message\Certificate(
-                   project: $console,
-                   domain: $document,
-                   skipRenewCheck: true,
-               ));
+               $queueForCertificates
+                   ->setDomain($document)
+                   ->setSkipRenewCheck(true)
+                   ->trigger();
            } catch (Duplicate $e) {
                Console::info('Certificate already exists');
            } finally {
@@ -1190,6 +1197,15 @@ Http::error()
     ->inject('devKey')
     ->inject('authorization')
     ->action(function (Throwable $error, Http $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, Bus $bus, Document $devKey, Authorization $authorization) {
+        $trace = $error->getTrace();
+
+        foreach (array_slice($trace, 0, 100) as $index => $traceEntry) {
+            $file = isset($traceEntry['file']) ? $traceEntry['file'] : '[internal function]';
+            $line = isset($traceEntry['line']) ? $traceEntry['line'] : '';
+            $function = isset($traceEntry['function']) ? $traceEntry['function'] : '';
+            Console::error("[$index] $file : $line -> $function()");
+        }
+
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
         $route = $utopia->getRoute();
         $class = \get_class($error);
@@ -1199,7 +1215,9 @@ Http::error()
         $line = $error->getLine();
         $trace = $error->getTrace();
 
-        Span::error($error);
+        if (php_sapi_name() === 'cli') {
+            Span::error($error);
+        }
 
         switch ($class) {
             case Utopia\Http\Exception::class:
@@ -1441,7 +1459,6 @@ Http::error()
             case 402: // Error allowed publicly
             case 403: // Error allowed publicly
             case 404: // Error allowed publicly
-            case 405: // Error allowed publicly
             case 408: // Error allowed publicly
             case 409: // Error allowed publicly
             case 412: // Error allowed publicly
@@ -1483,9 +1500,7 @@ Http::error()
         try {
             $cors = $utopia->getResource('cors');
             foreach ($cors->headers($request->getOrigin()) as $name => $value) {
-                $response
-                    ->removeHeader($name)
-                    ->addHeader($name, $value);
+                $response->addHeader($name, $value, override: true);
             }
         } catch (Throwable) {
             // Degrade gracefully - error response without CORS is no worse than before.
@@ -1512,9 +1527,9 @@ Http::error()
                 ->setParam('development', Http::isDevelopment())
                 ->setParam('projectName', $project->getAttribute('name'))
                 ->setParam('projectURL', $project->getAttribute('url'))
-                ->setParam('message', $output['message'])
-                ->setParam('type', $output['type'])
-                ->setParam('code', $output['code'])
+                ->setParam('message', $output['message'] ?? '')
+                ->setParam('type', $output['type'] ?? '')
+                ->setParam('code', $output['code'] ?? '')
                 ->setParam('trace', $output['trace'] ?? [])
                 ->setParam('exception', $error);
 
@@ -1629,7 +1644,7 @@ Http::get('/.well-known/acme-challenge/*')
             throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND, 'Unknown path');
         }
 
-        if (\substr($absolute, 0, \strlen($base)) !== $base) {
+        if (!\substr($absolute, 0, \strlen($base)) === $base) {
             throw new AppwriteException(AppwriteException::GENERAL_UNAUTHORIZED_SCOPE, 'Invalid path');
         }
 
@@ -1708,7 +1723,7 @@ Http::get('/_appwrite/authorize')
     ->inject('previewHostname')
     ->action(function (Request $request, Response $response, string $previewHostname) {
 
-        $host = $request->getHostname();
+        $host = $request->getHostname() ?? '';
         if (!empty($previewHostname)) {
             $host = $previewHostname;
         }

app/controllers/mock.php

@@ -251,7 +251,7 @@ Http::get('/v1/mock/github/callback')
         $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
         $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
         $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
-        $owner = $github->getOwnerName($providerInstallationId);
+        $owner = $github->getOwnerName($providerInstallationId) ?? '';
 
         $projectInternalId = $project->getSequence();
 

app/controllers/shared/api.php

@@ -3,17 +3,15 @@
 use Appwrite\Auth\Key;
 use Appwrite\Auth\MFA\Type\TOTP;
 use Appwrite\Bus\Events\RequestCompleted;
+use Appwrite\Event\Audit;
 use Appwrite\Event\Build;
-use Appwrite\Event\Context\Audit as AuditContext;
 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\Message\Audit as AuditMessage;
 use Appwrite\Event\Message\Usage as UsageMessage;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\Publisher\Audit;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\Webhook;
@@ -39,14 +37,13 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Database\Validator\Roles;
 use Utopia\Http\Http;
-use Utopia\Span\Span;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Validator\WhiteList;
 
-$parseLabel = function (string $label, array $responsePayload, array $requestParams, User $user, Document $project) {
+$parseLabel = function (string $label, array $responsePayload, array $requestParams, User $user) {
     preg_match_all('/{(.*?)}/', $label, $matches);
-    foreach ($matches[1] as $pos => $match) {
+    foreach ($matches[1] ?? [] as $pos => $match) {
         $find = $matches[0][$pos];
         $parts = explode('.', $match);
 
@@ -54,12 +51,11 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
             throw new Exception(Exception::GENERAL_SERVER_ERROR, "The server encountered an error while parsing the label: $label. Please create an issue on GitHub to allow us to investigate further https://github.com/appwrite/appwrite/issues/new/choose");
         }
 
-        $namespace = $parts[0];
-        $replace = $parts[1];
+        $namespace = $parts[0] ?? '';
+        $replace = $parts[1] ?? '';
 
         $params = match ($namespace) {
             'user' => (array) $user,
-            'project' => $project->getArrayCopy(),
             'request' => $requestParams,
             default => $responsePayload,
         };
@@ -91,7 +87,7 @@ Http::init()
     ->inject('request')
     ->inject('dbForPlatform')
     ->inject('dbForProject')
-    ->inject('auditContext')
+    ->inject('queueForAudits')
     ->inject('project')
     ->inject('user')
     ->inject('session')
@@ -100,11 +96,8 @@ Http::init()
     ->inject('team')
     ->inject('apiKey')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, AuditContext $auditContext, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
+    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
         $route = $utopia->getRoute();
-        if ($route === null) {
-            throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
-        }
 
         /**
          * Handle user authentication and session validation.
@@ -183,21 +176,20 @@ Http::init()
             // Handle special app role case
             if ($apiKey->getRole() === User::ROLE_APPS) {
                 // Disable authorization checks for project API keys
-                // Dynamic supported for backwards compatibility
-                if (($apiKey->getType() === API_KEY_STANDARD || $apiKey->getType() === API_KEY_EPHEMERAL || $apiKey->getType() === 'dynamic') && $apiKey->getProjectId() === $project->getId()) {
+                if (($apiKey->getType() === API_KEY_STANDARD || $apiKey->getType() === API_KEY_DYNAMIC) && $apiKey->getProjectId() === $project->getId()) {
                     $authorization->setDefaultStatus(false);
                 }
 
                 $user = new User([
                     '$id' => '',
                     'status' => true,
-                    'type' => ACTIVITY_TYPE_KEY_PROJECT,
+                    'type' => ACTIVITY_TYPE_APP,
                     'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
                     'password' => '',
                     'name' => $apiKey->getName(),
                 ]);
 
-                $auditContext->user = $user;
+                $queueForAudits->setUser($user);
             }
 
             // For standard keys, update last accessed time
@@ -261,13 +253,7 @@ Http::init()
                     }
                 }
 
-                $userClone = clone $user;
-                $userClone->setAttribute('type', match ($apiKey->getType()) {
-                    API_KEY_STANDARD => ACTIVITY_TYPE_KEY_PROJECT,
-                    API_KEY_ACCOUNT => ACTIVITY_TYPE_KEY_ACCOUNT,
-                    default => ACTIVITY_TYPE_KEY_ORGANIZATION,
-                });
-                $auditContext->user = $userClone;
+                $queueForAudits->setUser($user);
             }
 
             // Apply permission
@@ -386,7 +372,7 @@ Http::init()
         }
 
         // Step 6: Update project and user last activity
-        if ($project->getId() !== 'console') {
+        if (! $project->isEmpty() && $project->getId() !== 'console') {
             $accessedAt = $project->getAttribute('accessedAt', 0);
             if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
                 $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), new Document([
@@ -416,6 +402,9 @@ Http::init()
         }
 
         // Steps 7-9: Access Control - Method, Namespace and Scope Validation
+        /**
+         * @var ?Method $method
+         */
         $method = $route->getLabel('sdk', false);
 
         // Take the first method if there's more than one,
@@ -425,7 +414,7 @@ Http::init()
         }
 
         if (! empty($method)) {
-            $namespace = \strtolower($method->getNamespace());
+            $namespace = $method->getNamespace();
 
             if (
                 array_key_exists($namespace, $project->getAttribute('services', []))
@@ -436,15 +425,6 @@ Http::init()
             }
         }
 
-        // Step 8b: Check REST protocol status
-        if (
-            array_key_exists('rest', $project->getAttribute('apis', []))
-            && ! $project->getAttribute('apis', [])['rest']
-            && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
-        ) {
-            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
-        }
-
         // Step 9: Validate scope permissions
         $allowed = (array) $route->getLabel('scope', 'none');
         if (empty(\array_intersect($allowed, $scopes))) {
@@ -486,7 +466,7 @@ Http::init()
     ->inject('user')
     ->inject('queueForEvents')
     ->inject('queueForMessaging')
-    ->inject('auditContext')
+    ->inject('queueForAudits')
     ->inject('queueForDeletes')
     ->inject('queueForDatabase')
     ->inject('queueForBuilds')
@@ -503,16 +483,12 @@ Http::init()
     ->inject('telemetry')
     ->inject('platform')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Messaging $queueForMessaging, AuditContext $auditContext, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Context $usage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Context $usage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {
 
         $response->setUser($user);
         $request->setUser($user);
 
         $route = $utopia->getRoute();
-        if ($route === null) {
-            throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
-        }
-
         $path = $route->getMatchedPath();
         $databaseType = match (true) {
             str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
@@ -520,6 +496,14 @@ Http::init()
             default => '',
         };
 
+        if (
+            array_key_exists('rest', $project->getAttribute('apis', []))
+            && ! $project->getAttribute('apis', [])['rest']
+            && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+        ) {
+            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
+        }
+
         /*
         * Abuse Check
         */
@@ -596,21 +580,20 @@ Http::init()
             ->setProject($project)
             ->setUser($user);
 
-        $auditContext->mode = $mode;
-        $auditContext->userAgent = $request->getUserAgent('');
-        $auditContext->ip = $request->getIP();
-        $auditContext->hostname = $request->getHostname();
-        $auditContext->event = $route->getLabel('audits.event', '');
-        $auditContext->project = $project;
+        $queueForAudits
+            ->setMode($mode)
+            ->setUserAgent($request->getUserAgent(''))
+            ->setIP($request->getIP())
+            ->setHostname($request->getHostname())
+            ->setEvent($route->getLabel('audits.event', ''))
+            ->setProject($project);
 
         /* If a session exists, use the user associated with the session */
         if (! $user->isEmpty()) {
             $userClone = clone $user;
             // $user doesn't support `type` and can cause unintended effects.
-            if (empty($user->getAttribute('type'))) {
-                $userClone->setAttribute('type', $mode === APP_MODE_ADMIN ? ACTIVITY_TYPE_ADMIN : ACTIVITY_TYPE_USER);
-            }
-            $auditContext->user = $userClone;
+            $userClone->setAttribute('type', ACTIVITY_TYPE_USER);
+            $queueForAudits->setUser($userClone);
         }
 
         /* Auto-set projects */
@@ -634,7 +617,6 @@ Http::init()
             $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $user->isPrivileged($authorization->getRoles());
 
             $key = $request->cacheIdentifier();
-            Span::add('storage.cache.key', $key);
             $cacheLog = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
             $cache = new Cache(
                 new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
@@ -644,7 +626,7 @@ Http::init()
 
             if (! empty($data) && ! $cacheLog->isEmpty()) {
                 $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
-                $type = $parts[0];
+                $type = $parts[0] ?? null;
 
                 if ($type === 'bucket' && (! $isImageTransformation || ! $isDisabled)) {
                     $bucketId = $parts[1] ?? null;
@@ -683,8 +665,6 @@ Http::init()
                     if ($file->isEmpty()) {
                         throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                     }
-                    Span::add('storage.bucket.id', $bucketId);
-                    Span::add('storage.file.id', $fileId);
                     // Do not update transformedAt if it's a console user
                     if (! $user->isPrivileged($authorization->getRoles())) {
                         $transformedAt = $file->getAttribute('transformedAt', '');
@@ -697,27 +677,16 @@ Http::init()
                     }
                 }
 
-                $accessedAt = $cacheLog->getAttribute('accessedAt', '');
-                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
-                    $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), new Document([
-                        'accessedAt' => DateTime::now(),
-                    ])));
-                    // Refresh the filesystem file's mtime so TTL-based expiry in cache->load() stays valid
-                    $cache->save($key, $data);
-                }
-
                 $response
                     ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                     ->addHeader('X-Appwrite-Cache', 'hit')
                     ->setContentType($cacheLog->getAttribute('mimeType'));
                 $storageCacheOperationsCounter->add(1, ['result' => 'hit']);
                 if (! $isImageTransformation || ! $isDisabled) {
-                    Span::add('storage.cache.hit', true);
                     $response->send($data);
                 }
             } else {
                 $storageCacheOperationsCounter->add(1, ['result' => 'miss']);
-                Span::add('storage.cache.hit', false);
                 $response
                     ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
                     ->addHeader('Pragma', 'no-cache')
@@ -755,12 +724,7 @@ Http::shutdown()
     ->inject('project')
     ->inject('dbForProject')
     ->action(function (Http $utopia, Request $request, Response $response, Document $project, Database $dbForProject) {
-        $sessionLimit = $project->getAttribute('auths', [])['maxSessions'] ?? 0;
-
-        if ($sessionLimit === 0) {
-            return;
-        }
-
+        $sessionLimit = $project->getAttribute('auths', [])['maxSessions'] ?? APP_LIMIT_USER_SESSIONS_DEFAULT;
         $session = $response->getPayload();
         $userId = $session['userId'] ?? '';
         if (empty($userId)) {
@@ -794,8 +758,7 @@ Http::shutdown()
     ->inject('project')
     ->inject('user')
     ->inject('queueForEvents')
-    ->inject('auditContext')
-    ->inject('publisherForAudits')
+    ->inject('queueForAudits')
     ->inject('usage')
     ->inject('publisherForUsage')
     ->inject('queueForDeletes')
@@ -811,8 +774,7 @@ Http::shutdown()
     ->inject('eventProcessor')
     ->inject('bus')
     ->inject('apiKey')
-    ->inject('mode')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, AuditContext $auditContext, Audit $publisherForAudits, Context $usage, UsagePublisher $publisherForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey, string $mode) use ($parseLabel) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Audit $queueForAudits, Context $usage, UsagePublisher $publisherForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey) use ($parseLabel) {
 
         $responsePayload = $response->getPayload();
 
@@ -905,20 +867,18 @@ Http::shutdown()
          */
         $pattern = $route->getLabel('audits.resource', null);
         if (! empty($pattern)) {
-            $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user, $project);
+            $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
             if (! empty($resource) && $resource !== $pattern) {
-                $auditContext->resource = $resource;
+                $queueForAudits->setResource($resource);
             }
         }
 
         if (! $user->isEmpty()) {
             $userClone = clone $user;
             // $user doesn't support `type` and can cause unintended effects.
-            if (empty($user->getAttribute('type'))) {
-                $userClone->setAttribute('type', $mode === APP_MODE_ADMIN ? ACTIVITY_TYPE_ADMIN : ACTIVITY_TYPE_USER);
-            }
-            $auditContext->user = $userClone;
-        } elseif ($auditContext->user === null || $auditContext->user->isEmpty()) {
+            $userClone->setAttribute('type', ACTIVITY_TYPE_USER);
+            $queueForAudits->setUser($userClone);
+        } elseif ($queueForAudits->getUser() === null || $queueForAudits->getUser()->isEmpty()) {
             /**
              * User in the request is empty, and no user was set for auditing previously.
              * This indicates:
@@ -936,21 +896,24 @@ Http::shutdown()
                 'name' => 'Guest',
             ]);
 
-            $auditContext->user = $user;
+            $queueForAudits->setUser($user);
         }
 
-        $auditUser = $auditContext->user;
-        if (! empty($auditContext->resource) && ! $auditUser->isEmpty()) {
+        if (! empty($queueForAudits->getResource()) && ! $queueForAudits->getUser()->isEmpty()) {
             /**
              * audits.payload is switched to default true
              * in order to auto audit payload for all endpoints
              */
             $pattern = $route->getLabel('audits.payload', true);
             if (! empty($pattern)) {
-                $auditContext->payload = $responsePayload;
+                $queueForAudits->setPayload($responsePayload);
             }
 
-            $publisherForAudits->enqueue(AuditMessage::fromContext($auditContext));
+            foreach ($queueForEvents->getParams() as $key => $value) {
+                $queueForAudits->setParam($key, $value);
+            }
+
+            $queueForAudits->trigger();
         }
 
         if (! empty($queueForDeletes->getType())) {
@@ -974,16 +937,15 @@ Http::shutdown()
         if ($useCache) {
             $resource = $resourceType = null;
             $data = $response->getPayload();
-            $statusCode = $response->getStatusCode();
-            if (! empty($data['payload']) && $statusCode >= 200 && $statusCode < 300) {
+            if (! empty($data['payload'])) {
                 $pattern = $route->getLabel('cache.resource', null);
                 if (! empty($pattern)) {
-                    $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user, $project);
+                    $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                 }
 
                 $pattern = $route->getLabel('cache.resourceType', null);
                 if (! empty($pattern)) {
-                    $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user, $project);
+                    $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                 }
 
                 $cache = new Cache(

app/http.php

@@ -1,13 +1,16 @@
 <?php
 
-require_once __DIR__ . '/init.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/init/span.php';
 
-$registerRequestResources = require __DIR__ . '/init/resources/request.php';
+global $register;
 
 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 Swoole\Table;
 use Swoole\Timer;
@@ -26,7 +29,6 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
-use Utopia\Http\Adapter\Swoole\Server;
 use Utopia\Http\Files;
 use Utopia\Http\Http;
 use Utopia\Logger\Log;
@@ -47,33 +49,18 @@ $certifiedDomains = new Table(100_000);
 $certifiedDomains->column('value', Table::TYPE_INT, 1);
 $certifiedDomains->create();
 
-global $container;
-$container->set('riskyDomains', fn () => $riskyDomains);
-$container->set('certifiedDomains', fn () => $certifiedDomains);
-$container->set('pools', function ($register) {
-    return $register->get('pools');
-}, ['register']);
+Http::setResource('riskyDomains', fn () => $riskyDomains);
+Http::setResource('certifiedDomains', fn () => $certifiedDomains);
+
+$http = new Server(
+    host: "0.0.0.0",
+    port: System::getEnv('PORT', 80),
+    mode: SWOOLE_PROCESS,
+);
 
 $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
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 
-$swooleAdapter = new Server(
-    host: "0.0.0.0",
-    port: System::getEnv('PORT', 80),
-    settings: [
-        Constant::OPTION_WORKER_NUM => $totalWorkers,
-        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
-        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
-        Constant::OPTION_HTTP_COMPRESSION => false,
-        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
-        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
-        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
-    ],
-    container: $container,
-);
-
-$http = $swooleAdapter->getServer();
-
 /**
  * Assigns HTTP requests to worker threads by analyzing its payload/content.
  *
@@ -82,16 +69,16 @@ $http = $swooleAdapter->getServer();
  * riskier tasks to a dedicated worker subset. Prefers idle workers, with fallback to random selection if necessary.
  * doc: https://openswoole.com/docs/modules/swoole-server/configuration#dispatch_func
  *
- * @param \Swoole\Http\Server $server Swoole server instance.
+ * @param Server $server Swoole server instance.
  * @param int $fd client ID
  * @param int $type the type of data and its current state
  * @param string|null $data Request content for categorization.
  * @global int $totalThreads Total number of workers.
  * @return int Chosen worker ID for the request.
  */
-function dispatch(\Swoole\Http\Server $server, int $fd, int $type, $data = null): int
+function dispatch(Server $server, int $fd, int $type, $data = null): int
 {
-    $resolveWorkerId = function (\Swoole\Http\Server $server, $data = null) {
+    $resolveWorkerId = function (Server $server, $data = null) {
         global $totalWorkers, $riskyDomains;
 
         // If data is not set we can send request to any worker
@@ -174,6 +161,18 @@ function dispatch(\Swoole\Http\Server $server, int $fd, int $type, $data = null)
     return $workerId;
 }
 
+
+$http
+    ->set([
+        Constant::OPTION_WORKER_NUM => $totalWorkers,
+        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
+        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
+        Constant::OPTION_HTTP_COMPRESSION => false,
+        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
+        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
+        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
+    ]);
+
 $http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
 });
 
@@ -190,14 +189,16 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server) {
     Console::success('Reload completed...');
 });
 
-$container->set('bus', function ($register) use ($swooleAdapter) {
-    return $register->get('bus')->setResolver(fn (string $name) => $swooleAdapter->getContainer()->get($name));
-}, ['register']);
+Http::setResource('bus', function ($register, $utopia) {
+    return $register->get('bus')->setResolver(fn (string $name) => $utopia->getResource($name));
+}, ['register', 'utopia']);
 
 include __DIR__ . '/controllers/general.php';
 
 function createDatabase(Http $app, string $resourceKey, string $dbName, array $collections, mixed $pools, ?callable $extraSetup = null): void
 {
+    $max = 15;
+    $sleep = 2;
     $max = 15;
     $sleep = 2;
     $attempts = 0;
@@ -288,13 +289,13 @@ function createDatabase(Http $app, string $resourceKey, string $dbName, array $c
     Span::current()?->finish();
 }
 
-$http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorkers, $swooleAdapter) {
-    $app = new Http($swooleAdapter, 'UTC');
+$http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $totalWorkers, $register) {
+    $app = new Http('UTC');
 
-    /** @var \Utopia\Pools\Group $pools */
-    $pools = $app->getResource('pools');
-
-    go(function () use ($app, $pools) {
+    go(function () use ($register, $app) {
+        $pools = $register->get('pools');
+        /** @var \Utopia\Pools\Group $pools */
+        Http::setResource('pools', fn () => $pools);
 
         /** @var array $collections */
         $collections = Config::getParam('collections', []);
@@ -413,19 +414,27 @@ $http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorke
         $projectCollections = $collections['projects'];
 
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+        $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
+        $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
+
         $documentsSharedTables = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''));
+        $documentsSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1', ''));
+        $documentsSharedTablesV2 = \array_diff($documentsSharedTables, $documentsSharedTablesV1);
+
         $vectorSharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''));
+        $vectorSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES_V1', ''));
+        $vectorSharedTablesV2 = \array_diff($vectorSharedTables, $vectorSharedTablesV1);
 
         $cache = $app->getResource('cache');
 
-        // All shared tables pools that need project metadata collections
-        $allSharedTables = \array_values(\array_unique(\array_filter([
-            ...$sharedTables,
-            ...$documentsSharedTables,
-            ...$vectorSharedTables,
+        // All shared tables V2 pools that need project metadata collections
+        $sharedTablesV2All = \array_values(\array_unique(\array_filter([
+            ...$sharedTablesV2,
+            ...$documentsSharedTablesV2,
+            ...$vectorSharedTablesV2,
         ])));
 
-        foreach ($allSharedTables as $hostname) {
+        foreach ($sharedTablesV2All as $hostname) {
             Span::init('database.setup');
             Span::add('database.hostname', $hostname);
 
@@ -502,11 +511,14 @@ $http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorke
     });
 });
 
-$swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swooleAdapter, $registerRequestResources) {
+$http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register, $files) {
     Span::init('http.request');
 
-    $request = new Request($utopiaRequest->getSwooleRequest());
-    $response = new Response($utopiaResponse->getSwooleResponse());
+    Http::setResource('swooleRequest', fn () => $swooleRequest);
+    Http::setResource('swooleResponse', fn () => $swooleResponse);
+
+    $request = new Request($swooleRequest);
+    $response = new Response($swooleResponse);
 
     Span::add('http.method', $request->getMethod());
 
@@ -522,19 +534,13 @@ $swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files
         return;
     }
 
-    $requestContainer = $swooleAdapter->getContainer();
-    $requestContainer->set('container', fn () => $requestContainer);
-    $requestContainer->set('request', fn () => $request);
-    $requestContainer->set('response', fn () => $response);
-
-    $app = new Http($swooleAdapter, 'UTC');
-    $requestContainer->set('utopia', fn () => $app);
-
-    $registerRequestResources($requestContainer);
-
+    $app = new Http('UTC');
     $app->setCompression(System::getEnv('_APP_COMPRESSION_ENABLED', 'enabled') === 'enabled');
     $app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB
 
+    $pools = $register->get('pools');
+    Http::setResource('pools', fn () => $pools);
+
     try {
         $authorization = $app->getResource('authorization');
 
@@ -618,7 +624,6 @@ $swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files
             }
         }
 
-        $swooleResponse = $utopiaResponse->getSwooleResponse();
         $swooleResponse->setStatusCode(500);
 
         $output = ((Http::isDevelopment())) ? [
@@ -642,10 +647,11 @@ $swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files
 });
 
 // Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on(Constant::EVENT_TASK, function () use ($swooleAdapter) {
+$http->on(Constant::EVENT_TASK, function () use ($register) {
     $lastSyncUpdate = null;
-
-    $app = new Http($swooleAdapter, 'UTC');
+    $pools = $register->get('pools');
+    Http::setResource('pools', fn () => $pools);
+    $app = new Http('UTC');
 
     /** @var Utopia\Database\Database $dbForPlatform */
     $dbForPlatform = $app->getResource('dbForPlatform');
@@ -720,4 +726,4 @@ $http->on(Constant::EVENT_TASK, function () use ($swooleAdapter) {
     });
 });
 
-$swooleAdapter->start();
+$http->start();

app/init/configs.php

@@ -12,7 +12,7 @@ Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php', $configAdapt
 Config::load('template-runtimes', __DIR__ . '/../config/template-runtimes.php', $configAdapter);
 Config::load('events', __DIR__ . '/../config/events.php', $configAdapter);
 Config::load('auth', __DIR__ . '/../config/auth.php', $configAdapter);
-Config::load('protocols', __DIR__ . '/../config/protocols.php', $configAdapter);
+Config::load('apis', __DIR__ . '/../config/apis.php', $configAdapter);  // List of APIs
 Config::load('errors', __DIR__ . '/../config/errors.php', $configAdapter);
 Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php', $configAdapter);
 Config::load('sdks', __DIR__ . '/../config/sdks.php', $configAdapter);

app/init/constants.php

@@ -1,7 +1,6 @@
 <?php
 
 use Appwrite\Platform\Modules\Compute\Specification;
-use Utopia\System\System;
 
 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
@@ -25,6 +24,9 @@ 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
@@ -44,8 +46,8 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_RESOURCE_TOKEN_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 4324;
-const APP_VERSION_STABLE = '1.9.3';
+const APP_CACHE_BUSTER = 4321;
+const APP_VERSION_STABLE = '1.9.0';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -154,12 +156,9 @@ const SESSION_PROVIDER_SERVER = 'server';
 /**
  * Activity associated with user or the app.
  */
+const ACTIVITY_TYPE_APP = 'app';
 const ACTIVITY_TYPE_USER = 'user';
-const ACTIVITY_TYPE_ADMIN = 'admin';
 const ACTIVITY_TYPE_GUEST = 'guest';
-const ACTIVITY_TYPE_KEY_PROJECT = 'keyProject';
-const ACTIVITY_TYPE_KEY_ACCOUNT = 'keyAccount';
-const ACTIVITY_TYPE_KEY_ORGANIZATION = 'keyOrganization';
 
 /**
  * MFA
@@ -188,7 +187,7 @@ const BUILD_TYPE_RETRY = 'retry';
 
 // Deletion Types
 
-\define('ENABLE_EXECUTIONS_LIMIT_ON_ROUTE', System::getEnv('_APP_EXECUTIONS_LIMIT_ON_ROUTE', 'disabled') === 'enabled');
+const ENABLE_EXECUTIONS_LIMIT_ON_ROUTE = false;
 
 const DELETE_TYPE_DATABASES = 'databases';
 const DELETE_TYPE_DOCUMENT = 'document';
@@ -244,7 +243,6 @@ const APP_AUTH_TYPE_KEY = 'Key';
 const APP_AUTH_TYPE_ADMIN = 'Admin';
 // Response related
 const MAX_OUTPUT_CHUNK_SIZE = 10 * 1024 * 1024; // 10MB
-const APP_LIMIT_UPLOAD_CHUNK_SIZE = 5 * 1024 * 1024; // 5MB
 const APP_FUNCTION_LOG_LENGTH_LIMIT = 1000000;
 const APP_FUNCTION_ERROR_LENGTH_LIMIT = 1000000;
 // Function headers
@@ -256,7 +254,7 @@ const MESSAGE_TYPE_SMS = 'sms';
 const MESSAGE_TYPE_PUSH = 'push';
 // API key types
 const API_KEY_STANDARD = 'standard';
-const API_KEY_EPHEMERAL = 'ephemeral';
+const API_KEY_DYNAMIC = 'dynamic';
 const API_KEY_ORGANIZATION = 'organization';
 const API_KEY_ACCOUNT = 'account';
 // Usage metrics

app/init/database/filters.php

@@ -1,6 +1,5 @@
 <?php
 
-use Appwrite\Network\Platform;
 use Appwrite\OpenSSL\OpenSSL;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -124,17 +123,11 @@ Database::addFilter(
         return;
     },
     function (mixed $value, Document $document, Database $database) {
-        $platforms = $database->getAuthorization()->skip(fn () => $database
+        return $database->getAuthorization()->skip(fn () => $database
             ->find('platforms', [
                 Query::equal('projectInternalId', [$document->getSequence()]),
                 Query::limit(APP_LIMIT_SUBQUERY),
             ]));
-
-        foreach ($platforms as $platform) {
-            $platform->setAttribute('type', Platform::mapDeprecatedType($platform->getAttribute('type')));
-        }
-
-        return $platforms;
     }
 );
 

app/init/models.php

@@ -56,11 +56,6 @@ use Appwrite\Utopia\Response\Model\ColumnString;
 use Appwrite\Utopia\Response\Model\ColumnText;
 use Appwrite\Utopia\Response\Model\ColumnURL;
 use Appwrite\Utopia\Response\Model\ColumnVarchar;
-use Appwrite\Utopia\Response\Model\ConsoleKeyScope;
-use Appwrite\Utopia\Response\Model\ConsoleKeyScopeList;
-use Appwrite\Utopia\Response\Model\ConsoleOAuth2Provider;
-use Appwrite\Utopia\Response\Model\ConsoleOAuth2ProviderList;
-use Appwrite\Utopia\Response\Model\ConsoleOAuth2ProviderParameter;
 use Appwrite\Utopia\Response\Model\ConsoleVariables;
 use Appwrite\Utopia\Response\Model\Continent;
 use Appwrite\Utopia\Response\Model\Country;
@@ -73,7 +68,6 @@ use Appwrite\Utopia\Response\Model\DetectionVariable;
 use Appwrite\Utopia\Response\Model\DevKey;
 use Appwrite\Utopia\Response\Model\Document as ModelDocument;
 use Appwrite\Utopia\Response\Model\Embedding;
-use Appwrite\Utopia\Response\Model\EphemeralKey;
 use Appwrite\Utopia\Response\Model\Error;
 use Appwrite\Utopia\Response\Model\ErrorDev;
 use Appwrite\Utopia\Response\Model\Execution;
@@ -111,72 +105,14 @@ use Appwrite\Utopia\Response\Model\MigrationReport;
 use Appwrite\Utopia\Response\Model\Mock;
 use Appwrite\Utopia\Response\Model\MockNumber;
 use Appwrite\Utopia\Response\Model\None;
-use Appwrite\Utopia\Response\Model\OAuth2Amazon;
-use Appwrite\Utopia\Response\Model\OAuth2Apple;
-use Appwrite\Utopia\Response\Model\OAuth2Auth0;
-use Appwrite\Utopia\Response\Model\OAuth2Authentik;
-use Appwrite\Utopia\Response\Model\OAuth2Autodesk;
-use Appwrite\Utopia\Response\Model\OAuth2Bitbucket;
-use Appwrite\Utopia\Response\Model\OAuth2Bitly;
-use Appwrite\Utopia\Response\Model\OAuth2Box;
-use Appwrite\Utopia\Response\Model\OAuth2Dailymotion;
-use Appwrite\Utopia\Response\Model\OAuth2Discord;
-use Appwrite\Utopia\Response\Model\OAuth2Disqus;
-use Appwrite\Utopia\Response\Model\OAuth2Dropbox;
-use Appwrite\Utopia\Response\Model\OAuth2Etsy;
-use Appwrite\Utopia\Response\Model\OAuth2Facebook;
-use Appwrite\Utopia\Response\Model\OAuth2Figma;
-use Appwrite\Utopia\Response\Model\OAuth2FusionAuth;
-use Appwrite\Utopia\Response\Model\OAuth2GitHub;
-use Appwrite\Utopia\Response\Model\OAuth2Gitlab;
-use Appwrite\Utopia\Response\Model\OAuth2Google;
-use Appwrite\Utopia\Response\Model\OAuth2Keycloak;
-use Appwrite\Utopia\Response\Model\OAuth2Kick;
-use Appwrite\Utopia\Response\Model\OAuth2Linkedin;
-use Appwrite\Utopia\Response\Model\OAuth2Microsoft;
-use Appwrite\Utopia\Response\Model\OAuth2Notion;
-use Appwrite\Utopia\Response\Model\OAuth2Oidc;
-use Appwrite\Utopia\Response\Model\OAuth2Okta;
-use Appwrite\Utopia\Response\Model\OAuth2Paypal;
-use Appwrite\Utopia\Response\Model\OAuth2Podio;
-use Appwrite\Utopia\Response\Model\OAuth2ProviderList;
-use Appwrite\Utopia\Response\Model\OAuth2Salesforce;
-use Appwrite\Utopia\Response\Model\OAuth2Slack;
-use Appwrite\Utopia\Response\Model\OAuth2Spotify;
-use Appwrite\Utopia\Response\Model\OAuth2Stripe;
-use Appwrite\Utopia\Response\Model\OAuth2Tradeshift;
-use Appwrite\Utopia\Response\Model\OAuth2Twitch;
-use Appwrite\Utopia\Response\Model\OAuth2WordPress;
-use Appwrite\Utopia\Response\Model\OAuth2X;
-use Appwrite\Utopia\Response\Model\OAuth2Yahoo;
-use Appwrite\Utopia\Response\Model\OAuth2Yandex;
-use Appwrite\Utopia\Response\Model\OAuth2Zoho;
-use Appwrite\Utopia\Response\Model\OAuth2Zoom;
 use Appwrite\Utopia\Response\Model\Phone;
-use Appwrite\Utopia\Response\Model\PlatformAndroid;
-use Appwrite\Utopia\Response\Model\PlatformApple;
-use Appwrite\Utopia\Response\Model\PlatformLinux;
-use Appwrite\Utopia\Response\Model\PlatformList;
-use Appwrite\Utopia\Response\Model\PlatformWeb;
-use Appwrite\Utopia\Response\Model\PlatformWindows;
-use Appwrite\Utopia\Response\Model\PolicyList;
-use Appwrite\Utopia\Response\Model\PolicyMembershipPrivacy;
-use Appwrite\Utopia\Response\Model\PolicyPasswordDictionary;
-use Appwrite\Utopia\Response\Model\PolicyPasswordHistory;
-use Appwrite\Utopia\Response\Model\PolicyPasswordPersonalData;
-use Appwrite\Utopia\Response\Model\PolicySessionAlert;
-use Appwrite\Utopia\Response\Model\PolicySessionDuration;
-use Appwrite\Utopia\Response\Model\PolicySessionInvalidation;
-use Appwrite\Utopia\Response\Model\PolicySessionLimit;
-use Appwrite\Utopia\Response\Model\PolicyUserLimit;
+use Appwrite\Utopia\Response\Model\Platform;
 use Appwrite\Utopia\Response\Model\Preferences;
 use Appwrite\Utopia\Response\Model\Project;
 use Appwrite\Utopia\Response\Model\Provider;
 use Appwrite\Utopia\Response\Model\ProviderRepository;
 use Appwrite\Utopia\Response\Model\ProviderRepositoryFramework;
-use Appwrite\Utopia\Response\Model\ProviderRepositoryFrameworkList;
 use Appwrite\Utopia\Response\Model\ProviderRepositoryRuntime;
-use Appwrite\Utopia\Response\Model\ProviderRepositoryRuntimeList;
 use Appwrite\Utopia\Response\Model\ResourceToken;
 use Appwrite\Utopia\Response\Model\Row;
 use Appwrite\Utopia\Response\Model\Rule;
@@ -194,6 +130,7 @@ use Appwrite\Utopia\Response\Model\TemplateFramework;
 use Appwrite\Utopia\Response\Model\TemplateFunction;
 use Appwrite\Utopia\Response\Model\TemplateRuntime;
 use Appwrite\Utopia\Response\Model\TemplateSite;
+use Appwrite\Utopia\Response\Model\TemplateSMS;
 use Appwrite\Utopia\Response\Model\TemplateVariable;
 use Appwrite\Utopia\Response\Model\Token;
 use Appwrite\Utopia\Response\Model\Topic;
@@ -248,8 +185,8 @@ Response::setModel(new BaseList('Site Templates List', Response::MODEL_TEMPLATE_
 Response::setModel(new BaseList('Functions List', Response::MODEL_FUNCTION_LIST, 'functions', Response::MODEL_FUNCTION));
 Response::setModel(new BaseList('Function Templates List', Response::MODEL_TEMPLATE_FUNCTION_LIST, 'templates', Response::MODEL_TEMPLATE_FUNCTION));
 Response::setModel(new BaseList('Installations List', Response::MODEL_INSTALLATION_LIST, 'installations', Response::MODEL_INSTALLATION));
-Response::setModel(new ProviderRepositoryFrameworkList());
-Response::setModel(new ProviderRepositoryRuntimeList());
+Response::setModel(new BaseList('Framework Provider Repositories List', Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST, 'frameworkProviderRepositories', Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK));
+Response::setModel(new BaseList('Runtime Provider Repositories List', Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST, 'runtimeProviderRepositories', Response::MODEL_PROVIDER_REPOSITORY_RUNTIME));
 Response::setModel(new BaseList('Branches List', Response::MODEL_BRANCH_LIST, 'branches', Response::MODEL_BRANCH));
 Response::setModel(new BaseList('Frameworks List', Response::MODEL_FRAMEWORK_LIST, 'frameworks', Response::MODEL_FRAMEWORK));
 Response::setModel(new BaseList('Runtimes List', Response::MODEL_RUNTIME_LIST, 'runtimes', Response::MODEL_RUNTIME));
@@ -260,6 +197,7 @@ Response::setModel(new BaseList('Webhooks List', Response::MODEL_WEBHOOK_LIST, '
 Response::setModel(new BaseList('API Keys List', Response::MODEL_KEY_LIST, 'keys', Response::MODEL_KEY, true, true));
 Response::setModel(new BaseList('Dev Keys List', Response::MODEL_DEV_KEY_LIST, 'devKeys', Response::MODEL_DEV_KEY, true, false));
 Response::setModel(new BaseList('Auth Providers List', Response::MODEL_AUTH_PROVIDER_LIST, 'platforms', Response::MODEL_AUTH_PROVIDER, true, false));
+Response::setModel(new BaseList('Platforms List', Response::MODEL_PLATFORM_LIST, 'platforms', Response::MODEL_PLATFORM, true, false));
 Response::setModel(new BaseList('Countries List', Response::MODEL_COUNTRY_LIST, 'countries', Response::MODEL_COUNTRY));
 Response::setModel(new BaseList('Continents List', Response::MODEL_CONTINENT_LIST, 'continents', Response::MODEL_CONTINENT));
 Response::setModel(new BaseList('Languages List', Response::MODEL_LANGUAGE_LIST, 'languages', Response::MODEL_LANGUAGE));
@@ -267,9 +205,6 @@ Response::setModel(new BaseList('Currencies List', Response::MODEL_CURRENCY_LIST
 Response::setModel(new BaseList('Phones List', Response::MODEL_PHONE_LIST, 'phones', Response::MODEL_PHONE));
 Response::setModel(new BaseList('Metric List', Response::MODEL_METRIC_LIST, 'metrics', Response::MODEL_METRIC, true, false));
 Response::setModel(new BaseList('Variables List', Response::MODEL_VARIABLE_LIST, 'variables', Response::MODEL_VARIABLE));
-Response::setModel(new BaseList('Mock Numbers List', Response::MODEL_MOCK_NUMBER_LIST, 'mockNumbers', Response::MODEL_MOCK_NUMBER));
-Response::setModel(new PolicyList());
-Response::setModel(new BaseList('Email Templates List', Response::MODEL_EMAIL_TEMPLATE_LIST, 'templates', Response::MODEL_EMAIL_TEMPLATE));
 Response::setModel(new BaseList('Status List', Response::MODEL_HEALTH_STATUS_LIST, 'statuses', Response::MODEL_HEALTH_STATUS));
 Response::setModel(new BaseList('Rule List', Response::MODEL_PROXY_RULE_LIST, 'rules', Response::MODEL_PROXY_RULE));
 Response::setModel(new BaseList('Schedules List', Response::MODEL_SCHEDULE_LIST, 'schedules', Response::MODEL_SCHEDULE));
@@ -395,66 +330,10 @@ Response::setModel(new Execution());
 Response::setModel(new Project());
 Response::setModel(new Webhook());
 Response::setModel(new Key());
-Response::setModel(new EphemeralKey());
 Response::setModel(new DevKey());
 Response::setModel(new MockNumber());
-Response::setModel(new OAuth2GitHub());
-Response::setModel(new OAuth2Discord());
-Response::setModel(new OAuth2Figma());
-Response::setModel(new OAuth2Dropbox());
-Response::setModel(new OAuth2Dailymotion());
-Response::setModel(new OAuth2Bitbucket());
-Response::setModel(new OAuth2Bitly());
-Response::setModel(new OAuth2Box());
-Response::setModel(new OAuth2Autodesk());
-Response::setModel(new OAuth2Google());
-Response::setModel(new OAuth2Zoom());
-Response::setModel(new OAuth2Zoho());
-Response::setModel(new OAuth2Yandex());
-Response::setModel(new OAuth2X());
-Response::setModel(new OAuth2WordPress());
-Response::setModel(new OAuth2Twitch());
-Response::setModel(new OAuth2Stripe());
-Response::setModel(new OAuth2Spotify());
-Response::setModel(new OAuth2Slack());
-Response::setModel(new OAuth2Podio());
-Response::setModel(new OAuth2Notion());
-Response::setModel(new OAuth2Salesforce());
-Response::setModel(new OAuth2Yahoo());
-Response::setModel(new OAuth2Linkedin());
-Response::setModel(new OAuth2Disqus());
-Response::setModel(new OAuth2Amazon());
-Response::setModel(new OAuth2Etsy());
-Response::setModel(new OAuth2Facebook());
-Response::setModel(new OAuth2Tradeshift());
-Response::setModel(new OAuth2Paypal());
-Response::setModel(new OAuth2Gitlab());
-Response::setModel(new OAuth2Authentik());
-Response::setModel(new OAuth2Auth0());
-Response::setModel(new OAuth2FusionAuth());
-Response::setModel(new OAuth2Keycloak());
-Response::setModel(new OAuth2Oidc());
-Response::setModel(new OAuth2Okta());
-Response::setModel(new OAuth2Kick());
-Response::setModel(new OAuth2Apple());
-Response::setModel(new OAuth2Microsoft());
-Response::setModel(new OAuth2ProviderList());
-Response::setModel(new PolicyPasswordDictionary());
-Response::setModel(new PolicyPasswordHistory());
-Response::setModel(new PolicyPasswordPersonalData());
-Response::setModel(new PolicySessionAlert());
-Response::setModel(new PolicySessionDuration());
-Response::setModel(new PolicySessionInvalidation());
-Response::setModel(new PolicySessionLimit());
-Response::setModel(new PolicyUserLimit());
-Response::setModel(new PolicyMembershipPrivacy());
 Response::setModel(new AuthProvider());
-Response::setModel(new PlatformWeb());
-Response::setModel(new PlatformApple());
-Response::setModel(new PlatformAndroid());
-Response::setModel(new PlatformWindows());
-Response::setModel(new PlatformLinux());
-Response::setModel(new PlatformList());
+Response::setModel(new Platform());
 Response::setModel(new Variable());
 Response::setModel(new Country());
 Response::setModel(new Continent());
@@ -485,13 +364,9 @@ Response::setModel(new Headers());
 Response::setModel(new Specification());
 Response::setModel(new Rule());
 Response::setModel(new Schedule());
+Response::setModel(new TemplateSMS());
 Response::setModel(new TemplateEmail());
 Response::setModel(new ConsoleVariables());
-Response::setModel(new ConsoleOAuth2ProviderParameter());
-Response::setModel(new ConsoleOAuth2Provider());
-Response::setModel(new ConsoleOAuth2ProviderList());
-Response::setModel(new ConsoleKeyScope());
-Response::setModel(new ConsoleKeyScopeList());
 Response::setModel(new MFAChallenge());
 Response::setModel(new MFARecoveryCodes());
 Response::setModel(new MFAType());

app/init/realtime/connection.php

@@ -1,368 +0,0 @@
-<?php
-
-use Ahc\Jwt\JWT;
-use Ahc\Jwt\JWTException;
-use Appwrite\Extend\Exception;
-use Appwrite\Network\Platform;
-use Appwrite\Network\Validator\Origin;
-use Appwrite\Utopia\Database\Documents\User;
-use Appwrite\Utopia\Request;
-use Utopia\Auth\Hashes\Sha;
-use Utopia\Auth\Proofs\Token;
-use Utopia\Auth\Store;
-use Utopia\Database\DateTime as DatabaseDateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
-use Utopia\System\System;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;
-
-/**
- * Register the minimal per-connection resources required by realtime.
- */
-return function (Container $container): void {
-    $getProjectId = static function (Request $request): string {
-        $projectId = $request->getHeader('x-appwrite-project', '');
-
-        if (!empty($projectId)) {
-            return $projectId;
-        }
-
-        $projectId = $request->getParam('project', '');
-
-        return \is_string($projectId) ? $projectId : '';
-    };
-
-    $getMode = static function (Request $request, Document $project) use ($getProjectId): string {
-        $mode = $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
-        $projectId = $getProjectId($request);
-
-        if (!empty($projectId) && $project->getId() !== $projectId) {
-            $mode = APP_MODE_ADMIN;
-        }
-
-        return $mode;
-    };
-
-    $getDbForPlatform = static function (Authorization $authorization) {
-        $database = getConsoleDB();
-        $database->setAuthorization($authorization);
-
-        return $database;
-    };
-
-    $getDbForProject = static function (Document $project, Authorization $authorization) use ($getDbForPlatform) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $getDbForPlatform($authorization);
-        }
-
-        $database = getProjectDB($project);
-        $database->setAuthorization($authorization);
-
-        return $database;
-    };
-
-    $findRule = static function (Request $request, Document $project, Authorization $authorization) use ($getDbForPlatform): Document {
-        $domain = \parse_url($request->getOrigin(), PHP_URL_HOST);
-
-        if (empty($domain)) {
-            $domain = \parse_url($request->getReferer(), PHP_URL_HOST);
-        }
-
-        if (empty($domain)) {
-            return new Document();
-        }
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-        $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
-
-        $rule = $authorization->skip(function () use ($dbForPlatform, $domain, $isMd5) {
-            if ($isMd5) {
-                return $dbForPlatform->getDocument('rules', md5($domain));
-            }
-
-            return $dbForPlatform->findOne('rules', [
-                Query::equal('domain', [$domain]),
-            ]);
-        });
-
-        $permitsCurrentProject = $rule->getAttribute('projectInternalId', '') === $project->getSequence();
-
-        if (!$permitsCurrentProject && !$rule->isEmpty() && !empty($rule->getAttribute('projectId', ''))) {
-            $trustedProjects = [];
-            foreach (\explode(',', System::getEnv('_APP_CONSOLE_TRUSTED_PROJECTS', '')) as $trustedProject) {
-                if (empty($trustedProject)) {
-                    continue;
-                }
-
-                $trustedProjects[] = $trustedProject;
-            }
-
-            if (\in_array($rule->getAttribute('projectId', ''), $trustedProjects, true)) {
-                $permitsCurrentProject = true;
-            }
-        }
-
-        if (!$permitsCurrentProject) {
-            return new Document();
-        }
-
-        return $rule;
-    };
-
-    $findDevKey = static function (Request $request, Document $project, array $servers, Authorization $authorization) use ($getDbForPlatform): Document {
-        $devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));
-        $key = $project->find('secret', $devKey, 'devKeys');
-
-        if (!$key) {
-            return new Document([]);
-        }
-
-        $expire = $key->getAttribute('expire');
-        if (!empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
-            return new Document([]);
-        }
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-        $accessedAt = $key->getAttribute('accessedAt', 0);
-
-        if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-            $key->setAttribute('accessedAt', DatabaseDateTime::now());
-            $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
-                'accessedAt' => $key->getAttribute('accessedAt'),
-            ])));
-            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-        }
-
-        $sdkValidator = new WhiteList($servers, true);
-        $sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
-
-        if ($sdk !== 'unknown' && $sdkValidator->isValid($sdk)) {
-            $sdks = $key->getAttribute('sdks', []);
-
-            if (!\in_array($sdk, $sdks, true)) {
-                $sdks[] = $sdk;
-                $key->setAttribute('sdks', $sdks);
-                $key->setAttribute('accessedAt', DatabaseDateTime::now());
-
-                $key = $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
-                    'sdks' => $key->getAttribute('sdks'),
-                    'accessedAt' => $key->getAttribute('accessedAt'),
-                ])));
-                $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-            }
-        }
-
-        return $key;
-    };
-
-    $container->set('authorization', function () {
-        return new Authorization();
-    }, []);
-
-    $container->set('project', function (Request $request, Document $console, Authorization $authorization) use ($getProjectId, $getDbForPlatform) {
-        $projectId = $getProjectId($request);
-
-        if (empty($projectId) || $projectId === 'console') {
-            return $console;
-        }
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-
-        return $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-    }, ['request', 'console', 'authorization']);
-
-    $container->set('originValidator', function (array $platform, Request $request, Document $project, array $servers, Authorization $authorization) use ($findDevKey, $findRule) {
-        $devKey = $findDevKey($request, $project, $servers, $authorization);
-
-        if (!$devKey->isEmpty()) {
-            return new URL();
-        }
-
-        $allowedHostnames = [...($platform['hostnames'] ?? [])];
-        if (!$project->isEmpty() && $project->getId() !== 'console') {
-            $allowedHostnames = [...$allowedHostnames, ...Platform::getHostnames($project->getAttribute('platforms', []))];
-        }
-
-        $rule = $findRule($request, $project, $authorization);
-        if (!$rule->isEmpty() && !empty($rule->getAttribute('domain', ''))) {
-            $allowedHostnames[] = $rule->getAttribute('domain', '');
-        }
-
-        $originHostname = \parse_url($request->getOrigin(), PHP_URL_HOST);
-        $refererHostname = \parse_url($request->getReferer(), PHP_URL_HOST);
-        $hostname = $originHostname ?: $refererHostname;
-
-        if ($request->getMethod() === 'OPTIONS' && !empty($hostname)) {
-            $allowedHostnames[] = $hostname;
-        }
-
-        $allowedSchemes = [...($platform['schemas'] ?? [])];
-        if (!$project->isEmpty() && $project->getId() !== 'console') {
-            $allowedSchemes[] = 'exp';
-            $allowedSchemes[] = 'appwrite-callback-' . $project->getId();
-            $allowedSchemes = [...$allowedSchemes, ...Platform::getSchemes($project->getAttribute('platforms', []))];
-        }
-
-        return new Origin(\array_unique($allowedHostnames), \array_unique($allowedSchemes));
-    }, ['platform', 'request', 'project', 'servers', 'authorization']);
-
-    $container->set('user', function (Request $request, Document $project, Document $console, Authorization $authorization) use ($getMode, $getDbForPlatform, $getDbForProject) {
-        $mode = $getMode($request, $project);
-        $store = new Store();
-        $proofForToken = new Token();
-        $proofForToken->setHash(new Sha());
-
-        $authorization->setDefaultStatus(true);
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-        $dbForProject = $getDbForProject($project, $authorization);
-
-        $store->setKey('a_session_' . $project->getId());
-        if ($mode === APP_MODE_ADMIN) {
-            $store->setKey('a_session_' . $console->getId());
-        }
-
-        $store->decode(
-            $request->getCookie(
-                $store->getKey(),
-                $request->getCookie($store->getKey() . '_legacy', '')
-            )
-        );
-
-        if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
-            $sessionHeader = $request->getHeader('x-appwrite-session', '');
-
-            if (!empty($sessionHeader)) {
-                $store->decode($sessionHeader);
-            }
-        }
-
-        if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
-            $fallback = \json_decode($request->getHeader('x-fallback-cookies', ''), true);
-            $store->decode((\is_array($fallback) && isset($fallback[$store->getKey()])) ? $fallback[$store->getKey()] : '');
-        }
-
-        $user = null;
-        if ($mode === APP_MODE_ADMIN) {
-            /** @var User $user */
-            $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
-        } else {
-            if ($project->isEmpty()) {
-                $user = new User([]);
-            } elseif (!empty($store->getProperty('id', ''))) {
-                if ($project->getId() === 'console') {
-                    /** @var User $user */
-                    $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
-                } else {
-                    /** @var User $user */
-                    $user = $dbForProject->getDocument('users', $store->getProperty('id', ''));
-                }
-            }
-        }
-
-        if (
-            !$user
-            || $user->isEmpty()
-            || !$user->sessionVerify($store->getProperty('secret', ''), $proofForToken)
-        ) {
-            $user = new User([]);
-        }
-
-        $authJWT = $request->getHeader('x-appwrite-jwt', '');
-        if (!empty($authJWT) && !$project->isEmpty()) {
-            if (!$user->isEmpty()) {
-                throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
-            }
-
-            $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
-
-            try {
-                $payload = $jwt->decode($authJWT);
-            } catch (JWTException $error) {
-                throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
-            }
-
-            $jwtUserId = $payload['userId'] ?? '';
-            if (!empty($jwtUserId)) {
-                if ($mode === APP_MODE_ADMIN) {
-                    $user = $dbForPlatform->getDocument('users', $jwtUserId);
-                } else {
-                    $user = $dbForProject->getDocument('users', $jwtUserId);
-                }
-            }
-
-            $jwtSessionId = $payload['sessionId'] ?? '';
-            if (!empty($jwtSessionId) && empty($user->find('$id', $jwtSessionId, 'sessions'))) {
-                $user = new User([]);
-            }
-        }
-
-        $accountKey = $request->getHeader('x-appwrite-key', '');
-        $accountKeyUserId = $request->getHeader('x-appwrite-user', '');
-
-        if (!empty($accountKeyUserId) && !empty($accountKey)) {
-            if (!$user->isEmpty()) {
-                throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
-            }
-
-            $accountKeyUser = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
-            if (!$accountKeyUser->isEmpty()) {
-                $key = $accountKeyUser->find(
-                    key: 'secret',
-                    find: $accountKey,
-                    subject: 'keys'
-                );
-
-                if (!empty($key)) {
-                    $expire = $key->getAttribute('expire');
-                    if (!empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
-                        throw new Exception(Exception::ACCOUNT_KEY_EXPIRED);
-                    }
-
-                    $user = $accountKeyUser;
-                }
-            }
-        }
-
-        // Query params mirror the header fallback pattern used by ?project= and ?devKey=,
-        // allowing Console to embed impersonation in direct file/image URLs where headers cannot be set.
-        $impersonateUserId = $request->getHeader('x-appwrite-impersonate-user-id', (string)$request->getParam('impersonateUserId', ''));
-        $impersonateEmail = $request->getHeader('x-appwrite-impersonate-user-email', (string)$request->getParam('impersonateEmail', ''));
-        $impersonatePhone = $request->getHeader('x-appwrite-impersonate-user-phone', (string)$request->getParam('impersonatePhone', ''));
-
-        if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) {
-            $userDb = ($mode === APP_MODE_ADMIN || $project->getId() === 'console') ? $dbForPlatform : $dbForProject;
-            $targetUser = null;
-
-            if (!empty($impersonateUserId)) {
-                $targetUser = $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId));
-            } elseif (!empty($impersonateEmail)) {
-                $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [
-                    Query::equal('email', [\strtolower($impersonateEmail)]),
-                ]));
-            } elseif (!empty($impersonatePhone)) {
-                $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [
-                    Query::equal('phone', [$impersonatePhone]),
-                ]));
-            }
-
-            if ($targetUser !== null && !$targetUser->isEmpty()) {
-                $impersonator = clone $user;
-                $user = clone $targetUser;
-                $user->setAttribute('impersonatorUserId', $impersonator->getId());
-                $user->setAttribute('impersonatorUserInternalId', $impersonator->getSequence());
-                $user->setAttribute('impersonatorUserName', $impersonator->getAttribute('name', ''));
-                $user->setAttribute('impersonatorUserEmail', $impersonator->getAttribute('email', ''));
-                $user->setAttribute('impersonatorAccessedAt', $impersonator->getAttribute('accessedAt', 0));
-            }
-        }
-
-        $dbForPlatform->setMetadata('user', $user->getId());
-        $dbForProject->setMetadata('user', $user->getId());
-
-        return $user;
-    }, ['request', 'project', 'console', 'authorization']);
-};

app/init/registers.php

@@ -71,7 +71,7 @@ $register->set('logger', function () {
 
         $providerConfig = match ($providerName) {
             'sentry' => [ 'key' => $configChunks[0], 'projectId' => $configChunks[1] ?? '', 'host' => '',],
-            'logowl' => ['ticket' => $configChunks[0], 'host' => ''],
+            'logowl' => ['ticket' => $configChunks[0] ?? '', 'host' => ''],
             default => ['key' => $providerConfig],
         };
     }
@@ -245,15 +245,26 @@ $register->set('pools', function () {
     $maxConnections = (int) System::getEnv('_APP_CONNECTIONS_MAX', 151);
     $instanceConnections = $maxConnections / (int) System::getEnv('_APP_POOL_CLIENTS', 14);
 
-    $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
-    $poolSize = max(1, (int)($instanceConnections / $workerCount));
+    $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
+
+    if ($multiprocessing) {
+        $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+    } else {
+        $workerCount = 1;
+    }
+
+    if ($workerCount > $instanceConnections) {
+        throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500);
+    }
+
+    $poolSize = (int)($instanceConnections / $workerCount);
 
     foreach ($connections as $key => $connection) {
-        $type = $connection['type'];
-        $multiple = $connection['multiple'];
-        $schemes = $connection['schemes'];
+        $type = $connection['type'] ?? '';
+        $multiple = $connection['multiple'] ?? false;
+        $schemes = $connection['schemes'] ?? [];
         $config = [];
-        $dsns = explode(',', $connection['dsns']);
+        $dsns = explode(',', $connection['dsns'] ?? '');
         foreach ($dsns as &$dsn) {
             $dsn = explode('=', $dsn);
             $name = ($multiple) ? $key . '_' . $dsn[0] : $key;
@@ -318,7 +329,7 @@ $register->set('pools', function () {
                         ));
                     });
                 },
-                default => function () use ($dsnHost, $dsnPort, $dsnPass) {
+                'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
                     $redis = new \Redis();
                     @$redis->pconnect($dsnHost, (int)$dsnPort);
                     if ($dsnPass) {
@@ -328,6 +339,7 @@ $register->set('pools', function () {
 
                     return $redis;
                 },
+                default => throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid scheme'),
             };
 
             $poolAdapter = System::getEnv('_APP_POOL_ADAPTER', default: 'stack') === 'swoole' ? new SwoolePool() : new StackPool();

app/init/worker/message.php

@@ -1,474 +0,0 @@
-<?php
-
-use Appwrite\Event\Build;
-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\Realtime;
-use Appwrite\Event\Webhook;
-use Appwrite\Usage\Context;
-use Appwrite\Utopia\Database\Documents\User;
-use Utopia\Audit\Adapter\Database as AdapterDatabase;
-use Utopia\Audit\Audit as UtopiaAudit;
-use Utopia\Cache\Cache;
-use Utopia\Config\Config;
-use Utopia\Console;
-use Utopia\Database\Adapter\Pool as DatabasePool;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
-use Utopia\DSN\DSN;
-use Utopia\Logger\Log;
-use Utopia\Pools\Group;
-use Utopia\Queue\Publisher;
-use Utopia\Registry\Registry;
-use Utopia\Storage\Device\Telemetry as TelemetryDevice;
-use Utopia\System\System;
-use Utopia\Telemetry\Adapter as Telemetry;
-
-/**
- * Register per-job resources on the given container.
- * These resources depend on the queue message or keep mutable state and
- * must be fresh for each worker job.
- */
-return function (Container $container): void {
-    $container->set('log', fn () => new Log(), []);
-
-    $container->set('usage', fn () => new Context(), []);
-
-    $container->set('authorization', function () {
-        $authorization = new Authorization();
-        $authorization->disable();
-
-        return $authorization;
-    }, []);
-
-    $container->set('dbForPlatform', function (Cache $cache, Group $pools, Authorization $authorization) {
-        $adapter = new DatabasePool($pools->get('console'));
-        $dbForPlatform = new Database($adapter, $cache);
-
-        $dbForPlatform
-            ->setDatabase(APP_DATABASE)
-            ->setAuthorization($authorization)
-            ->setNamespace('_console')
-            ->setDocumentType('users', User::class);
-
-        return $dbForPlatform;
-    }, ['cache', 'pools', 'authorization']);
-
-    $container->set('project', function ($message, Database $dbForPlatform) {
-        $payload = $message->getPayload() ?? [];
-        $project = new Document($payload['project'] ?? []);
-
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $project;
-        }
-
-        return $dbForPlatform->getDocument('projects', $project->getId());
-    }, ['message', 'dbForPlatform']);
-
-    $container->set('dbForProject', function (Cache $cache, Group $pools, Document $project, Database $dbForPlatform, Authorization $authorization) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
-        }
-
-        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 = new DatabasePool($pools->get($dsn->getHost()));
-        $database = new Database($adapter, $cache);
-        $database->setDocumentType('users', User::class);
-
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-        if (\in_array($dsn->getHost(), $sharedTables)) {
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
-            $database
-                ->setSharedTables(true)
-                ->setGlobalCollections($projectsGlobalCollections)
-                ->setTenant($project->getSequence())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getSequence());
-        }
-
-        $database
-            ->setDatabase(APP_DATABASE)
-            ->setAuthorization($authorization)
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
-        return $database;
-    }, ['cache', 'pools', 'project', 'dbForPlatform', 'authorization']);
-
-    $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
-        $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
-
-        return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases): Database {
-            if ($project->isEmpty() || $project->getId() === 'console') {
-                return $dbForPlatform;
-            }
-
-            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()];
-                $database->setAuthorization($authorization);
-                $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-                if (\in_array($dsn->getHost(), $sharedTables)) {
-                    /** @var array $collections */
-                    $collections = Config::getParam('collections', []);
-                    $projectCollections = $collections['projects'] ?? [];
-                    $projectsGlobalCollections = array_keys($projectCollections);
-                    $projectsGlobalCollections[] = 'audit';
-
-                    $database
-                        ->setSharedTables(true)
-                        ->setGlobalCollections($projectsGlobalCollections)
-                        ->setTenant($project->getSequence())
-                        ->setNamespace($dsn->getParam('namespace'));
-                } else {
-                    $database
-                        ->setSharedTables(false)
-                        ->setTenant(null)
-                        ->setNamespace('_' . $project->getSequence());
-                }
-
-                return $database;
-            }
-
-            $adapter = new DatabasePool($pools->get($dsn->getHost()));
-            $database = new Database($adapter, $cache);
-
-            $databases[$dsn->getHost()] = $database;
-
-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-            if (\in_array($dsn->getHost(), $sharedTables)) {
-                /** @var array $collections */
-                $collections = Config::getParam('collections', []);
-                $projectCollections = $collections['projects'] ?? [];
-                $projectsGlobalCollections = array_keys($projectCollections);
-                $projectsGlobalCollections[] = 'audit';
-
-                $database
-                    ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
-                    ->setTenant($project->getSequence())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getSequence());
-            }
-
-            $database
-                ->setDatabase(APP_DATABASE)
-                ->setAuthorization($authorization)
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
-            return $database;
-        };
-    }, ['pools', 'dbForPlatform', 'cache', 'authorization']);
-
-    $container->set('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
-        return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): Database {
-            $projectDocument ??= $project;
-            $databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
-            $databaseType = $database->getAttribute('type', '');
-
-            // Backwards-compatibility: older or seeded legacy databases may not have a DSN stored
-            // in the "database" attribute. In that case, fall back to the project's database DSN.
-            if ($databaseDSN === '') {
-                $databaseDSN = $projectDocument->getAttribute('database', '');
-            }
-
-            try {
-                $databaseDSN = new DSN($databaseDSN);
-            } catch (\InvalidArgumentException) {
-                $databaseDSN = new DSN('mysql://' . $databaseDSN);
-            }
-
-            try {
-                $dsn = new DSN($projectDocument->getAttribute('database'));
-            } catch (\InvalidArgumentException) {
-                // Temporary fallback until all projects use shared tables
-                $dsn = new DSN('mysql://' . $projectDocument->getAttribute('database'));
-            }
-
-            $pools = $register->get('pools');
-            $databaseHost = $databaseDSN->getHost();
-            $pool = $pools->get($databaseHost);
-
-            $adapter = new DatabasePool($pool);
-            $database = new Database($adapter, $cache);
-            $database
-                ->setDatabase(APP_DATABASE)
-                ->setAuthorization($authorization);
-            $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
-
-            $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));
-
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
-            $database->setGlobalCollections($projectsGlobalCollections);
-
-            // For separate pools (documentsdb/vectorsdb), check their own shared tables config.
-            // If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
-            if ($databaseHost !== $dsn->getHost()) {
-                $dbTypeSharedTables = match ($databaseType) {
-                    DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
-                    VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
-                    default => [],
-                };
-
-                if (\in_array($databaseHost, $dbTypeSharedTables)) {
-                    $database
-                        ->setSharedTables(true)
-                        ->setGlobalCollections($projectsGlobalCollections)
-                        ->setTenant($projectDocument->getSequence())
-                        ->setNamespace($databaseDSN->getParam('namespace'));
-                } else {
-                    $database
-                        ->setSharedTables(false)
-                        ->setTenant(null)
-                        ->setNamespace('_' . $projectDocument->getSequence());
-                }
-            } elseif (\in_array($dsn->getHost(), $sharedTables, true)) {
-                $database
-                    ->setSharedTables(true)
-                    ->setGlobalCollections($projectsGlobalCollections)
-                    ->setTenant($projectDocument->getSequence())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $projectDocument->getSequence());
-            }
-
-            $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-            return $database;
-        };
-    }, ['cache', 'register', 'project', 'authorization']);
-
-    $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
-        $database = null;
-
-        return function (?Document $project = null) use ($pools, $cache, $authorization, &$database) {
-            if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-                $database->setTenant($project->getSequence());
-
-                return $database;
-            }
-
-            /** @var array $collections */
-            $collections = Config::getParam('collections', []);
-            $logsCollections = $collections['logs'] ?? [];
-            $logsCollections = array_keys($logsCollections);
-
-            $adapter = new DatabasePool($pools->get('logs'));
-            $database = new Database($adapter, $cache);
-
-            $database
-                ->setDatabase(APP_DATABASE)
-                ->setAuthorization($authorization)
-                ->setSharedTables(true)
-                ->setGlobalCollections($logsCollections)
-                ->setNamespace('logsV1')
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
-                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
-
-            if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-                $database->setTenant($project->getSequence());
-            }
-
-            return $database;
-        };
-    }, ['pools', 'cache', 'authorization']);
-
-    $container->set('abuseRetention', function () {
-        return \time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
-    }, []);
-
-    $container->set('auditRetention', function (Document $project) {
-        if ($project->getId() === 'console') {
-            return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
-        }
-
-        return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
-    }, ['project']);
-
-    $container->set('executionRetention', function () {
-        return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
-    }, []);
-
-    $container->set('queueForDatabase', function (Publisher $publisher) {
-        return new EventDatabase($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForMessaging', function (Publisher $publisher) {
-        return new Messaging($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForMails', function (Publisher $publisher) {
-        return new Mail($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForBuilds', function (Publisher $publisher) {
-        return new Build($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForDeletes', function (Publisher $publisher) {
-        return new Delete($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForEvents', function (Publisher $publisher) {
-        return new Event($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForWebhooks', function (Publisher $publisher) {
-        return new Webhook($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForFunctions', function (Publisher $publisher) {
-        return new Func($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForRealtime', function () {
-        return new Realtime();
-    }, []);
-
-    $container->set('deviceForSites', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForMigrations', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForFiles', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForCache', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('logError', function (Registry $register, Document $project) {
-        return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
-            $logger = $register->get('logger');
-
-            if ($logger) {
-                $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
-
-                $log = new Log();
-                $log->setNamespace($namespace);
-                $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \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->addTag('projectId', $project->getId());
-
-                $log->addExtra('file', $error->getFile());
-                $log->addExtra('line', $error->getLine());
-                $log->addExtra('trace', $error->getTraceAsString());
-
-                if ($error->getPrevious() !== null) {
-                    if ($error->getPrevious()->getMessage() != $error->getMessage()) {
-                        $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
-                    }
-                    $log->addExtra('previousFile', $error->getPrevious()->getFile());
-                    $log->addExtra('previousLine', $error->getPrevious()->getLine());
-                }
-
-                foreach (($extras ?? []) as $key => $value) {
-                    $log->addExtra($key, $value);
-                }
-
-                $log->setAction($action);
-
-                $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
-                $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-                try {
-                    $responseCode = $logger->addLog($log);
-                    Console::info('Error log pushed with status code: ' . $responseCode);
-                } catch (Throwable $th) {
-                    Console::error('Error pushing log: ' . $th->getMessage());
-                }
-            }
-
-            Console::warning("Failed: {$error->getMessage()}");
-            Console::warning($error->getTraceAsString());
-
-            if ($error->getPrevious() !== null) {
-                if ($error->getPrevious()->getMessage() != $error->getMessage()) {
-                    Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
-                }
-                Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
-            }
-        };
-    }, ['register', 'project']);
-
-    $container->set('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
-        return function (Document $project) use ($dbForPlatform, $getProjectDB) {
-            if ($project->isEmpty() || $project->getId() === 'console') {
-                $adapter = new AdapterDatabase($dbForPlatform);
-
-                return new UtopiaAudit($adapter);
-            }
-
-            $dbForProject = $getProjectDB($project);
-            $adapter = new AdapterDatabase($dbForProject);
-
-            return new UtopiaAudit($adapter);
-        };
-    }, ['dbForPlatform', 'getProjectDB']);
-
-    $container->set('executionsRetentionCount', function (Document $project, array $plan) {
-        if ($project->getId() === 'console' || empty($plan)) {
-            return 0;
-        }
-
-        return (int) ($plan['executionsRetentionCount'] ?? 100);
-    }, ['project', 'plan']);
-};

app/listeners.php

@@ -1,11 +1,9 @@
 <?php
 
 use Appwrite\Bus\Listeners\Log;
-use Appwrite\Bus\Listeners\Mails;
 use Appwrite\Bus\Listeners\Usage;
 
 return [
     new Log(),
-    new Mails(),
     new Usage(),
 ];

app/realtime.php

@@ -33,28 +33,21 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
 use Utopia\DSN\DSN;
+use Utopia\Http\Http;
 use Utopia\Logger\Log;
 use Utopia\Pools\Group;
 use Utopia\Registry\Registry;
-use Utopia\Span\Span;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\WebSocket\Adapter;
 use Utopia\WebSocket\Server;
 
+/**
+ * @var Registry $register
+ */
 require_once __DIR__ . '/init.php';
 
-if (System::getEnv('_APP_EDITION', 'self-hosted') === 'self-hosted') {
-    require_once __DIR__ . '/init/span.php';
-}
-
-/** @var Registry $register */
-$register = $GLOBALS['register'] ?? throw new \RuntimeException('Registry not initialized');
-
-$registerConnectionResources ??= require __DIR__ . '/init/realtime/connection.php';
-
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 
 // Log uncaught exceptions in one line instead of relying on Swoole's full backtrace dump
@@ -130,14 +123,8 @@ if (!function_exists('getProjectDB')) {
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
         if (\in_array($dsn->getHost(), $sharedTables)) {
-            $collections = Config::getParam('collections', []);
-            $projectCollections = $collections['projects'] ?? [];
-            $projectsGlobalCollections = array_keys($projectCollections);
-            $projectsGlobalCollections[] = 'audit';
-
             $database
                 ->setSharedTables(true)
-                ->setGlobalCollections($projectsGlobalCollections)
                 ->setTenant($project->getSequence())
                 ->setNamespace($dsn->getParam('namespace'));
         } else {
@@ -253,11 +240,6 @@ if (!function_exists('triggerStats')) {
     }
 }
 
-global $container;
-$container->set('pools', function ($register) {
-    return $register->get('pools');
-}, ['register']);
-
 $realtime = getRealtime();
 
 /**
@@ -273,9 +255,7 @@ $stats->create();
 
 $containerId = uniqid();
 $statsDocument = null;
-
-$workerNumber = intval(System::getEnv('_APP_WORKERS_NUM', 0))
-    ?: intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+$workerNumber = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 
 $adapter = new Adapter\Swoole(port: System::getEnv('PORT', 80));
 $adapter
@@ -403,31 +383,30 @@ $server->onStart(function () use ($stats, $containerId, &$statsDocument) {
     }
 });
 
+function cloudRealtimeLogConnectionHostnames(Http $app, Document $project, Request $request): void
+{
+    try {
+        /** @var array<int, string> $allowed */
+        $allowed = $app->getResource('allowedHostnames');
+        Console::info(sprintf(
+            '[Realtime] project=%s origin=%s allowedHostnames=%s',
+            $project->getId(),
+            $request->getOrigin(),
+            json_encode(array_values($allowed))
+        ));
+    } catch (Throwable $e) {
+        Console::error('[Realtime] allowedHostnames log failed: ' . $e->getMessage());
+    }
+}
+
 $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime) {
     Console::success('Worker ' . $workerId . ' started successfully');
 
     $telemetry = getTelemetry($workerId);
-    $realtimeDelayBuckets = [100, 250, 500, 750, 1000, 1500, 2000, 3000, 5000, 7500, 10000, 15000, 30000];
-    $workerTelemetryAttributes = ['workerId' => (string) $workerId];
     $register->set('telemetry', fn () => $telemetry);
-    $register->set('telemetry.workerAttributes', fn () => $workerTelemetryAttributes);
-    $register->set('telemetry.workerCounter', fn () => $telemetry->createUpDownCounter('realtime.server.active_workers'));
-    $register->set('telemetry.workerClientCounter', fn () => $telemetry->createUpDownCounter('realtime.server.worker_clients'));
-    $register->set('telemetry.workerSubscriptionCounter', fn () => $telemetry->createUpDownCounter('realtime.server.worker_subscriptions'));
     $register->set('telemetry.connectionCounter', fn () => $telemetry->createUpDownCounter('realtime.server.open_connections'));
     $register->set('telemetry.connectionCreatedCounter', fn () => $telemetry->createCounter('realtime.server.connection.created'));
     $register->set('telemetry.messageSentCounter', fn () => $telemetry->createCounter('realtime.server.message.sent'));
-    $register->set('telemetry.deliveryDelayHistogram', fn () => $telemetry->createHistogram(
-        name: 'realtime.server.delivery_delay',
-        unit: 'ms',
-        advisory: ['ExplicitBucketBoundaries' => $realtimeDelayBuckets],
-    ));
-    $register->set('telemetry.arrivalDelayHistogram', fn () => $telemetry->createHistogram(
-        name: 'realtime.server.arrival_delay',
-        unit: 'ms',
-        advisory: ['ExplicitBucketBoundaries' => $realtimeDelayBuckets],
-    ));
-    $register->get('telemetry.workerCounter')->add(1);
 
     $attempts = 0;
     $start = time();
@@ -478,7 +457,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         ]
                     ];
 
-                    $server->send(array_keys($realtime->getSubscribers($event)), json_encode([
+                    $server->send($realtime->getSubscribers($event), json_encode([
                         'type' => 'event',
                         'data' => $event['data']
                     ]));
@@ -544,28 +523,12 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
             $pubsub->subscribe(['realtime'], function (mixed $redis, string $channel, string $payload) use ($server, $workerId, $stats, $register, $realtime) {
                 $event = json_decode($payload, true);
 
-                $eventTimestamp = $event['data']['timestamp'] ?? null;
-                if (\is_string($eventTimestamp)) {
-                    try {
-                        $eventDate = new \DateTimeImmutable($eventTimestamp, new \DateTimeZone('UTC'));
-                        $now = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
-                        $eventTimestampMs = (float) $eventDate->format('U.u') * 1000;
-                        $nowTimestampMs = (float) $now->format('U.u') * 1000;
-                        $arrivalDelayMs = (int) \max(0, $nowTimestampMs - $eventTimestampMs);
-
-                        $register->get('telemetry.arrivalDelayHistogram')->record($arrivalDelayMs);
-                    } catch (\Throwable) {
-                        // Ignore invalid timestamp payloads.
-                    }
-                }
-
                 if ($event['permissionsChanged'] && isset($event['userId'])) {
                     $projectId = $event['project'];
                     $userId = $event['userId'];
 
                     if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
                         $connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
-                        $subscriptionsBefore = \count($realtime->getSubscriptionMetadata($connection));
                         $consoleDatabase = getConsoleDB();
                         $project = $consoleDatabase->getAuthorization()->skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
                         $database = getProjectDB($project);
@@ -575,7 +538,6 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
 
                         $roles = $user->getRoles($database->getAuthorization());
                         $authorization = $realtime->connections[$connection]['authorization'] ?? null;
-                        $previousUserId = $realtime->connections[$connection]['userId'] ?? '';
 
                         $meta = $realtime->getSubscriptionMetadata($connection);
 
@@ -583,19 +545,13 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
 
                         foreach ($meta as $subscriptionId => $subscription) {
                             $queries = Query::parseQueries($subscription['queries'] ?? []);
-                            $channels = Realtime::rebindAccountChannels(
-                                $subscription['channels'] ?? [],
-                                $previousUserId,
-                                $userId
-                            );
                             $realtime->subscribe(
                                 $projectId,
                                 $connection,
                                 $subscriptionId,
                                 $roles,
-                                $channels,
-                                $queries,
-                                $userId
+                                $subscription['channels'] ?? [],
+                                $queries
                             );
                         }
 
@@ -603,18 +559,12 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         if ($authorization !== null) {
                             $realtime->connections[$connection]['authorization'] = $authorization;
                         }
-
-                        $subscriptionsAfter = \count($realtime->getSubscriptionMetadata($connection));
-                        $subscriptionDelta = $subscriptionsAfter - $subscriptionsBefore;
-                        if ($subscriptionDelta !== 0) {
-                            $register->get('telemetry.workerSubscriptionCounter')->add($subscriptionDelta, $register->get('telemetry.workerAttributes'));
-                        }
                     }
                 }
 
                 $receivers = $realtime->getSubscribers($event);
 
-                if (System::getEnv('_APP_ENV', 'production') === 'development' && !empty($receivers)) {
+                if (Http::isDevelopment() && !empty($receivers)) {
                     Console::log("[Debug][Worker {$workerId}] Receivers: " . count($receivers));
                     Console::log("[Debug][Worker {$workerId}] Connection IDs: " . json_encode(array_keys($receivers)));
                     Console::log("[Debug][Worker {$workerId}] Matched: " . json_encode(array_values($receivers)));
@@ -651,20 +601,6 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 if ($total > 0) {
                     $register->get('telemetry.messageSentCounter')->add($total);
                     $stats->incr($event['project'], 'messages', $total);
-                    $updatedAt = $event['data']['payload']['$updatedAt'] ?? null;
-                    if (\is_string($updatedAt)) {
-                        try {
-                            $updatedAtDate = new \DateTimeImmutable($updatedAt, new \DateTimeZone('UTC'));
-                            $now = new \DateTimeImmutable('now', new \DateTimeZone('UTC'));
-                            $updatedAtTimestampMs = (float) $updatedAtDate->format('U.u') * 1000;
-                            $nowTimestampMs = (float) $now->format('U.u') * 1000;
-                            $delayMs = (int) \max(0, $nowTimestampMs - $updatedAtTimestampMs);
-
-                            $register->get('telemetry.deliveryDelayHistogram')->record($delayMs);
-                        } catch (\Throwable) {
-                            // Ignore invalid timestamp payloads.
-                        }
-                    }
 
                     $projectId = $event['project'] ?? null;
 
@@ -694,50 +630,25 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     Console::error('Failed to restart pub/sub...');
 });
 
-$server->onWorkerStop(function (int $workerId) use ($register) {
-    Console::warning('Worker ' . $workerId . ' stopping');
-
-    try {
-        $register->get('telemetry.workerCounter')->add(-1);
-    } catch (\Throwable $th) {
-        Console::error('Realtime onWorkerStop telemetry error: ' . $th->getMessage());
-    }
-});
-
-$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $registerConnectionResources) {
-    global $container;
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
+    $app = new Http('UTC');
     $request = new Request($request);
     $response = new Response(new SwooleResponse());
 
     Console::info("Connection open (user: {$connection})");
 
-    $connectionContainer = new Container($container);
-    $connectionContainer->set('request', fn () => $request);
-
-    $registerConnectionResources($connectionContainer);
+    Http::setResource('pools', fn () => $register->get('pools'));
+    Http::setResource('request', fn () => $request);
+    Http::setResource('response', fn () => $response);
 
     $project = null;
     $logUser = null;
     $authorization = null;
-    $rawSize = $request->getSize();
-    $channelCount = 0;
-    $subscriptionCount = 0;
-    $outboundBytes = 0;
-    $responseCode = 200;
-    $subscriptionMode = 'message';
-    $success = false;
-
-    Span::init('realtime.open');
-    Span::add('realtime.connectionId', $connection);
-    Span::add('realtime.inboundBytes', $rawSize);
-    if (!empty($request->getOrigin())) {
-        Span::add('realtime.origin', $request->getOrigin());
-    }
 
     try {
         /** @var Document $project */
-        $project = $connectionContainer->get('project');
-        $authorization = $connectionContainer->get('authorization');
+        $project = $app->getResource('project');
+        $authorization = $app->getResource('authorization');
 
         /*
          *  Project Check
@@ -746,15 +657,13 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing or unknown project ID');
         }
 
-        $timelimit = $connectionContainer->get('timelimit');
-        $user = $connectionContainer->get('user'); /** @var User $user */
+        $timelimit = $app->getResource('timelimit');
+        $user = $app->getResource('user'); /** @var User $user */
         $logUser = $user;
 
-        $apis = $project->getAttribute('apis', []);
-        // Websocket is what to check, but realtime is checked too for backwards compatibility
-        $websocketEnabled = $apis['websocket'] ?? $apis['realtime'] ?? true;
         if (
-            !$websocketEnabled
+            array_key_exists('realtime', $project->getAttribute('apis', []))
+            && !$project->getAttribute('apis', [])['realtime']
             && !($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
@@ -782,6 +691,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new Exception(Exception::REALTIME_TOO_MANY_MESSAGES, 'Too many requests');
         }
 
+        $rawSize = $request->getSize();
+
         triggerStats([
             METRIC_REALTIME_INBOUND => $rawSize,
         ], $project->getId());
@@ -792,7 +703,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
          * Skip this check for non-web platforms which are not required to send an origin header.
          */
         $origin = $request->getOrigin();
-        $originValidator = $connectionContainer->get('originValidator');
+        $originValidator = $app->getResource('originValidator');
+        
+    
+        cloudRealtimeLogConnectionHostnames($app, $project, $request);
 
         if (!empty($origin) && !$originValidator->isValid($origin) && $project->getId() !== 'console') {
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription());
@@ -801,53 +715,15 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         $roles = $user->getRoles($authorization);
 
         $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());
-        $channelCount = \count($channels);
-
-        $updateStats = static function (string $projectId, ?string $teamId, string $payloadJson) use ($register, $stats): void {
-            $register->get('telemetry.connectionCounter')->add(1);
-            $register->get('telemetry.workerClientCounter')->add(1, $register->get('telemetry.workerAttributes'));
-            $register->get('telemetry.connectionCreatedCounter')->add(1);
-
-            $stats->set($projectId, [
-                'projectId' => $projectId,
-                'teamId' => $teamId
-            ]);
-            $stats->incr($projectId, 'connections');
-            $stats->incr($projectId, 'connectionsTotal');
-
-            triggerStats([
-                METRIC_REALTIME_CONNECTIONS => 1,
-                METRIC_REALTIME_OUTBOUND => \strlen($payloadJson),
-            ], $projectId);
-        };
 
         /**
          * Channels Check
          */
         if (empty($channels)) {
-            // in case of message based 'subscribe' channels will be empty at first and only projectId and roles will be available
-            $sanitizedUser = empty($user->getId()) ? null : $response->output($user, Response::MODEL_ACCOUNT);
-            $connectedPayloadJson = json_encode([
-                'type' => 'connected',
-                'data' => [
-                    'channels' => [],
-                    'subscriptions' => [],
-                    'user' => $sanitizedUser
-                ]
-            ]);
-
-            $realtime->subscribe($project->getId(), $connection, '', $roles, [], [], $user->getId());
-            $realtime->connections[$connection]['authorization'] = $authorization;
-            $server->send([$connection], $connectedPayloadJson);
-            $outboundBytes += \strlen($connectedPayloadJson);
-            $updateStats($project->getId(), $project->getAttribute('teamId'), $connectedPayloadJson);
-            $subscriptionMode = 'message';
-            $success = true;
-            return;
+            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing channels');
         }
 
         $names = array_keys($channels);
-        $subscriptionMode = 'url';
 
         try {
             $subscriptions = Realtime::constructSubscriptions(
@@ -868,16 +744,11 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
                 $subscriptionId,
                 $roles,
                 $subscription['channels'],
-                $subscription['queries'],
-                $user->getId()
+                $subscription['queries']
             );
 
             $mapping[$index] = $subscriptionId;
         }
-        $subscriptionCount = \count($subscriptions);
-        if (!empty($subscriptions)) {
-            $register->get('telemetry.workerSubscriptionCounter')->add(\count($subscriptions), $register->get('telemetry.workerAttributes'));
-        }
 
         $realtime->connections[$connection]['authorization'] = $authorization;
 
@@ -893,9 +764,21 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         ]);
 
         $server->send([$connection], $connectedPayloadJson);
-        $outboundBytes += \strlen($connectedPayloadJson);
-        $updateStats($project->getId(), $project->getAttribute('teamId'), $connectedPayloadJson);
-        $success = true;
+
+        $register->get('telemetry.connectionCounter')->add(1);
+        $register->get('telemetry.connectionCreatedCounter')->add(1);
+
+        $stats->set($project->getId(), [
+            'projectId' => $project->getId(),
+            'teamId' => $project->getAttribute('teamId')
+        ]);
+        $stats->incr($project->getId(), 'connections');
+        $stats->incr($project->getId(), 'connectionsTotal');
+
+        $connectedOutboundBytes = \strlen($connectedPayloadJson);
+
+        triggerStats([METRIC_REALTIME_CONNECTIONS => 1, METRIC_REALTIME_OUTBOUND => $connectedOutboundBytes], $project->getId());
+
 
     } catch (Throwable $th) {
         logError($th, 'realtime', project: $project, user: $logUser, authorization: $authorization);
@@ -905,13 +788,12 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         if (!\is_int($code)) {
             $code = 500;
         }
-        $responseCode = $code;
 
         $message = $th->getMessage();
 
         // sanitize 0 && 5xx errors
         $realtimeViolation = $th instanceof AppwriteException && $th->getType() === AppwriteException::REALTIME_POLICY_VIOLATION;
-        if (($code === 0 || $code >= 500) && !$realtimeViolation && System::getEnv('_APP_ENV', 'production') !== 'development') {
+        if (($code === 0 || $code >= 500) && !$realtimeViolation && !Http::isDevelopment()) {
             $message = 'Error: Server Error';
         }
 
@@ -923,54 +805,25 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             ]
         ];
 
-        $responsePayloadJson = json_encode($response);
-        $server->send([$connection], $responsePayloadJson);
-        $outboundBytes += \strlen($responsePayloadJson);
+        $server->send([$connection], json_encode($response));
         $server->close($connection, $code);
 
-        if (System::getEnv('_APP_ENV', 'production') === 'development') {
+        if (Http::isDevelopment()) {
             Console::error('[Error] Connection Error');
             Console::error('[Error] Code: ' . $response['data']['code']);
             Console::error('[Error] Message: ' . $response['data']['message']);
         }
-        Span::error($th);
-    } finally {
-        Span::add('realtime.success', $success);
-        Span::add('realtime.responseCode', $responseCode);
-        Span::add('realtime.subscriptionMode', $subscriptionMode);
-        Span::add('realtime.channelCount', $channelCount);
-        Span::add('realtime.subscriptionCount', $subscriptionCount);
-        Span::add('realtime.outboundBytes', $outboundBytes);
-        if (!empty($project?->getId())) {
-            Span::add('realtime.projectId', $project->getId());
-        }
-        if (!empty($logUser?->getId())) {
-            Span::add('realtime.userId', $logUser->getId());
-        }
-        Span::current()?->finish();
     }
 });
 
-$server->onMessage(function (int $connection, string $message) use ($server, $realtime, $containerId, $register) {
+$server->onMessage(function (int $connection, string $message) use ($server, $realtime, $containerId) {
     $project = null;
     $authorization = null;
-    $projectId = $realtime->connections[$connection]['projectId'] ?? null;
-    $rawSize = \strlen($message);
-    $messageType = 'invalid';
-    $subscriptionDelta = 0;
-    $subscriptionsRequested = 0;
-    $subscriptionsRemoved = 0;
-    $outboundBytes = 0;
-    $responseCode = 200;
-    $success = false;
-
-    Span::init('realtime.message');
-    Span::add('realtime.connectionId', $connection);
-    Span::add('realtime.inboundBytes', $rawSize);
-    Span::add('realtime.containerId', $containerId);
 
     try {
+        $rawSize = \strlen($message);
         $response = new Response(new SwooleResponse());
+        $projectId = $realtime->connections[$connection]['projectId'] ?? null;
 
         // Get authorization from connection (stored during onOpen)
         $authorization = $realtime->connections[$connection]['authorization'] ?? null;
@@ -1020,12 +873,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
             throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Message format is not valid.');
         }
 
-        $messageType = $message['type'] ?? 'invalid';
-
-        if (!\is_scalar($messageType)) {
-            throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Message type is not valid.');
-        }
-
         // Ping does not require project context; other messages do (e.g. after unsubscribe during auth)
         if (empty($projectId) && ($message['type'] ?? '') !== 'ping') {
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing project context. Reconnect to the project first.');
@@ -1038,7 +885,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 ]);
 
                 $server->send([$connection], $pongPayloadJson);
-                $outboundBytes += \strlen($pongPayloadJson);
 
                 if ($project !== null && !$project->isEmpty()) {
                     $pongOutboundBytes = \strlen($pongPayloadJson);
@@ -1084,13 +930,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
 
                 $authorization = $realtime->connections[$connection]['authorization'] ?? null;
                 $projectId = $realtime->connections[$connection]['projectId'] ?? null;
-                // Capture the pre-auth userId so we can rebind any account channels
-                // that were stored under it (e.g. guest who subscribed to `account`
-                // and now authenticates). unsubscribe() below clears the connection
-                // entry, so we must read it first.
-                $previousUserId = $realtime->connections[$connection]['userId'] ?? '';
 
-                $subscriptionsBefore = \count($realtime->getSubscriptionMetadata($connection));
                 $meta = $realtime->getSubscriptionMetadata($connection);
 
                 $realtime->unsubscribe($connection);
@@ -1098,20 +938,14 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 if (!empty($projectId)) {
                     foreach ($meta as $subscriptionId => $subscription) {
                         $queries = Query::parseQueries($subscription['queries'] ?? []);
-                        $channels = Realtime::rebindAccountChannels(
-                            $subscription['channels'] ?? [],
-                            $previousUserId,
-                            $user->getId()
-                        );
 
                         $realtime->subscribe(
                             $projectId,
                             $connection,
                             $subscriptionId,
                             $roles,
-                            $channels,
-                            $queries,
-                            $user->getId()
+                            $subscription['channels'] ?? [],
+                            $queries
                         );
                     }
                 }
@@ -1120,12 +954,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                     $realtime->connections[$connection]['authorization'] = $authorization;
                 }
 
-                $subscriptionsAfter = \count($realtime->getSubscriptionMetadata($connection));
-                $subscriptionDelta = $subscriptionsAfter - $subscriptionsBefore;
-                if ($subscriptionDelta !== 0) {
-                    $register->get('telemetry.workerSubscriptionCounter')->add($subscriptionDelta, $register->get('telemetry.workerAttributes'));
-                }
-
                 $user = $response->output($user, Response::MODEL_ACCOUNT);
 
                 $authResponsePayloadJson = json_encode([
@@ -1138,7 +966,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 ]);
 
                 $server->send([$connection], $authResponsePayloadJson);
-                $outboundBytes += \strlen($authResponsePayloadJson);
 
                 if ($project !== null && !$project->isEmpty()) {
                     $authOutboundBytes = \strlen($authResponsePayloadJson);
@@ -1152,185 +979,20 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
 
                 break;
 
-            case 'subscribe':
-                /**
-                 * Message based upsertion of a subscription
-                 * If subscriptionId is given then it will match subId of the connection and update the subscription with channels and queries
-                 * If non-existing subid is given or not given a new subid will be generated
-                 * Similar to what we have now -> two subscribe() block with same channels and queries still two different subscriptions
-                 *
-                 * structure of the payload -> array of maps
-                 * 'data' : [subscriptionId:"" , channels:[] , queries:[]]
-                 */
-                if (!is_array($message['data']) || !array_is_list($message['data'])) {
-                    throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Payload is not valid.');
-                }
-
-                $roles = $realtime->connections[$connection]['roles'] ?? [Role::guests()->toString()];
-                $userId = $realtime->connections[$connection]['userId'] ?? '';
-
-                // bulk validation + parsing before subscribing
-                $parsedPayloads = [];
-                $subscriptionsBefore = \count($realtime->getSubscriptionMetadata($connection));
-                foreach ($message['data'] as $payload) {
-                    if (!\is_array($payload)) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Each subscribe payload must be an object.');
-                    }
-                    if (!array_key_exists('channels', $payload)) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'channels is not present in payload.');
-                    }
-                    if (!is_array($payload['channels']) || !array_is_list($payload['channels'])) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'channels is not a valid array.');
-                    }
-                    // registering the queries if not present and check in the same payload later on
-                    if (!array_key_exists('queries', $payload)) {
-                        $payload['queries'] = [];
-                    }
-                    if (!is_array($payload['queries']) || !array_is_list($payload['queries'])) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'queries is not a valid array.');
-                    }
-
-                    $subscriptionId = \array_key_exists('subscriptionId', $payload)
-                        ? $payload['subscriptionId']
-                        : ID::unique();
-
-                    try {
-                        $convertedQueries = Realtime::convertQueries($payload['queries']);
-                    } catch (QueryException $e) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Invalid query: ' . $e->getMessage());
-                    }
-
-                    $convertedChannels = \array_keys(Realtime::convertChannels($payload['channels'], $userId));
-
-                    $parsedPayloads[] = [
-                        'subscriptionId' => $subscriptionId,
-                        'channels' => $payload['channels'],
-                        'convertedChannels' => $convertedChannels,
-                        'queries' => $convertedQueries,
-                    ];
-                }
-
-                foreach ($parsedPayloads as $parsedPayload) {
-                    $subscriptionId = $parsedPayload['subscriptionId'];
-                    $channels = $parsedPayload['convertedChannels'];
-                    $queries = $parsedPayload['queries'];
-                    $realtime->subscribe($projectId, $connection, $subscriptionId, $roles, $channels, $queries);
-                }
-                $subscriptionsAfter = \count($realtime->getSubscriptionMetadata($connection));
-                $subscriptionDelta = $subscriptionsAfter - $subscriptionsBefore;
-                $subscriptionsRequested = \count($parsedPayloads);
-                if ($subscriptionDelta !== 0) {
-                    $register->get('telemetry.workerSubscriptionCounter')->add($subscriptionDelta, $register->get('telemetry.workerAttributes'));
-                }
-
-                $responsePayload = json_encode([
-                    'type' => 'response',
-                    'data' => [
-                        'to' => 'subscribe',
-                        'success' => true,
-                        'subscriptions' => \array_map(function (array $parsedPayload) {
-                            return [
-                                'subscriptionId' => $parsedPayload['subscriptionId'],
-                                'channels' => $parsedPayload['convertedChannels'],
-                                'queries' => \array_map(fn ($q) => $q->toString(), $parsedPayload['queries']),
-                            ];
-                        }, $parsedPayloads),
-                    ]
-                ]);
-
-                $server->send([$connection], $responsePayload);
-                $outboundBytes += \strlen($responsePayload);
-
-                if ($project !== null && !$project->isEmpty()) {
-                    $subscribeOutboundBytes = \strlen($responsePayload);
-
-                    if ($subscribeOutboundBytes > 0) {
-                        triggerStats([
-                            METRIC_REALTIME_OUTBOUND => $subscribeOutboundBytes,
-                        ], $project->getId());
-                    }
-                }
-
-                break;
-
-            case 'unsubscribe':
-                if (!\is_array($message['data']) || !\array_is_list($message['data'])) {
-                    throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Payload is not valid.');
-                }
-
-                $subscriptionsBefore = \count($realtime->getSubscriptionMetadata($connection));
-
-                // Validate every payload before executing any removal so an invalid entry
-                // later in the batch does not leave earlier entries half-applied on the server.
-                $validatedIds = [];
-                foreach ($message['data'] as $payload) {
-                    if (
-                        !\is_array($payload)
-                        || !\array_key_exists('subscriptionId', $payload)
-                        || !\is_string($payload['subscriptionId'])
-                        || $payload['subscriptionId'] === ''
-                    ) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Each unsubscribe payload must include a non-empty subscriptionId.');
-                    }
-                    $validatedIds[] = $payload['subscriptionId'];
-                }
-
-                $unsubscribeResults = [];
-                foreach ($validatedIds as $subscriptionId) {
-                    $wasRemoved = $realtime->unsubscribeSubscription($connection, $subscriptionId);
-                    $unsubscribeResults[] = [
-                        'subscriptionId' => $subscriptionId,
-                        'removed' => $wasRemoved,
-                    ];
-                }
-                $subscriptionsAfter = \count($realtime->getSubscriptionMetadata($connection));
-                $subscriptionDelta = $subscriptionsAfter - $subscriptionsBefore;
-                $subscriptionsRequested = \count($validatedIds);
-                $subscriptionsRemoved = \count(\array_filter($unsubscribeResults, fn (array $item) => $item['removed']));
-                if ($subscriptionDelta !== 0) {
-                    $register->get('telemetry.workerSubscriptionCounter')->add($subscriptionDelta, $register->get('telemetry.workerAttributes'));
-                }
-
-                $unsubscribeResponsePayload = json_encode([
-                    'type' => 'response',
-                    'data' => [
-                        'to' => 'unsubscribe',
-                        'success' => true,
-                        'subscriptions' => $unsubscribeResults,
-                    ],
-                ]);
-
-                $server->send([$connection], $unsubscribeResponsePayload);
-                $outboundBytes += \strlen($unsubscribeResponsePayload);
-
-                if ($project !== null && !$project->isEmpty()) {
-                    $unsubscribeOutboundBytes = \strlen($unsubscribeResponsePayload);
-
-                    if ($unsubscribeOutboundBytes > 0) {
-                        triggerStats([
-                            METRIC_REALTIME_OUTBOUND => $unsubscribeOutboundBytes,
-                        ], $project->getId());
-                    }
-                }
-
-                break;
-
             default:
                 throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Message type is not valid.');
         }
-        $success = true;
     } catch (Throwable $th) {
         logError($th, 'realtimeMessage', project: $project, authorization: $authorization);
         $code = $th->getCode();
         if (!is_int($code)) {
             $code = 500;
         }
-        $responseCode = $code;
 
         $message = $th->getMessage();
 
         // sanitize 0 && 5xx errors
-        if (($code === 0 || $code >= 500) && System::getEnv('_APP_ENV', 'production') !== 'development') {
+        if (($code === 0 || $code >= 500) && !Http::isDevelopment()) {
             $message = 'Error: Server Error';
         }
 
@@ -1342,52 +1004,19 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
             ]
         ];
 
-        $responsePayloadJson = json_encode($response);
-        $server->send([$connection], $responsePayloadJson);
-        $outboundBytes += \strlen($responsePayloadJson);
+        $server->send([$connection], json_encode($response));
 
         if ($th->getCode() === 1008) {
             $server->close($connection, $th->getCode());
         }
-        Span::error($th);
-    } finally {
-        Span::add('realtime.success', $success);
-        Span::add('realtime.responseCode', $responseCode);
-        Span::add('realtime.subscriptionDelta', $subscriptionDelta);
-        Span::add('realtime.subscriptionsRequested', $subscriptionsRequested);
-        Span::add('realtime.subscriptionsRemoved', $subscriptionsRemoved);
-        Span::add('realtime.subscribe.subscriptionsCount', $subscriptionsRequested);
-        Span::add('realtime.outboundBytes', $outboundBytes);
-        Span::add('realtime.projectId', $project?->getId() ?? $projectId);
-        Span::add('realtime.userId', $realtime->connections[$connection]['userId'] ?? null);
-        Span::add('realtime.messageType', $messageType);
-        Span::current()?->finish();
     }
 });
 
 $server->onClose(function (int $connection) use ($realtime, $stats, $register) {
-    $projectId = null;
-    $userId = null;
-    $subscriptionsBeforeClose = 0;
-    $success = false;
-
-    Span::init('realtime.close');
-    Span::add('realtime.connectionId', $connection);
-
-    if (array_key_exists($connection, $realtime->connections)) {
-        $projectId = $realtime->connections[$connection]['projectId'] ?? null;
-        $userId = $realtime->connections[$connection]['userId'] ?? null;
-    }
-
     try {
         if (array_key_exists($connection, $realtime->connections)) {
             $stats->decr($realtime->connections[$connection]['projectId'], 'connectionsTotal');
             $register->get('telemetry.connectionCounter')->add(-1);
-            $register->get('telemetry.workerClientCounter')->add(-1, $register->get('telemetry.workerAttributes'));
-            $subscriptionsBeforeClose = \count($realtime->getSubscriptionMetadata($connection));
-            if ($subscriptionsBeforeClose > 0) {
-                $register->get('telemetry.workerSubscriptionCounter')->add(-$subscriptionsBeforeClose, $register->get('telemetry.workerAttributes'));
-            }
 
             $projectId = $realtime->connections[$connection]['projectId'];
 
@@ -1395,30 +1024,12 @@ $server->onClose(function (int $connection) use ($realtime, $stats, $register) {
                 METRIC_REALTIME_CONNECTIONS => -1,
             ], $projectId);
         }
-        $success = true;
     } catch (\Throwable $th) {
         // Log only; do not rethrow. If we let this bubble, Swoole dumps full coroutine
         // backtraces and unsubscribe() below would never run (connection cleanup would fail).
         Console::error('Realtime onClose error: ' . $th->getMessage());
-        Span::error($th);
-    } finally {
-        try {
-            $realtime->unsubscribe($connection);
-        } catch (\Throwable $th) {
-            Console::error('Realtime onClose unsubscribe error: ' . $th->getMessage());
-            Span::error($th);
-        }
-
-        Span::add('realtime.success', $success);
-        if (!empty($projectId)) {
-            Span::add('realtime.projectId', $projectId);
-        }
-        if (!empty($userId)) {
-            Span::add('realtime.userId', $userId);
-        }
-        Span::add('realtime.subscriptionsBeforeClose', $subscriptionsBeforeClose);
-        Span::current()?->finish();
     }
+    $realtime->unsubscribe($connection);
 
     Console::info('Connection close: ' . $connection);
 });

app/views/install/compose.phtml

@@ -120,6 +120,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -255,6 +256,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_USAGE_STATS
       - _APP_LOGGING_CONFIG
 
@@ -285,6 +287,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-webhooks:
@@ -312,6 +315,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -352,6 +356,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
       - _APP_STORAGE_S3_SECRET
@@ -411,6 +416,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-builds:
@@ -447,6 +453,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_VCS_GITHUB_APP_NAME
       - _APP_VCS_GITHUB_PRIVATE_KEY
@@ -522,35 +529,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_LOGGING_CONFIG
-
-  appwrite-worker-executions:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-executions
-    <<: *x-logging
-    container_name: appwrite-worker-executions
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_ENV
       - _APP_DB_ADAPTER
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-functions:
@@ -584,6 +563,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_SITES_TIMEOUT
       - _APP_COMPUTE_BUILD_TIMEOUT
@@ -621,6 +601,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -663,6 +644,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_SMS_FROM
       - _APP_SMS_PROVIDER
@@ -723,6 +705,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
@@ -761,6 +744,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
@@ -793,6 +777,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -825,6 +810,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -856,6 +842,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
@@ -891,6 +878,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
 
   appwrite-task-scheduler-executions:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -919,6 +907,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
 
   appwrite-task-scheduler-messages:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -947,6 +936,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
+      - _APP_DB_ADAPTER
 
 <?php if ($enableAssistant): ?>
   appwrite-assistant:
@@ -974,7 +964,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
-    image: openruntimes/executor:0.11.4
+    image: openruntimes/executor:0.7.22
     networks:
       - appwrite
       - runtimes
@@ -1049,12 +1039,13 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     image: mongo:8.2.5
     container_name: appwrite-mongodb
     <<: *x-logging
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
       - appwrite-mongodb:/data/db
       - appwrite-mongodb-keyfile:/data/keyfile
+    ports:
+      - "27017:27017"
     environment:
       - MONGO_INITDB_ROOT_USERNAME=root
       - MONGO_INITDB_ROOT_PASSWORD=${_APP_DB_ROOT_PASS}
@@ -1185,6 +1176,7 @@ volumes:
 <?php elseif ($dbService === 'mongodb'): ?>
   appwrite-mongodb:
   appwrite-mongodb-keyfile:
+  appwrite-mongodb-config:
 <?php endif; ?>
   appwrite-redis:
   appwrite-cache:

app/worker.php

@@ -1,69 +1,564 @@
 <?php
 
 require_once __DIR__ . '/init.php';
-$registerWorkerMessageResources = require __DIR__ . '/init/worker/message.php';
-
 use Appwrite\Certificates\LetsEncrypt;
+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\Publisher\Usage as UsagePublisher;
+use Appwrite\Event\Realtime;
+use Appwrite\Event\Screenshot;
+use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
+use Appwrite\Usage\Context;
+use Appwrite\Utopia\Database\Documents\User;
+use Executor\Executor;
 use Swoole\Runtime;
+use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\Audit\Adapter\Database as AdapterDatabase;
+use Utopia\Audit\Audit as UtopiaAudit;
+use Utopia\Cache\Adapter\Pool as CachePool;
+use Utopia\Cache\Adapter\Sharding;
+use Utopia\Cache\Cache;
+use Utopia\Config\Config;
 use Utopia\Console;
+use Utopia\Database\Adapter\Pool as DatabasePool;
+use Utopia\Database\Database;
+use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
+use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Adapter\Swoole;
 use Utopia\Queue\Broker\Pool as BrokerPool;
+use Utopia\Queue\Message;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
 use Utopia\Queue\Server;
+use Utopia\Registry\Registry;
+use Utopia\Storage\Device\Telemetry as TelemetryDevice;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter as Telemetry;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
 Runtime::enableCoroutine();
 require_once __DIR__ . '/init/span.php';
 
-global $container;
-$container->set('pools', function ($register) {
-    return $register->get('pools');
-}, ['register']);
+global $register;
+Server::setResource('register', fn () => $register);
 
-$container->set('authorization', function () {
+Server::setResource('authorization', function () {
     $authorization = new Authorization();
     $authorization->disable();
 
     return $authorization;
 }, []);
 
-$container->set('project', fn () => new Document([]), []);
+Server::setResource('dbForPlatform', function (Cache $cache, Registry $register, Authorization $authorization) {
+    $pools = $register->get('pools');
+    $adapter = new DatabasePool($pools->get('console'));
+    $dbForPlatform = new Database($adapter, $cache);
 
-$container->set('log', fn () => new Log(), []);
+    $dbForPlatform
+        ->setDatabase(APP_DATABASE)
+        ->setAuthorization($authorization)
+        ->setNamespace('_console')
+        ->setDocumentType('users', User::class);
 
-$container->set('consumer', function (Group $pools) {
+    return $dbForPlatform;
+}, ['cache', 'register', 'authorization']);
+
+Server::setResource('project', function (Message $message, Database $dbForPlatform) {
+    $payload = $message->getPayload() ?? [];
+    $project = new Document($payload['project'] ?? []);
+
+    if ($project->getId() === 'console') {
+        return $project;
+    }
+
+    return $dbForPlatform->getDocument('projects', $project->getId());
+}, ['message', 'dbForPlatform']);
+
+Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform, Authorization $authorization) {
+    if ($project->isEmpty() || $project->getId() === 'console') {
+        return $dbForPlatform;
+    }
+
+    $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 = new DatabasePool($pools->get($dsn->getHost()));
+    $database = new Database($adapter, $cache);
+    $database->setDocumentType('users', User::class);
+
+    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+    if (\in_array($dsn->getHost(), $sharedTables)) {
+        $database
+            ->setSharedTables(true)
+            ->setTenant($project->getSequence())
+            ->setNamespace($dsn->getParam('namespace'));
+    } else {
+        $database
+            ->setSharedTables(false)
+            ->setTenant(null)
+            ->setNamespace('_' . $project->getSequence());
+    }
+
+    $database
+        ->setDatabase(APP_DATABASE)
+        ->setAuthorization($authorization)
+        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+
+    return $database;
+}, ['cache', 'register', 'message', 'project', 'dbForPlatform', 'authorization']);
+
+Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, Authorization $authorization) {
+    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
+
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases): Database {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            return $dbForPlatform;
+        }
+
+        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()];
+            $database->setAuthorization($authorization);
+            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+            if (\in_array($dsn->getHost(), $sharedTables)) {
+                $database
+                    ->setSharedTables(true)
+                    ->setTenant($project->getSequence())
+                    ->setNamespace($dsn->getParam('namespace'));
+            } else {
+                $database
+                    ->setSharedTables(false)
+                    ->setTenant(null)
+                    ->setNamespace('_' . $project->getSequence());
+            }
+
+            return $database;
+        }
+
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $database = new Database($adapter, $cache);
+
+        $databases[$dsn->getHost()] = $database;
+
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+        if (\in_array($dsn->getHost(), $sharedTables)) {
+            $database
+                ->setSharedTables(true)
+                ->setTenant($project->getSequence())
+                ->setNamespace($dsn->getParam('namespace'));
+        } else {
+            $database
+                ->setSharedTables(false)
+                ->setTenant(null)
+                ->setNamespace('_' . $project->getSequence());
+        }
+
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization)
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+
+        return $database;
+    };
+}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+
+Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+    $database = null;
+
+    return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
+        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant($project->getSequence());
+            return $database;
+        }
+
+        $adapter = new DatabasePool($pools->get('logs'));
+        $database = new Database($adapter, $cache);
+
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization)
+            ->setSharedTables(true)
+            ->setNamespace('logsV1')
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
+
+        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant($project->getSequence());
+        }
+
+        return $database;
+    };
+}, ['pools', 'cache', 'authorization']);
+
+Server::setResource('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
+    return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): Database {
+        $projectDocument ??= $project;
+        $databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
+        $databaseType = $database->getAttribute('type', '');
+
+        // Backwards‑compatibility: older or seeded legacy databases may not have a DSN stored
+        // in the "database" attribute. In that case, fall back to the project's database DSN.
+        if ($databaseDSN === '') {
+            $databaseDSN = $projectDocument->getAttribute('database', '');
+        }
+
+        try {
+            $databaseDSN = new DSN($databaseDSN);
+        } catch (\InvalidArgumentException) {
+            $databaseDSN = new DSN('mysql://'.$databaseDSN);
+        }
+
+        try {
+            $dsn = new DSN($projectDocument->getAttribute('database'));
+        } catch (\InvalidArgumentException) {
+            // Temporary fallback until all projects use shared tables
+            $dsn = new DSN('mysql://' . $projectDocument->getAttribute('database'));
+        }
+
+        $pools = $register->get('pools');
+        $pool = $pools->get($databaseDSN->getHost());
+
+        $adapter = new DatabasePool($pool);
+        $database = new Database($adapter, $cache);
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization);
+        $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
+
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+        if (\in_array($dsn->getHost(), $sharedTables, true)) {
+            $database
+                ->setSharedTables(true)
+                ->setTenant((int) $projectDocument->getSequence())
+                ->setNamespace($dsn->getParam('namespace'));
+        } else {
+            $database
+                ->setSharedTables(false)
+                ->setTenant(null)
+                ->setNamespace('_' . $projectDocument->getSequence());
+        }
+
+        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+        return $database;
+    };
+}, ['cache', 'register', 'project', 'authorization']);
+
+Server::setResource('abuseRetention', function () {
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+});
+
+Server::setResource('auditRetention', function (Document $project) {
+    if ($project->getId() === 'console') {
+        return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
+    }
+
+    return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
+}, ['project']);
+
+Server::setResource('executionRetention', function () {
+    return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+});
+
+Server::setResource('cache', function (Registry $register) {
+    $pools = $register->get('pools');
+    $list = Config::getParam('pools-cache', []);
+    $adapters = [];
+
+    foreach ($list as $value) {
+        $adapters[] = new CachePool($pools->get($value));
+    }
+
+    return new Cache(new Sharding($adapters));
+}, ['register']);
+
+Server::setResource('redis', function () {
+    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
+    $port = System::getEnv('_APP_REDIS_PORT', 6379);
+    $pass = System::getEnv('_APP_REDIS_PASS', '');
+
+    $redis = new \Redis();
+    @$redis->pconnect($host, (int) $port);
+    if ($pass) {
+        $redis->auth($pass);
+    }
+    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
+
+    return $redis;
+});
+
+Server::setResource('timelimit', function (\Redis $redis) {
+    return function (string $key, int $limit, int $time) use ($redis) {
+        return new TimeLimitRedis($key, $limit, $time, $redis);
+    };
+}, ['redis']);
+
+Server::setResource('log', fn () => new Log());
+
+Server::setResource('publisher', function (Group $pools) {
+    return new BrokerPool(publisher: $pools->get('publisher'));
+}, ['pools']);
+
+Server::setResource('publisherDatabases', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('publisherFunctions', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('publisherMigrations', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('publisherMessaging', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('consumer', function (Group $pools) {
     return new BrokerPool(consumer: $pools->get('consumer'));
 }, ['pools']);
 
-$container->set('consumerDatabases', function (BrokerPool $consumer) {
+Server::setResource('consumerDatabases', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-$container->set('consumerMigrations', function (BrokerPool $consumer) {
+Server::setResource('consumerMigrations', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-$container->set('consumerStatsUsage', function (BrokerPool $consumer) {
+Server::setResource('consumerStatsUsage', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-$container->set('certificates', function () {
+Server::setResource('usage', function () {
+    return new Context();
+}, []);
+Server::setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
+    $publisher,
+    new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
+), ['publisher']);
+
+Server::setResource('queueForDatabase', function (Publisher $publisher) {
+    return new EventDatabase($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForMessaging', function (Publisher $publisher) {
+    return new Messaging($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForMails', function (Publisher $publisher) {
+    return new Mail($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForBuilds', function (Publisher $publisher) {
+    return new Build($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForScreenshots', function (Publisher $publisher) {
+    return new Screenshot($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForDeletes', function (Publisher $publisher) {
+    return new Delete($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForEvents', function (Publisher $publisher) {
+    return new Event($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForAudits', function (Publisher $publisher) {
+    return new Audit($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForWebhooks', function (Publisher $publisher) {
+    return new Webhook($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForFunctions', function (Publisher $publisher) {
+    return new Func($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForRealtime', function () {
+    return new Realtime();
+}, []);
+
+Server::setResource('queueForCertificates', function (Publisher $publisher) {
+    return new Certificate($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForMigrations', function (Publisher $publisher) {
+    return new Migration($publisher);
+}, ['publisher']);
+
+Server::setResource('logger', function (Registry $register) {
+    return $register->get('logger');
+}, ['register']);
+
+Server::setResource('pools', function (Registry $register) {
+    return $register->get('pools');
+}, ['register']);
+
+Server::setResource('telemetry', fn () => new NoTelemetry());
+
+Server::setResource('deviceForSites', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForMigrations', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForFiles', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForCache', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource(
+    'isResourceBlocked',
+    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
+);
+
+Server::setResource('plan', function (array $plan = []) {
+    return [];
+});
+
+Server::setResource('certificates', function () {
     $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
     if (empty($email)) {
         throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue a LetsEncrypt SSL certificate.');
     }
 
     return new LetsEncrypt($email);
-}, []);
+});
 
+Server::setResource('logError', function (Registry $register, Document $project) {
+    return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
+        $logger = $register->get('logger');
+
+        if ($logger) {
+            $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+
+            $log = new Log();
+            $log->setNamespace($namespace);
+            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \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->addTag('projectId', $project->getId() ?? '');
+
+            $log->addExtra('file', $error->getFile());
+            $log->addExtra('line', $error->getLine());
+            $log->addExtra('trace', $error->getTraceAsString());
+
+            if ($error->getPrevious() !== null) {
+                if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+                    $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
+                }
+                $log->addExtra('previousFile', $error->getPrevious()->getFile());
+                $log->addExtra('previousLine', $error->getPrevious()->getLine());
+            }
+
+            foreach (($extras ?? []) as $key => $value) {
+                $log->addExtra($key, $value);
+            }
+
+            $log->setAction($action);
+
+            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
+        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
+
+        if ($error->getPrevious() !== null) {
+            if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+                Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
+            }
+            Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
+        }
+    };
+}, ['register', 'project']);
+
+Server::setResource('executor', fn () => new Executor());
+
+Server::setResource('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
+    return function (Document $project) use ($dbForPlatform, $getProjectDB) {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            $adapter = new AdapterDatabase($dbForPlatform);
+
+            return new UtopiaAudit($adapter);
+        }
+
+        $dbForProject = $getProjectDB($project);
+        $adapter = new AdapterDatabase($dbForProject);
+
+        return new UtopiaAudit($adapter);
+    };
+}, ['dbForPlatform', 'getProjectDB']);
+
+Server::setResource('executionsRetentionCount', function (Document $project, array $plan) {
+    if ($project->getId() === 'console' || empty($plan)) {
+        return 0;
+    }
+
+    return (int) ($plan['executionsRetentionCount'] ?? 100);
+}, ['project', 'plan']);
+
+$pools = $register->get('pools');
 $platform = new Appwrite();
-$args = $_SERVER['argv'] ?? [];
+$args = $platform->getEnv('argv');
 
 if (! isset($args[1])) {
     Console::error('Missing worker name');
@@ -79,45 +574,38 @@ if (\str_starts_with($workerName, 'databases')) {
     $queueName = System::getEnv('_APP_QUEUE_NAME', 'v1-' . strtolower($workerName));
 }
 
-/** @var \Utopia\Pools\Group $pools */
-$pools = $container->get('pools');
-
-$adapter = new Swoole(
-    $pools->get('consumer')->pop()->getResource(),
-    System::getEnv('_APP_WORKERS_NUM', 1),
-    $queueName
-);
-
-$worker = new Server($adapter, $container);
-
 try {
-    $worker->init()->action(function () use ($worker, $registerWorkerMessageResources) {
-        $registerWorkerMessageResources($worker->getContainer());
-    });
-
-    $container->set('bus', function ($register) use ($worker) {
-        return $register->get('bus')->setResolver(
-            fn (string $name) => $worker->getContainer()->get($name)
-        );
-    }, ['register']);
-
-    $platform->setWorker($worker);
+    /**
+     * Any worker can be configured with the following env vars:
+     * - _APP_WORKERS_NUM           The total number of worker processes
+     * - _APP_WORKER_PER_CORE       The number of worker processes per core (ignored if _APP_WORKERS_NUM is set)
+     * - _APP_QUEUE_NAME            The name of the queue to read for database events
+     */
     $platform->init(Service::TYPE_WORKER, [
-        'workerName' => strtolower($workerName),
+        'workersNum' => System::getEnv('_APP_WORKERS_NUM', 1),
+        'connection' => $pools->get('consumer')->pop()->getResource(),
+        'workerName' => strtolower($workerName) ?? null,
+        'queueName' => $queueName,
     ]);
 } catch (\Throwable $e) {
     Console::error($e->getMessage() . ', File: ' . $e->getFile() . ', Line: ' . $e->getLine());
-    Console::exit(1);
 }
 
+$worker = $platform->getWorker();
+
+Server::setResource('bus', function ($register) use ($worker) {
+    return $register->get('bus')->setResolver(fn (string $name) => $worker->getResource($name));
+}, ['register']);
+
 $worker
     ->error()
     ->inject('error')
     ->inject('logger')
     ->inject('log')
+    ->inject('pools')
     ->inject('project')
     ->inject('authorization')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Document $project, Authorization $authorization) use ($queueName) {
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project, Authorization $authorization) use ($queueName) {
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
 
         if ($logger) {
@@ -129,7 +617,7 @@ $worker
             $log->setAction('appwrite-queue-' . $queueName);
             $log->addTag('verboseType', get_class($error));
             $log->addTag('code', $error->getCode());
-            $log->addTag('projectId', $project->getId());
+            $log->addTag('projectId', $project->getId() ?? 'n/a');
             $log->addExtra('file', $error->getFile());
             $log->addExtra('line', $error->getLine());
             $log->addExtra('trace', $error->getTraceAsString());

composer.json

@@ -49,40 +49,39 @@
         "ext-openssl": "*",
         "ext-zlib": "*",
         "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.20.*",
+        "appwrite/php-runtimes": "0.19.*",
         "appwrite/php-clamav": "2.0.*",
         "utopia-php/abuse": "1.2.*",
-        "utopia-php/agents": "1.2.*",
         "utopia-php/analytics": "0.15.*",
         "utopia-php/audit": "2.2.*",
         "utopia-php/auth": "0.5.*",
         "utopia-php/cache": "1.0.*",
-        "utopia-php/cli": "0.23.*",
+        "utopia-php/cli": "0.22.*",
         "utopia-php/compression": "0.1.*",
         "utopia-php/config": "1.*",
         "utopia-php/console": "0.1.*",
         "utopia-php/database": "5.*",
+        "utopia-php/agents": "1.*",
         "utopia-php/detector": "0.2.*",
         "utopia-php/domains": "1.*",
         "utopia-php/emails": "0.6.*",
         "utopia-php/dns": "1.6.*",
         "utopia-php/dsn": "0.2.1",
-        "utopia-php/http": "0.34.*",
+        "utopia-php/framework": "0.33.*",
         "utopia-php/fetch": "0.5.*",
-        "utopia-php/validators": "0.2.*",
         "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.8.*",
         "utopia-php/logger": "0.6.*",
         "utopia-php/messaging": "0.22.*",
         "utopia-php/migration": "1.9.*",
-        "utopia-php/platform": "0.13.*",
+        "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "1.*",
         "utopia-php/span": "1.1.*",
         "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.17.*",
-        "utopia-php/servers": "0.3.*",
+        "utopia-php/queue": "0.15.*",
+        "utopia-php/servers": "0.2.5",
         "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "2.*",
+        "utopia-php/storage": "1.0.*",
         "utopia-php/system": "0.10.*",
         "utopia-php/telemetry": "0.2.*",
         "utopia-php/vcs": "3.*",
@@ -93,9 +92,10 @@
         "chillerlan/php-qrcode": "4.3.*",
         "adhocore/jwt": "1.1.*",
         "spomky-labs/otphp": "11.*",
-        "webonyx/graphql-php": "15.31.*",
+        "webonyx/graphql-php": "14.11.*",
         "league/csv": "9.14.*",
-        "enshrined/svg-sanitize": "0.22.*"
+        "enshrined/svg-sanitize": "0.22.*",
+        "utopia-php/di": "0.1.0"
     },
     "require-dev": {
         "ext-fileinfo": "*",

docker-compose.yml

@@ -242,20 +242,19 @@ services:
       - _APP_EXPERIMENT_LOGGING_PROVIDER
       - _APP_EXPERIMENT_LOGGING_CONFIG
       - _APP_DATABASE_SHARED_TABLES
+      - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_DATABASE_SHARED_NAMESPACE
       - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
       - _APP_CUSTOM_DOMAIN_DENY_LIST
       - _APP_TRUSTED_HEADERS
       - _APP_MIGRATION_HOST
-      - _TESTS_OAUTH2_GITHUB_CLIENT_ID
-      - _TESTS_OAUTH2_GITHUB_CLIENT_SECRET
     extra_hosts:
       - "host.docker.internal:host-gateway"
 
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:7.8.45
+    image: appwrite/console:7.8.26
     restart: unless-stopped
     networks:
       - appwrite
@@ -463,6 +462,7 @@ services:
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_DATABASE_SHARED_TABLES
+      - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_EMAIL_CERTIFICATES
       - _APP_MAINTENANCE_RETENTION_AUDIT
       - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
@@ -1288,7 +1288,6 @@ services:
     image: mongo:8.2.5
     container_name: appwrite-mongodb
     <<: *x-logging
-    restart: on-failure:3
     networks:
       - appwrite
     volumes:

docs/references/account/create-2fa-challenge.md

@@ -0,0 +1 @@
+Initialize an MFA challenge of the specified factor. The factor must be available on the account.

docs/references/account/delete-session-current.md

@@ -0,0 +1 @@
+Use this endpoint to log out the currently logged in user from their account. When successful this endpoint will delete the user session and remove the session secret cookie from the user client.

docs/references/console/variables.md

@@ -0,0 +1 @@
+Get all Environment Variables that are relevant for the console.

docs/references/documentsdb/get-collection-logs.md

@@ -0,0 +1 @@
+Get the collection activity logs list by its unique ID.

docs/references/documentsdb/get-document-logs.md

@@ -0,0 +1 @@
+Get the document activity logs list by its unique ID.

docs/references/documentsdb/list-attributes.md

@@ -0,0 +1 @@
+List attributes in the collection.

docs/references/functions/create-build.md

@@ -0,0 +1 @@
+Create a new build for an existing function deployment. This endpoint allows you to rebuild a deployment with the updated function configuration, including its entrypoint and build commands if they have been modified. The build process will be queued and executed asynchronously. The original deployment's code will be preserved and used for the new build.

docs/references/functions/create-deployment.md

@@ -0,0 +1,5 @@
+Create a new function code deployment. Use this endpoint to upload a new version of your code function. To execute your newly uploaded code, you'll need to update the function's deployment to use your new deployment UID.
+
+This endpoint accepts a tar.gz file compressed with your code. Make sure to include any dependencies your code has within the compressed file. You can learn more about code packaging in the [Appwrite Cloud Functions tutorial](https://appwrite.io/docs/functions).
+
+Use the "command" param to set the entrypoint used to execute your code.

docs/references/functions/create-execution.md

@@ -0,0 +1 @@
+Trigger a function execution. The returned object will return you the current execution status. You can ping the `Get Execution` endpoint to get updates on the current execution status. Once this endpoint is called, your function execution process will start asynchronously.

docs/references/functions/create-function.md

@@ -0,0 +1 @@
+Create a new function. You can pass a list of [permissions](https://appwrite.io/docs/permissions) to allow different project users or team with access to execute the function using the client API.

docs/references/functions/create-variable.md

@@ -0,0 +1 @@
+Create a new function environment variable. These variables can be accessed in the function at runtime as environment variables.

docs/references/functions/delete-deployment.md

@@ -0,0 +1 @@
+Delete a code deployment by its unique ID.

docs/references/functions/delete-execution.md

@@ -0,0 +1 @@
+Delete a function execution by its unique ID.

docs/references/functions/delete-function.md

@@ -0,0 +1 @@
+Delete a function by its unique ID.

docs/references/functions/delete-variable.md

@@ -0,0 +1 @@
+Delete a variable by its unique ID.

docs/references/functions/get-deployment-download.md

@@ -0,0 +1 @@
+Get a Deployment's contents by its unique ID. This endpoint supports range requests for partial or streaming file download.

docs/references/functions/get-deployment.md

@@ -0,0 +1 @@
+Get a code deployment by its unique ID.

docs/references/functions/get-execution.md

@@ -0,0 +1 @@
+Get a function execution log by its unique ID.

docs/references/functions/get-function-usage.md

@@ -0,0 +1 @@
+Get usage metrics and statistics for a for a specific function. View statistics including total deployments, builds, executions, storage usage, and compute time. The response includes both current totals and historical data for each metric. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, defaults to 30 days.

docs/references/functions/get-function.md

@@ -0,0 +1 @@
+Get a function by its unique ID.

docs/references/functions/get-functions-usage.md

@@ -0,0 +1 @@
+Get usage metrics and statistics for a for all functions. View statistics including total functions, deployments, builds, executions, storage usage, and compute time. The response includes both current totals and historical data for each metric. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, defaults to 30 days.

docs/references/functions/get-template.md

@@ -0,0 +1 @@
+Get a function template using ID. You can use template details in [createFunction](/docs/references/cloud/server-nodejs/functions#create) method.

docs/references/functions/get-variable.md

@@ -0,0 +1 @@
+Get a variable by its unique ID.

docs/references/functions/list-deployments.md

@@ -0,0 +1 @@
+Get a list of all the function's code deployments. You can use the query params to filter your results.

docs/references/functions/list-executions.md

@@ -0,0 +1 @@
+Get a list of all the current user function execution logs. You can use the query params to filter your results.

docs/references/functions/list-functions.md

@@ -0,0 +1 @@
+Get a list of all the project's functions. You can use the query params to filter your results.

docs/references/functions/list-runtimes.md

@@ -0,0 +1 @@
+Get a list of all runtimes that are currently active on your instance.

docs/references/functions/list-specifications.md

@@ -0,0 +1 @@
+List allowed function specifications for this instance.

docs/references/functions/list-templates.md

@@ -0,0 +1 @@
+List available function templates. You can use template details in [createFunction](/docs/references/cloud/server-nodejs/functions#create) method.

docs/references/functions/list-variables.md

@@ -0,0 +1 @@
+Get a list of all variables of a specific function.

docs/references/functions/update-deployment-build.md

@@ -0,0 +1 @@
+Cancel an ongoing function deployment build. If the build is already in progress, it will be stopped and marked as canceled. If the build hasn't started yet, it will be marked as canceled without executing. You cannot cancel builds that have already completed (status 'ready') or failed. The response includes the final build status and details.

docs/references/functions/update-function-deployment.md

@@ -0,0 +1 @@
+Update the function code deployment ID using the unique function ID. Use this endpoint to switch the code deployment that should be executed by the execution endpoint.

docs/references/functions/update-function.md

@@ -0,0 +1 @@
+Update function by its unique ID.

docs/references/functions/update-variable.md

@@ -0,0 +1 @@
+Update variable by its unique ID.

docs/references/health/get-queue-stats-usage-dump.md

@@ -0,0 +1 @@
+Get the number of projects containing metrics that are waiting to be processed in the Appwrite internal queue server.

docs/references/health/get-queue-tasks.md

@@ -0,0 +1 @@
+Get the number of tasks that are waiting to be processed in the Appwrite internal queue server.

docs/references/health/get-queue.md

@@ -0,0 +1 @@
+Check the Appwrite queue messaging servers are up and connection is successful.

docs/references/messaging/delete.md

@@ -0,0 +1 @@
+Delete a message by its unique ID.

docs/references/project/create-variable.md

@@ -0,0 +1 @@
+Create a new project variable. This variable will be accessible in all Appwrite Functions at runtime.

docs/references/project/delete-variable.md

@@ -0,0 +1 @@
+Delete a project variable by its unique ID. 

docs/references/project/get-variable.md

@@ -0,0 +1 @@
+Get a project variable by its unique ID.

docs/references/project/list-variables.md

@@ -0,0 +1 @@
+Get a list of all project variables. These variables will be accessible in all Appwrite Functions at runtime.

docs/references/project/update-variable.md

@@ -0,0 +1 @@
+Update project variable by its unique ID. This variable will be accessible in all Appwrite Functions at runtime.

docs/references/projects/create-key.md

@@ -0,0 +1 @@
+Create a new API key. It's recommended to have multiple API keys with strict scopes for separate functions within your project.

docs/references/projects/create-platform.md

@@ -0,0 +1 @@
+Create a new platform for your project. Use this endpoint to register a new platform where your users will run your application which will interact with the Appwrite API.

docs/references/projects/create-webhook.md

@@ -0,0 +1 @@
+Create a new webhook. Use this endpoint to configure a URL that will receive events from Appwrite when specific events occur.