Merge pull request #1566 from appwrite/0.10.x

0.10.x -> master

.gitignore

@@ -2,6 +2,7 @@
 /vendor/
 /node_modules/
 /tests/resources/storage/
+/app/sdks/*
 /.idea/
 .DS_Store
 .php_cs.cache

CHANGES.md

@@ -1,7 +1,20 @@
-# Version 0.10.0 (Not Released Yet)
-- Switch from using Docker CLI to Docker API by intergrating [utopia-php/orchestration](https://github.com/utopia-php/orchestration)
-- Added DOCKERHUB_PULL_USERNAME, DOCKERHUB_PULL_PASSWORD and DOCKERHUB_PULL_EMAIL env variables for pulling from
-  private DockerHub repos
+# Version 0.10.0
+
+## Features
+- Added Realtime (#948)
+- Added Realtime statistics to the console (#948)
+- Added Magic URL login (#1552)
+- Refactored E-Mail template (#1422)
+- Improved locale management (#1440)
+- Added `$permissions` to execution response (#948)
+- Switch from using Docker CLI to Docker API by intergrating [utopia-php/orchestration](https://github.com/utopia-php/orchestration) (#1420)
+- Added DOCKERHUB_PULL_USERNAME, DOCKERHUB_PULL_PASSWORD and DOCKERHUB_PULL_EMAIL env variables for pulling from private DockerHub repos (#1420)
+- Added `updateName`, `updateEmail` and `updatePassword` to Users service and console (#1547)
+
+## Bugs
+- Fixed MariaDB timeout after 24 hours (#1510)
+- Fixed upgrading installation with customized `docker-compose.yml` file (#1513)
+- Fixed usage stats on the dashboard displaying invalid total users count (#1514)
 
 # Version 0.9.4
 

CONTRIBUTING.md

@@ -167,6 +167,8 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 │       ├── Migration
 │       ├── Network
 │       ├── OpenSSL
+│       ├── Realtime
+│       ├── Resque
 │       ├── Specification
 │       ├── Task
 │       ├── Template

Dockerfile

@@ -33,6 +33,7 @@ RUN \
   git \
   zlib-dev \
   brotli-dev \
+  openssl-dev \
   yaml-dev \
   imagemagick \
   imagemagick-dev \
@@ -52,7 +53,7 @@ RUN \
   git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git && \
   cd swoole-src && \
   phpize && \
-  ./configure --enable-http2 && \
+  ./configure --enable-sockets --enable-http2 --enable-openssl && \
   make && make install && \
   cd .. && \
   ## Imagick Extension
@@ -217,6 +218,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/maintenance && \
     chmod +x /usr/local/bin/install && \
     chmod +x /usr/local/bin/migrate && \
+    chmod +x /usr/local/bin/realtime && \
     chmod +x /usr/local/bin/schedule && \
     chmod +x /usr/local/bin/sdks && \
     chmod +x /usr/local/bin/ssl && \
@@ -246,6 +248,7 @@ RUN if [ "$DEBUG" == "true" ]; then echo "opcache.enable=0" >> /usr/local/etc/ph
 RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini
 RUN echo "opcache.preload=/usr/src/code/app/preload.php" >> /usr/local/etc/php/conf.d/appwrite.ini
 RUN echo "opcache.enable_cli=1" >> /usr/local/etc/php/conf.d/appwrite.ini
+RUN echo "default_socket_timeout=-1" >> /usr/local/etc/php/conf.d/appwrite.ini
 RUN echo "opcache.jit_buffer_size=100M" >> /usr/local/etc/php/conf.d/appwrite.ini
 RUN echo "opcache.jit=1235" >> /usr/local/etc/php/conf.d/appwrite.ini
 

README.md

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

app/config/auth.php

@@ -10,6 +10,13 @@ return [
         'docs' => 'https://appwrite.io/docs/client/account?sdk=web#accountCreateSession',
         'enabled' => true,
     ],
+    'magic-url' => [
+        'name' => 'Magic URL',
+        'key' => 'usersAuthMagicURL',
+        'icon' => '/images/users/magic-url.png',
+        'docs' => 'https://appwrite.io/docs/client/account?sdk=web#accountCreateMagicURLSession',
+        'enabled' => true,
+    ],
     'anonymous' => [
         'name' => 'Anonymous',
         'key' => 'usersAuthAnonymous',

app/config/collections.php

@@ -1706,6 +1706,39 @@ $collections = [
             ],
         ],
     ],
+    Database::SYSTEM_COLLECTION_CONNECTIONS => [
+        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
+        '$id' => Database::SYSTEM_COLLECTION_CONNECTIONS,
+        '$permissions' => ['read' => ['*']],
+        'name' => 'Realtime Connections',
+        'structure' => true,
+        'rules' => [
+            [
+                '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
+                'label' => 'Container',
+                'key' => 'container',
+                'type' => Database::SYSTEM_VAR_TYPE_TEXT,
+                'required' => true,
+                'array' => false,
+            ],
+            [
+                '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
+                'label' => 'Timestamp',
+                'key' => 'timestamp',
+                'type' => Database::SYSTEM_VAR_TYPE_NUMERIC,
+                'required' => true,
+                'array' => false,
+            ],
+            [
+                '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
+                'label' => 'Value',
+                'key' => 'value',
+                'type' => Database::SYSTEM_VAR_TYPE_TEXT,
+                'required' => true,
+                'array' => false,
+            ],
+        ],
+    ],
     Database::SYSTEM_COLLECTION_RESERVED => [
         '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
         '$id' => Database::SYSTEM_COLLECTION_RESERVED,

app/config/events.php

@@ -162,6 +162,21 @@ return [
         'model' => Response::MODEL_ANY,
         'note' => 'version >= 0.7',
     ],
+    'users.update.email' => [
+        'description' => 'This event triggers when the user email address is updated.',
+        'model' => Response::MODEL_USER,
+        'note' => 'version >= 0.10',
+    ],
+    'users.update.name' => [
+        'description' => 'This event triggers when the user name is updated.',
+        'model' => Response::MODEL_USER,
+        'note' => 'version >= 0.10',
+    ],
+    'users.update.password' => [
+        'description' => 'This event triggers when the user password is updated.',
+        'model' => Response::MODEL_USER,
+        'note' => 'version >= 0.10',
+    ],
     'users.update.status' => [
         'description' => 'This event triggers when a user status is updated from the users API.',
         'model' => Response::MODEL_USER,

app/config/locale/translations/en.json

@@ -9,6 +9,12 @@
     "emails.verification.footer": "If you didn’t ask to verify this address, you can ignore this message.",
     "emails.verification.thanks": "Thanks",
     "emails.verification.signature": "{{project}} team",
+    "emails.magicSession.subject": "Login",
+    "emails.magicSession.hello": "Hey,",
+    "emails.magicSession.body": "Follow this link to login.",
+    "emails.magicSession.footer": "If you didn’t ask to login using this email, you can ignore this message.",
+    "emails.magicSession.thanks": "Thanks",
+    "emails.magicSession.signature": "{{project}} team",
     "emails.recovery.subject": "Password Reset",
     "emails.recovery.hello": "Hello {{name}}",
     "emails.recovery.body": "Follow this link to reset your {{project}} password.",

app/config/platforms.php

@@ -15,7 +15,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '3.2.0',
+                'version' => '4.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-web',
                 'package' => 'https://www.npmjs.com/package/appwrite',
                 'enabled' => true,
@@ -62,7 +62,7 @@ return [
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '0.7.1',
+                'version' => '1.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -111,7 +111,7 @@ return [
             [
                 'key' => 'android',
                 'name' => 'Android',
-                'version' => '0.0.1',
+                'version' => '0.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-android',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                 'enabled' => true,
@@ -156,7 +156,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Console',
-                'version' => '2.1.0',
+                'version' => '3.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-console',
                 'package' => '',
                 'enabled' => true,
@@ -183,7 +183,7 @@ return [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '2.4.0',
+                'version' => '2.5.0',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -200,7 +200,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '0.3.0',
+                'version' => '0.4.0',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -217,7 +217,7 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '2.2.0',
+                'version' => '2.3.0',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -234,7 +234,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '0.4.0',
+                'version' => '0.5.0',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -251,7 +251,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '2.3.0',
+                'version' => '2.4.0',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -319,7 +319,7 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '0.7.0',
+                'version' => '1.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
@@ -336,7 +336,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '0.11.0',
+                'version' => '0.12.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://github.com/appwrite/sdk-for-cli',
                 'enabled' => true,
@@ -353,7 +353,7 @@ return [
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '0.0.1',
+                'version' => '0.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,

app/controllers/api/account.php

@@ -611,6 +611,291 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
         ;
     });
 
+
+App::post('/v1/account/sessions/magic-url')
+    ->desc('Create Magic URL session')
+    ->groups(['api', 'account'])
+    ->label('scope', 'public')
+    ->label('auth.type', 'magic-url')
+    ->label('sdk.auth', [])
+    ->label('sdk.namespace', 'account')
+    ->label('sdk.method', 'createMagicURLSession')
+    ->label('sdk.description', '/docs/references/account/create-magic-url-session.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_TOKEN)
+    ->label('abuse-limit', 10)
+    ->label('abuse-key', 'url:{url},email:{param-email}')
+    ->param('email', '', new Email(), 'User email.')
+    ->param('url', '', function ($clients) { return new Host($clients); }, 'URL to redirect the user back to your app from the magic URL login. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients'])
+    ->inject('request')
+    ->inject('response')
+    ->inject('project')
+    ->inject('projectDB')
+    ->inject('locale')
+    ->inject('audits')
+    ->inject('events')
+    ->inject('mails')
+    ->action(function ($email, $url, $request, $response, $project, $projectDB, $locale, $audits, $events, $mails) {
+        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Document $project */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Locale\Locale $locale */
+        /** @var Appwrite\Event\Event $audits */
+        /** @var Appwrite\Event\Event $events */
+        /** @var Appwrite\Event\Event $mails */
+
+        if(empty(App::getEnv('_APP_SMTP_HOST'))) {
+            throw new Exception('SMTP Disabled', 503);
+        }
+
+        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
+        $isAppUser = Auth::isAppUser(Authorization::$roles);
+
+        $user = $projectDB->getCollectionFirst([ // Get user by email address
+            'limit' => 1,
+            'filters' => [
+                '$collection='.Database::SYSTEM_COLLECTION_USERS,
+                'email='.$email,
+            ],
+        ]);
+
+        if (empty($user)) {
+            $limit = $project->getAttribute('usersAuthLimit', 0);
+
+            if ($limit !== 0) {
+                $projectDB->getCollection([ // Count users
+                    'filters' => [
+                        '$collection='.Database::SYSTEM_COLLECTION_USERS,
+                    ],
+                ]);
+
+                $sum = $projectDB->getSum();
+
+                if($sum >= $limit) {
+                    throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501);
+                }
+            }
+
+            Authorization::disable();
+
+            $user = $projectDB->createDocument([
+                '$collection' => Database::SYSTEM_COLLECTION_USERS,
+                '$permissions' => [
+                    'read' => ['*'],
+                    'write' => ['user:{self}'],
+                ],
+                'email' => $email,
+                'emailVerification' => false,
+                'status' => Auth::USER_STATUS_UNACTIVATED,
+                'password' => null,
+                'passwordUpdate' => \time(),
+                'registration' => \time(),
+                'reset' => false,
+                'name' => null,
+            ], ['email' => $email]);
+
+            Authorization::reset();
+            $mails->setParam('event', 'users.create');
+            $audits->setParam('event', 'users.create');
+        }
+
+        $loginSecret = Auth::tokenGenerator();
+
+        $expire = \time() + Auth::TOKEN_EXPIRATION_CONFIRM;
+        
+        $token = new Document([
+            '$collection' => Database::SYSTEM_COLLECTION_TOKENS,
+            '$permissions' => ['read' => ['user:'.$user->getId()], 'write' => ['user:'.$user->getId()]],
+            'userId' => $user->getId(),
+            'type' => Auth::TOKEN_TYPE_MAGIC_URL,
+            'secret' => Auth::hash($loginSecret), // One way hash encryption to protect DB leak
+            'expire' => $expire,
+            'userAgent' => $request->getUserAgent('UNKNOWN'),
+            'ip' => $request->getIP(),
+        ]);
+            
+        Authorization::setRole('user:'.$user->getId());
+
+        $token = $projectDB->createDocument($token->getArrayCopy());
+
+        if (false === $token) {
+            throw new Exception('Failed saving token to DB', 500);
+        }
+
+        $user->setAttribute('tokens', $token, Document::SET_TYPE_APPEND);
+
+        $user = $projectDB->updateDocument($user->getArrayCopy());
+
+        if (false === $user) {
+            throw new Exception('Failed to save user to DB', 500);
+        }
+
+        if(empty($url)) {
+            $url = $request->getProtocol().'://'.$request->getHostname().'/auth/magic-url';
+        }
+
+        $url = Template::parseURL($url);
+        $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $user->getId(), 'secret' => $loginSecret, 'expire' => $expire, 'project' => $project->getId()]);
+        $url = Template::unParseURL($url);
+
+        $mails
+            ->setParam('from', $project->getId())
+            ->setParam('recipient', $user->getAttribute('email'))
+            ->setParam('url', $url)
+            ->setParam('locale', $locale->default)
+            ->setParam('project', $project->getAttribute('name', ['[APP-NAME]']))
+            ->setParam('type', MAIL_TYPE_MAGIC_SESSION)
+            ->trigger()
+        ;
+
+        $events
+            ->setParam('eventData',
+                $response->output($token->setAttribute('secret', $loginSecret),
+                Response::MODEL_TOKEN
+            ))
+        ;
+
+        $token  // Hide secret for clients
+            ->setAttribute('secret',
+                ($isPrivilegedUser || $isAppUser) ? $loginSecret : '');
+
+        $audits
+            ->setParam('userId', $user->getId())
+            ->setParam('resource', 'users/'.$user->getId())
+        ;
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($token, Response::MODEL_TOKEN)
+        ;
+    });
+
+App::put('/v1/account/sessions/magic-url')
+    ->desc('Create Magic URL session (confirmation)')
+    ->groups(['api', 'account'])
+    ->label('scope', 'public')
+    ->label('event', 'account.sessions.create')
+    ->label('sdk.auth', [])
+    ->label('sdk.namespace', 'account')
+    ->label('sdk.method', 'updateMagicURLSession')
+    ->label('sdk.description', '/docs/references/account/update-magic-url-session.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_SESSION)
+    ->label('abuse-limit', 10)
+    ->label('abuse-key', 'url:{url},userId:{param-userId}')
+    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('secret', '', new Text(256), 'Valid verification token.')
+    ->inject('request')
+    ->inject('response')
+    ->inject('projectDB')
+    ->inject('locale')
+    ->inject('geodb')
+    ->inject('audits')
+    ->action(function ($userId, $secret, $request, $response, $projectDB, $locale, $geodb, $audits) {
+        /** @var string $userId */
+        /** @var string $secret */
+        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Locale\Locale $locale */
+        /** @var MaxMind\Db\Reader $geodb */
+        /** @var Appwrite\Event\Event $audits */
+
+        $profile = $projectDB->getCollectionFirst([ // Get user by user ID
+            'limit' => 1,
+            'filters' => [
+                '$collection='.Database::SYSTEM_COLLECTION_USERS,
+                '$id='.$userId,
+            ],
+        ]);
+
+        if (empty($profile)) {
+            throw new Exception('User not found', 404);
+        }
+
+        $token = Auth::tokenVerify($profile->getAttribute('tokens', []), Auth::TOKEN_TYPE_MAGIC_URL, $secret);
+
+        if (!$token) {
+            throw new Exception('Invalid login token', 401);
+        }
+
+        $detector = new Detector($request->getUserAgent('UNKNOWN'));
+        $record = $geodb->get($request->getIP());
+        $secret = Auth::tokenGenerator();
+        $expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG;
+        $session = new Document(array_merge(
+            [
+                '$collection' => Database::SYSTEM_COLLECTION_SESSIONS,
+                '$permissions' => ['read' => ['user:' . $profile->getId()], 'write' => ['user:' . $profile->getId()]],
+                'userId' => $profile->getId(),
+                'provider' => Auth::SESSION_PROVIDER_MAGIC_URL,
+                'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
+                'expire' => $expiry,
+                'userAgent' => $request->getUserAgent('UNKNOWN'),
+                'ip' => $request->getIP(),
+                'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+            ],
+            $detector->getOS(),
+            $detector->getClient(),
+            $detector->getDevice()
+        ));
+
+        Authorization::setRole('user:'.$profile->getId());
+
+        $session = $projectDB->createDocument($session->getArrayCopy());
+
+        if (false === $session) {
+            throw new Exception('Failed saving session to DB', 500);
+        }
+
+        $profile->setAttribute('emailVerification', true);
+        $profile->setAttribute('sessions', $session, Document::SET_TYPE_APPEND);
+
+        $user = $projectDB->updateDocument($profile->getArrayCopy());
+
+        if (false === $user) {
+            throw new Exception('Failed saving user to DB', 500);
+        }
+
+        if (!$projectDB->deleteDocument($token)) {
+            throw new Exception('Failed to remove login token from DB', 500);
+        }
+
+        $audits
+            ->setParam('userId', $user->getId())
+            ->setParam('event', 'account.sessions.create')
+            ->setParam('resource', 'users/'.$user->getId())
+        ;
+
+        if (!Config::getParam('domainVerification')) {
+            $response
+                ->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
+            ;
+        }
+
+        $protocol = $request->getProtocol();
+
+        $response
+            ->addCookie(Auth::$cookieName.'_legacy', Auth::encodeSession($user->getId(), $secret), $expiry, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), $expiry, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+        ;
+
+        $countryName = (isset($countries[strtoupper($session->getAttribute('countryCode'))]))
+        ? $countries[strtoupper($session->getAttribute('countryCode'))]
+        : $locale->getText('locale.country.unknown');
+
+        $session
+            ->setAttribute('current', true)
+            ->setAttribute('countryName', $countryName)
+        ;
+
+        $response->dynamic($session, Response::MODEL_SESSION);
+    });
+
 App::post('/v1/account/sessions/anonymous')
     ->desc('Create Anonymous Session')
     ->groups(['api', 'account', 'auth'])
@@ -1461,6 +1746,10 @@ App::post('/v1/account/recovery')
         /** @var Appwrite\Event\Event $audits */
         /** @var Appwrite\Event\Event $events */
 
+        if(empty(App::getEnv('_APP_SMTP_HOST'))) {
+            throw new Exception('SMTP Disabled', 503);
+        }
+
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
         $isAppUser = Auth::isAppUser(Authorization::$roles);
         
@@ -1551,7 +1840,7 @@ App::post('/v1/account/recovery')
     });
 
 App::put('/v1/account/recovery')
