Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into…

… feat-reatime-cache-cert-sync

� Conflicts:
�	.env
�	.gitignore
�	Dockerfile
�	app/cli.php
�	app/config/collections.php
�	app/config/regions.php
�	app/config/services.php
�	app/console
�	app/controllers/api/databases.php
�	app/controllers/api/functions.php
�	app/controllers/api/projects.php
�	app/controllers/api/storage.php
�	app/controllers/api/teams.php
�	app/controllers/api/users.php
�	app/controllers/general.php
�	app/controllers/shared/api.php
�	app/init.php
�	app/realtime.php
�	app/worker.php
�	app/workers/deletes.php
�	bin/worker-certificates
�	bin/worker-deletes
�	composer.json
�	composer.lock
�	docker-compose.yml
�	src/Appwrite/Platform/Services/Tasks.php
�	src/Appwrite/Platform/Tasks/Maintenance.php
�	src/Appwrite/Platform/Tasks/SSL.php
�	src/Appwrite/Platform/Workers/Certificates.php
�	src/Appwrite/Platform/Workers/sync-in.php
�	src/Appwrite/Platform/Workers/sync-out.php
�	src/Appwrite/Utopia/Response.php
�	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
�	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
�	tests/e2e/Services/Realtime/RealtimeCustomClientTest.php

.env

@@ -1,20 +1,24 @@
 _APP_ENV=development
+_APP_EDITION=self-hosted
 _APP_LOCALE=en
-_APP_WORKER_PER_CORE=2
+_APP_WORKER_PER_CORE=6
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
-_APP_CONSOLE_WHITELIST_CODES=code-zero,code-one
 _APP_CONSOLE_WHITELIST_IPS=
-_APP_CONSOLE_INVITES=enabled
+_APP_CONSOLE_COUNTRIES_DENYLIST=AQ
+_APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 [email protected]
 [email protected]
 _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
+_APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
+_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
-_APP_DOMAIN=demo.appwrite.io
-_APP_DOMAIN_TARGET=demo.appwrite.io
+_APP_DOMAIN=localhost
+_APP_DOMAIN_FUNCTIONS=functions.localhost
+_APP_DOMAIN_TARGET=localhost
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
@@ -25,52 +29,79 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_CONNECTIONS_MAX=3100
-_APP_POOL_CLIENTS=14
-_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb:https://user:password@mariadb:3306/appwrite
-_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb:https://user:password@mariadb:3306/appwrite
-_APP_CONNECTIONS_CACHE=redis_fra1_01=redis:https://redis:6379
-_APP_CONNECTIONS_QUEUE=redis_fra1_01=redis:https://redis:6379
-_APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis:https://redis:6379
-_APP_CONNECTIONS_STORAGE=local:https://localhost
+_APP_STORAGE_DEVICE=Local
+_APP_STORAGE_S3_ACCESS_KEY=
+_APP_STORAGE_S3_SECRET=
+_APP_STORAGE_S3_REGION=us-east-1
+_APP_STORAGE_S3_BUCKET=
+_APP_STORAGE_DO_SPACES_ACCESS_KEY=
+_APP_STORAGE_DO_SPACES_SECRET=
+_APP_STORAGE_DO_SPACES_REGION=us-east-1
+_APP_STORAGE_DO_SPACES_BUCKET=
+_APP_STORAGE_BACKBLAZE_ACCESS_KEY=
+_APP_STORAGE_BACKBLAZE_SECRET=
+_APP_STORAGE_BACKBLAZE_REGION=us-west-004
+_APP_STORAGE_BACKBLAZE_BUCKET=
+_APP_STORAGE_LINODE_ACCESS_KEY=
+_APP_STORAGE_LINODE_SECRET=
+_APP_STORAGE_LINODE_REGION=eu-central-1
+_APP_STORAGE_LINODE_BUCKET=
+_APP_STORAGE_WASABI_ACCESS_KEY=
+_APP_STORAGE_WASABI_SECRET=
+_APP_STORAGE_WASABI_REGION=eu-central-1
+_APP_STORAGE_WASABI_BUCKET=
 _APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