-    ->desc('Complete Password Recovery')
+    ->desc('Create Password Recovery (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'account.recovery.update')
@@ -1664,6 +1953,10 @@ App::post('/v1/account/verification')
         /** @var Appwrite\Event\Event $events */
         /** @var Appwrite\Event\Event $mails */
 
+        if(empty(App::getEnv('_APP_SMTP_HOST'))) {
+            throw new Exception('SMTP Disabled', 503);
+        }
+        
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
         $isAppUser = Auth::isAppUser(Authorization::$roles);
 
@@ -1738,7 +2031,7 @@ App::post('/v1/account/verification')
     });
 
 App::put('/v1/account/verification')
-    ->desc('Complete Email Verification')
+    ->desc('Create Email Verification (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'account.verification.update')

app/controllers/api/projects.php

@@ -190,6 +190,8 @@ App::get('/v1/projects/:projectId/usage')
             throw new Exception('Project not found', 404);
         }
 
+        $projectDB->setNamespace('app_'.$project->getId());
+
         if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
 
             $period = [
@@ -220,6 +222,8 @@ App::get('/v1/projects/:projectId/usage')
             $requests = [];
             $network = [];
             $functions = [];
+            $realtimeConnections = [];
+            $realtimeMessages = [];
     
             if ($client) {
                 $start = $period[$range]['start']->format(DateTime::RFC3339);
@@ -258,16 +262,38 @@ App::get('/v1/projects/:projectId/usage')
                         'date' => \strtotime($point['time']),
                     ];
                 }
+
+                // Realtime Connections
+                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_realtime_clients" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
+                $points = $result->getPoints();
+    
+                foreach ($points as $point) {
+                    $realtimeConnections[] = [
+                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
+                        'date' => \strtotime($point['time']),
+                    ];
+                }
+                // Realtime Messages
+                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_realtime_messages" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
+                $points = $result->getPoints();
+    
+                foreach ($points as $point) {
+                    $realtimeMessages[] = [
+                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
+                        'date' => \strtotime($point['time']),
+                    ];
+                }
             }
         } else {
             $requests = [];
             $network = [];
             $functions = [];
+            $realtimeConnections = [];
+            $realtimeMessages = [];
         }
 
 
         // Users
-
         $projectDB->getCollection([
             'limit' => 0,
             'offset' => 0,
@@ -279,7 +305,6 @@ App::get('/v1/projects/:projectId/usage')
         $usersTotal = $projectDB->getSum();
 
         // Documents
-
         $collections = $projectDB->getCollection([
             'limit' => 100,
             'offset' => 0,
@@ -327,6 +352,18 @@ App::get('/v1/projects/:projectId/usage')
                     return $item['value'];
                 }, $functions)),
             ],
+            'realtimeConnections' => [
+                'data' => $realtimeConnections,
+                'total' => \array_sum(\array_map(function ($item) {
+                    return $item['value'];
+                }, $realtimeConnections)),
+            ],
+            'realtimeMessages' => [
+                'data' => $realtimeMessages,
+                'total' => \array_sum(\array_map(function ($item) {
+                    return $item['value'];
+                }, $realtimeMessages)),
+            ],
             'collections' => [
                 'data' => $collections,
                 'total' => $collectionsTotal,

app/controllers/api/teams.php

@@ -37,10 +37,12 @@ App::post('/v1/teams')
     ->inject('response')
     ->inject('user')
     ->inject('projectDB')
-    ->action(function ($name, $roles, $response, $user, $projectDB) {
+    ->inject('events')
+    ->action(function ($name, $roles, $response, $user, $projectDB, $events) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Event\Event $events */
 
         Authorization::disable();
 
@@ -90,6 +92,10 @@ App::post('/v1/teams')
             }
         }
 
+        if (!empty($user->getId())) {
+            $events->setParam('userId', $user->getId());
+        }
+
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($team, Response::MODEL_TEAM)
@@ -274,6 +280,10 @@ App::post('/v1/teams/:teamId/memberships')
         /** @var Appwrite\Event\Event $audits */
         /** @var Appwrite\Event\Event $mails */
 
+        if(empty(App::getEnv('_APP_SMTP_HOST'))) {
+            throw new Exception('SMTP Disabled', 503);
+        }
+        
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
         $isAppUser = Auth::isAppUser(Authorization::$roles);
         

app/controllers/api/users.php

@@ -403,6 +403,163 @@ App::patch('/v1/users/:userId/verification')
         $response->dynamic($user, Response::MODEL_USER);
     });
 
+App::patch('/v1/users/:userId/name')
+    ->desc('Update Name')
+    ->groups(['api', 'users'])
+    ->label('event', 'users.update.name')
+    ->label('scope', 'users.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'users')
+    ->label('sdk.method', 'updateName')
+    ->label('sdk.description', '/docs/references/users/update-user-name.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USER)
+    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.')
+    ->inject('response')
+    ->inject('projectDB')
+    ->inject('audits')
+    ->action(function ($userId, $name, $response, $projectDB, $audits) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Event\Event $audits */
+        
+        $user = $projectDB->getDocument($userId);
+
+        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+            throw new Exception('User not found', 404);
+        }
+
+        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
+            'name' => $name,
+        ]));
+
+        if (false === $user) {
+            throw new Exception('Failed saving user to DB', 500);
+        }
+
+        $audits
+            ->setParam('userId', $user->getId())
+            ->setParam('event', 'users.update.name')
+            ->setParam('resource', 'users/'.$user->getId())
+        ;
+
+        $response->dynamic($user, Response::MODEL_USER);
+    });
+
+App::patch('/v1/users/:userId/password')
+    ->desc('Update Password')
+    ->groups(['api', 'users'])
+    ->label('event', 'users.update.password')
+    ->label('scope', 'users.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'users')
+    ->label('sdk.method', 'updatePassword')
+    ->label('sdk.description', '/docs/references/users/update-user-password.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USER)
+    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('password', '', new Password(), 'New user password. Must be between 6 to 32 chars.')
+    ->inject('response')
+    ->inject('projectDB')
+    ->inject('audits')
+    ->action(function ($userId, $password, $response, $projectDB, $audits) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Event\Event $audits */
+
+        $user = $projectDB->getDocument($userId);
+
+        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+            throw new Exception('User not found', 404);
+        }
+
+        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
+            'password' => Auth::passwordHash($password),
+            'passwordUpdate' => \time(),
+        ]));
+
+        if (false === $user) {
+            throw new Exception('Failed saving user to DB', 500);
+        }
+
+        $audits
+            ->setParam('userId', $user->getId())
+            ->setParam('event', 'users.update.password')
+            ->setParam('resource', 'users/'.$user->getId())
+        ;
+
+        $response->dynamic($user, Response::MODEL_USER);
+    });
+
+App::patch('/v1/users/:userId/email')
+    ->desc('Update Email')
+    ->groups(['api', 'users'])
+    ->label('event', 'users.update.email')
+    ->label('scope', 'users.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'users')
+    ->label('sdk.method', 'updateEmail')
+    ->label('sdk.description', '/docs/references/users/update-user-email.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USER)
+    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('email', '', new Email(), 'User email.')
+    ->inject('response')
+    ->inject('projectDB')
+    ->inject('audits')
+    ->action(function ($userId, $email, $response, $projectDB, $audits) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Event\Event $audits */
+
+        $user = $projectDB->getDocument($userId);
+        
+        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+            throw new Exception('User not found', 404);
+        }
+        
+        $isAnonymousUser = is_null($user->getAttribute('email')) && is_null($user->getAttribute('password')); // Check if request is from an anonymous account for converting
+        $email = \strtolower($email);
+        $profile = $projectDB->getCollectionFirst([ // Get user by email address
+            'limit' => 1,
+            'filters' => [
+                '$collection='.Database::SYSTEM_COLLECTION_USERS,
+                'email='.$email,
+            ],
+        ]);
+
+        if (!empty($profile)) {
+            throw new Exception('User already registered', 400);
+        }
+
+        if (!$isAnonymousUser) {
+            // Remove previous unique ID.
+            $projectDB->deleteUniqueKey(\md5($user->getArrayCopy()['$collection'].':'.'email'.'='.$user->getAttribute('email')));
+        }
+
+        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
+            'email' => $email,
+        ]));
+
+        $projectDB->addUniqueKey(\md5($user['$collection'].':'.'email'.'='.$email));
+
+        if (false === $user) {
+            throw new Exception('Failed saving user to DB', 500);
+        }
+        
+        $audits
+            ->setParam('userId', $user->getId())
+            ->setParam('event', 'account.update.email')
+            ->setParam('resource', 'users/'.$user->getId())
+        ;
+
+        $response->dynamic($user, Response::MODEL_USER);
+    });
+
 App::patch('/v1/users/:userId/prefs')
     ->desc('Update User Preferences')
     ->groups(['api', 'users'])

app/controllers/general.php

@@ -33,7 +33,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
     /** @var Utopia\Locale\Locale $locale */
     /** @var bool $mode */
     /** @var array $clients */
-    
+
     $domain = $request->getHostname();
     $domains = Config::getParam('domains', []);
     if (!array_key_exists($domain, $domains)) {
@@ -98,7 +98,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
 
     $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.((\in_array($origin, $clients))
         ? $origin : 'localhost').(!empty($port) ? ':'.$port : '');
-    
+
     $refDomain = (!$route->getLabel('origin', false))  // This route is publicly accessible
         ? $refDomain
         : (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.$origin.(!empty($port) ? ':'.$port : '');
@@ -119,7 +119,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
     Config::setParam('domainVerification',
         ($selfDomain->getRegisterable() === $endDomain->getRegisterable()) &&
             $endDomain->getRegisterable() !== '');
-        
+
     Config::setParam('cookieDomain', (
         $request->getHostname() === 'localhost' ||
         $request->getHostname() === 'localhost:'.$request->getPort() ||
@@ -189,7 +189,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
         && empty($request->getHeader('x-appwrite-key', ''))) {
         throw new Exception($originValidator->getDescription(), 403);
     }
-    
+
     /*
      * ACL Check
      */
@@ -223,7 +223,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
     if (!empty($authKey)) { // API Key authentication
         // Check if given key match project API keys
         $key = $project->search('secret', $authKey, $project->getAttribute('keys', []));
-            
+
         /*
          * Try app auth when we have project key and no user
          *  Mock user to app and grant API key scopes in addition to default app scopes
@@ -240,33 +240,22 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
             $role = Auth::USER_ROLE_APP;
             $scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));
 
+            Authorization::setRole('role:'.Auth::USER_ROLE_APP);
             Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
         }
     }
 
-    if ($user->getId()) {
-        Authorization::setRole('user:'.$user->getId());
+    foreach (Auth::getRoles($user) as $authRole) {
+        Authorization::setRole($authRole);
     }
 
-    Authorization::setRole('role:'.$role);
-
-    \array_map(function ($node) {
-        if (isset($node['teamId']) && isset($node['roles'])) {
-            Authorization::setRole('team:'.$node['teamId']);
-
-            foreach ($node['roles'] as $nodeRole) { // Set all team roles
-                Authorization::setRole('team:'.$node['teamId'].'/'.$nodeRole);
-            }
-        }
-    }, $user->getAttribute('memberships', []));
-
     // TDOO Check if user is root
 
     if (!\in_array($scope, $scopes)) {
         if (empty($project->getId()) || Database::SYSTEM_COLLECTION_PROJECTS !== $project->getCollection()) { // Check if permission is denied because project is missing
             throw new Exception('Project not found', 404);
         }
-        
+
         throw new Exception($user->getAttribute('email', 'User').' (role: '.\strtolower($roles[$role]['label']).') missing scope ('.$scope.')', 401);
     }
 
@@ -313,12 +302,12 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
 
     if (php_sapi_name() === 'cli') {
         Console::error('[Error] Timestamp: '.date('c', time()));
-        
+
         if($route) {
             Console::error('[Error] Method: '.$route->getMethod());
             Console::error('[Error] URL: '.$route->getPath());
         }
-        
+
         Console::error('[Error] Type: '.get_class($error));
         Console::error('[Error] Message: '.$error->getMessage());
         Console::error('[Error] File: '.$error->getFile());
@@ -337,6 +326,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
         case 412: // Error allowed publicly
         case 429: // Error allowed publicly
         case 501: // Error allowed publicly
+        case 503: // Error allowed publicly
             $code = $error->getCode();
             $message = $error->getMessage();
             break;

app/controllers/shared/api.php

@@ -1,7 +1,9 @@
 <?php
 
 use Appwrite\Auth\Auth;
+use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
+use Appwrite\Messaging\Adapter\Realtime;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Abuse\Abuse;
@@ -21,6 +23,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
     /** @var Appwrite\Event\Event $usage */
     /** @var Appwrite\Event\Event $deletes */
     /** @var Appwrite\Event\Event $functions */
+    /** @var PDO $db */
 
     Storage::setDevice('files', new Local(APP_STORAGE_UPLOADS.'/app-'.$project->getId()));
     Storage::setDevice('functions', new Local(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId()));
@@ -111,7 +114,6 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
 
 }, ['utopia', 'request', 'response', 'project', 'user', 'register', 'events', 'audits', 'usage', 'deletes', 'db'], 'api');
 
-
 App::init(function ($utopia, $request, $response, $project, $user) {
     /** @var Utopia\App $utopia */
     /** @var Utopia\Swoole\Request $request */
@@ -141,6 +143,12 @@ App::init(function ($utopia, $request, $response, $project, $user) {
             }
             break;
 
+        case 'magic-url':
+            if($project->getAttribute('usersAuthMagicURL', true) === false) {
+                throw new Exception('Magic URL authentication is disabled for this project', 501);
+            }
+            break;
+
         case 'anonymous':
             if($project->getAttribute('usersAuthAnonymous', true) === false) {
                 throw new Exception('Anonymous authentication is disabled for this project', 501);
@@ -175,7 +183,6 @@ App::shutdown(function ($utopia, $request, $response, $project, $events, $audits
     /** @var Appwrite\Event\Event $audits */
     /** @var Appwrite\Event\Event $usage */
     /** @var Appwrite\Event\Event $deletes */
-    /** @var Appwrite\Event\Event $functions */
     /** @var bool $mode */
 
     if (!empty($events->getParam('event'))) {
@@ -195,6 +202,23 @@ App::shutdown(function ($utopia, $request, $response, $project, $events, $audits
             ->setQueue('v1-functions')
             ->setClass('FunctionsV1')
             ->trigger();
+
+        if ($project->getId() !== 'console') {
+            $payload = new Document($response->getPayload());
+            $target = Realtime::fromPayload($events->getParam('event'), $payload);
+
+            Realtime::send(
+                $project->getId(), 
+                $response->getPayload(), 
+                $events->getParam('event'), 
+                $target['channels'], 
+                $target['roles'], 
+                [
+                    'permissionsChanged' => $target['permissionsChanged'], 
+                    'userId' => $events->getParam('userId')
+                ]
+            );
+        }
     }
     
     if (!empty($audits->getParam('event'))) {

app/controllers/web/console.php

@@ -326,6 +326,7 @@ App::get('/console/users')
         $page
             ->setParam('auth', Config::getParam('auth'))
             ->setParam('providers', Config::getParam('providers'))
+            ->setParam('smtpEnabled', (!empty(App::getEnv('_APP_SMTP_HOST'))))
         ;
 
         $layout

app/controllers/web/home.php

@@ -197,6 +197,24 @@ App::get('/auth/oauth2/success')
         ;
     });
 
+App::get('/auth/magic-url')
+    ->groups(['web', 'home'])
+    ->label('permission', 'public')
+    ->label('scope', 'home')
+    ->inject('layout')
+    ->action(function ($layout) {
+        /** @var Utopia\View $layout */
+
+        $page = new View(__DIR__.'/../../views/home/auth/magicURL.phtml');
+
+        $layout
+            ->setParam('title', APP_NAME)
+            ->setParam('body', $page)
+            ->setParam('header', [])
+            ->setParam('footer', [])
+        ;
+    });
+
 App::get('/auth/oauth2/failure')
     ->groups(['web', 'home'])
     ->label('permission', 'public')

app/init.php

@@ -26,6 +26,7 @@ use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
+use Appwrite\Event\Realtime;
 use Appwrite\OpenSSL\OpenSSL;
 use Utopia\App;
 use Utopia\View;
@@ -47,8 +48,8 @@ const APP_USERAGENT = APP_NAME.'-Server v%s. Please report abuse at %s';
 const APP_MODE_DEFAULT = 'default';
 const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 12;
-const APP_CACHE_BUSTER = 151;
-const APP_VERSION_STABLE = '0.9.4';
+const APP_CACHE_BUSTER = 160;
+const APP_VERSION_STABLE = '0.10.0';
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_CACHE = '/storage/cache';
@@ -70,8 +71,10 @@ const DELETE_TYPE_EXECUTIONS = 'executions';
 const DELETE_TYPE_AUDIT = 'audit';
 const DELETE_TYPE_ABUSE = 'abuse';
 const DELETE_TYPE_CERTIFICATES = 'certificates';
+const DELETE_TYPE_REALTIME = 'realtime';
 // Mail Types
 const MAIL_TYPE_VERIFICATION = 'verification';
+const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
 const MAIL_TYPE_RECOVERY = 'recovery';
 const MAIL_TYPE_INVITATION = 'invitation';
 // Auth Types
@@ -420,10 +423,10 @@ App::setResource('user', function($mode, $project, $console, $request, $response
             $request->getCookie(Auth::$cookieName.'_legacy', '')));// Get fallback session from old clients (no SameSite support)
 
     // Get fallback session from clients who block 3rd-party cookies
-    $response->addHeader('X-Debug-Fallback', 'false');
+    if($response) $response->addHeader('X-Debug-Fallback', 'false');
 
     if(empty($session['id']) && empty($session['secret'])) {
-        $response->addHeader('X-Debug-Fallback', 'true');
+        if($response) $response->addHeader('X-Debug-Fallback', 'true');
         $fallback = $request->getHeader('x-fallback-cookies', '');
         $fallback = \json_decode($fallback, true);
         $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
@@ -434,8 +437,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
 
     if (APP_MODE_ADMIN !== $mode) {
         $user = $projectDB->getDocument(Auth::$unique);
-    }
-    else {
+    } else {
         $user = $consoleDB->getDocument(Auth::$unique);
 
         $user
@@ -467,7 +469,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
         } catch (JWTException $error) {
             throw new Exception('Failed to verify JWT. '.$error->getMessage(), 401);
         }
-        
+
         $jwtUserId = $payload['userId'] ?? '';
         $jwtSessionId = $payload['sessionId'] ?? '';
 

app/preload.php

@@ -32,6 +32,7 @@ foreach ([
     realpath(__DIR__ . '/../vendor/psr/log'),
     realpath(__DIR__ . '/../vendor/matomo'),
     realpath(__DIR__ . '/../vendor/symfony'),
+    realpath(__DIR__ . '/../vendor/utopia-php/websocket'), // TODO: remove workerman autoload
 ] as $key => $value) {
     if($value !== false) {
         $preloader->ignore($value);

app/realtime.php

@@ -0,0 +1,581 @@
+<?php
+
+use Appwrite\Auth\Auth;
+use Appwrite\Database\Adapter\Redis as RedisAdapter;
+use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
+use Appwrite\Database\Database;
+use Appwrite\Database\Validator\Authorization;
+use Appwrite\Event\Event;
+use Appwrite\Messaging\Adapter\Realtime;
+use Appwrite\Network\Validator\Origin;
+use Appwrite\Utopia\Response;
+use Swoole\Http\Request as SwooleRequest;
+use Swoole\Http\Response as SwooleResponse;
+use Swoole\Runtime;
+use Swoole\Table;
+use Swoole\Timer;
+use Utopia\Abuse\Abuse;
+use Utopia\Abuse\Adapters\TimeLimit;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Swoole\Request;
+use Utopia\WebSocket\Server;
+use Utopia\WebSocket\Adapter;
+
+require_once __DIR__ . '/init.php';
+
+Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+
+$realtime = new Realtime();
+
+/**
+ * Table for statistics across all workers.
+ */
+$stats = new Table(4096, 1);
+$stats->column('projectId', Table::TYPE_STRING, 64);
+$stats->column('teamId', Table::TYPE_STRING, 64);
+$stats->column('connections', Table::TYPE_INT);
+$stats->column('connectionsTotal', Table::TYPE_INT);
+$stats->column('messages', Table::TYPE_INT);
+$stats->create();
+
+$containerId = uniqid();
+$documentId = null;
+
+$adapter = new Adapter\Swoole(port: App::getEnv('PORT', 80));
+$adapter->setPackageMaxLength(64000); // Default maximum Package Size (64kb)
+
+$server = new Server($adapter);
+
+$server->onStart(function () use ($stats, $register, $containerId, &$documentId) {
+    Console::success('Server started succefully');
+
+    $getConsoleDb = function () use ($register) {
+        $db = $register->get('dbPool')->get();
+        $cache = $register->get('redisPool')->get();
+
+        $consoleDb = new Database();
+        $consoleDb->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
+        $consoleDb->setNamespace('app_console');
+        $consoleDb->setMocks(Config::getParam('collections', []));
+
+        return [
+            $consoleDb,
+            function () use ($register, $db, $cache) {
+                $register->get('dbPool')->put($db);
+                $register->get('redisPool')->put($cache);
+            }
+        ];
+    };
+
+    /**
+     * Create document for this worker to share stats across Containers.
+     */
+    go(function () use ($getConsoleDb, $containerId, &$documentId) {
+        try {
+            [$consoleDb, $returnConsoleDb] = call_user_func($getConsoleDb);
+            $document = [
+                '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
+                '$permissions' => [
+                    'read' => ['*'],
+                    'write' => ['*'],
+                ],
+                'container' => $containerId,
+                'timestamp' => time(),
+                'value' => '{}'
+            ];
+            Authorization::disable();
+            $document = $consoleDb->createDocument($document);
+            Authorization::enable();
+            $documentId = $document->getId();
+        } catch (\Throwable $th) {
+            Console::error('[Error] Type: ' . get_class($th));
+            Console::error('[Error] Message: ' . $th->getMessage());
+            Console::error('[Error] File: ' . $th->getFile());
+            Console::error('[Error] Line: ' . $th->getLine());
+        } finally {
+            call_user_func($returnConsoleDb);
+        }
+    });
+
+    /**
+     * Save current connections to the Database every 5 seconds.
+     */
+    Timer::tick(5000, function () use ($stats, $getConsoleDb, $containerId, &$documentId) {
+        [$consoleDb, $returnConsoleDb] = call_user_func($getConsoleDb);
+
+        foreach ($stats as $projectId => $value) {
+            if (empty($value['connections']) && empty($value['messages'])) {
+                continue;
+            }
+
+            $connections = $value['connections'];
+            $messages = $value['messages'];
+
+            $usage = new Event('v1-usage', 'UsageV1');
+            $usage
+                ->setParam('projectId', $projectId)
+                ->setParam('realtimeConnections', $connections)
+                ->setParam('realtimeMessages', $messages)
+                ->setParam('networkRequestSize', 0)
+                ->setParam('networkResponseSize', 0);
+
+            $stats->set($projectId, [
+                'messages' => 0,
+                'connections' => 0
+            ]);
+
+            if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+                $usage->trigger();
+            }
+        }
+        $payload = [];
+        foreach ($stats as $projectId => $value) {
+            if (!empty($value['connectionsTotal'])) {
+                $payload[$projectId] = $value['connectionsTotal'];
+            }
+        }
+        if (empty($payload)) {
+            return;
+        }
+        $document = [
+            '$id' => $documentId,
+            '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
+            '$permissions' => [
+                'read' => ['*'],
+                'write' => ['*'],
+            ],
+            'container' => $containerId,
+            'timestamp' => time(),
+            'value' => json_encode($payload)
+        ];
+        try {
+            $document = $consoleDb->updateDocument($document);
+        } catch (\Throwable $th) {
+            Console::error('[Error] Type: ' . get_class($th));
+            Console::error('[Error] Message: ' . $th->getMessage());
+            Console::error('[Error] File: ' . $th->getFile());
+            Console::error('[Error] Line: ' . $th->getLine());
+        } finally {
+            call_user_func($returnConsoleDb);
+        }
+    });
+});
+
+$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime) {
+    Console::success('Worker ' . $workerId . ' started succefully');
+
+    $attempts = 0;
+    $start = time();
+
+    Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
+        /**
+         * Sending current connections to project channels on the console project every 5 seconds.
+         */
+        if ($realtime->hasSubscriber('console', 'role:member', 'project')) {
+            $db = $register->get('dbPool')->get();
+            $cache = $register->get('redisPool')->get();
+
+            $consoleDb = new Database();
+            $consoleDb->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
+            $consoleDb->setNamespace('app_console');
+            $consoleDb->setMocks(Config::getParam('collections', []));
+
+            $payload = [];
+            $list = $consoleDb->getCollection([
+                'filters' => [
+                    '$collection=' . Database::SYSTEM_COLLECTION_CONNECTIONS,
+                    'timestamp>' . (time() - 15)
+                ],
+            ]);
+
+            /**
+             * Aggregate stats across containers.
+             */
+            foreach ($list as $document) {
+                foreach (json_decode($document->getAttribute('value')) as $projectId => $value) {
+                    if (array_key_exists($projectId, $payload)) {
+                        $payload[$projectId] +=  $value;
+                    } else {
+                        $payload[$projectId] =  $value;
+                    }
+                }
+            }
+
+            foreach ($stats as $projectId => $value) {
+                if (!array_key_exists($projectId, $payload)) {
+                    continue;
+                }
+
+                $event = [
+                    'project' => 'console',
+                    'roles' => ['team:' . $value['teamId']],
+                    'data' => [
+                        'event' => 'stats.connections',
+                        'channels' => ['project'],
+                        'timestamp' => time(),
+                        'payload' => [
+                            $projectId => $payload[$projectId]
+                        ]
+                    ]
+                ];
+
+                $server->send($realtime->getSubscribers($event), json_encode([
+                    'type' => 'event',
+                    'data' => $event['data']
+                ]));
+            }
+
+            $register->get('dbPool')->put($db);
+            $register->get('redisPool')->put($cache);
+        }
+        /**
+         * Sending test message for SDK E2E tests every 5 seconds.
+         */
+        if ($realtime->hasSubscriber('console', 'role:guest', 'tests')) {
+            $payload = ['response' => 'WS:/v1/realtime:passed'];
+
+            $event = [
+                'project' => 'console',
+                'roles' => ['role:guest'],
+                'data' => [
+                    'event' => 'test.event',
+                    'channels' => ['tests'],
+                    'timestamp' => time(),
+                    'payload' => $payload
+                ]
+            ];
+
+            $server->send($realtime->getSubscribers($event), json_encode([
+                'type' => 'event',
+                'data' => $event['data']
+            ]));
+        }
+    });
+
+    while ($attempts < 300) {
+        try {
+            if ($attempts > 0) {
+                Console::error('Pub/sub connection lost (lasted ' . (time() - $start) . ' seconds, worker: ' . $workerId . ').
+                    Attempting restart in 5 seconds (attempt #' . $attempts . ')');
+                sleep(5); // 5 sec delay between connection attempts
+            }
+            $start = time();
+
+            /** @var Redis $redis */
+            $redis = $register->get('redisPool')->get();
+            $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
+
+            if ($redis->ping(true)) {
+                $attempts = 0;
+                Console::success('Pub/sub connection established (worker: ' . $workerId . ')');
+            } else {
+                Console::error('Pub/sub failed (worker: ' . $workerId . ')');
+            }
+
+            $redis->subscribe(['realtime'], function (Redis $redis, string $channel, string $payload) use ($server, $workerId, $stats, $register, $realtime) {
+                $event = json_decode($payload, true);
+
+                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]));
+                    } else {
+                        return;
+                    }
+
+                    $db = $register->get('dbPool')->get();
+                    $cache = $register->get('redisPool')->get();
+
+                    $projectDB = new Database();
+                    $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
+                    $projectDB->setNamespace('app_' . $projectId);
+                    $projectDB->setMocks(Config::getParam('collections', []));
+
+                    $user = $projectDB->getDocument($userId);
+
+                    $roles = Auth::getRoles($user);
+
+                    $realtime->subscribe($projectId, $connection, $roles, $realtime->connections[$connection]['channels']);
+
+                    $register->get('dbPool')->put($db);
+                    $register->get('redisPool')->put($cache);
+                }
+
+                $receivers = $realtime->getSubscribers($event);
+
+                if (App::isDevelopment() && !empty($receivers)) {
+                    Console::log("[Debug][Worker {$workerId}] Receivers: " . count($receivers));
+                    Console::log("[Debug][Worker {$workerId}] Receivers Connection IDs: " . json_encode($receivers));
+                    Console::log("[Debug][Worker {$workerId}] Event: " . $payload);
+                }
+
+                $server->send(
+                    $receivers,
+                    json_encode([
+                        'type' => 'event',
+                        'data' => $event['data']
+                    ])
+                );
+
+                if (($num = count($receivers)) > 0) {
+                    $stats->incr($event['project'], 'messages', $num);
+                }
+            });
+        } catch (\Throwable $th) {
+            Console::error('Pub/sub error: ' . $th->getMessage());
+            $register->get('redisPool')->put($redis);
+            $attempts++;
+            continue;
+        }
+
+        $attempts++;
+    }
+
+    Console::error('Failed to restart pub/sub...');
+});
+
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
+    $app = new App('UTC');
+    $request = new Request($request);
+    $response = new Response(new SwooleResponse());
+
+    /** @var PDO $db */
+    $db = $register->get('dbPool')->get();
+    /** @var Redis $redis */
+    $redis = $register->get('redisPool')->get();
+
+    Console::info("Connection open (user: {$connection})");
+
+    App::setResource('db', function () use (&$db) {
+        return $db;
+    });
+
+    App::setResource('cache', function () use (&$redis) {
+        return $redis;
+    });
+
+    App::setResource('request', function () use ($request) {
+        return $request;
+    });
+
+    App::setResource('response', function () use ($response) {
+        return $response;
+    });
+
+    try {
+        /** @var \Appwrite\Database\Document $user */
+        $user = $app->getResource('user');
+
+        /** @var \Appwrite\Database\Document $project */
+        $project = $app->getResource('project');
+
+        /** @var \Appwrite\Database\Document $console */
+        $console = $app->getResource('console');
+
+        /*
+         *  Project Check
+         */
+        if (empty($project->getId())) {
+            throw new Exception('Missing or unknown project ID', 1008);
+        }
+
+        /*
+         * Abuse Check
+         *
+         * Abuse limits are connecting 128 times per minute and ip address.
+         */
+        $timeLimit = new TimeLimit('url:{url},ip:{ip}', 128, 60, $db);
+        $timeLimit
+            ->setNamespace('app_' . $project->getId())
+            ->setParam('{ip}', $request->getIP())
+            ->setParam('{url}', $request->getURI());
+
+        $abuse = new Abuse($timeLimit);
+
+        if ($abuse->check() && App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
+            throw new Exception('Too many requests', 1013);
+        }
+
+        /*
+         * Validate Client Domain - Check to avoid CSRF attack.
+         * Adding Appwrite API domains to allow XDOMAIN communication.
+         * Skip this check for non-web platforms which are not required to send an origin header.
+         */
+        $origin = $request->getOrigin();
+        $originValidator = new Origin(\array_merge($project->getAttribute('platforms', []), $console->getAttribute('platforms', [])));
+
+        if (!$originValidator->isValid($origin) && $project->getId() !== 'console') {
+            throw new Exception($originValidator->getDescription(), 1008);
+        }
+
+        $roles = Auth::getRoles($user);
+
+        $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());
+
+        /**
+         * Channels Check
+         */
+        if (empty($channels)) {
+            throw new Exception('Missing channels', 1008);
+        }
+
+        $realtime->subscribe($project->getId(), $connection, $roles, $channels);
+
+        $user = empty($user->getId()) ? null : $response->output($user, Response::MODEL_USER);
+
+        $server->send([$connection], json_encode([
+            'type' => 'connected',
+            'data' => [
+                'channels' => array_keys($channels),
+                'user' => $user
+            ]
+        ]));
+
+        $stats->set($project->getId(), [
+            'projectId' => $project->getId(),
+            'teamId' => $project->getAttribute('teamId')
+        ]);
+        $stats->incr($project->getId(), 'connections');
+        $stats->incr($project->getId(), 'connectionsTotal');
+    } catch (\Throwable $th) {
+        $response = [
+            'type' => 'error',
+            'data' => [
+                'code' => $th->getCode(),
+                'message' => $th->getMessage()
+            ]
+        ];
+
+        $server->send([$connection], json_encode($response));
+        $server->close($connection, $th->getCode());
+
+        if (App::isDevelopment()) {
+            Console::error('[Error] Connection Error');
+            Console::error('[Error] Code: ' . $response['data']['code']);
+            Console::error('[Error] Message: ' . $response['data']['message']);
+        }
+
+        if ($th instanceof PDOException) {
+            $db = null;
+        }
+    } finally {
+        /**
+         * Put used PDO and Redis Connections back into their pools.
+         */
+        $register->get('dbPool')->put($db);
+        $register->get('redisPool')->put($redis);
+    }
+});
+
+$server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
+    try {
+        $response = new Response(new SwooleResponse());
+        $db = $register->get('dbPool')->get();
+        $cache = $register->get('redisPool')->get();
+
+        $projectDB = new Database();
+        $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
+        $projectDB->setNamespace('app_' . $realtime->connections[$connection]['projectId']);
+        $projectDB->setMocks(Config::getParam('collections', []));
+
+        /*
+         * Abuse Check
+         *
+         * Abuse limits are sending 32 times per minute and connection.
+         */
+        $timeLimit = new TimeLimit('url:{url},conection:{connection}', 32, 60, $db);
+        $timeLimit
+            ->setNamespace('app_' . $realtime->connections[$connection]['projectId'])
+            ->setParam('{connection}', $connection)
+            ->setParam('{container}', $containerId);
+
+        $abuse = new Abuse($timeLimit);
+
+        if ($abuse->check() && App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
+            throw new Exception('Too many messages', 1013);
+        }
+
+        $message = json_decode($message, true);
+
+        if (is_null($message) || (!array_key_exists('type', $message) && !array_key_exists('data', $message))) {
+            throw new Exception('Message format is not valid.', 1003);
+        }
+
+        switch ($message['type']) {
+            /**
+             * This type is used to authenticate.
+             */
+            case 'authentication':
+                if (!array_key_exists('session', $message['data'])) {
+                    throw new Exception('Payload is not valid.', 1003);
+                }
+
+                $session = Auth::decodeSession($message['data']['session']);
+                Auth::$unique = $session['id'];
+                Auth::$secret = $session['secret'];
+
+                $user = $projectDB->getDocument(Auth::$unique);
+
+                if (
+                    empty($user->getId()) // Check a document has been found in the DB
+                    || Database::SYSTEM_COLLECTION_USERS !== $user->getCollection() // Validate returned document is really a user document
+                    || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret) // Validate user has valid login token
+                ) {
+                    // cookie not valid
+                    throw new Exception('Session is not valid.', 1003);
+                }
+
+                $roles = Auth::getRoles($user);
+                $channels = Realtime::convertChannels(array_flip($realtime->connections[$connection]['channels']), $user->getId());
+                $realtime->subscribe($realtime->connections[$connection]['projectId'], $connection, $roles, $channels);
+
+                $user = $response->output($user, Response::MODEL_USER);
+                $server->send([$connection], json_encode([
+                    'type' => 'response',
+                    'data' => [
+                        'to' => 'authentication',
+                        'success' => true,
+                        'user' => $user
+                    ]
+                ]));
+
+                break;
+
+            default:
+                throw new Exception('Message type is not valid.', 1003);
+                break;
+        }
+    } catch (\Throwable $th) {
+        $response = [
+            'type' => 'error',
+            'data' => [
+                'code' => $th->getCode(),
+                'message' => $th->getMessage()
+            ]
+        ];
+
+        $server->send([$connection], json_encode($response));
+
+        if ($th->getCode() === 1008) {
+            $server->close($connection, $th->getCode());
+        }
+    } finally {
+        $register->get('dbPool')->put($db);
+        $register->get('redisPool')->put($cache);
+    }
+});
+
+$server->onClose(function (int $connection) use ($realtime, $stats) {
+    if (array_key_exists($connection, $realtime->connections)) {
+        $stats->decr($realtime->connections[$connection]['projectId'], 'connectionsTotal');
+    }
+    $realtime->unsubscribe($connection);
+
+    Console::info('Connection close: ' . $connection);
+});
+
+$server->start();