-_APP_INFLUXDB_HOST=influxdb
-_APP_INFLUXDB_PORT=8086
-_APP_STATSD_HOST=telegraf
-_APP_STATSD_PORT=8125
 _APP_SMTP_HOST=maildev
 _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
 _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
 _APP_SMS_PROVIDER=sms:https://username:password@mock
 _APP_SMS_FROM=+123456789
+_APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
-_APP_FUNCTIONS_MEMORY=512
+_APP_FUNCTIONS_MEMORY=1024
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600
 _APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
 _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http:https://exc1/v1
-_APP_FUNCTIONS_RUNTIMES=
+_APP_EXECUTOR_HOST=http:https://proxy/v1
+_APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
 _APP_MAINTENANCE_INTERVAL=86400
+_APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
+_APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
+_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled
-_APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
-_APP_REGION=nyc1
+_APP_GRAPHQL_MAX_BATCH_SIZE=10
+_APP_GRAPHQL_MAX_COMPLEXITY=250
+_APP_GRAPHQL_MAX_DEPTH=4
 _APP_DOCKER_HUB_USERNAME=
-_APP_DOCKER_HUB_PASSWORD=
+_APP_DOCKER_HUB_PASSWORD=
+_APP_VCS_GITHUB_APP_NAME=
+_APP_VCS_GITHUB_PRIVATE_KEY=disabled
+_APP_VCS_GITHUB_APP_ID=
+_APP_VCS_GITHUB_CLIENT_ID=
+_APP_VCS_GITHUB_CLIENT_SECRET=
+_APP_VCS_GITHUB_WEBHOOK_SECRET=
+_APP_MIGRATIONS_FIREBASE_CLIENT_ID=
+_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=
+_APP_ASSISTANT_OPENAI_API_KEY=
+_APP_MESSAGE_SMS_TEST_DSN=
+_APP_MESSAGE_EMAIL_TEST_DSN=
+_APP_MESSAGE_PUSH_TEST_DSN=
+_APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
+_APP_PROJECT_REGIONS=default

.gitattributes