app/tasks/install.php

@@ -73,7 +73,15 @@ $cli
             $compose = new Compose($data);
             $appwrite = $compose->getService('appwrite');
             $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null;
-            $ports = $compose->getService('traefik')->getPorts();
+            try {
+                $ports = $compose->getService('traefik')->getPorts();
+            } catch (\Throwable $th) {
+                $ports = [
+                    $defaultHTTPPort => $defaultHTTPPort,
+                    $defaultHTTPSPort => $defaultHTTPSPort
+                ];
+                Console::warning('Traefik not found. Falling back to default ports.');
+            }
 
             if($oldVersion) {
                 foreach($compose->getServices() as $service) { // Fetch all env vars from previous compose file
@@ -171,7 +179,7 @@ $cli
             ->setParam('organization', $organization)
             ->setParam('image', $image)
         ;
-        
+
         $templateForEnv
             ->setParam('vars', $input)
         ;

app/tasks/maintenance.php

@@ -39,6 +39,14 @@ $cli
             ]);
         }
 
+        function notifyDeleteConnections() 
+        {
+            Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
+                'type' => DELETE_TYPE_REALTIME,
+                'timestamp' => time() - 60
+            ]);
+        }
+
         // # of days in seconds (1 day = 86400s)
         $interval = (int) App::getEnv('_APP_MAINTENANCE_INTERVAL', '86400');
         $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600');
@@ -51,5 +59,6 @@ $cli
             notifyDeleteExecutionLogs($executionLogsRetention);
             notifyDeleteAbuseLogs($abuseLogsRetention);
             notifyDeleteAuditLogs($auditLogRetention);
+            notifyDeleteConnections();
         }, $interval);
     });

app/tasks/migrate.php

@@ -72,7 +72,7 @@ $cli
             $sum = \count($projects);
             $offset = $offset + $limit;
             $count = $count + $sum;
-            
+
             if ($sum > 0) {
                 Console::log('Fetched '.$count.'/'.$consoleDB->getSum().' projects...');
             }

app/tasks/sdks.php

@@ -29,7 +29,7 @@ $cli
         $production = ($git) ? (Console::confirm('Type "Appwrite" to push code to production git repos') == 'Appwrite') : false;
         $message = ($git) ? Console::confirm('Please enter your commit message:') : '';
 
-        if(!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x'])) {
+        if(!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x'])) {
             throw new Exception('Unknown version given');
         }
 
@@ -184,7 +184,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     ->setTwitter(APP_SOCIAL_TWITTER_HANDLE)
                     ->setDiscord(APP_SOCIAL_DISCORD_CHANNEL, APP_SOCIAL_DISCORD)
                     ->setDefaultHeaders([
-                        'X-Appwrite-Response-Format' => '0.9.0',
+                        'X-Appwrite-Response-Format' => '0.10.0',
                     ])
                 ;
                 

app/views/console/database/collection.phtml

@@ -531,5 +531,6 @@ $maxCells = 10;
     data-service="database.listCollections"
     data-event="load,database.createCollection,database.updateCollection,database.deleteCollection"
     data-scope="sdk"
+    data-param-limit="100"
     data-name="project-collections">
 </div>

app/views/console/database/index.phtml

@@ -100,7 +100,7 @@
                         <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
                         <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
                         <input type="hidden" id="collection-rules" name="rules" required data-cast-to="json" value="{}" />
-                        
+
                         <hr />
 
                         <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>

app/views/console/home/index.phtml

@@ -4,7 +4,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 ?>
 
 <div class="cover margin-bottom-small">
-    <div class="zone xl margin-bottom-xl margin-top-small">
+    <div class="zone xxl margin-bottom-xl margin-top-small">
         <h1 class="margin-bottom-small"
             data-service="projects.get"
             data-event="load,project.update,projects.createPlatform,projects.updatePlatform,projects.deletePlatform"
@@ -39,7 +39,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     data-event="submit"
                     data-name="usage"
                     data-param-project-id="{{router.params.project}}"
-                    data-param-range="24h">
+                    data-param-range="24h"
+                    data-scope="console">
                     <button class="tick">24h</button>
                 </form>
 
@@ -53,7 +54,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     data-service="projects.getUsage"
                     data-event="submit"
                     data-name="usage"
-                    data-param-project-id="{{router.params.project}}">
+                    data-param-project-id="{{router.params.project}}"
+                    data-scope="console">
                     <button class="tick">30d</button>
                 </form>
 
@@ -68,7 +70,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     data-event="submit"
                     data-name="usage"
                     data-param-project-id="{{router.params.project}}"
-                    data-param-range="90d">
+                    data-param-range="90d"
+                    data-scope="console">
                     <button class="tick">90d</button>
                 </form>
 
@@ -83,8 +86,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         data-name="usage"
         data-param-project-id="{{router.params.project}}"
         data-param-range="30d">
-
-        <?php if (!$graph && $usageStatsEnabled): ?>
+            <?php if (!$graph && $usageStatsEnabled): ?>
             <div class="box dashboard">
                 <div class="row responsive">
                     <div class="col span-9">
@@ -94,50 +96,46 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                         <div class="chart-metric">
                             <div class="value margin-bottom-small"><span class="sum" data-ls-bind="{{usage.requests.total|statsTotal}}">N/A</span></div>
-                            <div class="metric margin-bottom-small">Requests <span class="tooltip" data-tooltip="Total number of API requests"><i class="icon-info-circled"></i></span></div>
+                            <div class="unit margin-start-no margin-bottom-small">Requests</div>
                         </div>
                     </div>
                     <div class="col span-3">
                         <div class="value margin-bottom-small">
-                            <span class="sum" data-ls-bind="{{usage.network.total|humanFileSize}}" data-default="0">0</span>
-                            <span data-ls-bind="{{usage.network.total|humanFileUnit}}" class="text-size-small unit"></span>
-                        </div>
-                        <div class="metric margin-bottom-small">Bandwidth</div>
-
-                        <div class="margin-top-large value small">
-                            <b class="text-size-small sum small" data-ls-bind="{{usage.functions.total|statsTotal}}" data-default="0"></b>
-                            <br />
-                            <b>Func. Executions</b>
+                            <span class="sum" data-ls-bind="{{realtime.current|accessProject}}" data-default="0">0</span>
                         </div>
+                        <div class="unit margin-start-no margin-bottom-small">Connections</div>
+                        <div class="chart-bar margin-top-small margin-bottom-small" data-ls-attrs="data-history={{realtime.history|accessProject}}" data-forms-chart-bars="{{realtime.history|accessProject}}"></div>
+                        <div class="text-fade-dark text-size-small">Activity last 60 seconds</div>
                     </div>
                 </div>
             </div>
-        <?php endif; ?>
-
-        <div class="box dashboard">
-            <div class="row responsive">
-                <div class="col span-3">
-                    <div class="value"><span class="sum" data-ls-bind="{{usage.documents.total|statsTotal}}" data-default="0">0</span></div>
-                    <div class="margin-top-small"><b class="text-size-small unit">Documents</b></div>
-                </div>
-                <div class="col span-3">
-                    <div class="value">
-                        <span class="sum" data-ls-bind="{{usage.storage.total|humanFileSize}}" data-default="0">0</span>
-                        <span data-ls-bind="{{usage.storage.total|humanFileUnit}}" class="text-size-small unit"></span>
+            <?php endif; ?>
+            <div class="box dashboard">
+                <div class="row responsive">
+                    <div class="col span-3">
+                        <div class="value"><span class="sum" data-ls-bind="{{usage.documents.total|statsTotal}}" data-default="0">0</span></div>
+                        <div class="margin-top-small"><b class="text-size-small unit">Documents</b></div>
+                    </div>
+                    <div class="col span-3">
+                        <div class="value">
+                            <span class="sum" data-ls-bind="{{usage.storage.total|humanFileSize}}" data-default="0">0</span>
+                            <span data-ls-bind="{{usage.storage.total|humanFileUnit}}" class="text-size-small unit"></span>
+                        </div>
+                        <div class="margin-top-small"><b class="text-size-small unit">Storage</b></div>
+                    </div>
+                    <div class="col span-3">
+                        <div class="value"><span class="sum" data-ls-bind="{{usage.users.total}}" data-default="0">0</span></div>
+                        <div class="margin-top-small"><b class="text-size-small unit">Users</b></div>
+                    </div>
+                    <div class="col span-3">
+                        <div class="value"><span class="sum" data-ls-bind="{{usage.functions.total|statsTotal}}" data-default="0">0</span></div>
+                        <div class="margin-top-small"><b class="text-size-small unit">Executions</b></div>
                     </div>
-                    <div class="margin-top-small"><b class="text-size-small unit">Storage</b></div>
-                </div>
-                <div class="col span-3">
-                    <div class="value"><span class="sum" data-ls-bind="{{usage.users.total}}" data-default="0">0</span></div>
-                    <div class="margin-top-small"><b class="text-size-small unit">Users</b></div>
-                </div>
-                <div class="col span-3">
-                    <div class="value"><span class="sum" data-ls-bind="{{usage.tasks.total}}" data-default="0">0</span></div>
-                    <div class="margin-top-small"><b class="text-size-small unit">Tasks</b></div>
                 </div>
             </div>
         </div>
     </div>
+    </div>
 </div>
 
 <div class="zone xl margin-top-xl clear" data-ls-if="({{console-project}})">

app/views/console/users/index.phtml

@@ -1,6 +1,7 @@
 <?php
 $providers = $this->getParam('providers', []);
 $auth = $this->getParam('auth', []);
+$smtpEnabled = $this->getParam('smtpEnabled', false);
 ?>
 
 <div class="cover">
@@ -372,19 +373,26 @@ $auth = $this->getParam('auth', []);
                                 data-failure-param-alert-text="Failed to update project auth status settings"
                                 data-failure-param-alert-classname="error">
                                 <input name="method" id="<?php echo $this->escape($key); ?>" type="hidden" autocomplete="off" value="<?php echo $this->escape($index); ?>">
-
-                                <input name="status" type="hidden" data-forms-switch data-ls-bind="{{console-project.<?php echo $this->escape($key); ?>}}" data-cast-to="boolean" class="pull-end" />
+                                <?php if( !(in_array($key, ['usersAuthMagicURL', 'usersAuthInvites']) && !$smtpEnabled)): ?>
+                                    <input name="status" type="hidden" data-forms-switch data-ls-bind="{{console-project.<?php echo $this->escape($key); ?>}}" data-cast-to="boolean" class="pull-end" />
+                                <?php endif; ?>
                             </form>
                         <?php endif; ?>
-
+                        
                         <img src="<?php echo $this->escape($icon); ?>?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="Email/Password Logo" class="pull-start provider margin-end" />
                                 
-                        <span class="text-size-small"><?php echo $this->escape($name); ?><?php if(!$enabled): ?> <spann class="text-fade text-size-xs">soon</span><?php endif; ?></span>
-
-                        <?php if($docs): ?>
-                        <p class="margin-bottom-no text-one-liner text-size-small">
-                            <a href="<?php echo $this->escape($docs); ?>" target="_blank" rel="noopener">Docs<i class="icon-link-ext"></i></a>
-                        </p>
+                        <span class="text-size-small"><?php echo $this->escape($name); ?><?php if(!$enabled): ?> <spann class="text-fade text-size-xs">soon</span><?php endif; ?>
+                        
+                        <?php if( in_array($key, ['usersAuthMagicURL', 'usersAuthInvites']) && !$smtpEnabled): ?>
+                            <p class="margin-bottom-no text-one-liner text-size-small text-danger">
+                                SMTP Disabled
+                            </p>
+                        <?php else: ?>
+                            <?php if($docs): ?>
+                            <p class="margin-bottom-no text-one-liner text-size-small">
+                                <a href="<?php echo $this->escape($docs); ?>" target="_blank" rel="noopener">Docs<i class="icon-link-ext"></i></a>
+                            </p>
+                            <?php endif; ?>
                         <?php endif; ?>
                     </div>
                 </li>

app/views/console/users/user.phtml

@@ -17,6 +17,114 @@
         </h1>
     </div>
 
+    <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-name">
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
+        
+        <h2>Update name</h2>
+
+        <form name="users.updateName"
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Update User Name"
+            data-service="users.updateName"
+            data-scope="sdk"
+            data-event="submit"
+            data-success="trigger,alert"
+            data-success-param-alert-text="User name was updated successfully"
+            data-success-param-trigger-events="users.update"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to update user name"
+            data-failure-param-alert-classname="error">
+            
+            <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
+
+            <label for="name">Name</label>
+            <input name="name" id="name" type="text" autocomplete="off" data-ls-bind="{{user.name}}" required class="full-width" maxlength="128">
+
+            <hr />
+
+            <footer>
+
+                <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+            </footer>
+        </form>
+
+    </div>
+    
+    <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-email">
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
+        
+        <h2>Update Email</h2>
+
+        <form name="users.updateEmail"
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Update User Email"
+            data-service="users.updateEmail"
+            data-scope="sdk"
+            data-event="submit"
+            data-success="trigger,alert"
+            data-success-param-alert-text="User email was updated successfully"
+            data-success-param-trigger-events="users.update"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to update user email"
+            data-failure-param-alert-classname="error">
+            
+            <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
+
+            <label for="email">Email</label>
+            <input name="email" id="email" type="text" autocomplete="off" data-ls-bind="{{user.email}}" required class="full-width" maxlength="128">
+
+            <hr />
+
+            <footer>
+
+                <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+            </footer>
+        </form>
+
+    </div>
+
+    <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-password">
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
+        
+        <h2>Update Password</h2>
+
+        <form name="users.updatePassword"
+            data-analytics
+            data-analytics-activity
+            data-analytics-event="submit"
+            data-analytics-category="console"
+            data-analytics-label="Update User Password"
+            data-service="users.updatePassword"
+            data-scope="sdk"
+            data-event="submit"
+            data-success="trigger,alert"
+            data-success-param-alert-text="User password was updated successfully"
+            data-success-param-trigger-events="users.update"
+            data-failure="alert"
+            data-failure-param-alert-text="Failed to update user password"
+            data-failure-param-alert-classname="error">
+            
+            <input type="hidden" disabled name="userId" data-ls-bind="{{user.$id}}">
+
+            <label for="password">Password</label>
+            <input name="password" id="password" type="password" autocomplete="off" required class="full-width" maxlength="128">
+
+            <hr />
+
+            <footer>
+
+                <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+            </footer>
+        </form>
+
+    </div>
+
     <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
         <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
         
@@ -134,6 +242,9 @@
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-name" class="link text-size-small">Update name</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-email" class="link text-size-small">Update Email</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-password" class="link text-size-small">Update Password</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
                         </ul>
 

app/views/home/auth/magicURL.phtml

@@ -0,0 +1,38 @@
+<div class="zone large padding margin-top" id="message" style="display: none">
+    <h1 class="margin-bottom">Missing Redirect URL</h1>
+    <p>Your Magic URL login flow is missing a proper redirect URL. Please check the
+        <a href="https://<?php echo APP_DOMAIN; ?>/docs/client/account?sdk=web#createMagicURLSession">Magic URL docs</a>
+        and send request for new session with a valid redirect URL.</p>
+</div>
+
+<script>
+    setTimeout(function () {
+        document.getElementById('message').style.display = 'block';
+    }, 25);
+
+    const urlSearchParams = new URLSearchParams(window.location.search);
+    const {
+        userId,
+        secret,
+        project
+    } = Object.fromEntries(urlSearchParams.entries());
+
+    const formData = new FormData();
+    formData.append('userId', userId);
+    formData.append('secret', secret);
+
+    const res = fetch(window.location.origin + '/v1/account/sessions/magic-url', {
+        method: 'PUT',
+        body: formData,
+        headers: {
+            ["x-appwrite-project"]: project
+        }
+    }).then(response => response.json())
+    .then(data => {
+        if(data.$id) {
+            window.location = 'appwrite-callback-' + project + '://'+window.location.search;
+        }
+    })
+
+</script>
+<hr />

app/views/install/compose.phtml

@@ -17,8 +17,8 @@ services:
       - --providers.docker=true
       - --providers.docker.exposedByDefault=false
       - --providers.docker.constraints=Label(`traefik.constraint-label-stack`,`appwrite`)
-      - --entrypoints.web.address=:80
-      - --entrypoints.websecure.address=:443
+      - --entrypoints.appwrite_web.address=:80
+      - --entrypoints.appwrite_websecure.address=:443
     restart: unless-stopped
     ports:
       - <?php echo $httpPort; ?>:80
@@ -42,9 +42,17 @@ services:
     labels:
       - traefik.enable=true
       - traefik.constraint-label-stack=appwrite
-      - traefik.http.routers.appwrite.rule=PathPrefix(`/`)
-      - traefik.http.routers.appwrite-secure.rule=PathPrefix(`/`)
-      - traefik.http.routers.appwrite-secure.tls=true
+      - traefik.docker.network=appwrite
+      - traefik.http.services.appwrite_api.loadbalancer.server.port=80
+      #http
+      - traefik.http.routers.appwrite_api_http.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_api_http.rule=PathPrefix(`/`)
+      - traefik.http.routers.appwrite_api_http.service=appwrite_api
+      # https
+      - traefik.http.routers.appwrite_api_https.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_api_https.rule=PathPrefix(`/`)
+      - traefik.http.routers.appwrite_api_https.service=appwrite_api
+      - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -99,6 +107,43 @@ services:
       - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_RUNTIMES
 
+  appwrite-realtime:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: realtime
+    container_name: appwrite-realtime
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_realtime.loadbalancer.server.port=80"
+      #ws
+      - traefik.http.routers.appwrite_realtime_ws.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_realtime_ws.rule=PathPrefix(`/v1/realtime`)
+      - traefik.http.routers.appwrite_realtime_ws.service=appwrite_realtime
+      # wss
+      - traefik.http.routers.appwrite_realtime_wss.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_realtime_wss.rule=PathPrefix(`/v1/realtime`)
+      - traefik.http.routers.appwrite_realtime_wss.service=appwrite_realtime
+      - traefik.http.routers.appwrite_realtime_wss.tls=true
+      - traefik.http.routers.appwrite_realtime_wss.tls.certresolver=dns
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_OPTIONS_ABUSE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_USAGE_STATS
+
   appwrite-worker-usage:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: worker-usage

app/workers/audits.php

@@ -5,15 +5,13 @@ use Utopia\Audit\Audit;
 use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 use Utopia\CLI\Console;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Console::title('Audits V1 Worker');
-Console::success(APP_NAME.' audits worker v1 has started');
+Console::success(APP_NAME . ' audits worker v1 has started');
 
 class AuditsV1 extends Worker
 {
-    public $args = [];
-
     public function init(): void
     {
     }
@@ -30,9 +28,9 @@ class AuditsV1 extends Worker
         $ip = $this->args['ip'];
         $data = $this->args['data'];
         $db = $register->get('db', true);
-        
+
         $adapter = new AuditAdapter($db);
-        $adapter->setNamespace('app_'.$projectId);
+        $adapter->setNamespace('app_' . $projectId);
 
         $audit = new Audit($adapter);
 
@@ -43,4 +41,4 @@ class AuditsV1 extends Worker
     {
         // ... Remove environment for this job
     }
-}
+}

app/workers/certificates.php

@@ -11,15 +11,13 @@ use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Domains\Domain;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Console::title('Certificates V1 Worker');
-Console::success(APP_NAME.' certificates worker v1 has started');
+Console::success(APP_NAME . ' certificates worker v1 has started');
 
 class CertificatesV1 extends Worker
 {
-    public $args = [];
-
     public function init(): void
     {
     }
@@ -57,33 +55,33 @@ class CertificatesV1 extends Worker
         // Validation Args
         $validateTarget = $this->args['validateTarget'] ?? true;
         $validateCNAME = $this->args['validateCNAME'] ?? true;
-        
+
         // Options
         $domain = new Domain((!empty($domain)) ? $domain : '');
         $expiry = 60 * 60 * 24 * 30 * 2; // 60 days
         $safety = 60 * 60; // 1 hour
         $renew  = (\time() + $expiry);
 
-        if(empty($domain->get())) {
+        if (empty($domain->get())) {
             throw new Exception('Missing domain');
         }
 
-        if(!$domain->isKnown() || $domain->isTest()) {
+        if (!$domain->isKnown() || $domain->isTest()) {
             throw new Exception('Unknown public suffix for domain');
         }
 
-        if($validateTarget) {
+        if ($validateTarget) {
             $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
-    
-            if(!$target->isKnown() || $target->isTest()) {
-                throw new Exception('Unreachable CNAME target ('.$target->get().'), please use a domain with a public suffix.');
+
+            if (!$target->isKnown() || $target->isTest()) {
+                throw new Exception('Unreachable CNAME target (' . $target->get() . '), please use a domain with a public suffix.');
             }
         }
 
-        if($validateCNAME) {
+        if ($validateCNAME) {
             $validator = new CNAME($target->get()); // Verify Domain with DNS records
-    
-            if(!$validator->isValid($domain->get())) {
+
+            if (!$validator->isValid($domain->get())) {
                 throw new Exception('Failed to verify domain DNS records');
             }
         }
@@ -92,8 +90,8 @@ class CertificatesV1 extends Worker
             'limit' => 1,
             'offset' => 0,
             'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_CERTIFICATES,
-                'domain='.$domain->get(),
+                '$collection=' . Database::SYSTEM_COLLECTION_CERTIFICATES,
+                'domain=' . $domain->get(),
             ],
         ]);
 
@@ -106,16 +104,18 @@ class CertificatesV1 extends Worker
 
         $certificate = (!empty($certificate) && $certificate instanceof $certificate) ? $certificate->getArrayCopy() : [];
 
-        if(!empty($certificate)
+        if (
+            !empty($certificate)
             && isset($certificate['issueDate'])
-            && (($certificate['issueDate'] + ($expiry)) > \time())) { // Check last issue time
-                throw new Exception('Renew isn\'t required');
+            && (($certificate['issueDate'] + ($expiry)) > \time())
+        ) { // Check last issue time
+            throw new Exception('Renew isn\'t required');
         }
 
         $staging = (App::isProduction()) ? '' : ' --dry-run';
         $email = App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS');
 
-        if(empty($email)) {
+        if (empty($email)) {
             throw new Exception('You must set a valid security email address (_APP_SYSTEM_SECURITY_EMAIL_ADDRESS) to issue an SSL certificate');
         }
 
@@ -123,36 +123,36 @@ class CertificatesV1 extends Worker
         $stderr = '';
 
         $exit = Console::execute("certbot certonly --webroot --noninteractive --agree-tos{$staging}"
-            ." --email ".$email
-            ." -w ".APP_STORAGE_CERTIFICATES
-            ." -d {$domain->get()}", '', $stdout, $stderr);
+            . " --email " . $email
+            . " -w " . APP_STORAGE_CERTIFICATES
+            . " -d {$domain->get()}", '', $stdout, $stderr);
 
-        if($exit !== 0) {
-            throw new Exception('Failed to issue a certificate with message: '.$stderr);
+        if ($exit !== 0) {
+            throw new Exception('Failed to issue a certificate with message: ' . $stderr);
         }
 
-        $path = APP_STORAGE_CERTIFICATES.'/'.$domain->get();
+        $path = APP_STORAGE_CERTIFICATES . '/' . $domain->get();
 
-        if(!\is_readable($path)) {
+        if (!\is_readable($path)) {
             if (!\mkdir($path, 0755, true)) {
                 throw new Exception('Failed to create path...');
             }
         }
-        
-        if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/cert.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/cert.pem')) {
-            throw new Exception('Failed to rename certificate cert.pem: '.\json_encode($stdout));
+
+        if (!@\rename('/etc/letsencrypt/live/' . $domain->get() . '/cert.pem', APP_STORAGE_CERTIFICATES . '/' . $domain->get() . '/cert.pem')) {
+            throw new Exception('Failed to rename certificate cert.pem: ' . \json_encode($stdout));
         }
 
-        if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/chain.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/chain.pem')) {
-            throw new Exception('Failed to rename certificate chain.pem: '.\json_encode($stdout));
+        if (!@\rename('/etc/letsencrypt/live/' . $domain->get() . '/chain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain->get() . '/chain.pem')) {
+            throw new Exception('Failed to rename certificate chain.pem: ' . \json_encode($stdout));
         }
 
-        if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/fullchain.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/fullchain.pem')) {
-            throw new Exception('Failed to rename certificate fullchain.pem: '.\json_encode($stdout));
+        if (!@\rename('/etc/letsencrypt/live/' . $domain->get() . '/fullchain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain->get() . '/fullchain.pem')) {
+            throw new Exception('Failed to rename certificate fullchain.pem: ' . \json_encode($stdout));
         }
 
-        if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/privkey.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/privkey.pem')) {
-            throw new Exception('Failed to rename certificate privkey.pem: '.\json_encode($stdout));
+        if (!@\rename('/etc/letsencrypt/live/' . $domain->get() . '/privkey.pem', APP_STORAGE_CERTIFICATES . '/' . $domain->get() . '/privkey.pem')) {
+            throw new Exception('Failed to rename certificate privkey.pem: ' . \json_encode($stdout));
         }
 
         $certificate = \array_merge($certificate, [
@@ -170,30 +170,30 @@ class CertificatesV1 extends Worker
 
         $certificate = $consoleDB->createDocument($certificate);
 
-        if(!$certificate) {
+        if (!$certificate) {
             throw new Exception('Failed saving certificate to DB');
         }
 
-        if(!empty($document)) {
+        if (!empty($document)) {
             $document = \array_merge($document, [
                 'updated' => \time(),
                 'certificateId' => $certificate->getId(),
             ]);
-    
+
             $document = $consoleDB->updateDocument($document);
-    
-            if(!$document) {
+
+            if (!$document) {
                 throw new Exception('Failed saving domain to DB');
             }
         }
-        
-        $config = 
-"tls:
+
+        $config =
+            "tls:
   certificates:
     - certFile: /storage/certificates/{$domain->get()}/fullchain.pem
       keyFile: /storage/certificates/{$domain->get()}/privkey.pem";
 
-        if(!\file_put_contents(APP_STORAGE_CONFIG.'/'.$domain->get().'.yml', $config)) {
+        if (!\file_put_contents(APP_STORAGE_CONFIG . '/' . $domain->get() . '.yml', $config)) {
             throw new Exception('Failed to save SSL configuration');
         }
 
@@ -210,4 +210,4 @@ class CertificatesV1 extends Worker
     public function shutdown(): void
     {
     }
-}
+}

app/workers/deletes.php

@@ -14,16 +14,14 @@ use Utopia\Config\Config;
 use Utopia\Audit\Audit;
 use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Console::title('Deletes V1 Worker');
-Console::success(APP_NAME.' deletes worker v1 has started'."\n");
+Console::success(APP_NAME . ' deletes worker v1 has started' . "\n");
 
 class DeletesV1 extends Worker
 {
-    public $args = [];
-
-    protected $consoleDB = null;
+    protected Database $consoleDB;
 
     public function init(): void
     {
@@ -31,9 +29,9 @@ class DeletesV1 extends Worker
 
     public function run(): void
     {
-        $projectId = isset($this->args['projectId']) ? $this->args['projectId'] : '';   
+        $projectId = isset($this->args['projectId']) ? $this->args['projectId'] : '';
         $type = $this->args['type'];
-        
+
         switch (strval($type)) {
             case DELETE_TYPE_DOCUMENT:
                 $document = $this->args['document'];
@@ -55,7 +53,7 @@ class DeletesV1 extends Worker
                         $this->deleteMemberships($document, $projectId);
                         break;
                     default:
-                        Console::error('No lazy delete operation available for document of type: '.$document->getCollection());
+                        Console::error('No lazy delete operation available for document of type: ' . $document->getCollection());
                         break;
                 }
                 break;
@@ -72,37 +70,41 @@ class DeletesV1 extends Worker
                 $this->deleteAbuseLogs($this->args['timestamp']);
                 break;
 
+            case DELETE_TYPE_REALTIME:
+                $this->deleteRealtimeUsage($this->args['timestamp']);
+                break;
+
             case DELETE_TYPE_CERTIFICATES:
                 $document = new Document($this->args['document']);
                 $this->deleteCertificates($document);
                 break;
-                        
+
             default:
-                Console::error('No delete operation for type: '.$type);
+                Console::error('No delete operation for type: ' . $type);
                 break;
-            
-            }
+        }
     }
 
     public function shutdown(): void
     {
     }
-    
-    protected function deleteDocuments(Document $document, $projectId) 
+
+    protected function deleteDocuments(Document $document, $projectId)
     {
         $collectionId = $document->getId();
-        
+
         // Delete Documents in the deleted collection 
         $this->deleteByGroup([
-            '$collection='.$collectionId
-        ], $this->getProjectDB($projectId));   
+            '$collection=' . $collectionId
+        ], $this->getProjectDB($projectId));
     }
 
-    protected function deleteMemberships(Document $document, $projectId) {
+    protected function deleteMemberships(Document $document, $projectId)
+    {
         // Delete Memberships
         $this->deleteByGroup([
-            '$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-            'teamId='.$document->getId(),
+            '$collection=' . Database::SYSTEM_COLLECTION_MEMBERSHIPS,
+            'teamId=' . $document->getId(),
         ], $this->getProjectDB($projectId));
     }
 
@@ -110,8 +112,8 @@ class DeletesV1 extends Worker
     {
         // Delete all DBs
         $this->getConsoleDB()->deleteNamespace($document->getId());
-        $uploads = new Local(APP_STORAGE_UPLOADS.'/app-'.$document->getId());
-        $cache = new Local(APP_STORAGE_CACHE.'/app-'.$document->getId());
+        $uploads = new Local(APP_STORAGE_UPLOADS . '/app-' . $document->getId());
+        $cache = new Local(APP_STORAGE_CACHE . '/app-' . $document->getId());
 
         // Delete all storage directories
         $uploads->delete($uploads->getRoot(), true);
@@ -121,7 +123,7 @@ class DeletesV1 extends Worker
     protected function deleteUser(Document $document, $projectId)
     {
         $tokens = $document->getAttribute('tokens', []);
-        
+
         foreach ($tokens as $token) {
             if (!$this->getProjectDB($projectId)->deleteDocument($token->getId())) {
                 throw new Exception('Failed to remove token from DB');
@@ -138,14 +140,14 @@ class DeletesV1 extends Worker
 
         // Delete Memberships and decrement team membership counts
         $this->deleteByGroup([
-            '$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-            'userId='.$document->getId(),
-        ], $this->getProjectDB($projectId), function(Document $document) use ($projectId) {
+            '$collection=' . Database::SYSTEM_COLLECTION_MEMBERSHIPS,
+            'userId=' . $document->getId(),
+        ], $this->getProjectDB($projectId), function (Document $document) use ($projectId) {
 
             if ($document->getAttribute('confirm')) { // Count only confirmed members
                 $teamId = $document->getAttribute('teamId');
                 $team = $this->getProjectDB($projectId)->getDocument($teamId);
-                if(!$team->isEmpty()) {
+                if (!$team->isEmpty()) {
                     $team = $this->getProjectDB($projectId)->updateDocument(\array_merge($team->getArrayCopy(), [
                         'sum' => \max($team->getAttribute('sum', 0) - 1, 0), // Ensure that sum >= 0
                     ]));
@@ -154,37 +156,37 @@ class DeletesV1 extends Worker
         });
     }
 
-    protected function deleteExecutionLogs($timestamp) 
+    protected function deleteExecutionLogs($timestamp)
     {
-        $this->deleteForProjectIds(function($projectId) use ($timestamp) {
+        $this->deleteForProjectIds(function ($projectId) use ($timestamp) {
             if (!($projectDB = $this->getProjectDB($projectId))) {
-                throw new Exception('Failed to get projectDB for project '.$projectId);
+                throw new Exception('Failed to get projectDB for project ' . $projectId);
             }
 
             // Delete Executions
             $this->deleteByGroup([
-                '$collection='.Database::SYSTEM_COLLECTION_EXECUTIONS,
-                'dateCreated<'.$timestamp
+                '$collection=' . Database::SYSTEM_COLLECTION_EXECUTIONS,
+                'dateCreated<' . $timestamp
             ], $projectDB);
         });
     }
 
-    protected function deleteAbuseLogs($timestamp) 
+    protected function deleteAbuseLogs($timestamp)
     {
         global $register;
-        if($timestamp == 0) {
+        if ($timestamp == 0) {
             throw new Exception('Failed to delete audit logs. No timestamp provided');
         }
 
         $timeLimit = new TimeLimit("", 0, 1, $register->get('db'));
 
-        $this->deleteForProjectIds(function($projectId) use ($timeLimit, $timestamp){
-            $timeLimit->setNamespace('app_'.$projectId);
-            $abuse = new Abuse($timeLimit); 
+        $this->deleteForProjectIds(function ($projectId) use ($timeLimit, $timestamp) {
+            $timeLimit->setNamespace('app_' . $projectId);
+            $abuse = new Abuse($timeLimit);
 
             $status = $abuse->cleanup($timestamp);
             if (!$status) {
-                throw new Exception('Failed to delete Abuse logs for project '.$projectId);
+                throw new Exception('Failed to delete Abuse logs for project ' . $projectId);
             }
         });
     }
@@ -192,43 +194,55 @@ class DeletesV1 extends Worker
     protected function deleteAuditLogs($timestamp)
     {
         global $register;
-        if($timestamp == 0) {
+        if ($timestamp == 0) {
             throw new Exception('Failed to delete audit logs. No timestamp provided');
         }
-        $this->deleteForProjectIds(function($projectId) use ($register, $timestamp){
+        $this->deleteForProjectIds(function ($projectId) use ($register, $timestamp) {
             $adapter = new AuditAdapter($register->get('db'));
-            $adapter->setNamespace('app_'.$projectId);
+            $adapter->setNamespace('app_' . $projectId);
             $audit = new Audit($adapter);
             $status = $audit->cleanup($timestamp);
             if (!$status) {
-                throw new Exception('Failed to delete Audit logs for project'.$projectId);
+                throw new Exception('Failed to delete Audit logs for project' . $projectId);
             }
         });
     }
 
+    protected function deleteRealtimeUsage($timestamp) 
+    {
+        if (!($consoleDB = $this->getConsoleDB())) {
+            throw new Exception('Failed to get consoleDb.');
+        }  
+        // Delete Dead Realtime Logs
+        $this->deleteByGroup([
+            '$collection='.Database::SYSTEM_COLLECTION_REALTIME_CONNECTIONS,
+            'timestamp<'.$timestamp
+        ], $consoleDB);
+
+    }
+
     protected function deleteFunction(Document $document, $projectId)
     {
         $projectDB = $this->getProjectDB($projectId);
-        $device = new Local(APP_STORAGE_FUNCTIONS.'/app-'.$projectId);
+        $device = new Local(APP_STORAGE_FUNCTIONS . '/app-' . $projectId);
 
         // Delete Tags
         $this->deleteByGroup([
-            '$collection='.Database::SYSTEM_COLLECTION_TAGS,
-            'functionId='.$document->getId(),
-        ], $projectDB, function(Document $document) use ($device) {
+            '$collection=' . Database::SYSTEM_COLLECTION_TAGS,
+            'functionId=' . $document->getId(),
+        ], $projectDB, function (Document $document) use ($device) {
 
             if ($device->delete($document->getAttribute('path', ''))) {
-                Console::success('Delete code tag: '.$document->getAttribute('path', ''));
-            }
-            else {
-                Console::error('Failed to delete code tag: '.$document->getAttribute('path', ''));
+                Console::success('Delete code tag: ' . $document->getAttribute('path', ''));
+            } else {
+                Console::error('Failed to delete code tag: ' . $document->getAttribute('path', ''));
             }
         });
 
         // Delete Executions
         $this->deleteByGroup([
-            '$collection='.Database::SYSTEM_COLLECTION_EXECUTIONS,
-            'functionId='.$document->getId(),
+            '$collection=' . Database::SYSTEM_COLLECTION_EXECUTIONS,
+            'functionId=' . $document->getId(),
         ], $projectDB);
     }
 
@@ -236,17 +250,16 @@ class DeletesV1 extends Worker
     {
         Authorization::disable();
 
-        if($database->deleteDocument($document->getId())) {
-            Console::success('Deleted document "'.$document->getId().'" successfully');
+        if ($database->deleteDocument($document->getId())) {
+            Console::success('Deleted document "' . $document->getId() . '" successfully');
 
-            if(is_callable($callback)) {
+            if (is_callable($callback)) {
                 $callback($document);
             }
 
             return true;
-        }
-        else {
-            Console::error('Failed to delete document: '.$document->getId());
+        } else {
+            Console::error('Failed to delete document: ' . $document->getId());
             return false;
         }
 
@@ -262,8 +275,8 @@ class DeletesV1 extends Worker
         $sum = $limit;
 
         $executionStart = \microtime(true);
-        
-        while($sum === $limit) {
+
+        while ($sum === $limit) {
             $chunk++;
 
             Authorization::disable();
@@ -272,18 +285,18 @@ class DeletesV1 extends Worker
                 'orderType' => 'ASC',
                 'orderCast' => 'string',
                 'filters' => [
-                    '$collection='.Database::SYSTEM_COLLECTION_PROJECTS,
+                    '$collection=' . Database::SYSTEM_COLLECTION_PROJECTS,
                 ],
             ]);
             Authorization::reset();
 
-            $projectIds = array_map (function ($project) { 
-                return $project->getId(); 
+            $projectIds = array_map(function ($project) {
+                return $project->getId();
             }, $projects);
 
             $sum = count($projects);
 
-            Console::info('Executing delete function for chunk #'.$chunk.'. Found '.$sum.' projects');
+            Console::info('Executing delete function for chunk #' . $chunk . '. Found ' . $sum . ' projects');
             foreach ($projectIds as $projectId) {
                 $callback($projectId);
                 $count++;
@@ -303,8 +316,8 @@ class DeletesV1 extends Worker
         $sum = $limit;
 
         $executionStart = \microtime(true);
-        
-        while($sum === $limit) {
+
+        while ($sum === $limit) {
             $chunk++;
 
             Authorization::disable();
@@ -321,7 +334,7 @@ class DeletesV1 extends Worker
 
             $sum = count($results);
 
-            Console::info('Deleting chunk #'.$chunk.'. Found '.$sum.' documents');
+            Console::info('Deleting chunk #' . $chunk . '. Found ' . $sum . ' documents');
 
             foreach ($results as $document) {
                 $this->deleteById($document, $database, $callback);
@@ -340,8 +353,8 @@ class DeletesV1 extends Worker
         $directory = APP_STORAGE_CERTIFICATES . '/' . $domain;
         $checkTraversal = realpath($directory) === $directory;
 
-        if($domain && $checkTraversal && is_dir($directory)) {
-            array_map('unlink', glob($directory.'/*.*'));
+        if ($domain && $checkTraversal && is_dir($directory)) {
+            array_map('unlink', glob($directory . '/*.*'));
             rmdir($directory);
             Console::info("Deleted certificate files for {$domain}");
         } else {
@@ -350,7 +363,8 @@ class DeletesV1 extends Worker
     }
 
     /**
-     * @return Database;
+     * @return Database 
+     * @throws Exception 
      */
     protected function getConsoleDB(): Database
     {
@@ -359,7 +373,7 @@ class DeletesV1 extends Worker
         $db = $register->get('db');
         $cache = $register->get('cache');
 
-        if($this->consoleDB === null) {
+        if (!isset($this->consoleDB)) {
             $this->consoleDB = new Database();
             $this->consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));;
             $this->consoleDB->setNamespace('app_console'); // Main DB
@@ -370,9 +384,11 @@ class DeletesV1 extends Worker
     }
 
     /**
-     * @return Database;
+     * @param string $projectId 
+     * @return Database 
+     * @throws Exception 
      */
-    protected function getProjectDB($projectId): Database
+    protected function getProjectDB(string $projectId): Database
     {
         global $register;
 
@@ -381,9 +397,9 @@ class DeletesV1 extends Worker
 
         $projectDB = new Database();
         $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-        $projectDB->setNamespace('app_'.$projectId); // Main DB
+        $projectDB->setNamespace('app_' . $projectId); // Main DB
         $projectDB->setMocks(Config::getParam('collections', []));
 
         return $projectDB;
     }
-}
+}

app/workers/functions.php

@@ -6,6 +6,7 @@ use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
+use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Resque\Worker;
 use Appwrite\Utopia\Response\Model\Execution;
 use Cron\CronExpression;
@@ -19,12 +20,12 @@ use Utopia\Orchestration\Container;
 use Utopia\Orchestration\Exception\Orchestration as OrchestrationException;
 use Utopia\Orchestration\Exception\Timeout as TimeoutException;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Runtime::enableCoroutine(0);
 
 Console::title('Functions V1 Worker');
-Console::success(APP_NAME.' functions worker v1 has started');
+Console::success(APP_NAME . ' functions worker v1 has started');
 
 $runtimes = Config::getParam('runtimes');
 
@@ -38,11 +39,11 @@ $orchestration = new Orchestration(new DockerAPI($dockerUser, $dockerPass, $dock
  */
 $warmupStart = \microtime(true);
 
-Co\run(function() use ($runtimes, $orchestration) {  // Warmup: make sure images are ready to run fast 🚀
-    foreach($runtimes as $runtime) {
-        go(function() use ($runtime, $orchestration) {
-            Console::info('Warming up '.$runtime['name'].' '.$runtime['version'].' environment...');
-                
+Co\run(function () use ($runtimes, $orchestration) {  // Warmup: make sure images are ready to run fast 🚀
+    foreach ($runtimes as $runtime) {
+        go(function () use ($runtime, $orchestration) {
+            Console::info('Warming up ' . $runtime['name'] . ' ' . $runtime['version'] . ' environment...');
+
             $response = $orchestration->pull($runtime['image']);
 
             if ($response) {
@@ -57,7 +58,7 @@ Co\run(function() use ($runtimes, $orchestration) {  // Warmup: make sure images
 $warmupEnd = \microtime(true);
 $warmupTime = $warmupEnd - $warmupStart;
 
-Console::success('Finished warmup in '.$warmupTime.' seconds');
+Console::success('Finished warmup in ' . $warmupTime . ' seconds');
 
 /**
  * List function servers
@@ -68,7 +69,7 @@ $stderr = '';
 $executionStart = \microtime(true);
 
 $response = $orchestration->list(['label' => 'appwrite-type=function']);
-
+/** @var Container[] $list */
 $list = [];
 
 foreach ($response as $value) {
@@ -77,7 +78,7 @@ foreach ($response as $value) {
 
 $executionEnd = \microtime(true);
 
-Console::info(count($list).' functions listed in ' . ($executionEnd - $executionStart) . ' seconds');
+Console::info(count($list) . ' functions listed in ' . ($executionEnd - $executionStart) . ' seconds');
 
 /**
  * 1. Get event args - DONE
@@ -96,9 +97,9 @@ Console::info(count($list).' functions listed in ' . ($executionEnd - $execution
 
 class FunctionsV1 extends Worker
 {
-    public $args = [];
+    public array $args = [];
 
-    public $allowed = [];
+    public array $allowed = [];
 
     public function init(): void
     {
@@ -125,7 +126,7 @@ class FunctionsV1 extends Worker
 
         $database = new Database();
         $database->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-        $database->setNamespace('app_'.$projectId);
+        $database->setNamespace('app_' . $projectId);
         $database->setMocks(Config::getParam('collections', []));
 
         switch ($trigger) {
@@ -133,7 +134,8 @@ class FunctionsV1 extends Worker
                 $limit = 30;
                 $sum = 30;
                 $offset = 0;
-                $functions = []; /** @var Document[] $functions */
+                $functions = [];
+                /** @var Document[] $functions */
 
                 while ($sum >= $limit) {
 
@@ -146,7 +148,7 @@ class FunctionsV1 extends Worker
                         'orderType' => 'ASC',
                         'orderCast' => 'string',
                         'filters' => [
-                            '$collection='.Database::SYSTEM_COLLECTION_FUNCTIONS,
+                            '$collection=' . Database::SYSTEM_COLLECTION_FUNCTIONS,
                         ],
                     ]);
 
@@ -155,21 +157,33 @@ class FunctionsV1 extends Worker
                     $sum = \count($functions);
                     $offset = $offset + $limit;
 
-                    Console::log('Fetched '.$sum.' functions...');
+                    Console::log('Fetched ' . $sum . ' functions...');
 
-                    foreach($functions as $function) {
+                    foreach ($functions as $function) {
                         $events =  $function->getAttribute('events', []);
                         $tag =  $function->getAttribute('tag', []);
 
-                        Console::success('Itterating function: '.$function->getAttribute('name'));
+                        Console::success('Itterating function: ' . $function->getAttribute('name'));
 
-                        if(!\in_array($event, $events) || empty($tag)) {
+                        if (!\in_array($event, $events) || empty($tag)) {
                             continue;
                         }
 
-                        Console::success('Triggered function: '.$event);
+                        Console::success('Triggered function: ' . $event);
 
-                        $this->execute('event', $projectId, '', $database, $function, $event, $eventData, $data, $webhooks, $userId, $jwt);
+                        $this->execute(
+                            trigger: 'event',
+                            projectId: $projectId,
+                            executionId: '',
+                            database: $database,
+                            function: $function,
+                            event: $event,
+                            eventData: $eventData,
+                            data: $data,
+                            webhooks: $webhooks,
+                            userId: $userId,
+                            jwt: $jwt
+                        );
                     }
                 }
                 break;
@@ -194,10 +208,10 @@ class FunctionsV1 extends Worker
                 Authorization::reset();
 
                 if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
-                    throw new Exception('Function not found ('.$functionId.')');
+                    throw new Exception('Function not found (' . $functionId . ')');
                 }
 
-                if($scheduleOriginal && $scheduleOriginal !== $function->getAttribute('schedule')) { // Schedule has changed from previous run, ignore this run.
+                if ($scheduleOriginal && $scheduleOriginal !== $function->getAttribute('schedule')) { // Schedule has changed from previous run, ignore this run.
                     return;
                 }
 
@@ -206,8 +220,7 @@ class FunctionsV1 extends Worker
 
                 $function
                     ->setAttribute('scheduleNext', $next)
-                    ->setAttribute('schedulePrevious', \time())
-                ;
+                    ->setAttribute('schedulePrevious', \time());
 
                 Authorization::disable();
 
@@ -215,6 +228,10 @@ class FunctionsV1 extends Worker
                     'scheduleNext' => $next,
                 ]));
 
+                if ($function === false) {
+                    throw new Exception('Function update failed (' . $functionId . ')');
+                }
+
                 Authorization::reset();
 
                 ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
@@ -226,7 +243,17 @@ class FunctionsV1 extends Worker
                     'scheduleOriginal' => $function->getAttribute('schedule', ''),
                 ]);  // Async task rescheduale
 
-                $this->execute($trigger, $projectId, $executionId, $database, $function, /*$event*/'', /*$eventData*/'', $data, $webhooks, $userId, $jwt);
+                $this->execute(
+                    trigger: $trigger,
+                    projectId: $projectId,
+                    executionId: $executionId,
+                    database: $database,
+                    function: $function,
+                    data: $data,
+                    webhooks: $webhooks,
+                    userId: $userId,
+                    jwt: $jwt
+                );
                 break;
 
             case 'http':
@@ -235,14 +262,20 @@ class FunctionsV1 extends Worker
                 Authorization::reset();
 
                 if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
-                    throw new Exception('Function not found ('.$functionId.')');
+                    throw new Exception('Function not found (' . $functionId . ')');
                 }
 
-                $this->execute($trigger, $projectId, $executionId, $database, $function, /*$event*/'', /*$eventData*/'', $data, $webhooks, $userId, $jwt);
-                break;
-            
-            default:
-                # code...
+                $this->execute(
+                    trigger: $trigger,
+                    projectId: $projectId,
+                    executionId: $executionId,
+                    database: $database,
+                    function: $function,
+                    data: $data,
+                    webhooks: $webhooks,
+                    userId: $userId,
+                    jwt: $jwt
+                );
                 break;
         }
     }
@@ -254,7 +287,7 @@ class FunctionsV1 extends Worker
      * @param string $projectId
      * @param string $executionId
      * @param Database $database
-     * @param Database $function
+     * @param Document $function
      * @param string $event
      * @param string $eventData
      * @param string $data
@@ -275,7 +308,7 @@ class FunctionsV1 extends Worker
         $tag = $database->getDocument($function->getAttribute('tag', ''));
         Authorization::reset();
 
-        if($tag->getAttribute('functionId') !== $function->getId()) {
+        if ($tag->getAttribute('functionId') !== $function->getId()) {
             throw new Exception('Tag not found', 404);
         }
 
@@ -297,18 +330,18 @@ class FunctionsV1 extends Worker
             'time' => 0,
         ]);
 
-        if(false === $execution || ($execution instanceof Document && $execution->isEmpty())) {
+        if ($execution->isEmpty()) {
             throw new Exception('Failed to create or read execution');
         }
-        
+
         Authorization::reset();
 
         $runtime = (isset($runtimes[$function->getAttribute('runtime', '')]))
             ? $runtimes[$function->getAttribute('runtime', '')]
             : null;
 
-        if(\is_null($runtime)) {
-            throw new Exception('Runtime "'.$function->getAttribute('runtime', '').'" is not supported');
+        if (\is_null($runtime)) {
+            throw new Exception('Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
         }
 
         $vars = \array_merge($function->getAttribute('vars', []), [
@@ -325,37 +358,37 @@ class FunctionsV1 extends Worker
             'APPWRITE_FUNCTION_JWT' => $jwt,
             'APPWRITE_FUNCTION_PROJECT_ID' => $projectId,
         ]);
-
+        $tagId = $tag->getId() ?? '';
         $tagPath = $tag->getAttribute('path', '');
-        $tagPathTarget = '/tmp/project-'.$projectId.'/'.$tag->getId().'/code.tar.gz';
+        $tagPathTarget = '/tmp/project-' . $projectId . '/' . $tagId . '/code.tar.gz';
         $tagPathTargetDir = \pathinfo($tagPathTarget, PATHINFO_DIRNAME);
-        $container = 'appwrite-function-'.$tag->getId();
+        $container = 'appwrite-function-' . $tagId;
         $command = \escapeshellcmd($tag->getAttribute('command', ''));
 
-        if(!\is_readable($tagPath)) {
-            throw new Exception('Code is not readable: '.$tag->getAttribute('path', ''));
+        if (!\is_readable($tagPath)) {
+            throw new Exception('Code is not readable: ' . $tag->getAttribute('path', ''));
         }
 
         if (!\file_exists($tagPathTargetDir)) {
             if (!\mkdir($tagPathTargetDir, 0755, true)) {
-                throw new Exception('Can\'t create directory '.$tagPathTargetDir);
-            }
-        }
-        
-        if (!\file_exists($tagPathTarget)) {
-            if(!\copy($tagPath, $tagPathTarget)) {
-                throw new Exception('Can\'t create temporary code file '.$tagPathTarget);
+                throw new Exception('Can\'t create directory ' . $tagPathTargetDir);
             }
         }
 
-        if(isset($list[$container]) && !(\substr($list[$container]->getStatus(), 0, 2) === 'Up')) { // Remove conatiner if not online
+        if (!\file_exists($tagPathTarget)) {
+            if (!\copy($tagPath, $tagPathTarget)) {
+                throw new Exception('Can\'t create temporary code file ' . $tagPathTarget);
+            }
+        }
+
+        if (isset($list[$container]) && !(\substr($list[$container]->getStatus(), 0, 2) === 'Up')) { // Remove conatiner if not online
             $stdout = '';
             $stderr = '';
 
             try {
                 $orchestration->remove($container);
             } catch (Exception $e) {
-                Console::warning('Failed to remove container: '.$e->getMessage());
+                Console::warning('Failed to remove container: ' . $e->getMessage());
             }
 
             unset($list[$container]);
@@ -370,10 +403,10 @@ class FunctionsV1 extends Worker
          * Make sure no access to NFS server / storage volumes
          * Access Appwrite REST from internal network for improved performance
          */
-        if(!isset($list[$container])) { // Create contianer if not ready
+        if (!isset($list[$container])) { // Create contianer if not ready
             $stdout = '';
             $stderr = '';
-    
+
             $executionStart = \microtime(true);
             $executionTime = \time();
 
@@ -381,16 +414,17 @@ class FunctionsV1 extends Worker
             $orchestration->setMemory(App::getEnv('_APP_FUNCTIONS_MEMORY', '256'));
             $orchestration->setSwap(App::getEnv('_APP_FUNCTIONS_MEMORY_SWAP', '256'));
 
-            foreach($vars as &$value) {
+            foreach ($vars as &$value) {
                 $value = strval($value);
             }
 
             $id = $orchestration->run(
                 image: $runtime['image'],
                 name: $container,
-                command: ['tail',
-                '-f',
-                '/dev/null'
+                command: [
+                    'tail',
+                    '-f',
+                    '/dev/null'
                 ],
                 entrypoint: '',
                 workdir: '/usr/local/src',
@@ -400,38 +434,43 @@ class FunctionsV1 extends Worker
                 labels: [
                     'appwrite-type' => 'function',
                     'appwrite-created' => strval($executionTime)
-                ]);
+                ]
+            );
 
             $untarStdout = '';
             $untarStderr = '';
 
             $untarSuccess = $orchestration->execute(
-                name: $container, 
+                name: $container,
                 command: [
                     'sh',
                     '-c',
                     'mv /tmp/code.tar.gz /usr/local/src/code.tar.gz && tar -zxf /usr/local/src/code.tar.gz --strip 1 && rm /usr/local/src/code.tar.gz'
                 ],
-                stdout: $untarStdout, 
+                stdout: $untarStdout,
                 stderr: $untarStderr,
                 vars: $vars,
-                timeout: 60);
+                timeout: 60
+            );
 
             if (!$untarSuccess) {
-                throw new Exception('Failed to extract tar: '.$untarStderr);
+                throw new Exception('Failed to extract tar: ' . $untarStderr);
             }
 
             $executionEnd = \microtime(true);
 
-            $list[$container] = new Container($container, $id, 'Up', 
+            $list[$container] = new Container(
+                $container,
+                $id,
+                'Up',
                 [
                     'appwrite-type' => 'function',
                     'appwrite-created' => strval($executionTime),
-                ]);
+                ]
+            );
 
             Console::info('Function created in ' . ($executionEnd - $executionStart) . ' seconds');
-        }
-        else {
+        } else {
             Console::info('Container is ready to run');
         }
 
@@ -444,12 +483,13 @@ class FunctionsV1 extends Worker
 
         try {
             $exitCode = (int)!$orchestration->execute(
-                name: $container, 
-                command: $orchestration->parseCommandString($command), 
-                stdout: $stdout, 
-                stderr: $stderr, 
-                vars: $vars, 
-                timeout: $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)));
+                name: $container,
+                command: $orchestration->parseCommandString($command),
+                stdout: $stdout,
+                stderr: $stderr,
+                vars: $vars,
+                timeout: $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900))
+            );
         } catch (TimeoutException $e) {
             $exitCode = 124;
         } catch (OrchestrationException $e) {
@@ -473,10 +513,10 @@ class FunctionsV1 extends Worker
             'stderr' => \mb_substr($stderr, -4000), // log last 4000 chars output
             'time' => $executionTime
         ]));
-        
+
         Authorization::reset();
 
-        if (false === $function) {
+        if ($execution === false) {
             throw new Exception('Failed saving execution to DB', 500);
         }
 
@@ -492,6 +532,16 @@ class FunctionsV1 extends Worker
 
         $executionUpdate->trigger();
 
+        $target = Realtime::fromPayload('functions.executions.update', $execution);
+
+        Realtime::send(
+            $projectId, 
+            $execution->getArrayCopy(), 
+            'functions.executions.update', 
+            $target['channels'], 
+            $target['roles']
+        );
+
         $usage = new Event('v1-usage', 'UsageV1');
 
         $usage
@@ -503,8 +553,8 @@ class FunctionsV1 extends Worker
             ->setParam('networkRequestSize', 0)
             ->setParam('networkResponseSize', 0)
         ;
-        
-        if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
             $usage->trigger();
         }
 
@@ -518,28 +568,30 @@ class FunctionsV1 extends Worker
      */
     public function cleanup(): void
     {
+        /** @var Container[] $list */
         global $list;
+        /** @var Orchestration $orchestration */
         global $orchestration;
 
-        Console::success(count($list).' running containers counted');
+        Console::success(count($list) . ' running containers counted');
 
         $max = (int) App::getEnv('_APP_FUNCTIONS_CONTAINERS');
 
-        if(\count($list) > $max) {
+        if (\count($list) > $max) {
             Console::info('Starting containers cleanup');
 
-            \uasort($list, function ($item1, $item2) {
+            \uasort($list, function (Container $item1, Container $item2) {
                 return (int)($item1->getLabels['appwrite-created'] ?? 0) <=> (int)($item2->getLabels['appwrite-created'] ?? 0);
             });
 
-            while(\count($list) > $max) {
+            while (\count($list) > $max) {
                 $first = \array_shift($list);
 
                 try {
                     $orchestration->remove($first->getName(), true);
-                    Console::info('Removed container: '.$first->getName());
+                    Console::info('Removed container: ' . $first->getName());
                 } catch (Exception $e) {
-                    Console::error('Failed to remove container: '.$e);
+                    Console::error('Failed to remove container: ' . $e);
                 }
             }
         }
@@ -554,7 +606,7 @@ class FunctionsV1 extends Worker
      */
     public function filterEnvKey(string $string): string
     {
-        if(empty($this->allowed)) {
+        if (empty($this->allowed)) {
             $this->allowed = array_fill_keys(\str_split('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_'), true);
         }
 
@@ -562,7 +614,7 @@ class FunctionsV1 extends Worker
         $output     = '';
 
         foreach ($string as $char) {
-            if(\array_key_exists($char, $this->allowed)) {
+            if (\array_key_exists($char, $this->allowed)) {
                 $output .= $char;
             }
         }
@@ -573,4 +625,4 @@ class FunctionsV1 extends Worker
     public function shutdown(): void
     {
     }
-}
+}

app/workers/mails.php

@@ -13,11 +13,6 @@ Console::success(APP_NAME . ' mails worker v1 has started' . "\n");
 
 class MailsV1 extends Worker
 {
-    /**
-     * @var array
-     */
-    public $args = [];
-
     public function init(): void
     {
     }
@@ -47,15 +42,14 @@ class MailsV1 extends Worker
         $body = Template::fromFile(__DIR__ . '/../config/locale/templates/email-base.tpl');
         $subject = '';
         switch ($type) {
-            case MAIL_TYPE_RECOVERY:
-                $subject = $locale->getText("$prefix.subject");
-                break;
             case MAIL_TYPE_INVITATION:
                 $subject = \sprintf($locale->getText("$prefix.subject"), $this->args['team'], $project);
                 $body->setParam('{{owner}}', $this->args['owner']);
                 $body->setParam('{{team}}', $this->args['team']);
                 break;
+            case MAIL_TYPE_RECOVERY:
             case MAIL_TYPE_VERIFICATION:
+            case MAIL_TYPE_MAGIC_SESSION:
                 $subject = $locale->getText("$prefix.subject");
                 break;
             default:
@@ -132,6 +126,8 @@ class MailsV1 extends Worker
                 return 'emails.invitation';
             case MAIL_TYPE_VERIFICATION:
                 return 'emails.verification';
+            case MAIL_TYPE_MAGIC_SESSION:
+                return 'emails.magicSession';
             default:
                 throw new Exception('Undefined Mail Type : ' . $type, 500);
         }

app/workers/tasks.php

@@ -10,18 +10,13 @@ use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Console::title('Tasks V1 Worker');
-Console::success(APP_NAME.' tasks worker v1 has started');
+Console::success(APP_NAME . ' tasks worker v1 has started');
 
 class TasksV1 extends Worker
 {
-    /**
-     * @var array
-     */
-    public $args = [];
-
     public function init(): void
     {
     }
@@ -91,8 +86,7 @@ class TasksV1 extends Worker
 
         $task
             ->setAttribute('next', $next)
-            ->setAttribute('previous', \time())
-        ;
+            ->setAttribute('previous', \time());
 
         ResqueScheduler::enqueueAt($next, 'v1-tasks', 'TasksV1', $task->getArrayCopy());  // Async task rescheduale
 
@@ -106,7 +100,8 @@ class TasksV1 extends Worker
         \curl_setopt($ch, CURLOPT_POSTFIELDS, '');
         \curl_setopt($ch, CURLOPT_HEADER, 0);
         \curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        \curl_setopt($ch, CURLOPT_USERAGENT, \sprintf(APP_USERAGENT,
+        \curl_setopt($ch, CURLOPT_USERAGENT, \sprintf(
+            APP_USERAGENT,
             App::getEnv('_APP_VERSION', 'UNKNOWN'),
             App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY)
         ));
@@ -114,8 +109,8 @@ class TasksV1 extends Worker
             $ch,
             CURLOPT_HTTPHEADER,
             \array_merge($headers, [
-                'X-'.APP_NAME.'-Task-ID: '.$task->getAttribute('$id', ''),
-                'X-'.APP_NAME.'-Task-Name: '.$task->getAttribute('name', ''),
+                'X-' . APP_NAME . '-Task-ID: ' . $task->getAttribute('$id', ''),
+                'X-' . APP_NAME . '-Task-Name: ' . $task->getAttribute('name', ''),
             ])
         );
         \curl_setopt($ch, CURLOPT_HEADER, true);  // we want headers
@@ -138,7 +133,7 @@ class TasksV1 extends Worker
         $response = \curl_exec($ch);
 
         if (false === $response) {
-            $errors[] = \curl_error($ch).'Failed to execute task';
+            $errors[] = \curl_error($ch) . 'Failed to execute task';
         }
 
         $code = \curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -154,22 +149,21 @@ class TasksV1 extends Worker
         switch ($codeFamily) {
             case '2':
             case '3':
-            break;
+                break;
             default:
-                $errors[] = 'Request failed with status code '.$code;
+                $errors[] = 'Request failed with status code ' . $code;
         }
 
         if (empty($errors)) {
             $task->setAttribute('failures', 0);
 
-            $alert = 'Task "'.$task->getAttribute('name').'" Executed Successfully';
+            $alert = 'Task "' . $task->getAttribute('name') . '" Executed Successfully';
         } else {
             $task
                 ->setAttribute('failures', $task->getAttribute('failures', 0) + 1)
-                ->setAttribute('status', ($task->getAttribute('failures') >= $errorLimit) ? 'pause' : 'play')
-            ;
+                ->setAttribute('status', ($task->getAttribute('failures') >= $errorLimit) ? 'pause' : 'play');
 
-            $alert = 'Task "'.$task->getAttribute('name').'" failed to execute with the following errors: '.\implode("\n", $errors);
+            $alert = 'Task "' . $task->getAttribute('name') . '" failed to execute with the following errors: ' . \implode("\n", $errors);
         }
 
         $log = \json_decode($task->getAttribute('log', '{}'), true);
@@ -190,8 +184,7 @@ class TasksV1 extends Worker
         $task
             ->setAttribute('log', \json_encode($log))
             ->setAttribute('duration', $totalTime)
-            ->setAttribute('delay', $delay)
-        ;
+            ->setAttribute('delay', $delay);
 
         Authorization::disable();
 
@@ -211,4 +204,4 @@ class TasksV1 extends Worker
     public function shutdown(): void
     {
     }
-}
+}

app/workers/usage.php

@@ -4,18 +4,13 @@ use Appwrite\Resque\Worker;
 use Utopia\App;
 use Utopia\CLI\Console;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Console::title('Usage V1 Worker');
-Console::success(APP_NAME.' usage worker v1 has started');
+Console::success(APP_NAME . ' usage worker v1 has started');
 
 class UsageV1 extends Worker
 {
-    /**
-     * @var array
-     */
-    public $args = [];
-
     public function init(): void
     {
     }
@@ -33,7 +28,7 @@ class UsageV1 extends Worker
 
         $networkRequestSize = $this->args['networkRequestSize'] ?? 0;
         $networkResponseSize = $this->args['networkResponseSize'] ?? 0;
-        
+
         $httpMethod = $this->args['httpMethod'] ?? '';
         $httpRequest = $this->args['httpRequest'] ?? 0;
 
@@ -42,30 +37,41 @@ class UsageV1 extends Worker
         $functionExecutionTime = $this->args['functionExecutionTime'] ?? 0;
         $functionStatus = $this->args['functionStatus'] ?? '';
 
+        $realtimeConnections = $this->args['realtimeConnections'] ?? 0;
+        $realtimeMessages = $this->args['realtimeMessages'] ?? 0;
+
         $tags = ",project={$projectId},version=".App::getEnv('_APP_VERSION', 'UNKNOWN');
 
         // the global namespace is prepended to every key (optional)
         $statsd->setNamespace('appwrite.usage');
 
-        if($httpRequest >= 1) {
-            $statsd->increment('requests.all'.$tags.',method='.\strtolower($httpMethod));
+        if ($httpRequest >= 1) {
+            $statsd->increment('requests.all' . $tags . ',method=' . \strtolower($httpMethod));
         }
-        
-        if($functionExecution >= 1) {
-            $statsd->increment('executions.all'.$tags.',functionId='.$functionId.',functionStatus='.$functionStatus);
-            $statsd->count('executions.time'.$tags.',functionId='.$functionId, $functionExecutionTime);
+
+        if ($functionExecution >= 1) {
+            $statsd->increment('executions.all' . $tags . ',functionId=' . $functionId . ',functionStatus=' . $functionStatus);
+            $statsd->count('executions.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
+        }
+
+        if($realtimeConnections >= 1) {
+            $statsd->count('realtime.clients'.$tags, $realtimeConnections);
+        }
+
+        if($realtimeMessages >= 1) {
+            $statsd->count('realtime.messages'.$tags, $realtimeMessages);
         }
 
         $statsd->count('network.inbound'.$tags, $networkRequestSize);
         $statsd->count('network.outbound'.$tags, $networkResponseSize);
         $statsd->count('network.all'.$tags, $networkRequestSize + $networkResponseSize);
 
-        if($storage >= 1) {
-            $statsd->count('storage.all'.$tags, $storage);
+        if ($storage >= 1) {
+            $statsd->count('storage.all' . $tags, $storage);
         }
     }
 
     public function shutdown(): void
     {
     }
-}
+}

app/workers/webhooks.php

@@ -4,15 +4,13 @@ use Appwrite\Resque\Worker;
 use Utopia\App;
 use Utopia\CLI\Console;
 
-require_once __DIR__.'/../workers.php';
+require_once __DIR__ . '/../workers.php';
 
 Console::title('Webhooks V1 Worker');
-Console::success(APP_NAME.' webhooks worker v1 has started');
+Console::success(APP_NAME . ' webhooks worker v1 has started');
 
 class WebhooksV1 extends Worker
 {
-    public $args = [];
-
     public function init(): void
     {
     }
@@ -37,7 +35,7 @@ class WebhooksV1 extends Worker
             $name = $webhook['name'] ?? '';
             $signature = $webhook['signature'] ?? 'not-yet-implemented';
             $url = $webhook['url'] ?? '';
-            $security = (bool) $webhook['security'] ?? true;
+            $security = (bool) ($webhook['security'] ?? true);
             $httpUser = $webhook['httpUser'] ?? null;
             $httpPass = $webhook['httpPass'] ?? null;
 
@@ -47,7 +45,8 @@ class WebhooksV1 extends Worker
             \curl_setopt($ch, CURLOPT_POSTFIELDS, $eventData);
             \curl_setopt($ch, CURLOPT_HEADER, 0);
             \curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            \curl_setopt($ch, CURLOPT_USERAGENT, \sprintf(APP_USERAGENT,
+            \curl_setopt($ch, CURLOPT_USERAGENT, \sprintf(
+                APP_USERAGENT,
                 App::getEnv('_APP_VERSION', 'UNKNOWN'),
                 App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY)
             ));
@@ -56,13 +55,13 @@ class WebhooksV1 extends Worker
                 CURLOPT_HTTPHEADER,
                 [
                     'Content-Type: application/json',
-                    'Content-Length: '.\strlen($eventData),
-                    'X-'.APP_NAME.'-Webhook-Id: '.$id,
-                    'X-'.APP_NAME.'-Webhook-Event: '.$event,
-                    'X-'.APP_NAME.'-Webhook-Name: '.$name,
-                    'X-'.APP_NAME.'-Webhook-User-Id: '.$userId,
-                    'X-'.APP_NAME.'-Webhook-Project-Id: '.$projectId,
-                    'X-'.APP_NAME.'-Webhook-Signature: '.$signature,
+                    'Content-Length: ' . \strlen($eventData),
+                    'X-' . APP_NAME . '-Webhook-Id: ' . $id,
+                    'X-' . APP_NAME . '-Webhook-Event: ' . $event,
+                    'X-' . APP_NAME . '-Webhook-Name: ' . $name,
+                    'X-' . APP_NAME . '-Webhook-User-Id: ' . $userId,
+                    'X-' . APP_NAME . '-Webhook-Project-Id: ' . $projectId,
+                    'X-' . APP_NAME . '-Webhook-Signature: ' . $signature,
                 ]
             );
 
@@ -77,7 +76,7 @@ class WebhooksV1 extends Worker
             }
 
             if (false === \curl_exec($ch)) {
-                $errors[] = \curl_error($ch).' in event '.$event.' for webhook '.$name;
+                $errors[] = \curl_error($ch) . ' in event ' . $event . ' for webhook ' . $name;
             }
 
             \curl_close($ch);
@@ -91,4 +90,4 @@ class WebhooksV1 extends Worker
     public function shutdown(): void
     {
     }
-}
+}

bin/realtime

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

composer.json

@@ -51,6 +51,7 @@
         "utopia-php/domains": "1.1.*",
         "utopia-php/swoole": "0.2.*",
         "utopia-php/storage": "0.5.*",
+        "utopia-php/websocket": "0.0.*",
         "utopia-php/image": "0.5.*",
         "resque/php-resque": "1.3.6",
         "matomo/device-detector": "4.2.3",
@@ -63,9 +64,10 @@
         "slickdeals/statsd": "3.1.0"
     },
     "require-dev": {
-        "appwrite/sdk-generator": "0.12.1",
-        "swoole/ide-helper": "4.6.7",
+        "appwrite/sdk-generator": "0.14.0",
         "phpunit/phpunit": "9.5.6",
+        "swoole/ide-helper": "4.6.7",
+        "textalk/websocket": "1.5.2",
         "vimeo/psalm": "4.7.2"
     },
     "provide": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0a782184d016e458ff18f20a2c49ccfb",
+    "content-hash": "86c1d7779c0c083c4493e154d6bb3ee0",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2230,6 +2230,64 @@
             },
             "time": "2021-02-04T14:14:49+00:00"
         },
+        {
+            "name": "utopia-php/websocket",
+            "version": "0.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/utopia-php/websocket.git",
+                "reference": "808317ef4ea0683c2c82dee5d543b1c8378e2e1b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/utopia-php/websocket/zipball/808317ef4ea0683c2c82dee5d543b1c8378e2e1b",
+                "reference": "808317ef4ea0683c2c82dee5d543b1c8378e2e1b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5.5",
+                "swoole/ide-helper": "4.6.6",
+                "textalk/websocket": "1.5.2",
+                "vimeo/psalm": "^4.8.1",
+                "workerman/workerman": "^4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Utopia\\WebSocket\\": "src/WebSocket"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eldad Fux",
+                    "email": "eldad@appwrite.io"
+                },
+                {
+                    "name": "Torsten Dittmann",
+                    "email": "torsten@appwrite.io"
+                }
+            ],
+            "description": "A simple abstraction for WebSocket servers.",
+            "keywords": [
+                "framework",
+                "php",
+                "upf",
+                "utopia",
+                "websocket"
+            ],
+            "support": {
+                "issues": "https://github.com/utopia-php/websocket/issues",
+                "source": "https://github.com/utopia-php/websocket/tree/0.0.1"
+            },
+            "time": "2021-07-11T13:09:44+00:00"
+        },
         {
             "name": "webmozart/assert",
             "version": "1.10.0",
@@ -2458,16 +2516,16 @@
         },
         {
             "name": "appwrite/sdk-generator",
-            "version": "0.12.1",
+            "version": "0.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "8e3c4a0a4159152d428602ffc3a2a4947e72c609"
+                "reference": "7a30fac0de583559b9c4cdd8308ab5a1f5803e60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/8e3c4a0a4159152d428602ffc3a2a4947e72c609",
-                "reference": "8e3c4a0a4159152d428602ffc3a2a4947e72c609",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/7a30fac0de583559b9c4cdd8308ab5a1f5803e60",
+                "reference": "7a30fac0de583559b9c4cdd8308ab5a1f5803e60",
                 "shasum": ""
             },
             "require": {
@@ -2501,9 +2559,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/0.12.1"
+                "source": "https://github.com/appwrite/sdk-generator/tree/0.14.0"
             },
-            "time": "2021-07-29T07:50:02+00:00"
+            "time": "2021-09-02T09:50:30+00:00"
         },
         {
             "name": "composer/package-versions-deprecated",
@@ -5835,6 +5893,55 @@
             ],
             "time": "2021-08-26T08:00:08+00:00"
         },
+        {
+            "name": "textalk/websocket",
+            "version": "1.5.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Textalk/websocket-php.git",
+                "reference": "b93249453806a2dd46495de46d76fcbcb0d8dee8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Textalk/websocket-php/zipball/b93249453806a2dd46495de46d76fcbcb0d8dee8",
+                "reference": "b93249453806a2dd46495de46d76fcbcb0d8dee8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 | ^8.0",
+                "psr/log": "^1.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.0",
+                "phpunit/phpunit": "^8.0|^9.0",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "WebSocket\\": "lib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Fredrik Liljegren"
+                },
+                {
+                    "name": "Sören Jensen",
+                    "email": "soren@abicart.se"
+                }
+            ],
+            "description": "WebSocket client and server",
+            "support": {
+                "issues": "https://github.com/Textalk/websocket-php/issues",
+                "source": "https://github.com/Textalk/websocket-php/tree/1.5.2"
+            },
+            "time": "2021-02-12T15:39:23+00:00"
+        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.1",

docker-compose.yml

@@ -17,8 +17,8 @@ services:
       - --providers.docker=true
       - --providers.docker.exposedByDefault=false
       - --providers.docker.constraints=Label(`traefik.constraint-label-stack`,`appwrite`)
-      - --entrypoints.web.address=:80
-      - --entrypoints.websecure.address=:443
+      - --entrypoints.appwrite_web.address=:80
+      - --entrypoints.appwrite_websecure.address=:443
       - --accesslog=true
     ports:
       - 80:80
@@ -47,11 +47,19 @@ services:
     networks:
       - appwrite
     labels:
-      - traefik.enable=true
-      - traefik.constraint-label-stack=appwrite
-      - traefik.http.routers.appwrite.rule=PathPrefix(`/`)
-      - traefik.http.routers.appwrite-secure.rule=PathPrefix(`/`)
-      - traefik.http.routers.appwrite-secure.tls=true
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_api.loadbalancer.server.port=80"
+      #http
+      - traefik.http.routers.appwrite_api_http.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_api_http.rule=PathPrefix(`/`)
+      - traefik.http.routers.appwrite_api_http.service=appwrite_api
+      # https
+      - traefik.http.routers.appwrite_api_https.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_api_https.rule=PathPrefix(`/`)
+      - traefik.http.routers.appwrite_api_https.service=appwrite_api
+      - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - appwrite-uploads:/storage/uploads:rw
@@ -122,6 +130,49 @@ services:
       - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_RUNTIMES
 
+  appwrite-realtime:
+    entrypoint: realtime
+    container_name: appwrite-realtime
+    build:
+      context: .
+    restart: unless-stopped
+    ports: 
+      - 9505:80
+    labels:
+      - "traefik.enable=true"
+      - "traefik.constraint-label-stack=appwrite"
+      - "traefik.docker.network=appwrite"
+      - "traefik.http.services.appwrite_realtime.loadbalancer.server.port=80"
+      #ws
+      - traefik.http.routers.appwrite_realtime_ws.entrypoints=appwrite_web
+      - traefik.http.routers.appwrite_realtime_ws.rule=PathPrefix(`/v1/realtime`)
+      - traefik.http.routers.appwrite_realtime_ws.service=appwrite_realtime
+      # wss
+      - traefik.http.routers.appwrite_realtime_wss.entrypoints=appwrite_websecure
+      - traefik.http.routers.appwrite_realtime_wss.rule=PathPrefix(`/v1/realtime`)
+      - traefik.http.routers.appwrite_realtime_wss.service=appwrite_realtime
+      - traefik.http.routers.appwrite_realtime_wss.tls=true
+      - traefik.http.routers.appwrite_realtime_wss.tls.certresolver=dns
+    networks:
+      - appwrite
+    volumes:
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_OPTIONS_ABUSE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_USAGE_STATS
+
   appwrite-worker-usage:
     entrypoint: worker-usage
     container_name: appwrite-worker-usage
@@ -479,7 +530,7 @@ services:
     container_name: appwrite-adminer
     restart: always
     ports:
-      - 9505:8080
+      - 9506:8080
     networks:
       - appwrite
 

docs/examples/0.10.x/client-android/java/account/create-anonymous-session.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createAnonymousSession(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-j-w-t.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createJWT(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-magic-u-r-l-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createMagicURLSession(
+            "email@example.com", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-o-auth2session.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createOAuth2Session(
+            this,
+            "amazon", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-recovery.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createRecovery(
+            "email@example.com", 
+            "https://example.com"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-session.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createSession(
+            "email@example.com", 
+            "password"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create-verification.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createVerification(
+            "https://example.com"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/create.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.create(
+            "email@example.com", 
+            "password", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/delete-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.deleteSession(
+            "[SESSION_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/delete-sessions.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.deleteSessions(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/delete.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.delete(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-logs.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getLogs(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-prefs.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getPrefs(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getSession(
+            "[SESSION_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/get-sessions.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.getSessions(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/get.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.get(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-email.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateEmail(
+            "email@example.com", 
+            "password"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-magic-u-r-l-session.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateMagicURLSession(
+            "[USER_ID]", 
+            "[SECRET]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-name.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateName(
+            "[NAME]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-password.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updatePassword(
+            "password", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-prefs.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updatePrefs(
+            mapOf( "a" to "b" )
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-recovery.md

@@ -0,0 +1,51 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateRecovery(
+            "[USER_ID]", 
+            "[SECRET]", 
+            "password", 
+            "password"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/account/update-verification.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateVerification(
+            "[USER_ID]", 
+            "[SECRET]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-browser.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getBrowser(
+            "aa", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-credit-card.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getCreditCard(
+            "amex", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-favicon.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getFavicon(
+            "https://example.com"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-flag.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getFlag(
+            "af", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-image.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getImage(
+            "https://example.com", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-initials.md

@@ -0,0 +1,47 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getInitials(
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/avatars/get-q-r.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Avatars
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Avatars avatars = new Avatars(client);
+
+        avatars.getQR(
+            "[TEXT]", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/database/create-document.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Database
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Database database = new Database(client);
+
+        database.createDocument(
+            "[COLLECTION_ID]", 
+            mapOf( "a" to "b" ), 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/database/delete-document.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Database
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Database database = new Database(client);
+
+        database.deleteDocument(
+            "[COLLECTION_ID]", 
+            "[DOCUMENT_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/database/get-document.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Database
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Database database = new Database(client);
+
+        database.getDocument(
+            "[COLLECTION_ID]", 
+            "[DOCUMENT_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/database/list-documents.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Database
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Database database = new Database(client);
+
+        database.listDocuments(
+            "[COLLECTION_ID]", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/database/update-document.md

@@ -0,0 +1,50 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Database
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Database database = new Database(client);
+
+        database.updateDocument(
+            "[COLLECTION_ID]", 
+            "[DOCUMENT_ID]", 
+            mapOf( "a" to "b" ), 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/functions/create-execution.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Functions
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Functions functions = new Functions(client);
+
+        functions.createExecution(
+            "[FUNCTION_ID]", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/functions/get-execution.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Functions
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Functions functions = new Functions(client);
+
+        functions.getExecution(
+            "[FUNCTION_ID]", 
+            "[EXECUTION_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/functions/list-executions.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Functions
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Functions functions = new Functions(client);
+
+        functions.listExecutions(
+            "[FUNCTION_ID]", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get-continents.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.getContinents(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get-countries-e-u.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.getCountriesEU(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get-countries-phones.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.getCountriesPhones(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get-countries.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.getCountries(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get-currencies.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.getCurrencies(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get-languages.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.getLanguages(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/locale/get.md

@@ -0,0 +1,46 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Locale
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Locale locale = new Locale(client);
+
+        locale.get(new Continuation<Object>() {
+            @NotNull
+            @Override
+            public CoroutineContext getContext() {
+                return EmptyCoroutineContext.INSTANCE;
+            }
+
+            @Override
+            public void resumeWith(@NotNull Object o) {
+                String json = "";
+                try {
+                    if (o instanceof Result.Failure) {
+                        Result.Failure failure = (Result.Failure) o;
+                        throw failure.exception;
+                    } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    }
+                } catch (Throwable th) {
+                    Log.e("ERROR", th.toString());
+                }
+            }
+        });
+    }
+}

docs/examples/0.10.x/client-android/java/storage/create-file.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.createFile(
+            File("./path-to-files/image.jpg"), 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/delete-file.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.deleteFile(
+            "[FILE_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/get-file-download.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.getFileDownload(
+            "[FILE_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/get-file-preview.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.getFilePreview(
+            "[FILE_ID]", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/get-file-view.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.getFileView(
+            "[FILE_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/get-file.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.getFile(
+            "[FILE_ID]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/list-files.md

@@ -0,0 +1,47 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.listFiles(
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/0.10.x/client-android/java/storage/update-file.md

@@ -0,0 +1,50 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Storage
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Storage storage = new Storage(client);
+
+        storage.updateFile(
+            "[FILE_ID]", 
+            listOf(), 
+            listOf()
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}