@@ -1,28 +1,7 @@
-app/config/* linguist-detectable=false
-app/config/*/* linguist-detectable=false
-app/config/*/*/* linguist-detectable=false
-app/config/*/*/*/* linguist-detectable=false
-app/views/* linguist-detectable=false
-app/views/*/* linguist-detectable=false
-app/views/*/*/* linguist-detectable=false
-app/views/*/*/*/* linguist-detectable=false
-app/controllers/* linguist-detectable=false
-app/controllers/*/* linguist-detectable=false
-app/controllers/*/*/* linguist-detectable=false
-app/controllers/*/*/*/* linguist-detectable=false
-app/controllers/*/*/*/*/* linguist-detectable=false
-src/* linguist-detectable=false
-src/*/* linguist-detectable=false
-src/*/*/* linguist-detectable=false
-src/*/*/*/* linguist-detectable=false
-src/*/*/*/*/* linguist-detectable=false
-tests/* linguist-detectable=false
-tests/*/* linguist-detectable=false
-tests/*/*/* linguist-detectable=false
-tests/*/*/*/* linguist-detectable=false
-tests/*/*/*/*/* linguist-detectable=false
-tests/*/*/*/*/*/* linguist-detectable=false
-public/scripts/* linguist-detectable=false
-public/scripts/*/*/* linguist-detectable=false
-public/scripts/*/*/*/* linguist-detectable=false
-public/dist/scripts/* linguist-detectable=false
+app/config/** linguist-detectable=false
+app/views/** linguist-detectable=false
+app/controllers/** linguist-detectable=false
+src/** linguist-detectable=false
+tests/** linguist-detectable=false
+public/scripts/** linguist-detectable=false
+public/dist/scripts/** linguist-detectable=false

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,21 +11,17 @@ Happy contributing!
 
 ## What does this PR do?
 
-(Provide a description of what this PR does.)
+(Provide a description of what this PR does and why it's needed.)
 
 ## Test Plan
 
-(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work.)
+(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)
 
 ## Related PRs and Issues
 
-(If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.)
+- (Related PR or issue)
 
-### Have you added your change to the [Changelog](https://github.com/appwrite/appwrite/blob/master/CHANGES.md)?
+## Checklist
 
-(The CHANGES.md file tracks all the changes that make it to the `main` branch. Add your change to this file in the following format)
-- One line description of your PR [#pr_number](Link to your PR)
-
-### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
-
-(Write your answer here.)
+- [ ] Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+- [ ] If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?

.github/workflows/check-dependencies.yml

@@ -0,0 +1,19 @@
+name: Check dependencies
+
+# Adapted from https://google.github.io/osv-scanner/github-action/#scan-on-pull-request
+
+on:
+ pull_request:
+ branches: [main, 1.*.x]
+ merge_group:
+ branches: [main, 1.*.x]
+
+permissions:
+ # Require writing security events to upload SARIF file to security tab
+ security-events: write
+ # Only need to read contents
+ contents: read
+
+jobs:
+ scan-pr:
+ uses: "google/osv-scanner-action/.github/workflows/[email protected]"

.github/workflows/cleanup-cache.yml

@@ -0,0 +1,39 @@
+name: Cleanup Cache
+
+on:
+ pull_request:
+ types:
+ - closed
+
+jobs:
+ cleanup:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v3
+
+ - name: Cleanup
+ run: |
+ gh extension install actions/gh-actions-cache
+
+ REPO=${{ github.repository }}
+ BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+
+ while true
+ do
+ cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+
+ if [ -z "$cacheKeysForPR" ]
+ then
+ break
+ fi
+
+ ## Setting this to not fail the workflow while deleting cache keys. 
+ set +e
+ for cacheKey in $cacheKeysForPR
+ do
+ gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+ done
+ done
+ env:
+ GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -1,5 +1,9 @@
 name: "CodeQL"
 
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
 on:
  push:
  branches: [master]
@@ -25,7 +29,7 @@ jobs:
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
  with:
  # We must fetch at least the immediate parents so that if this is
  # a pull request then we can checkout the head.
@@ -38,14 +42,14 @@ jobs:
 
  # Initializes the CodeQL tools for scanning.
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
  with:
  languages: ${{ matrix.language }}
 
  # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
  # If this step fails, then you should remove it and run the build manually (see below)
  - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ uses: github/codeql-action/autobuild@v2
 
  # ℹ️ Command-line programs to run using the OS shell.
  # 📚 https://git.io/JvXDl
@@ -59,4 +63,4 @@ jobs:
  # make release
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2

.github/workflows/linter.yml

@@ -1,5 +1,9 @@
 name: "Linter"
 
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
 on: [pull_request]
 jobs:
  lint:
@@ -14,6 +18,10 @@ jobs:
 
  - run: git checkout HEAD^2
 
+ - name: Validate composer.json and composer.lock
+ run: |
+ docker run --rm -v $PWD:/app composer sh -c \
+ "composer validate"
  - name: Run Linter
  run: |
  docker run --rm -v $PWD:/app composer sh -c \

.github/workflows/publish.yml

@@ -0,0 +1,51 @@
+name: "Build and Publish Appwrite Images for Cloud"
+
+on:
+ push:
+ tags:
+ - cl-*
+
+jobs:
+ build-publish:
+ name: Build and Publish
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 2
+ submodules: recursive
+
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
+
+ - name: Login to Docker Hub
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ - name: Extract metadata (tags, labels) for Docker
+ id: meta
+ uses: docker/metadata-action@v4
+ with:
+ images: appwrite/cloud
+ tags: |
+ type=ref,event=tag
+
+ - name: Build & Publish to DockerHub
+ uses: docker/build-push-action@v4
+ with:
+ context: .
+ platforms: linux/amd64,linux/arm64
+ build-args: |
+ VERSION=${{ steps.meta.outputs.version }}
+ VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
+ VITE_GA_PROJECT=G-L7G2B6PLDS
+ VITE_CONSOLE_MODE=cloud
+ push: true
+ tags: ${{ steps.meta.outputs.tags }}