From cb2fc93f78bf0ae71da94934f79607cc0827721b Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 8 Jul 2022 02:27:06 +0000
Subject: [PATCH 01/65] basic setup for extendable tasks

---
 app/cli.php                   |  25 +----
 composer.json                 |   2 +-
 composer.lock                 |  29 ++++--
 src/Appwrite/Task/Task.php    |   9 ++
 src/Appwrite/Task/Tasks.php   |  24 +++++
 src/Appwrite/Task/Usage.php   | 178 ++++++++++++++++++++++++++++++++++
 src/Appwrite/Task/Vars.php    |  34 +++++++
 src/Appwrite/Task/Version.php |  22 +++++
 8 files changed, 290 insertions(+), 33 deletions(-)
 create mode 100644 src/Appwrite/Task/Task.php
 create mode 100644 src/Appwrite/Task/Tasks.php
 create mode 100644 src/Appwrite/Task/Usage.php
 create mode 100644 src/Appwrite/Task/Vars.php
 create mode 100644 src/Appwrite/Task/Version.php

diff --git a/app/cli.php b/app/cli.php
index 09b3dc9413..0539c98313 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -3,30 +3,11 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';
 
-use Utopia\App;
-use Utopia\CLI\CLI;
-use Utopia\CLI\Console;
+use Appwrite\Task\Tasks;
 use Utopia\Database\Validator\Authorization;
 
 Authorization::disable();
 
-$cli = new CLI();
+Tasks::init();
+Tasks::getCli()->run();
 
-include 'tasks/doctor.php';
-include 'tasks/maintenance.php';
-include 'tasks/install.php';
-include 'tasks/migrate.php';
-include 'tasks/sdks.php';
-include 'tasks/specs.php';
-include 'tasks/ssl.php';
-include 'tasks/vars.php';
-include 'tasks/usage.php';
-
-$cli
-    ->task('version')
-    ->desc('Get the server version')
-    ->action(function () {
-        Console::log(App::getEnv('_APP_VERSION', 'UNKNOWN'));
-    });
-
-$cli->run();
diff --git a/composer.json b/composer.json
index ded0834bb3..2cf3e44004 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.8.*",
         "utopia-php/cache": "0.6.*",
-        "utopia-php/cli": "0.12.*",
+        "utopia-php/cli": "dev-feat-allow-adding-task as 0.12.0",
         "utopia-php/config": "0.2.*",
         "utopia-php/database": "0.18.*",
         "utopia-php/locale": "0.4.*",
diff --git a/composer.lock b/composer.lock
index 9d29bc8ac7..3460506d35 100644
--- a/composer.lock
+++ b/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": "dedc6a6328b4fdc5dfbd556a08534403",
+    "content-hash": "4bd2cfb69f671c01e68b67221f8664fd",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1947,16 +1947,16 @@
         },
         {
             "name": "utopia-php/cli",
-            "version": "0.12.0",
+            "version": "dev-feat-allow-adding-task",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cli.git",
-                "reference": "6d164b752efeb1ca089e3a517bc274d8b383474b"
+                "reference": "1ecc371b018f6e65d7d70b65f1c8b7a74c9ebcb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cli/zipball/6d164b752efeb1ca089e3a517bc274d8b383474b",
-                "reference": "6d164b752efeb1ca089e3a517bc274d8b383474b",
+                "url": "https://api.github.com/repos/utopia-php/cli/zipball/1ecc371b018f6e65d7d70b65f1c8b7a74c9ebcb2",
+                "reference": "1ecc371b018f6e65d7d70b65f1c8b7a74c9ebcb2",
                 "shasum": ""
             },
             "require": {
@@ -1994,9 +1994,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/cli/issues",
-                "source": "https://github.com/utopia-php/cli/tree/0.12.0"
+                "source": "https://github.com/utopia-php/cli/tree/feat-allow-adding-task"
             },
-            "time": "2022-02-18T22:10:41+00:00"
+            "time": "2022-07-08T01:44:31+00:00"
         },
         {
             "name": "utopia-php/config",
@@ -5346,9 +5346,18 @@
             "time": "2022-05-17T05:48:52+00:00"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "utopia-php/cli",
+            "version": "dev-feat-allow-adding-task",
+            "alias": "0.12.0",
+            "alias_normalized": "0.12.0.0"
+        }
+    ],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "utopia-php/cli": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -5370,5 +5379,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/src/Appwrite/Task/Task.php b/src/Appwrite/Task/Task.php
new file mode 100644
index 0000000000..a10049b407
--- /dev/null
+++ b/src/Appwrite/Task/Task.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Appwrite\Task;
+
+use Utopia\CLI\Task as CLITask;
+
+interface Task {
+    public static function getTask(): CLITask;
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Tasks.php b/src/Appwrite/Task/Tasks.php
new file mode 100644
index 0000000000..6eae8e97a1
--- /dev/null
+++ b/src/Appwrite/Task/Tasks.php
@@ -0,0 +1,24 @@
+<?php
+namespace Appwrite\Task;
+
+use Utopia\CLI\CLI;
+use Appwrite\Task\Usage;
+use Appwrite\Task\Version;
+
+class Tasks {
+    protected static CLI $cli;
+
+
+    public static function init(): void
+    {
+        self::$cli = new CLI();
+        self::$cli->addTask(Vars::getTask());
+        self::$cli->addTask(Usage::getTask());
+        self::$cli->addTask(Version::getTask());
+    }
+
+    public static function getCli(): CLI
+    {
+        return self::$cli;
+    }
+}
diff --git a/src/Appwrite/Task/Usage.php b/src/Appwrite/Task/Usage.php
new file mode 100644
index 0000000000..777dc303f6
--- /dev/null
+++ b/src/Appwrite/Task/Usage.php
@@ -0,0 +1,178 @@
+<?php
+namespace Appwrite\Task;
+
+use Throwable;
+use Exception;
+use Appwrite\Task\Task;
+use Appwrite\Stats\Usage as InfluxUsage;
+use Appwrite\Stats\UsageDB;
+use InfluxDB\Database as InfluxDatabase;
+use Utopia\App;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Registry\Registry;
+use Utopia\Logger\Log;
+use Utopia\CLI\Task as CLITask;
+
+class Usage implements Task{
+    private static CLITask $task;
+    protected static function getDatabase(Registry &$register, string $namespace): Database
+    {
+        $attempts = 0;
+    
+        do {
+            try {
+                $attempts++;
+    
+                $db = $register->get('db');
+                $redis = $register->get('cache');
+    
+                $cache = new Cache(new RedisCache($redis));
+                $database = new Database(new MariaDB($db), $cache);
+                $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+                $database->setNamespace($namespace);
+    
+                if (!$database->exists($database->getDefaultDatabase(), 'projects')) {
+                    throw new Exception('Projects collection not ready');
+                }
+                break; // leave loop if successful
+            } catch (\Exception$e) {
+                Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
+                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+                }
+                sleep(DATABASE_RECONNECT_SLEEP);
+            }
+        } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
+    
+        return $database;
+    }
+    
+    protected static function getInfluxDB(Registry &$register): InfluxDatabase
+    {
+        /** @var InfluxDB\Client $client */
+        $client = $register->get('influxdb');
+        $attempts = 0;
+        $max = 10;
+        $sleep = 1;
+    
+        do { // check if telegraf database is ready
+            try {
+                $attempts++;
+                $database = $client->selectDB('telegraf');
+                if (in_array('telegraf', $client->listDatabases())) {
+                    break; // leave the do-while if successful
+                }
+            } catch (\Throwable$th) {
+                Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= $max) {
+                    throw new \Exception('InfluxDB database not ready yet');
+                }
+                sleep($sleep);
+            }
+        } while ($attempts < $max);
+        return $database;
+    }
+    
+    public static function getTask(): CLITask
+    {
+        global $register;
+
+        Authorization::disable();
+        Authorization::setDefaultStatus(false);
+
+        $logError = function (Throwable $error, string $action = 'syncUsageStats') use ($register) {
+            $logger = $register->get('logger');
+        
+            if ($logger) {
+                $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
+        
+                $log = new Log();
+                $log->setNamespace("usage");
+                $log->setServer(\gethostname());
+                $log->setVersion($version);
+                $log->setType(Log::TYPE_ERROR);
+                $log->setMessage($error->getMessage());
+        
+                $log->addTag('code', $error->getCode());
+                $log->addTag('verboseType', get_class($error));
+        
+                $log->addExtra('file', $error->getFile());
+                $log->addExtra('line', $error->getLine());
+                $log->addExtra('trace', $error->getTraceAsString());
+                $log->addExtra('detailedTrace', $error->getTrace());
+        
+                $log->setAction($action);
+        
+                $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
+                $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+        
+                $responseCode = $logger->addLog($log);
+                Console::info('Usage stats log pushed with status code: ' . $responseCode);
+            }
+        
+            Console::warning("Failed: {$error->getMessage()}");
+            Console::warning($error->getTraceAsString());
+        };
+
+        $usage = new CLITask('usage');
+        
+        $usage
+            ->desc('Schedules syncing data from influxdb to Appwrite console db')
+            ->action(function () use ($register, $logError) {
+                Console::title('Usage Aggregation V1');
+                Console::success(APP_NAME . ' usage aggregation process v1 has started');
+        
+                $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
+        
+                $database = self::getDatabase($register, '_console');
+                $influxDB = self::getInfluxDB($register);
+        
+                $usage = new InfluxUsage($database, $influxDB, $logError);
+                $usageDB = new UsageDB($database, $logError);
+        
+                $iterations = 0;
+                Console::loop(function () use ($interval, $usage, $usageDB, &$iterations) {
+                    $now = date('d-m-Y H:i:s', time());
+                    Console::info("[{$now}] Aggregating usage data every {$interval} seconds");
+        
+                    $loopStart = microtime(true);
+        
+                    /**
+                     * Aggregate InfluxDB every 30 seconds
+                     */
+                    $usage->collect();
+        
+                    if ($iterations % 30 != 0) { // return if 30 iterations has not passed
+                        $iterations++;
+                        $loopTook = microtime(true) - $loopStart;
+                        $now = date('d-m-Y H:i:s', time());
+                        Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+                        return;
+                    }
+        
+                    $iterations = 0; // Reset iterations to prevent overflow when running for long time
+                    /**
+                     * Aggregate MariaDB every 15 minutes
+                     * Some of the queries here might contain full-table scans.
+                     */
+                    $now = date('d-m-Y H:i:s', time());
+                    Console::info("[{$now}] Aggregating database counters.");
+        
+                    $usageDB->collect();
+        
+                    $iterations++;
+                    $loopTook = microtime(true) - $loopStart;
+                    $now = date('d-m-Y H:i:s', time());
+        
+                    Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+                }, $interval);
+            });
+        self::$task = $usage;
+        return self::$task;
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Vars.php b/src/Appwrite/Task/Vars.php
new file mode 100644
index 0000000000..7cfb1904ac
--- /dev/null
+++ b/src/Appwrite/Task/Vars.php
@@ -0,0 +1,34 @@
+<?php
+namespace Appwrite\Task;
+use Utopia\App;
+use Utopia\CLI\Task as CLITask;
+use Utopia\Config\Config;
+use Utopia\CLI\Console;
+
+
+class Vars implements Task{
+    private static CLITask $task;
+    
+    public static function getTask(): CLITask
+    {
+        $vars = new CLITask('vars');
+        $vars
+            ->desc('List all the server environment variables')
+            ->action(function () {
+                $config = Config::getParam('variables', []);
+                $vars = [];
+        
+                foreach ($config as $category) {
+                    foreach ($category['variables'] ?? [] as $var) {
+                        $vars[] = $var;
+                    }
+                }
+        
+                foreach ($vars as $key => $value) {
+                    Console::log('- ' . $value['name'] . '=' . App::getEnv($value['name'], ''));
+                }
+            });
+        self::$task = $vars;
+        return self::$task;
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Version.php b/src/Appwrite/Task/Version.php
new file mode 100644
index 0000000000..d63e1306c5
--- /dev/null
+++ b/src/Appwrite/Task/Version.php
@@ -0,0 +1,22 @@
+<?php
+namespace Appwrite\Task;
+
+use Utopia\App;
+use Appwrite\Task\Task;
+use Utopia\CLI\Task as CLITask;
+use Utopia\CLI\Console;
+
+class Version implements Task {
+    protected static CLITask $task;
+
+    public static function getTask(): CLITask {
+        $version = new CLITask('version');
+        $version
+            ->desc('Get the server version')
+            ->action(function () {
+                Console::log(App::getEnv('_APP_VERSION', 'UNKNOWN'));
+            });
+        self::$task = $version;
+        return self::$task;
+    }
+}

From a17496d2915afc0b3158042e051a9f7990d2bcc7 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 8 Jul 2022 02:36:54 +0000
Subject: [PATCH 02/65] update tasks

---
 app/cli.php                 |  6 ++++--
 src/Appwrite/Task/Tasks.php | 18 +++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 0539c98313..9b4bfdd85c 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -8,6 +8,8 @@ use Utopia\Database\Validator\Authorization;
 
 Authorization::disable();
 
-Tasks::init();
-Tasks::getCli()->run();
+$tasks = new Tasks();
+$tasks
+    ->init()
+    ->run();
 
diff --git a/src/Appwrite/Task/Tasks.php b/src/Appwrite/Task/Tasks.php
index 6eae8e97a1..ca50c1caa5 100644
--- a/src/Appwrite/Task/Tasks.php
+++ b/src/Appwrite/Task/Tasks.php
@@ -6,19 +6,19 @@ use Appwrite\Task\Usage;
 use Appwrite\Task\Version;
 
 class Tasks {
-    protected static CLI $cli;
+    protected CLI $cli;
 
-
-    public static function init(): void
+    public function init(): Tasks
     {
-        self::$cli = new CLI();
-        self::$cli->addTask(Vars::getTask());
-        self::$cli->addTask(Usage::getTask());
-        self::$cli->addTask(Version::getTask());
+        $this->cli = new CLI();
+        $this->cli->addTask(Vars::getTask());
+        $this->cli->addTask(Usage::getTask());
+        $this->cli->addTask(Version::getTask());
+        return $this;
     }
 
-    public static function getCli(): CLI
+    public function run(): CLI
     {
-        return self::$cli;
+        return $this->cli->run();
     }
 }

From 752117e07a4ebb4e133ca86b5fc0522c0f4e2b42 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 13 Jul 2022 06:26:22 +0000
Subject: [PATCH 03/65] using platform to implement CLI

---
 app/cli.php                       |  11 +--
 composer.json                     |   9 ++-
 composer.lock                     |  94 ++++++++++++++++++-----
 src/Appwrite/Task/CLIPlatform.php |  12 +++
 src/Appwrite/Task/Task.php        |   9 ---
 src/Appwrite/Task/Tasks.php       |  24 ++----
 src/Appwrite/Task/Usage.php       | 123 +++++++++++++++---------------
 src/Appwrite/Task/Vars.php        |  44 +++++------
 src/Appwrite/Task/Version.php     |  17 ++---
 9 files changed, 196 insertions(+), 147 deletions(-)
 create mode 100644 src/Appwrite/Task/CLIPlatform.php
 delete mode 100644 src/Appwrite/Task/Task.php

diff --git a/app/cli.php b/app/cli.php
index 9b4bfdd85c..413fa234ea 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -3,13 +3,14 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';
 
-use Appwrite\Task\Tasks;
+use Appwrite\Task\CLIPlatform;
 use Utopia\Database\Validator\Authorization;
 
 Authorization::disable();
 
-$tasks = new Tasks();
-$tasks
-    ->init()
-    ->run();
+$cliPlatform = new CLIPlatform();
+$cliPlatform->init('CLI');
+
+$cli = $cliPlatform->getCli();
+$cli->run();
 
diff --git a/composer.json b/composer.json
index 8cc38115b5..d29a6d4e8f 100644
--- a/composer.json
+++ b/composer.json
@@ -42,13 +42,14 @@
         "ext-sockets": "*",
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.10.*",
-        "utopia-php/framework": "0.19.*",
+        "utopia-php/framework": "dev-feat-public-add-route as 0.19.21",
         "utopia-php/logger": "0.3.*",
         "utopia-php/abuse": "0.7.*",
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.8.*",
         "utopia-php/cache": "0.6.*",
-        "utopia-php/cli": "dev-feat-allow-adding-task as 0.12.0",
+        "utopia-php/cli": "0.12.0",
+        "utopia-php/platform": "dev-dev",
         "utopia-php/config": "0.2.*",
         "utopia-php/database": "0.18.*",
         "utopia-php/locale": "0.4.*",
@@ -73,6 +74,10 @@
         {
             "url": "https://github.com/appwrite/runtimes.git",
             "type": "git"
+        },
+        {
+            "url": "https://github.com/utopia-php/platform.git",
+            "type": "git"
         }
     ],
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index eefbe33a8c..1994e95967 100644
--- a/composer.lock
+++ b/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": "4bd2cfb69f671c01e68b67221f8664fd",
+    "content-hash": "3775608dcbc4262c4edd8710aa94ce4d",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1947,16 +1947,16 @@
         },
         {
             "name": "utopia-php/cli",
-            "version": "dev-feat-allow-adding-task",
+            "version": "0.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cli.git",
-                "reference": "1ecc371b018f6e65d7d70b65f1c8b7a74c9ebcb2"
+                "reference": "6d164b752efeb1ca089e3a517bc274d8b383474b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cli/zipball/1ecc371b018f6e65d7d70b65f1c8b7a74c9ebcb2",
-                "reference": "1ecc371b018f6e65d7d70b65f1c8b7a74c9ebcb2",
+                "url": "https://api.github.com/repos/utopia-php/cli/zipball/6d164b752efeb1ca089e3a517bc274d8b383474b",
+                "reference": "6d164b752efeb1ca089e3a517bc274d8b383474b",
                 "shasum": ""
             },
             "require": {
@@ -1994,9 +1994,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/cli/issues",
-                "source": "https://github.com/utopia-php/cli/tree/feat-allow-adding-task"
+                "source": "https://github.com/utopia-php/cli/tree/0.12.0"
             },
-            "time": "2022-07-08T01:44:31+00:00"
+            "time": "2022-02-18T22:10:41+00:00"
         },
         {
             "name": "utopia-php/config",
@@ -2169,16 +2169,16 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.19.21",
+            "version": "dev-feat-public-add-route",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "3b7bd8e4acf84fd7d560ced8e0142221d302575d"
+                "reference": "d16f3d44375beb1e880600957ac65e97699d6e23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/3b7bd8e4acf84fd7d560ced8e0142221d302575d",
-                "reference": "3b7bd8e4acf84fd7d560ced8e0142221d302575d",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/d16f3d44375beb1e880600957ac65e97699d6e23",
+                "reference": "d16f3d44375beb1e880600957ac65e97699d6e23",
                 "shasum": ""
             },
             "require": {
@@ -2212,9 +2212,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.19.21"
+                "source": "https://github.com/utopia-php/framework/tree/feat-public-add-route"
             },
-            "time": "2022-05-12T18:42:28+00:00"
+            "time": "2022-07-10T08:39:49+00:00"
         },
         {
             "name": "utopia-php/image",
@@ -2440,6 +2440,63 @@
             },
             "time": "2022-02-20T09:23:06+00:00"
         },
+        {
+            "name": "utopia-php/platform",
+            "version": "dev-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/utopia-php/platform.git",
+                "reference": "370565fcc39996506357338e28cad97cb9e3db0f"
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-redis": "*",
+                "php": ">=8.0",
+                "utopia-php/cli": "0.12.*",
+                "utopia-php/framework": "dev-feat-public-add-route as 0.19.21"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "squizlabs/php_codesniffer": "^3.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Utopia\\Platform\\": "src/Platform"
+                }
+            },
+            "autoload-dev": {
+                "psr-4": {
+                    "Utopia\\Tests\\": "tests/Platform"
+                }
+            },
+            "scripts": {
+                "format": [
+                    "vendor/bin/phpcbf"
+                ],
+                "test": [
+                    "docker-compose up -d && sleep 10 && docker-compose exec web vendor/bin/phpunit --configuration phpunit.xml"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eldad Fux",
+                    "email": "eldad@appwrite.io"
+                }
+            ],
+            "description": "Light and Fast Platform Library",
+            "keywords": [
+                "cache",
+                "framework",
+                "php",
+                "upf",
+                "utopia"
+            ],
+            "time": "2022-07-13T05:59:26+00:00"
+        },
         {
             "name": "utopia-php/preloader",
             "version": "0.2.4",
@@ -5348,15 +5405,16 @@
     ],
     "aliases": [
         {
-            "package": "utopia-php/cli",
-            "version": "dev-feat-allow-adding-task",
-            "alias": "0.12.0",
-            "alias_normalized": "0.12.0.0"
+            "package": "utopia-php/framework",
+            "version": "dev-feat-public-add-route",
+            "alias": "0.19.21",
+            "alias_normalized": "0.19.21.0"
         }
     ],
     "minimum-stability": "stable",
     "stability-flags": {
-        "utopia-php/cli": 20
+        "utopia-php/framework": 20,
+        "utopia-php/platform": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/src/Appwrite/Task/CLIPlatform.php b/src/Appwrite/Task/CLIPlatform.php
new file mode 100644
index 0000000000..847071fd63
--- /dev/null
+++ b/src/Appwrite/Task/CLIPlatform.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Appwrite\Task;
+
+use Utopia\Platform\Platform;
+
+class CLIPlatform extends Platform {
+    public function __construct()
+    {
+        $this->addService('cliTasks', new Tasks());
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Task.php b/src/Appwrite/Task/Task.php
deleted file mode 100644
index a10049b407..0000000000
--- a/src/Appwrite/Task/Task.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Appwrite\Task;
-
-use Utopia\CLI\Task as CLITask;
-
-interface Task {
-    public static function getTask(): CLITask;
-}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Tasks.php b/src/Appwrite/Task/Tasks.php
index ca50c1caa5..a7d2a7527c 100644
--- a/src/Appwrite/Task/Tasks.php
+++ b/src/Appwrite/Task/Tasks.php
@@ -1,24 +1,14 @@
 <?php
 namespace Appwrite\Task;
 
-use Utopia\CLI\CLI;
-use Appwrite\Task\Usage;
-use Appwrite\Task\Version;
+use Utopia\Platform\Service;
 
-class Tasks {
-    protected CLI $cli;
-
-    public function init(): Tasks
+class Tasks extends Service {
+    public function __construct()
     {
-        $this->cli = new CLI();
-        $this->cli->addTask(Vars::getTask());
-        $this->cli->addTask(Usage::getTask());
-        $this->cli->addTask(Version::getTask());
-        return $this;
-    }
-
-    public function run(): CLI
-    {
-        return $this->cli->run();
+        $this->type = self::TYPE_CLI;
+        $this->addAction('version', new Version());
+        $this->addAction('usage', new Usage());
+        $this->addAction('vars', new Vars());
     }
 }
diff --git a/src/Appwrite/Task/Usage.php b/src/Appwrite/Task/Usage.php
index 777dc303f6..9dd855e2f3 100644
--- a/src/Appwrite/Task/Usage.php
+++ b/src/Appwrite/Task/Usage.php
@@ -3,7 +3,6 @@ namespace Appwrite\Task;
 
 use Throwable;
 use Exception;
-use Appwrite\Task\Task;
 use Appwrite\Stats\Usage as InfluxUsage;
 use Appwrite\Stats\UsageDB;
 use InfluxDB\Database as InfluxDatabase;
@@ -16,11 +15,10 @@ use Utopia\Database\Database;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Registry\Registry;
 use Utopia\Logger\Log;
-use Utopia\CLI\Task as CLITask;
+use Utopia\Platform\Action;
 
-class Usage implements Task{
-    private static CLITask $task;
-    protected static function getDatabase(Registry &$register, string $namespace): Database
+class Usage extends Action{
+    protected function getDatabase(Registry &$register, string $namespace): Database
     {
         $attempts = 0;
     
@@ -52,7 +50,7 @@ class Usage implements Task{
         return $database;
     }
     
-    protected static function getInfluxDB(Registry &$register): InfluxDatabase
+    protected function getInfluxDB(Registry &$register): InfluxDatabase
     {
         /** @var InfluxDB\Client $client */
         $client = $register->get('influxdb');
@@ -78,8 +76,17 @@ class Usage implements Task{
         return $database;
     }
     
-    public static function getTask(): CLITask
+    public function __construct()
     {
+        
+        
+        $this
+            ->desc('Schedules syncing data from influxdb to Appwrite console db')
+            ->callback(fn () => $this->action());
+    }
+
+    public function action() {
+
         global $register;
 
         Authorization::disable();
@@ -119,60 +126,52 @@ class Usage implements Task{
             Console::warning($error->getTraceAsString());
         };
 
-        $usage = new CLITask('usage');
-        
-        $usage
-            ->desc('Schedules syncing data from influxdb to Appwrite console db')
-            ->action(function () use ($register, $logError) {
-                Console::title('Usage Aggregation V1');
-                Console::success(APP_NAME . ' usage aggregation process v1 has started');
-        
-                $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
-        
-                $database = self::getDatabase($register, '_console');
-                $influxDB = self::getInfluxDB($register);
-        
-                $usage = new InfluxUsage($database, $influxDB, $logError);
-                $usageDB = new UsageDB($database, $logError);
-        
-                $iterations = 0;
-                Console::loop(function () use ($interval, $usage, $usageDB, &$iterations) {
-                    $now = date('d-m-Y H:i:s', time());
-                    Console::info("[{$now}] Aggregating usage data every {$interval} seconds");
-        
-                    $loopStart = microtime(true);
-        
-                    /**
-                     * Aggregate InfluxDB every 30 seconds
-                     */
-                    $usage->collect();
-        
-                    if ($iterations % 30 != 0) { // return if 30 iterations has not passed
-                        $iterations++;
-                        $loopTook = microtime(true) - $loopStart;
-                        $now = date('d-m-Y H:i:s', time());
-                        Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-                        return;
-                    }
-        
-                    $iterations = 0; // Reset iterations to prevent overflow when running for long time
-                    /**
-                     * Aggregate MariaDB every 15 minutes
-                     * Some of the queries here might contain full-table scans.
-                     */
-                    $now = date('d-m-Y H:i:s', time());
-                    Console::info("[{$now}] Aggregating database counters.");
-        
-                    $usageDB->collect();
-        
-                    $iterations++;
-                    $loopTook = microtime(true) - $loopStart;
-                    $now = date('d-m-Y H:i:s', time());
-        
-                    Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-                }, $interval);
-            });
-        self::$task = $usage;
-        return self::$task;
+        Console::title('Usage Aggregation V1');
+        Console::success(APP_NAME . ' usage aggregation process v1 has started');
+
+        $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
+
+        $database = self::getDatabase($register, '_console');
+        $influxDB = self::getInfluxDB($register);
+
+        $usage = new InfluxUsage($database, $influxDB, $logError);
+        $usageDB = new UsageDB($database, $logError);
+
+        $iterations = 0;
+        Console::loop(function () use ($interval, $usage, $usageDB, &$iterations) {
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregating usage data every {$interval} seconds");
+
+            $loopStart = microtime(true);
+
+            /**
+             * Aggregate InfluxDB every 30 seconds
+             */
+            $usage->collect();
+
+            if ($iterations % 30 != 0) { // return if 30 iterations has not passed
+                $iterations++;
+                $loopTook = microtime(true) - $loopStart;
+                $now = date('d-m-Y H:i:s', time());
+                Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+                return;
+            }
+
+            $iterations = 0; // Reset iterations to prevent overflow when running for long time
+            /**
+             * Aggregate MariaDB every 15 minutes
+             * Some of the queries here might contain full-table scans.
+             */
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregating database counters.");
+
+            $usageDB->collect();
+
+            $iterations++;
+            $loopTook = microtime(true) - $loopStart;
+            $now = date('d-m-Y H:i:s', time());
+
+            Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+        }, $interval);
     }
 }
\ No newline at end of file
diff --git a/src/Appwrite/Task/Vars.php b/src/Appwrite/Task/Vars.php
index 7cfb1904ac..fc50e2b114 100644
--- a/src/Appwrite/Task/Vars.php
+++ b/src/Appwrite/Task/Vars.php
@@ -1,34 +1,32 @@
 <?php
 namespace Appwrite\Task;
 use Utopia\App;
-use Utopia\CLI\Task as CLITask;
 use Utopia\Config\Config;
 use Utopia\CLI\Console;
+use Utopia\Platform\Action;
 
-
-class Vars implements Task{
-    private static CLITask $task;
+class Vars extends Action{
     
-    public static function getTask(): CLITask
+    public function __construct()
     {
-        $vars = new CLITask('vars');
-        $vars
+        $this
             ->desc('List all the server environment variables')
-            ->action(function () {
-                $config = Config::getParam('variables', []);
-                $vars = [];
-        
-                foreach ($config as $category) {
-                    foreach ($category['variables'] ?? [] as $var) {
-                        $vars[] = $var;
-                    }
-                }
-        
-                foreach ($vars as $key => $value) {
-                    Console::log('- ' . $value['name'] . '=' . App::getEnv($value['name'], ''));
-                }
-            });
-        self::$task = $vars;
-        return self::$task;
+            ->callback(fn () => $this->action());
+    }
+
+    public function action(): void
+    {
+        $config = Config::getParam('variables', []);
+        $vars = [];
+
+        foreach ($config as $category) {
+            foreach ($category['variables'] ?? [] as $var) {
+                $vars[] = $var;
+            }
+        }
+
+        foreach ($vars as $key => $value) {
+            Console::log('- ' . $value['name'] . '=' . App::getEnv($value['name'], ''));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Appwrite/Task/Version.php b/src/Appwrite/Task/Version.php
index d63e1306c5..07ef47f292 100644
--- a/src/Appwrite/Task/Version.php
+++ b/src/Appwrite/Task/Version.php
@@ -2,21 +2,16 @@
 namespace Appwrite\Task;
 
 use Utopia\App;
-use Appwrite\Task\Task;
-use Utopia\CLI\Task as CLITask;
 use Utopia\CLI\Console;
+use Utopia\Platform\Action;
 
-class Version implements Task {
-    protected static CLITask $task;
-
-    public static function getTask(): CLITask {
-        $version = new CLITask('version');
-        $version
+class Version extends Action {
+    public function __construct()
+    {
+        $this
             ->desc('Get the server version')
-            ->action(function () {
+            ->callback(function () {
                 Console::log(App::getEnv('_APP_VERSION', 'UNKNOWN'));
             });
-        self::$task = $version;
-        return self::$task;
     }
 }

From 5793a9c3761b3a705296105943b4ff83b6fad457 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 13 Jul 2022 07:02:55 +0000
Subject: [PATCH 04/65] refactor all the tasks using action

---
 src/Appwrite/Task/Doctor.php      | 255 ++++++++++++++++++++++++++++
 src/Appwrite/Task/Install.php     | 241 ++++++++++++++++++++++++++
 src/Appwrite/Task/Maintenance.php | 159 ++++++++++++++++++
 src/Appwrite/Task/Migrate.php     |  95 +++++++++++
 src/Appwrite/Task/SDKs.php        | 271 ++++++++++++++++++++++++++++++
 src/Appwrite/Task/SSL.php         |  34 ++++
 src/Appwrite/Task/Specs.php       | 269 +++++++++++++++++++++++++++++
 src/Appwrite/Task/Tasks.php       |  14 +-
 src/Appwrite/Task/Usage.php       |   2 +
 src/Appwrite/Task/Vars.php        |   2 +
 src/Appwrite/Task/Version.php     |   2 +
 11 files changed, 1341 insertions(+), 3 deletions(-)
 create mode 100644 src/Appwrite/Task/Doctor.php
 create mode 100644 src/Appwrite/Task/Install.php
 create mode 100644 src/Appwrite/Task/Maintenance.php
 create mode 100644 src/Appwrite/Task/Migrate.php
 create mode 100644 src/Appwrite/Task/SDKs.php
 create mode 100644 src/Appwrite/Task/SSL.php
 create mode 100644 src/Appwrite/Task/Specs.php

diff --git a/src/Appwrite/Task/Doctor.php b/src/Appwrite/Task/Doctor.php
new file mode 100644
index 0000000000..529116813b
--- /dev/null
+++ b/src/Appwrite/Task/Doctor.php
@@ -0,0 +1,255 @@
+<?php
+
+namespace Appwrite\Task;
+
+use Utopia\App;
+use Utopia\CLI\Console;
+use Appwrite\ClamAV\Network;
+use Utopia\Logger\Logger;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Storage;
+use Utopia\Domains\Domain;
+use Utopia\Platform\Action;
+
+class Doctor extends Action{
+    public const NAME = 'doctor';
+
+    public function __construct()
+    {
+        $this
+            ->desc('Validate server health')
+            ->callback(fn () => $this->action());
+    }
+
+    public function action(): void
+    {
+        global $register;
+
+        Console::log("  __   ____  ____  _  _  ____  __  ____  ____     __  __  
+ / _\ (  _ \(  _ \/ )( \(  _ \(  )(_  _)(  __)   (  )/  \ 
+/    \ ) __/ ) __/\ /\ / )   / )(   )(   ) _)  _  )((  O )
+\_/\_/(__)  (__)  (_/\_)(__\_)(__) (__) (____)(_)(__)\__/ ");
+
+        Console::log("\n" . '👩‍⚕️ Running ' . APP_NAME . ' Doctor for version ' . App::getEnv('_APP_VERSION', 'UNKNOWN') . ' ...' . "\n");
+
+        Console::log('Checking for production best practices...');
+
+        $domain = new Domain(App::getEnv('_APP_DOMAIN'));
+
+        if (!$domain->isKnown() || $domain->isTest()) {
+            Console::log('🔴 Hostname has no public suffix (' . $domain->get() . ')');
+        } else {
+            Console::log('🟢 Hostname has a public suffix (' . $domain->get() . ')');
+        }
+
+        $domain = new Domain(App::getEnv('_APP_DOMAIN_TARGET'));
+
+        if (!$domain->isKnown() || $domain->isTest()) {
+            Console::log('🔴 CNAME target has no public suffix (' . $domain->get() . ')');
+        } else {
+            Console::log('🟢 CNAME target has a public suffix (' . $domain->get() . ')');
+        }
+
+        if (App::getEnv('_APP_OPENSSL_KEY_V1') === 'your-secret-key' || empty(App::getEnv('_APP_OPENSSL_KEY_V1'))) {
+            Console::log('🔴 Not using a unique secret key for encryption');
+        } else {
+            Console::log('🟢 Using a unique secret key for encryption');
+        }
+
+        if (App::getEnv('_APP_ENV', 'development') !== 'production') {
+            Console::log('🔴 App environment is set for development');
+        } else {
+            Console::log('🟢 App environment is set for production');
+        }
+
+        if ('enabled' !== App::getEnv('_APP_OPTIONS_ABUSE', 'disabled')) {
+            Console::log('🔴 Abuse protection is disabled');
+        } else {
+            Console::log('🟢 Abuse protection is enabled');
+        }
+
+        $authWhitelistRoot = App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', null);
+        $authWhitelistEmails = App::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null);
+        $authWhitelistIPs = App::getEnv('_APP_CONSOLE_WHITELIST_IPS', null);
+
+        if (
+            empty($authWhitelistRoot)
+            && empty($authWhitelistEmails)
+            && empty($authWhitelistIPs)
+        ) {
+            Console::log('🔴 Console access limits are disabled');
+        } else {
+            Console::log('🟢 Console access limits are enabled');
+        }
+
+        if ('enabled' !== App::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled')) {
+            Console::log('🔴 HTTPS force option is disabled');
+        } else {
+            Console::log('🟢 HTTPS force option is enabled');
+        }
+
+
+        $providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
+        $providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
+
+        if (empty($providerName) || empty($providerConfig) || !Logger::hasProvider($providerName)) {
+            Console::log('🔴 Logging adapter is disabled');
+        } else {
+            Console::log('🟢 Logging adapter is enabled (' . $providerName . ')');
+        }
+
+        \sleep(0.2);
+
+        try {
+            Console::log("\n" . 'Checking connectivity...');
+        } catch (\Throwable $th) {
+            //throw $th;
+        }
+
+        try {
+            $register->get('db'); /* @var $db PDO */
+            Console::success('Database............connected 👍');
+        } catch (\Throwable $th) {
+            Console::error('Database.........disconnected 👎');
+        }
+
+        try {
+            $register->get('cache');
+            Console::success('Queue...............connected 👍');
+        } catch (\Throwable $th) {
+            Console::error('Queue............disconnected 👎');
+        }
+
+        try {
+            $register->get('cache');
+            Console::success('Cache...............connected 👍');
+        } catch (\Throwable $th) {
+            Console::error('Cache............disconnected 👎');
+        }
+
+        if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled') { // Check if scans are enabled
+            try {
+                $antivirus = new Network(
+                    App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
+                    (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310)
+                );
+
+                if ((@$antivirus->ping())) {
+                    Console::success('Antivirus...........connected 👍');
+                } else {
+                    Console::error('Antivirus........disconnected 👎');
+                }
+            } catch (\Throwable $th) {
+                Console::error('Antivirus........disconnected 👎');
+            }
+        }
+
+        try {
+            $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */
+
+            $mail->addAddress('demo@example.com', 'Example.com');
+            $mail->Subject = 'Test SMTP Connection';
+            $mail->Body = 'Hello World';
+            $mail->AltBody = 'Hello World';
+
+            $mail->send();
+            Console::success('SMTP................connected 👍');
+        } catch (\Throwable $th) {
+            Console::error('SMTP.............disconnected 👎');
+        }
+
+        $host = App::getEnv('_APP_STATSD_HOST', 'telegraf');
+        $port = App::getEnv('_APP_STATSD_PORT', 8125);
+
+        if ($fp = @\fsockopen('udp://' . $host, $port, $errCode, $errStr, 2)) {
+            Console::success('StatsD..............connected 👍');
+            \fclose($fp);
+        } else {
+            Console::error('StatsD...........disconnected 👎');
+        }
+
+        $host = App::getEnv('_APP_INFLUXDB_HOST', '');
+        $port = App::getEnv('_APP_INFLUXDB_PORT', '');
+
+        if ($fp = @\fsockopen($host, $port, $errCode, $errStr, 2)) {
+            Console::success('InfluxDB............connected 👍');
+            \fclose($fp);
+        } else {
+            Console::error('InfluxDB.........disconnected 👎');
+        }
+
+        \sleep(0.2);
+
+        Console::log('');
+        Console::log('Checking volumes...');
+
+        foreach (
+            [
+            'Uploads' => APP_STORAGE_UPLOADS,
+            'Cache' => APP_STORAGE_CACHE,
+            'Config' => APP_STORAGE_CONFIG,
+            'Certs' => APP_STORAGE_CERTIFICATES
+            ] as $key => $volume
+        ) {
+            $device = new Local($volume);
+
+            if (\is_readable($device->getRoot())) {
+                Console::success('🟢 ' . $key . ' Volume is readable');
+            } else {
+                Console::error('🔴 ' . $key . ' Volume is unreadable');
+            }
+
+            if (\is_writable($device->getRoot())) {
+                Console::success('🟢 ' . $key . ' Volume is writeable');
+            } else {
+                Console::error('🔴 ' . $key . ' Volume is unwriteable');
+            }
+        }
+
+        \sleep(0.2);
+
+        Console::log('');
+        Console::log('Checking disk space usage...');
+
+        foreach (
+            [
+            'Uploads' => APP_STORAGE_UPLOADS,
+            'Cache' => APP_STORAGE_CACHE,
+            'Config' => APP_STORAGE_CONFIG,
+            'Certs' => APP_STORAGE_CERTIFICATES
+            ] as $key => $volume
+        ) {
+            $device = new Local($volume);
+
+            $percentage = (($device->getPartitionTotalSpace() - $device->getPartitionFreeSpace())
+            / $device->getPartitionTotalSpace()) * 100;
+
+            $message = $key . ' Volume has ' . Storage::human($device->getPartitionFreeSpace()) . ' free space (' . \round($percentage, 2) . '% used)';
+
+            if ($percentage < 80) {
+                Console::success('🟢 ' . $message);
+            } else {
+                Console::error('🔴 ' . $message);
+            }
+        }
+
+        try {
+            if (App::isProduction()) {
+                Console::log('');
+                $version = \json_decode(@\file_get_contents(App::getEnv('_APP_HOME', 'http://localhost') . '/v1/health/version'), true);
+
+                if ($version && isset($version['version'])) {
+                    if (\version_compare($version['version'], App::getEnv('_APP_VERSION', 'UNKNOWN')) === 0) {
+                        Console::info('You are running the latest version of ' . APP_NAME . '! 🥳');
+                    } else {
+                        Console::info('A new version (' . $version['version'] . ') is available! 🥳' . "\n");
+                    }
+                } else {
+                    Console::error('Failed to check for a newer version' . "\n");
+                }
+            }
+        } catch (\Throwable $th) {
+            Console::error('Failed to check for a newer version' . "\n");
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Install.php b/src/Appwrite/Task/Install.php
new file mode 100644
index 0000000000..8d6a7d4294
--- /dev/null
+++ b/src/Appwrite/Task/Install.php
@@ -0,0 +1,241 @@
+<?php
+namespace Appwrite\Task;
+
+use Appwrite\Auth\Auth;
+use Appwrite\Docker\Compose;
+use Appwrite\Docker\Env;
+use Appwrite\Utopia\View;
+use Utopia\Analytics\GoogleAnalytics;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Validator\Text;
+use Utopia\Platform\Action;
+
+class Install extends Action{
+    public const NAME = 'install';
+    
+    public function __construct()
+    {
+        $this
+            ->desc('Install Appwrite')
+            ->param('httpPort', '', new Text(4), 'Server HTTP port', true)
+            ->param('httpsPort', '', new Text(4), 'Server HTTPS port', true)
+            ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true)
+            ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
+            ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
+            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive));
+    }
+
+    public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive): void
+    {
+        /**
+         * 1. Start - DONE
+         * 2. Check for older setup and get older version - DONE
+         *  2.1 If older version is equal or bigger(?) than current version, **stop setup**
+         *  2.2. Get ENV vars - DONE
+         *   2.2.1 Fetch from older docker-compose.yml file
+         *   2.2.2 Fetch from older .env file (manually parse)
+         *  2.3 Use old ENV vars as default values
+         *  2.4 Ask for all required vars not given as CLI args and if in interactive mode
+         *      Otherwise, just use default vars. - DONE
+         * 3. Ask user to backup important volumes, env vars, and SQL tables
+         *      In th future we can try and automate this for smaller/medium size setups
+         * 4. Drop new docker-compose.yml setup (located inside the container, no network dependencies with appwrite.io) - DONE
+         * 5. Run docker compose up -d - DONE
+         * 6. Run data migration
+         */
+        $config = Config::getParam('variables');
+        $path = '/usr/src/code/appwrite';
+        $defaultHTTPPort = '80';
+        $defaultHTTPSPort = '443';
+        $vars = [];
+
+        /**
+         * We are using a random value every execution for identification.
+         * This allows us to collect information without invading the privacy of our users.
+         */
+        $analytics = new GoogleAnalytics('UA-26264668-9', uniqid('server.', true));
+
+        foreach ($config as $category) {
+            foreach ($category['variables'] ?? [] as $var) {
+                $vars[] = $var;
+            }
+        }
+
+        Console::success('Starting Appwrite installation...');
+
+        // Create directory with write permissions
+        if (null !== $path && !\file_exists(\dirname($path))) {
+            if (!@\mkdir(\dirname($path), 0755, true)) {
+                Console::error('Can\'t create directory ' . \dirname($path));
+                Console::exit(1);
+            }
+        }
+
+        $data = @file_get_contents($path . '/docker-compose.yml');
+
+        if ($data !== false) {
+            $time = \time();
+            Console::info('Compose file found, creating backup: docker-compose.yml.' . $time . '.backup');
+            file_put_contents($path . '/docker-compose.yml.' . $time . '.backup', $data);
+            $compose = new Compose($data);
+            $appwrite = $compose->getService('appwrite');
+            $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null;
+            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
+                    if (!$service) {
+                        continue;
+                    }
+
+                    $env = $service->getEnvironment()->list();
+
+                    foreach ($env as $key => $value) {
+                        if (is_null($value)) {
+                            continue;
+                        }
+                        foreach ($vars as &$var) {
+                            if ($var['name'] === $key) {
+                                $var['default'] = $value;
+                            }
+                        }
+                    }
+                }
+
+                $data = @file_get_contents($path . '/.env');
+
+                if ($data !== false) { // Fetch all env vars from previous .env file
+                    Console::info('Env file found, creating backup: .env.' . $time . '.backup');
+                    file_put_contents($path . '/.env.' . $time . '.backup', $data);
+                    $env = new Env($data);
+
+                    foreach ($env->list() as $key => $value) {
+                        if (is_null($value)) {
+                            continue;
+                        }
+                        foreach ($vars as &$var) {
+                            if ($var['name'] === $key) {
+                                $var['default'] = $value;
+                            }
+                        }
+                    }
+                }
+
+                foreach ($ports as $key => $value) {
+                    if ($value === $defaultHTTPPort) {
+                        $defaultHTTPPort = $key;
+                    }
+
+                    if ($value === $defaultHTTPSPort) {
+                        $defaultHTTPSPort = $key;
+                    }
+                }
+            }
+        }
+
+        if (empty($httpPort)) {
+            $httpPort = Console::confirm('Choose your server HTTP port: (default: ' . $defaultHTTPPort . ')');
+            $httpPort = ($httpPort) ? $httpPort : $defaultHTTPPort;
+        }
+
+        if (empty($httpsPort)) {
+            $httpsPort = Console::confirm('Choose your server HTTPS port: (default: ' . $defaultHTTPSPort . ')');
+            $httpsPort = ($httpsPort) ? $httpsPort : $defaultHTTPSPort;
+        }
+
+        $input = [];
+
+        foreach ($vars as $key => $var) {
+            if (!empty($var['filter']) && ($interactive !== 'Y' || !Console::isInteractive())) {
+                if ($data && $var['default'] !== null) {
+                    $input[$var['name']] = $var['default'];
+                    continue;
+                }
+
+                if ($var['filter'] === 'token') {
+                    $input[$var['name']] = Auth::tokenGenerator();
+                    continue;
+                }
+
+                if ($var['filter'] === 'password') {
+                    $input[$var['name']] = Auth::passwordGenerator();
+                    continue;
+                }
+            }
+            if (!$var['required'] || !Console::isInteractive() || $interactive !== 'Y') {
+                $input[$var['name']] = $var['default'];
+                continue;
+            }
+
+            $input[$var['name']] = Console::confirm($var['question'] . ' (default: \'' . $var['default'] . '\')');
+
+            if (empty($input[$var['name']])) {
+                $input[$var['name']] = $var['default'];
+            }
+        }
+
+        $templateForCompose = new View(__DIR__ . '/../views/install/compose.phtml');
+        $templateForEnv = new View(__DIR__ . '/../views/install/env.phtml');
+
+        $templateForCompose
+            ->setParam('httpPort', $httpPort)
+            ->setParam('httpsPort', $httpsPort)
+            ->setParam('version', APP_VERSION_STABLE)
+            ->setParam('organization', $organization)
+            ->setParam('image', $image)
+        ;
+
+        $templateForEnv
+            ->setParam('vars', $input)
+        ;
+
+        if (!file_put_contents($path . '/docker-compose.yml', $templateForCompose->render(false))) {
+            $message = 'Failed to save Docker Compose file';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
+            Console::error($message);
+            Console::exit(1);
+        }
+
+        if (!file_put_contents($path . '/.env', $templateForEnv->render(false))) {
+            $message = 'Failed to save environment variables file';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
+            Console::error($message);
+            Console::exit(1);
+        }
+
+        $env = '';
+        $stdout = '';
+        $stderr = '';
+
+        foreach ($input as $key => $value) {
+            if ($value) {
+                $env .= $key . '=' . \escapeshellarg($value) . ' ';
+            }
+        }
+
+        Console::log("Running \"docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
+
+        $exit = Console::execute("${env} docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
+
+        if ($exit !== 0) {
+            $message = 'Failed to install Appwrite dockers';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
+            Console::error($message);
+            Console::error($stderr);
+            Console::exit($exit);
+        } else {
+            $message = 'Appwrite installed successfully';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
+            Console::success($message);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Maintenance.php b/src/Appwrite/Task/Maintenance.php
new file mode 100644
index 0000000000..3339438cfe
--- /dev/null
+++ b/src/Appwrite/Task/Maintenance.php
@@ -0,0 +1,159 @@
+<?php
+namespace Appwrite\Task;
+
+use Appwrite\Auth\Auth;
+use Appwrite\Event\Certificate;
+use Appwrite\Event\Delete;
+use Utopia\App;
+use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Database;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Platform\Action;
+
+class Maintenance extends Action {
+    public const NAME = 'maintenance';
+
+    protected function getConsoleDB(): Database
+    {
+        global $register;
+    
+        $attempts = 0;
+    
+        do {
+            try {
+                $attempts++;
+                $cache = new Cache(new RedisCache($register->get('cache')));
+                $database = new Database(new MariaDB($register->get('db')), $cache);
+                $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+                $database->setNamespace('_console'); // Main DB
+    
+                if (!$database->exists($database->getDefaultDatabase(), 'certificates')) {
+                    throw new \Exception('Console project not ready');
+                }
+    
+                break; // leave loop if successful
+            } catch (\Exception $e) {
+                Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
+                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+                }
+                sleep(DATABASE_RECONNECT_SLEEP);
+            }
+        } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
+    
+        return $database;
+    }
+    
+    public function __construct()
+    {
+        $this
+            ->desc('Schedules maintenance tasks and publishes them to resque')
+            ->callback(fn () => $this->action());
+    }
+
+    public function action(): void
+    {
+        Console::title('Maintenance V1');
+        Console::success(APP_NAME . ' maintenance process v1 has started');
+
+        function notifyDeleteExecutionLogs(int $interval)
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_EXECUTIONS)
+                ->setTimestamp(time() - $interval)
+                ->trigger();
+        }
+
+        function notifyDeleteAbuseLogs(int $interval)
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_ABUSE)
+                ->setTimestamp(time() - $interval)
+                ->trigger();
+        }
+
+        function notifyDeleteAuditLogs(int $interval)
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_AUDIT)
+                ->setTimestamp(time() - $interval)
+                ->trigger();
+        }
+
+        function notifyDeleteUsageStats(int $interval30m, int $interval1d)
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_USAGE)
+                ->setTimestamp1d(time() - $interval1d)
+                ->setTimestamp30m(time() - $interval30m)
+                ->trigger();
+        }
+
+        function notifyDeleteConnections()
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_REALTIME)
+                ->setTimestamp(time() - 60)
+                ->trigger();
+        }
+
+        function notifyDeleteExpiredSessions()
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_SESSIONS)
+                ->setTimestamp(time() - Auth::TOKEN_EXPIRATION_LOGIN_LONG)
+                ->trigger();
+        }
+
+        function renewCertificates($dbForConsole)
+        {
+            $time = date('d-m-Y H:i:s', time());
+            $certificates = $dbForConsole->find('certificates', [
+                new Query('attempts', Query::TYPE_LESSEREQUAL, [5]), // Maximum 5 attempts
+                new Query('renewDate', Query::TYPE_LESSEREQUAL, [\time()]) // includes 60 days cooldown (we have 30 days to renew)
+            ], 200); // Limit 200 comes from LetsEncrypt (300 orders per 3 hours, keeping some for new domains)
+
+
+            if (\count($certificates) > 0) {
+                Console::info("[{$time}] Found " . \count($certificates) . " certificates for renewal, scheduling jobs.");
+
+                $event = new Certificate();
+                foreach ($certificates as $certificate) {
+                    $event
+                        ->setDomain(new Document([
+                            'domain' => $certificate->getAttribute('domain')
+                        ]))
+                        ->trigger();
+                }
+            } else {
+                Console::info("[{$time}] No certificates for renewal.");
+            }
+        }
+
+        // # of days in seconds (1 day = 86400s)
+        $interval = (int) App::getEnv('_APP_MAINTENANCE_INTERVAL', '86400');
+        $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600');
+        $auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', '1209600');
+        $abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', '86400');
+        $usageStatsRetention30m = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_30M', '129600'); //36 hours
+        $usageStatsRetention1d = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_1D', '8640000'); // 100 days
+
+        Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetention30m, $usageStatsRetention1d) {
+            $database = $this->getConsoleDB();
+
+            $time = date('d-m-Y H:i:s', time());
+            Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
+            notifyDeleteExecutionLogs($executionLogsRetention);
+            notifyDeleteAbuseLogs($abuseLogsRetention);
+            notifyDeleteAuditLogs($auditLogRetention);
+            notifyDeleteUsageStats($usageStatsRetention30m, $usageStatsRetention1d);
+            notifyDeleteConnections();
+            notifyDeleteExpiredSessions();
+            renewCertificates($database);
+        }, $interval);
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Migrate.php b/src/Appwrite/Task/Migrate.php
new file mode 100644
index 0000000000..61cd757ca7
--- /dev/null
+++ b/src/Appwrite/Task/Migrate.php
@@ -0,0 +1,95 @@
+<?php
+namespace Appwrite\Task;
+
+use Utopia\Platform\Action;
+use Utopia\CLI\Console;
+use Appwrite\Migration\Migration;
+use Utopia\App;
+use Utopia\Cache\Cache;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Validator\Text;
+use Swoole\Event;
+
+class Migrate extends Action{
+
+    public const NAME = 'migrate';
+    
+    public function __construct()
+    {
+        $this
+            ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
+            ->callback(fn ($version) => $this->action($version));
+    }
+
+    public function action($version) {
+        global $register;
+        Authorization::disable();
+        if (!array_key_exists($version, Migration::$versions)) {
+            Console::error("Version {$version} not found.");
+            Console::exit(1);
+            return;
+        }
+
+        $app = new App('UTC');
+
+        Console::success('Starting Data Migration to version ' . $version);
+
+        $db = $register->get('db', true);
+        $redis = $register->get('cache', true);
+        $redis->flushAll();
+        $cache = new Cache(new RedisCache($redis));
+
+        $projectDB = new Database(new MariaDB($db), $cache);
+        $projectDB->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+
+        $consoleDB = new Database(new MariaDB($db), $cache);
+        $consoleDB->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        $consoleDB->setNamespace('_project_console');
+
+        $console = $app->getResource('console');
+
+        $limit = 30;
+        $sum = 30;
+        $offset = 0;
+        $projects = [$console];
+        $count = 0;
+
+        try {
+            $totalProjects = $consoleDB->count('projects') + 1;
+        } catch (\Throwable $th) {
+            $consoleDB->setNamespace('_console');
+            $totalProjects = $consoleDB->count('projects') + 1;
+        }
+
+        $class = 'Appwrite\\Migration\\Version\\' . Migration::$versions[$version];
+        $migration = new $class();
+
+        while (!empty($projects)) {
+            foreach ($projects as $project) {
+                try {
+                    $migration
+                        ->setProject($project, $projectDB, $consoleDB)
+                        ->execute();
+                } catch (\Throwable $th) {
+                    throw $th;
+                    Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
+                }
+            }
+
+            $sum = \count($projects);
+            $projects = $consoleDB->find('projects', limit: $limit, offset: $offset);
+
+            $offset = $offset + $limit;
+            $count = $count + $sum;
+
+            Console::log('Migrated ' . $count . '/' . $totalProjects . ' projects...');
+        }
+
+        Event::wait(); // Wait for Coroutines to finish
+        $redis->flushAll();
+        Console::success('Data Migration Completed');
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/SDKs.php b/src/Appwrite/Task/SDKs.php
new file mode 100644
index 0000000000..b5f1506919
--- /dev/null
+++ b/src/Appwrite/Task/SDKs.php
@@ -0,0 +1,271 @@
+<?php
+namespace Appwrite\Task;
+
+use Utopia\Platform\Action;
+use Utopia\Config\Config;
+use Utopia\CLI\Console;
+use Appwrite\Spec\Swagger2;
+use Appwrite\SDK\SDK;
+use Appwrite\SDK\Language\CLI;
+use Appwrite\SDK\Language\PHP;
+use Appwrite\SDK\Language\Web;
+use Appwrite\SDK\Language\Node;
+use Appwrite\SDK\Language\Python;
+use Appwrite\SDK\Language\Ruby;
+use Appwrite\SDK\Language\Dart;
+use Appwrite\SDK\Language\Deno;
+use Appwrite\SDK\Language\DotNet;
+use Appwrite\SDK\Language\Flutter;
+use Appwrite\SDK\Language\Go;
+use Appwrite\SDK\Language\Kotlin;
+use Appwrite\SDK\Language\Android;
+use Appwrite\SDK\Language\Swift;
+use Appwrite\SDK\Language\SwiftClient;
+use Exception;
+use Throwable;
+
+class SDKs extends Action{
+
+    public const NAME = 'sdks';
+    
+    public function __construct()
+    {
+        $this
+            ->callback(fn () => $this->action());
+    }
+
+    public function action(): void
+    {
+        $platforms = Config::getParam('platforms');
+        $selected = \strtolower(Console::confirm('Choose SDK ("*" for all):'));
+        $version = Console::confirm('Choose an Appwrite version');
+        $git = (Console::confirm('Should we use git push? (yes/no)') == 'yes');
+        $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', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', 'latest'])) {
+            throw new Exception('Unknown version given');
+        }
+
+        foreach ($platforms as $key => $platform) {
+            foreach ($platform['languages'] as $language) {
+                if ($selected !== $language['key'] && $selected !== '*') {
+                    continue;
+                }
+
+                if (!$language['enabled']) {
+                    Console::warning($language['name'] . ' for ' . $platform['name'] . ' is disabled');
+                    continue;
+                }
+
+                Console::info('Fetching API Spec for ' . $language['name'] . ' for ' . $platform['name'] . ' (version: ' . $version . ')');
+
+                $spec = file_get_contents(__DIR__ . '/../config/specs/swagger2-' . $version . '-' . $language['family'] . '.json');
+
+                $cover = 'https://appwrite.io/images/github.png';
+                $result = \realpath(__DIR__ . '/..') . '/sdks/' . $key . '-' . $language['key'];
+                $resultExamples = \realpath(__DIR__ . '/../..') . '/docs/examples/' . $version . '/' . $key . '-' . $language['key'];
+                $target = \realpath(__DIR__ . '/..') . '/sdks/git/' . $language['key'] . '/';
+                $readme = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/README.md');
+                $readme = ($readme) ? \file_get_contents($readme) : '';
+                $gettingStarted = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/GETTING_STARTED.md');
+                $gettingStarted = ($gettingStarted) ? \file_get_contents($gettingStarted) : '';
+                $examples = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/EXAMPLES.md');
+                $examples = ($examples) ? \file_get_contents($examples) : '';
+                $changelog = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/CHANGELOG.md');
+                $changelog = ($changelog) ? \file_get_contents($changelog) : '# Change Log';
+                $warning = '**This SDK is compatible with Appwrite server version ' . $version . '. For older versions, please check [previous releases](' . $language['url'] . '/releases).**';
+                $license = 'BSD-3-Clause';
+                $licenseContent = 'Copyright (c) ' . date('Y') . ' Appwrite (https://appwrite.io) and individual contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+    3. Neither the name Appwrite nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.';
+
+                switch ($language['key']) {
+                    case 'web':
+                        $config = new Web();
+                        $config->setNPMPackage('appwrite');
+                        $config->setBowerPackage('appwrite');
+                        break;
+                    case 'cli':
+                        $config = new CLI();
+                        $config->setNPMPackage('appwrite-cli');
+                        $config->setExecutableName('appwrite');
+                        $config->setLogo(json_encode("
+    _                            _ _           ___   __   _____ 
+   /_\  _ __  _ ____      ___ __(_) |_ ___    / __\ / /   \_   \
+  //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \  / /   / /     / /\/
+ /  _  \ |_) | |_) \ V  V /| |  | | ||  __/ / /___/ /___/\/ /_  
+ \_/ \_/ .__/| .__/ \_/\_/ |_|  |_|\__\___| \____/\____/\____/  
+       |_|   |_|                                                
+
+"));
+                        $config->setLogoUnescaped("
+     _                            _ _           ___   __   _____ 
+    /_\  _ __  _ ____      ___ __(_) |_ ___    / __\ / /   \_   \
+   //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \  / /   / /     / /\/
+  /  _  \ |_) | |_) \ V  V /| |  | | ||  __/ / /___/ /___/\/ /_  
+  \_/ \_/ .__/| .__/ \_/\_/ |_|  |_|\__\___| \____/\____/\____/  
+        |_|   |_|                                                ");
+                        break;
+                    case 'php':
+                        $config = new PHP();
+                        $config->setComposerVendor('appwrite');
+                        $config->setComposerPackage('appwrite');
+                        break;
+                    case 'nodejs':
+                        $config = new Node();
+                        $config->setNPMPackage('node-appwrite');
+                        $config->setBowerPackage('appwrite');
+                        $warning = $warning . "\n\n > This is the Node.js SDK for integrating with Appwrite from your Node.js server-side code.
+                            If you're looking to integrate from the browser, you should check [appwrite/sdk-for-web](https://github.com/appwrite/sdk-for-web)";
+                        break;
+                    case 'deno':
+                        $config = new Deno();
+                        break;
+                    case 'python':
+                        $config = new Python();
+                        $config->setPipPackage('appwrite');
+                        $license = 'BSD License'; // license edited due to classifiers in pypi
+                        break;
+                    case 'ruby':
+                        $config = new Ruby();
+                        $config->setGemPackage('appwrite');
+                        break;
+                    case 'flutter':
+                        $config = new Flutter();
+                        $config->setPackageName('appwrite');
+                        break;
+                    case 'flutter-dev':
+                        $config = new Flutter();
+                        $config->setPackageName('appwrite_dev');
+                        break;
+                    case 'dart':
+                        $config = new Dart();
+                        $config->setPackageName('dart_appwrite');
+                        $warning = $warning . "\n\n > This is the Dart SDK for integrating with Appwrite from your Dart server-side code. If you're looking for the Flutter SDK you should check [appwrite/sdk-for-flutter](https://github.com/appwrite/sdk-for-flutter)";
+                        break;
+                    case 'go':
+                        $config = new Go();
+                        break;
+                    case 'swift':
+                        $config = new Swift();
+                        $warning = $warning . "\n\n > This is the Swift SDK for integrating with Appwrite from your Swift server-side code. If you're looking for the Apple SDK you should check [appwrite/sdk-for-apple](https://github.com/appwrite/sdk-for-apple)";
+                        break;
+                    case 'apple':
+                        $config = new SwiftClient();
+                        break;
+                    case 'dotnet':
+                        $cover = '';
+                        $config = new DotNet();
+                        break;
+                    case 'android':
+                        $config = new Android();
+                        break;
+                    case 'kotlin':
+                        $config = new Kotlin();
+                        $warning = $warning . "\n\n > This is the Kotlin SDK for integrating with Appwrite from your Kotlin server-side code. If you're looking for the Android SDK you should check [appwrite/sdk-for-android](https://github.com/appwrite/sdk-for-android)";
+                        break;
+                    default:
+                        throw new Exception('Language "' . $language['key'] . '" not supported');
+                        break;
+                }
+
+                Console::info("Generating {$language['name']} SDK...");
+
+                $sdk = new SDK($config, new Swagger2($spec));
+
+                $sdk
+                    ->setName($language['name'])
+                    ->setNamespace('io appwrite')
+                    ->setDescription("Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the {$language['name']} SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)")
+                    ->setShortDescription('Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API')
+                    ->setLicense($license)
+                    ->setLicenseContent($licenseContent)
+                    ->setVersion($language['version'])
+                    ->setGitURL($language['url'])
+                    ->setGitRepo($language['gitUrl'])
+                    ->setGitRepoName($language['gitRepoName'])
+                    ->setGitUserName($language['gitUserName'])
+                    ->setLogo($cover)
+                    ->setURL('https://appwrite.io')
+                    ->setShareText('Appwrite is a backend as a service for building web or mobile apps')
+                    ->setShareURL('http://appwrite.io')
+                    ->setShareTags('JS,javascript,reactjs,angular,ios,android,serverless')
+                    ->setShareVia('appwrite')
+                    ->setWarning($warning)
+                    ->setReadme($readme)
+                    ->setGettingStarted($gettingStarted)
+                    ->setChangelog($changelog)
+                    ->setExamples($examples)
+                    ->setTwitter(APP_SOCIAL_TWITTER_HANDLE)
+                    ->setDiscord(APP_SOCIAL_DISCORD_CHANNEL, APP_SOCIAL_DISCORD)
+                    ->setDefaultHeaders([
+                        'X-Appwrite-Response-Format' => '0.15.0',
+                    ]);
+
+                try {
+                    $sdk->generate($result);
+                } catch (Exception $exception) {
+                    Console::error($exception->getMessage());
+                } catch (Throwable $exception) {
+                    Console::error($exception->getMessage());
+                }
+
+                $gitUrl = $language['gitUrl'];
+                $gitBranch = $language['gitBranch'];
+
+
+                if (!$production) {
+                    $gitUrl = 'git@github.com:aw-tests/' . $language['gitRepoName'] . '.git';
+                }
+
+                if ($git && !empty($gitUrl)) {
+                    \exec('rm -rf ' . $target . ' && \
+                        mkdir -p ' . $target . ' && \
+                        cd ' . $target . ' && \
+                        git init --initial-branch=' . $gitBranch . ' && \
+                        git remote add origin ' . $gitUrl . ' && \
+                        git fetch && \
+                        git pull ' . $gitUrl . ' && \
+                        rm -rf ' . $target . '/* && \
+                        cp -r ' . $result . '/* ' . $target . '/ && \
+                        git add . && \
+                        git commit -m "' . $message . '" && \
+                        git push -u origin ' . $gitBranch . '
+                    ');
+
+                    Console::success("Pushed {$language['name']} SDK to {$gitUrl}");
+
+                    \exec('rm -rf ' . $target);
+                    Console::success("Remove temp directory '{$target}' for {$language['name']} SDK");
+                }
+
+                $docDirectories = $language['docDirectories'] ?? [''];
+
+                if ($version === 'latest') {
+                    continue;
+                }
+
+                foreach ($docDirectories as $languageTitle => $path) {
+                    $languagePath = strtolower($languageTitle !== 0 ? '/' . $languageTitle : '');
+                    \exec(
+                        'mkdir -p ' . $resultExamples . $languagePath . ' && \
+                        cp -r ' . $result . '/docs/examples' . $languagePath . ' ' . $resultExamples
+                    );
+                    Console::success("Copied code examples for {$language['name']} SDK to: {$resultExamples}");
+                }
+            }
+        }
+
+        Console::exit();
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/SSL.php b/src/Appwrite/Task/SSL.php
new file mode 100644
index 0000000000..f4688c611e
--- /dev/null
+++ b/src/Appwrite/Task/SSL.php
@@ -0,0 +1,34 @@
+<?php
+namespace Appwrite\Task;
+
+use Utopia\Platform\Action;
+use Appwrite\Event\Certificate;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Database\Document;
+use Utopia\Validator\Hostname;
+
+class SSL extends Action{
+
+    public const NAME = 'ssl';
+    
+    public function __construct()
+    {
+        $this
+            ->desc('Validate server certificates')
+            ->param('domain', App::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
+            ->callback(fn ($domain) => $this->action($domain));
+    }
+
+    public function action(string $domain): void
+    {
+        Console::success('Scheduling a job to issue a TLS certificate for domain: ' . $domain);
+
+        (new Certificate())
+            ->setDomain(new Document([
+                'domain' => $domain
+            ]))
+            ->setSkipRenewCheck(true)
+            ->trigger();
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Specs.php b/src/Appwrite/Task/Specs.php
new file mode 100644
index 0000000000..3812f9302a
--- /dev/null
+++ b/src/Appwrite/Task/Specs.php
@@ -0,0 +1,269 @@
+<?php
+namespace Appwrite\Task;
+
+use Utopia\Platform\Action;
+use Utopia\Validator\Text;
+use Appwrite\Specification\Format\OpenAPI3;
+use Appwrite\Specification\Format\Swagger2;
+use Appwrite\Specification\Specification;
+use Appwrite\Utopia\Response;
+use Swoole\Http\Response as HttpResponse;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Request;
+use Utopia\Validator\WhiteList;
+use Exception;
+
+class Specs extends Action{
+
+    public const NAME = 'specs';
+    
+    public function __construct()
+    {
+        $this
+            ->param('version', 'latest', new Text(8), 'Spec version', true)
+            ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
+            ->callback(fn ($version, $mode) => $this->action($version, $mode));
+    }
+
+    public function action(string $version, string $mode): void
+    {
+        global $register;
+
+        $db = $register->get('db');
+        $redis = $register->get('cache');
+        $appRoutes = App::getRoutes();
+        $response = new Response(new HttpResponse());
+        $mocks = ($mode === 'mocks');
+
+        App::setResource('request', fn () => new Request());
+        App::setResource('response', fn () => $response);
+        App::setResource('db', fn () => $db);
+        App::setResource('cache', fn () => $redis);
+
+        $platforms = [
+            'client' => APP_PLATFORM_CLIENT,
+            'server' => APP_PLATFORM_SERVER,
+            'console' => APP_PLATFORM_CONSOLE,
+        ];
+
+        $authCounts = [
+            'client' => 1,
+            'server' => 2,
+            'console' => 1,
+        ];
+
+        $keys = [
+            APP_PLATFORM_CLIENT => [
+                'Project' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Project',
+                    'description' => 'Your project ID',
+                    'in' => 'header',
+                ],
+                'JWT' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-JWT',
+                    'description' => 'Your secret JSON Web Token',
+                    'in' => 'header',
+                ],
+                'Locale' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Locale',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+            ],
+            APP_PLATFORM_SERVER => [
+                'Project' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Project',
+                    'description' => 'Your project ID',
+                    'in' => 'header',
+                ],
+                'Key' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Key',
+                    'description' => 'Your secret API key',
+                    'in' => 'header',
+                ],
+                'JWT' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-JWT',
+                    'description' => 'Your secret JSON Web Token',
+                    'in' => 'header',
+                ],
+                'Locale' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Locale',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+            ],
+            APP_PLATFORM_CONSOLE => [
+                'Project' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Project',
+                    'description' => 'Your project ID',
+                    'in' => 'header',
+                ],
+                'Key' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Key',
+                    'description' => 'Your secret API key',
+                    'in' => 'header',
+                ],
+                'JWT' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-JWT',
+                    'description' => 'Your secret JSON Web Token',
+                    'in' => 'header',
+                ],
+                'Locale' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Locale',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+                'Mode' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Mode',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+            ],
+        ];
+
+        foreach ($platforms as $platform) {
+            $routes = [];
+            $models = [];
+            $services = [];
+
+            foreach ($appRoutes as $key => $method) {
+                foreach ($method as $route) {
+                    /** @var \Utopia\Route $route */
+                    $routeSecurity = $route->getLabel('sdk.auth', []);
+                    $sdkPlaforms = [];
+
+                    foreach ($routeSecurity as $value) {
+                        switch ($value) {
+                            case APP_AUTH_TYPE_SESSION:
+                                $sdkPlaforms[] = APP_PLATFORM_CLIENT;
+                                break;
+                            case APP_AUTH_TYPE_KEY:
+                                $sdkPlaforms[] = APP_PLATFORM_SERVER;
+                                break;
+                            case APP_AUTH_TYPE_JWT:
+                                $sdkPlaforms[] = APP_PLATFORM_SERVER;
+                                break;
+                            case APP_AUTH_TYPE_ADMIN:
+                                $sdkPlaforms[] = APP_PLATFORM_CONSOLE;
+                                break;
+                        }
+                    }
+
+                    if (empty($routeSecurity)) {
+                        $sdkPlaforms[] = APP_PLATFORM_CLIENT;
+                    }
+
+                    if (!$route->getLabel('docs', true)) {
+                        continue;
+                    }
+
+                    if ($route->getLabel('sdk.mock', false) && !$mocks) {
+                        continue;
+                    }
+
+                    if (!$route->getLabel('sdk.mock', false) && $mocks) {
+                        continue;
+                    }
+
+                    if (empty($route->getLabel('sdk.namespace', null))) {
+                        continue;
+                    }
+
+                    if ($platform !== APP_PLATFORM_CONSOLE && !\in_array($platforms[$platform], $sdkPlaforms)) {
+                        continue;
+                    }
+
+                    $routes[] = $route;
+                }
+            }
+
+            foreach (Config::getParam('services', []) as $service) {
+                if (
+                    !isset($service['docs']) // Skip service if not part of the public API
+                    || !isset($service['sdk'])
+                    || !$service['docs']
+                    || !$service['sdk']
+                ) {
+                    continue;
+                }
+
+                $services[] = [
+                    'name' => $service['key'] ?? '',
+                    'description' => $service['subtitle'] ?? '',
+                    'x-globalAttributes' => $service['globalAttributes'] ?? [],
+                ];
+            }
+
+            $models = $response->getModels();
+
+            foreach ($models as $key => $value) {
+                if ($platform !== APP_PLATFORM_CONSOLE && !$value->isPublic()) {
+                    unset($models[$key]);
+                }
+            }
+            // var_dump($models);
+            $arguments = [new App('UTC'), $services, $routes, $models, $keys[$platform], $authCounts[$platform] ?? 0];
+            foreach (['swagger2', 'open-api3'] as $format) {
+                $formatInstance = match ($format) {
+                    'swagger2' => new Swagger2(...$arguments),
+                    'open-api3' => new OpenAPI3(...$arguments),
+                    default => throw new Exception('Format not found: ' . $format)
+                };
+
+                $specs = new Specification($formatInstance);
+                $endpoint = App::getEnv('_APP_HOME', '[HOSTNAME]');
+                $email = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+
+                $formatInstance
+                    ->setParam('name', APP_NAME)
+                    ->setParam('description', 'Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)')
+                    ->setParam('endpoint', 'https://HOSTNAME/v1')
+                    ->setParam('version', APP_VERSION_STABLE)
+                    ->setParam('terms', $endpoint . '/policy/terms')
+                    ->setParam('support.email', $email)
+                    ->setParam('support.url', $endpoint . '/support')
+                    ->setParam('contact.name', APP_NAME . ' Team')
+                    ->setParam('contact.email', $email)
+                    ->setParam('contact.url', $endpoint . '/support')
+                    ->setParam('license.name', 'BSD-3-Clause')
+                    ->setParam('license.url', 'https://raw.githubusercontent.com/appwrite/appwrite/master/LICENSE')
+                    ->setParam('docs.description', 'Full API docs, specs and tutorials')
+                    ->setParam('docs.url', $endpoint . '/docs');
+
+                if ($mocks) {
+                    $path = __DIR__ . '/../config/specs/' . $format . '-mocks-' . $platform . '.json';
+
+                    if (!file_put_contents($path, json_encode($specs->parse()))) {
+                        throw new Exception('Failed to save mocks spec file: ' . $path);
+                    }
+
+                    Console::success('Saved mocks spec file: ' . realpath($path));
+
+                    continue;
+                }
+
+                $path = __DIR__ . '/../config/specs/' . $format . '-' . $version . '-' . $platform . '.json';
+
+                if (!file_put_contents($path, json_encode($specs->parse()))) {
+                    throw new Exception('Failed to save spec file: ' . $path);
+                }
+
+                Console::success('Saved spec file: ' . realpath($path));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Tasks.php b/src/Appwrite/Task/Tasks.php
index a7d2a7527c..3bacb03857 100644
--- a/src/Appwrite/Task/Tasks.php
+++ b/src/Appwrite/Task/Tasks.php
@@ -7,8 +7,16 @@ class Tasks extends Service {
     public function __construct()
     {
         $this->type = self::TYPE_CLI;
-        $this->addAction('version', new Version());
-        $this->addAction('usage', new Usage());
-        $this->addAction('vars', new Vars());
+        $this
+            ->addAction(Version::NAME, new Version())
+            ->addAction(Usage::NAME, new Usage())
+            ->addAction(Vars::NAME, new Vars())
+            ->addAction(SSL::NAME, new SSL())
+            ->addAction(Doctor::NAME, new Doctor())
+            ->addAction(Install::NAME, new Install())
+            ->addAction(Maintenance::NAME, new Maintenance())
+            ->addAction(Migrate::NAME, new Migrate())
+            ->addAction(SDKs::NAME, new SDKs())
+            ->addAction(Specs::NAME, new Specs());
     }
 }
diff --git a/src/Appwrite/Task/Usage.php b/src/Appwrite/Task/Usage.php
index 9dd855e2f3..a9f25a701a 100644
--- a/src/Appwrite/Task/Usage.php
+++ b/src/Appwrite/Task/Usage.php
@@ -18,6 +18,8 @@ use Utopia\Logger\Log;
 use Utopia\Platform\Action;
 
 class Usage extends Action{
+    public const NAME = 'usage';
+
     protected function getDatabase(Registry &$register, string $namespace): Database
     {
         $attempts = 0;
diff --git a/src/Appwrite/Task/Vars.php b/src/Appwrite/Task/Vars.php
index fc50e2b114..818563f362 100644
--- a/src/Appwrite/Task/Vars.php
+++ b/src/Appwrite/Task/Vars.php
@@ -6,6 +6,8 @@ use Utopia\CLI\Console;
 use Utopia\Platform\Action;
 
 class Vars extends Action{
+
+    public const NAME = 'vars';
     
     public function __construct()
     {
diff --git a/src/Appwrite/Task/Version.php b/src/Appwrite/Task/Version.php
index 07ef47f292..104c675a58 100644
--- a/src/Appwrite/Task/Version.php
+++ b/src/Appwrite/Task/Version.php
@@ -6,6 +6,8 @@ use Utopia\CLI\Console;
 use Utopia\Platform\Action;
 
 class Version extends Action {
+    public const NAME = 'version';
+
     public function __construct()
     {
         $this

From 031c8a5594e239c467dd6b06b0ae0d5b7e5b8920 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 13 Jul 2022 07:16:28 +0000
Subject: [PATCH 05/65] fix spec and sdks tasks

---
 src/Appwrite/Task/SDKs.php  | 16 ++++++++--------
 src/Appwrite/Task/Specs.php |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Appwrite/Task/SDKs.php b/src/Appwrite/Task/SDKs.php
index b5f1506919..9b89dfc7eb 100644
--- a/src/Appwrite/Task/SDKs.php
+++ b/src/Appwrite/Task/SDKs.php
@@ -60,19 +60,19 @@ class SDKs extends Action{
 
                 Console::info('Fetching API Spec for ' . $language['name'] . ' for ' . $platform['name'] . ' (version: ' . $version . ')');
 
-                $spec = file_get_contents(__DIR__ . '/../config/specs/swagger2-' . $version . '-' . $language['family'] . '.json');
+                $spec = file_get_contents(__DIR__ . '/../../../app/config/specs/swagger2-' . $version . '-' . $language['family'] . '.json');
 
                 $cover = 'https://appwrite.io/images/github.png';
-                $result = \realpath(__DIR__ . '/..') . '/sdks/' . $key . '-' . $language['key'];
-                $resultExamples = \realpath(__DIR__ . '/../..') . '/docs/examples/' . $version . '/' . $key . '-' . $language['key'];
-                $target = \realpath(__DIR__ . '/..') . '/sdks/git/' . $language['key'] . '/';
-                $readme = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/README.md');
+                $result = \realpath(__DIR__ . '/../../../app') . '/sdks/' . $key . '-' . $language['key'];
+                $resultExamples = \realpath(__DIR__ . '/../../..') . '/docs/examples/' . $version . '/' . $key . '-' . $language['key'];
+                $target = \realpath(__DIR__ . '/../../../app') . '/sdks/git/' . $language['key'] . '/';
+                $readme = \realpath(__DIR__ . '/../../../docs/sdks/' . $language['key'] . '/README.md');
                 $readme = ($readme) ? \file_get_contents($readme) : '';
-                $gettingStarted = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/GETTING_STARTED.md');
+                $gettingStarted = \realpath(__DIR__ . '/../../../docs/sdks/' . $language['key'] . '/GETTING_STARTED.md');
                 $gettingStarted = ($gettingStarted) ? \file_get_contents($gettingStarted) : '';
-                $examples = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/EXAMPLES.md');
+                $examples = \realpath(__DIR__ . '/../../../docs/sdks/' . $language['key'] . '/EXAMPLES.md');
                 $examples = ($examples) ? \file_get_contents($examples) : '';
-                $changelog = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/CHANGELOG.md');
+                $changelog = \realpath(__DIR__ . '/../../../docs/sdks/' . $language['key'] . '/CHANGELOG.md');
                 $changelog = ($changelog) ? \file_get_contents($changelog) : '# Change Log';
                 $warning = '**This SDK is compatible with Appwrite server version ' . $version . '. For older versions, please check [previous releases](' . $language['url'] . '/releases).**';
                 $license = 'BSD-3-Clause';
diff --git a/src/Appwrite/Task/Specs.php b/src/Appwrite/Task/Specs.php
index 3812f9302a..a79f434320 100644
--- a/src/Appwrite/Task/Specs.php
+++ b/src/Appwrite/Task/Specs.php
@@ -256,7 +256,7 @@ class Specs extends Action{
                     continue;
                 }
 
-                $path = __DIR__ . '/../config/specs/' . $format . '-' . $version . '-' . $platform . '.json';
+                $path = __DIR__ . '/../../../app/config/specs/' . $format . '-' . $version . '-' . $platform . '.json';
 
                 if (!file_put_contents($path, json_encode($specs->parse()))) {
                     throw new Exception('Failed to save spec file: ' . $path);

From 082967095eee3884ced6c924e5621a8449abb1f8 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Thu, 14 Jul 2022 02:04:31 +0000
Subject: [PATCH 06/65] linter fixes

---
 app/cli.php                       |  1 -
 src/Appwrite/Task/CLIPlatform.php |  5 ++--
 src/Appwrite/Task/Doctor.php      |  5 ++--
 src/Appwrite/Task/Install.php     |  8 +++---
 src/Appwrite/Task/Maintenance.php | 18 +++++++------
 src/Appwrite/Task/Migrate.php     | 12 +++++----
 src/Appwrite/Task/SDKs.php        |  9 ++++---
 src/Appwrite/Task/SSL.php         |  9 ++++---
 src/Appwrite/Task/Specs.php       |  9 ++++---
 src/Appwrite/Task/Tasks.php       |  4 ++-
 src/Appwrite/Task/Usage.php       | 45 ++++++++++++++++---------------
 src/Appwrite/Task/Vars.php        | 10 ++++---
 src/Appwrite/Task/Version.php     |  4 ++-
 13 files changed, 79 insertions(+), 60 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 413fa234ea..66c4208e14 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -13,4 +13,3 @@ $cliPlatform->init('CLI');
 
 $cli = $cliPlatform->getCli();
 $cli->run();
-
diff --git a/src/Appwrite/Task/CLIPlatform.php b/src/Appwrite/Task/CLIPlatform.php
index 847071fd63..063c6b6ca8 100644
--- a/src/Appwrite/Task/CLIPlatform.php
+++ b/src/Appwrite/Task/CLIPlatform.php
@@ -4,9 +4,10 @@ namespace Appwrite\Task;
 
 use Utopia\Platform\Platform;
 
-class CLIPlatform extends Platform {
+class CLIPlatform extends Platform
+{
     public function __construct()
     {
         $this->addService('cliTasks', new Tasks());
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Doctor.php b/src/Appwrite/Task/Doctor.php
index 529116813b..281efe4d35 100644
--- a/src/Appwrite/Task/Doctor.php
+++ b/src/Appwrite/Task/Doctor.php
@@ -11,7 +11,8 @@ use Utopia\Storage\Storage;
 use Utopia\Domains\Domain;
 use Utopia\Platform\Action;
 
-class Doctor extends Action{
+class Doctor extends Action
+{
     public const NAME = 'doctor';
 
     public function __construct()
@@ -252,4 +253,4 @@ class Doctor extends Action{
             Console::error('Failed to check for a newer version' . "\n");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Install.php b/src/Appwrite/Task/Install.php
index 8d6a7d4294..fe3fb826d4 100644
--- a/src/Appwrite/Task/Install.php
+++ b/src/Appwrite/Task/Install.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Appwrite\Auth\Auth;
@@ -11,9 +12,10 @@ use Utopia\Config\Config;
 use Utopia\Validator\Text;
 use Utopia\Platform\Action;
 
-class Install extends Action{
+class Install extends Action
+{
     public const NAME = 'install';
-    
+
     public function __construct()
     {
         $this
@@ -238,4 +240,4 @@ class Install extends Action{
             Console::success($message);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Maintenance.php b/src/Appwrite/Task/Maintenance.php
index 3339438cfe..8fbe282622 100644
--- a/src/Appwrite/Task/Maintenance.php
+++ b/src/Appwrite/Task/Maintenance.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Appwrite\Auth\Auth;
@@ -14,15 +15,16 @@ use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Platform\Action;
 
-class Maintenance extends Action {
+class Maintenance extends Action
+{
     public const NAME = 'maintenance';
 
     protected function getConsoleDB(): Database
     {
         global $register;
-    
+
         $attempts = 0;
-    
+
         do {
             try {
                 $attempts++;
@@ -30,11 +32,11 @@ class Maintenance extends Action {
                 $database = new Database(new MariaDB($register->get('db')), $cache);
                 $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
                 $database->setNamespace('_console'); // Main DB
-    
+
                 if (!$database->exists($database->getDefaultDatabase(), 'certificates')) {
                     throw new \Exception('Console project not ready');
                 }
-    
+
                 break; // leave loop if successful
             } catch (\Exception $e) {
                 Console::warning("Database not ready. Retrying connection ({$attempts})...");
@@ -44,10 +46,10 @@ class Maintenance extends Action {
                 sleep(DATABASE_RECONNECT_SLEEP);
             }
         } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-    
+
         return $database;
     }
-    
+
     public function __construct()
     {
         $this
@@ -156,4 +158,4 @@ class Maintenance extends Action {
             renewCertificates($database);
         }, $interval);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Migrate.php b/src/Appwrite/Task/Migrate.php
index 61cd757ca7..d1c154a0df 100644
--- a/src/Appwrite/Task/Migrate.php
+++ b/src/Appwrite/Task/Migrate.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Utopia\Platform\Action;
@@ -13,10 +14,10 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\Text;
 use Swoole\Event;
 
-class Migrate extends Action{
-
+class Migrate extends Action
+{
     public const NAME = 'migrate';
-    
+
     public function __construct()
     {
         $this
@@ -24,7 +25,8 @@ class Migrate extends Action{
             ->callback(fn ($version) => $this->action($version));
     }
 
-    public function action($version) {
+    public function action($version)
+    {
         global $register;
         Authorization::disable();
         if (!array_key_exists($version, Migration::$versions)) {
@@ -92,4 +94,4 @@ class Migrate extends Action{
         $redis->flushAll();
         Console::success('Data Migration Completed');
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/SDKs.php b/src/Appwrite/Task/SDKs.php
index 9b89dfc7eb..0bbe10bbc9 100644
--- a/src/Appwrite/Task/SDKs.php
+++ b/src/Appwrite/Task/SDKs.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Utopia\Platform\Action;
@@ -24,10 +25,10 @@ use Appwrite\SDK\Language\SwiftClient;
 use Exception;
 use Throwable;
 
-class SDKs extends Action{
-
+class SDKs extends Action
+{
     public const NAME = 'sdks';
-    
+
     public function __construct()
     {
         $this
@@ -268,4 +269,4 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
         Console::exit();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/SSL.php b/src/Appwrite/Task/SSL.php
index f4688c611e..f6067367dc 100644
--- a/src/Appwrite/Task/SSL.php
+++ b/src/Appwrite/Task/SSL.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Utopia\Platform\Action;
@@ -8,10 +9,10 @@ use Utopia\CLI\Console;
 use Utopia\Database\Document;
 use Utopia\Validator\Hostname;
 
-class SSL extends Action{
-
+class SSL extends Action
+{
     public const NAME = 'ssl';
-    
+
     public function __construct()
     {
         $this
@@ -31,4 +32,4 @@ class SSL extends Action{
             ->setSkipRenewCheck(true)
             ->trigger();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Specs.php b/src/Appwrite/Task/Specs.php
index a79f434320..d2e0f73f3c 100644
--- a/src/Appwrite/Task/Specs.php
+++ b/src/Appwrite/Task/Specs.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Utopia\Platform\Action;
@@ -15,10 +16,10 @@ use Utopia\Request;
 use Utopia\Validator\WhiteList;
 use Exception;
 
-class Specs extends Action{
-
+class Specs extends Action
+{
     public const NAME = 'specs';
-    
+
     public function __construct()
     {
         $this
@@ -266,4 +267,4 @@ class Specs extends Action{
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Tasks.php b/src/Appwrite/Task/Tasks.php
index 3bacb03857..4a24e0ca9d 100644
--- a/src/Appwrite/Task/Tasks.php
+++ b/src/Appwrite/Task/Tasks.php
@@ -1,9 +1,11 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Utopia\Platform\Service;
 
-class Tasks extends Service {
+class Tasks extends Service
+{
     public function __construct()
     {
         $this->type = self::TYPE_CLI;
diff --git a/src/Appwrite/Task/Usage.php b/src/Appwrite/Task/Usage.php
index a9f25a701a..f2f0b73f76 100644
--- a/src/Appwrite/Task/Usage.php
+++ b/src/Appwrite/Task/Usage.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Throwable;
@@ -17,25 +18,26 @@ use Utopia\Registry\Registry;
 use Utopia\Logger\Log;
 use Utopia\Platform\Action;
 
-class Usage extends Action{
+class Usage extends Action
+{
     public const NAME = 'usage';
 
     protected function getDatabase(Registry &$register, string $namespace): Database
     {
         $attempts = 0;
-    
+
         do {
             try {
                 $attempts++;
-    
+
                 $db = $register->get('db');
                 $redis = $register->get('cache');
-    
+
                 $cache = new Cache(new RedisCache($redis));
                 $database = new Database(new MariaDB($db), $cache);
                 $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
                 $database->setNamespace($namespace);
-    
+
                 if (!$database->exists($database->getDefaultDatabase(), 'projects')) {
                     throw new Exception('Projects collection not ready');
                 }
@@ -48,10 +50,10 @@ class Usage extends Action{
                 sleep(DATABASE_RECONNECT_SLEEP);
             }
         } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-    
+
         return $database;
     }
-    
+
     protected function getInfluxDB(Registry &$register): InfluxDatabase
     {
         /** @var InfluxDB\Client $client */
@@ -59,7 +61,7 @@ class Usage extends Action{
         $attempts = 0;
         $max = 10;
         $sleep = 1;
-    
+
         do { // check if telegraf database is ready
             try {
                 $attempts++;
@@ -77,17 +79,18 @@ class Usage extends Action{
         } while ($attempts < $max);
         return $database;
     }
-    
+
     public function __construct()
     {
-        
-        
+
+
         $this
             ->desc('Schedules syncing data from influxdb to Appwrite console db')
             ->callback(fn () => $this->action());
     }
 
-    public function action() {
+    public function action()
+    {
 
         global $register;
 
@@ -96,34 +99,34 @@ class Usage extends Action{
 
         $logError = function (Throwable $error, string $action = 'syncUsageStats') use ($register) {
             $logger = $register->get('logger');
-        
+
             if ($logger) {
                 $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
-        
+
                 $log = new Log();
                 $log->setNamespace("usage");
                 $log->setServer(\gethostname());
                 $log->setVersion($version);
                 $log->setType(Log::TYPE_ERROR);
                 $log->setMessage($error->getMessage());
-        
+
                 $log->addTag('code', $error->getCode());
                 $log->addTag('verboseType', get_class($error));
-        
+
                 $log->addExtra('file', $error->getFile());
                 $log->addExtra('line', $error->getLine());
                 $log->addExtra('trace', $error->getTraceAsString());
                 $log->addExtra('detailedTrace', $error->getTrace());
-        
+
                 $log->setAction($action);
-        
+
                 $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
                 $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-        
+
                 $responseCode = $logger->addLog($log);
                 Console::info('Usage stats log pushed with status code: ' . $responseCode);
             }
-        
+
             Console::warning("Failed: {$error->getMessage()}");
             Console::warning($error->getTraceAsString());
         };
@@ -176,4 +179,4 @@ class Usage extends Action{
             Console::info("[{$now}] Aggregation took {$loopTook} seconds");
         }, $interval);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Vars.php b/src/Appwrite/Task/Vars.php
index 818563f362..cd9ff4de6f 100644
--- a/src/Appwrite/Task/Vars.php
+++ b/src/Appwrite/Task/Vars.php
@@ -1,14 +1,16 @@
 <?php
+
 namespace Appwrite\Task;
+
 use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\CLI\Console;
 use Utopia\Platform\Action;
 
-class Vars extends Action{
-
+class Vars extends Action
+{
     public const NAME = 'vars';
-    
+
     public function __construct()
     {
         $this
@@ -31,4 +33,4 @@ class Vars extends Action{
             Console::log('- ' . $value['name'] . '=' . App::getEnv($value['name'], ''));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Appwrite/Task/Version.php b/src/Appwrite/Task/Version.php
index 104c675a58..e92a620368 100644
--- a/src/Appwrite/Task/Version.php
+++ b/src/Appwrite/Task/Version.php
@@ -1,11 +1,13 @@
 <?php
+
 namespace Appwrite\Task;
 
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Platform\Action;
 
-class Version extends Action {
+class Version extends Action
+{
     public const NAME = 'version';
 
     public function __construct()

From 2c2a5708191059442aba41f6dbcd638624911215 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Thu, 14 Jul 2022 02:20:29 +0000
Subject: [PATCH 07/65] composer update

---
 composer.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1994e95967..1854fe86be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2446,7 +2446,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "370565fcc39996506357338e28cad97cb9e3db0f"
+                "reference": "7a4c9b48b3ad06fb850cf8394c671603223bc872"
             },
             "require": {
                 "ext-json": "*",
@@ -2495,7 +2495,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-07-13T05:59:26+00:00"
+            "time": "2022-07-14T02:00:12+00:00"
         },
         {
             "name": "utopia-php/preloader",
@@ -5437,5 +5437,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 57518c69500e43472f1959fb99eb93cd5a41ac53 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 15 Jul 2022 05:02:39 +0000
Subject: [PATCH 08/65] updated implementation

---
 composer.lock                    |   6 +-
 src/Appwrite/Platform/Action.php | 110 +++++++++++++++++++++++++++++++
 src/Appwrite/Task/Usage.php      | 104 +----------------------------
 3 files changed, 115 insertions(+), 105 deletions(-)
 create mode 100644 src/Appwrite/Platform/Action.php

diff --git a/composer.lock b/composer.lock
index 1854fe86be..bf8963e887 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2446,7 +2446,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "7a4c9b48b3ad06fb850cf8394c671603223bc872"
+                "reference": "4327c4cbaafc39cd94ec4d977cbdc25c8e9df613"
             },
             "require": {
                 "ext-json": "*",
@@ -2495,7 +2495,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-07-14T02:00:12+00:00"
+            "time": "2022-07-14T07:30:15+00:00"
         },
         {
             "name": "utopia-php/preloader",
@@ -5437,5 +5437,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/src/Appwrite/Platform/Action.php b/src/Appwrite/Platform/Action.php
new file mode 100644
index 0000000000..314d7ede20
--- /dev/null
+++ b/src/Appwrite/Platform/Action.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Appwrite\Platform;
+
+use Utopia\Database\Database;
+use Utopia\Platform\Action as PlatformAction;
+use Exception;
+use InfluxDB\Database as InfluxDatabase;
+use Utopia\App;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Registry\Registry;
+use Utopia\Logger\Log;
+use Throwable;
+
+abstract class Action extends PlatformAction {
+    protected function logError(Registry $register, Throwable $error, string $action = 'syncUsageStats') {
+        $logger = $register->get('logger');
+
+        if ($logger) {
+            $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
+
+            $log = new Log();
+            $log->setNamespace("usage");
+            $log->setServer(\gethostname());
+            $log->setVersion($version);
+            $log->setType(Log::TYPE_ERROR);
+            $log->setMessage($error->getMessage());
+
+            $log->addTag('code', $error->getCode());
+            $log->addTag('verboseType', get_class($error));
+
+            $log->addExtra('file', $error->getFile());
+            $log->addExtra('line', $error->getLine());
+            $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('detailedTrace', $error->getTrace());
+
+            $log->setAction($action);
+
+            $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            $responseCode = $logger->addLog($log);
+            Console::info('Usage stats log pushed with status code: ' . $responseCode);
+        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
+    }
+
+    protected function getDatabase(Registry &$register, string $namespace): Database
+    {
+        $attempts = 0;
+
+        do {
+            try {
+                $attempts++;
+
+                $db = $register->get('db');
+                $redis = $register->get('cache');
+
+                $cache = new Cache(new RedisCache($redis));
+                $database = new Database(new MariaDB($db), $cache);
+                $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+                $database->setNamespace($namespace);
+
+                if (!$database->exists($database->getDefaultDatabase(), 'projects')) {
+                    throw new Exception('Projects collection not ready');
+                }
+                break; // leave loop if successful
+            } catch (\Exception$e) {
+                Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
+                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+                }
+                sleep(DATABASE_RECONNECT_SLEEP);
+            }
+        } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
+
+        return $database;
+    }
+
+    protected function getInfluxDB(Registry &$register): InfluxDatabase
+    {
+        /** @var InfluxDB\Client $client */
+        $client = $register->get('influxdb');
+        $attempts = 0;
+        $max = 10;
+        $sleep = 1;
+
+        do { // check if telegraf database is ready
+            try {
+                $attempts++;
+                $database = $client->selectDB('telegraf');
+                if (in_array('telegraf', $client->listDatabases())) {
+                    break; // leave the do-while if successful
+                }
+            } catch (\Throwable$th) {
+                Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= $max) {
+                    throw new \Exception('InfluxDB database not ready yet');
+                }
+                sleep($sleep);
+            }
+        } while ($attempts < $max);
+        return $database;
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Task/Usage.php b/src/Appwrite/Task/Usage.php
index f2f0b73f76..2093f32720 100644
--- a/src/Appwrite/Task/Usage.php
+++ b/src/Appwrite/Task/Usage.php
@@ -2,88 +2,21 @@
 
 namespace Appwrite\Task;
 
+use Appwrite\Platform\Action;
 use Throwable;
 use Exception;
 use Appwrite\Stats\Usage as InfluxUsage;
 use Appwrite\Stats\UsageDB;
-use InfluxDB\Database as InfluxDatabase;
 use Utopia\App;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Database;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Registry\Registry;
-use Utopia\Logger\Log;
-use Utopia\Platform\Action;
 
 class Usage extends Action
 {
     public const NAME = 'usage';
 
-    protected function getDatabase(Registry &$register, string $namespace): Database
-    {
-        $attempts = 0;
-
-        do {
-            try {
-                $attempts++;
-
-                $db = $register->get('db');
-                $redis = $register->get('cache');
-
-                $cache = new Cache(new RedisCache($redis));
-                $database = new Database(new MariaDB($db), $cache);
-                $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-                $database->setNamespace($namespace);
-
-                if (!$database->exists($database->getDefaultDatabase(), 'projects')) {
-                    throw new Exception('Projects collection not ready');
-                }
-                break; // leave loop if successful
-            } catch (\Exception$e) {
-                Console::warning("Database not ready. Retrying connection ({$attempts})...");
-                if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
-                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-                }
-                sleep(DATABASE_RECONNECT_SLEEP);
-            }
-        } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-
-        return $database;
-    }
-
-    protected function getInfluxDB(Registry &$register): InfluxDatabase
-    {
-        /** @var InfluxDB\Client $client */
-        $client = $register->get('influxdb');
-        $attempts = 0;
-        $max = 10;
-        $sleep = 1;
-
-        do { // check if telegraf database is ready
-            try {
-                $attempts++;
-                $database = $client->selectDB('telegraf');
-                if (in_array('telegraf', $client->listDatabases())) {
-                    break; // leave the do-while if successful
-                }
-            } catch (\Throwable$th) {
-                Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
-                if ($attempts >= $max) {
-                    throw new \Exception('InfluxDB database not ready yet');
-                }
-                sleep($sleep);
-            }
-        } while ($attempts < $max);
-        return $database;
-    }
-
     public function __construct()
     {
-
-
         $this
             ->desc('Schedules syncing data from influxdb to Appwrite console db')
             ->callback(fn () => $this->action());
@@ -91,45 +24,12 @@ class Usage extends Action
 
     public function action()
     {
-
         global $register;
 
         Authorization::disable();
         Authorization::setDefaultStatus(false);
 
-        $logError = function (Throwable $error, string $action = 'syncUsageStats') use ($register) {
-            $logger = $register->get('logger');
-
-            if ($logger) {
-                $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
-
-                $log = new Log();
-                $log->setNamespace("usage");
-                $log->setServer(\gethostname());
-                $log->setVersion($version);
-                $log->setType(Log::TYPE_ERROR);
-                $log->setMessage($error->getMessage());
-
-                $log->addTag('code', $error->getCode());
-                $log->addTag('verboseType', get_class($error));
-
-                $log->addExtra('file', $error->getFile());
-                $log->addExtra('line', $error->getLine());
-                $log->addExtra('trace', $error->getTraceAsString());
-                $log->addExtra('detailedTrace', $error->getTrace());
-
-                $log->setAction($action);
-
-                $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
-                $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-                $responseCode = $logger->addLog($log);
-                Console::info('Usage stats log pushed with status code: ' . $responseCode);
-            }
-
-            Console::warning("Failed: {$error->getMessage()}");
-            Console::warning($error->getTraceAsString());
-        };
+        $logError = fn(Throwable $error, string $action = 'syncUsageStats') => $this->logError($register, $error, $action);
 
         Console::title('Usage Aggregation V1');
         Console::success(APP_NAME . ' usage aggregation process v1 has started');

From 69feb7138a9f5eca0f9e3441ab15f2f35e6b219e Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 17 Jul 2022 01:29:45 +0000
Subject: [PATCH 09/65] update platform fix

---
 composer.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index 7f26a6e167..bb06931cd7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2446,7 +2446,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "fd133dd0f4d464c3aa6b4e5c338f7fc7201f8e4d"
+                "reference": "c187abd39d134287c1d71585083e4e99bf63ebb3"
             },
             "require": {
                 "ext-json": "*",
@@ -2498,7 +2498,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-07-17T01:05:38+00:00"
+            "time": "2022-07-17T01:28:06+00:00"
         },
         {
             "name": "utopia-php/preloader",

From bc4ec9652cb3b3369d00c2d448fdb64b10cdf096 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 17 Jul 2022 01:57:37 +0000
Subject: [PATCH 10/65] lint fixes

---
 src/Appwrite/Platform/Action.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Appwrite/Platform/Action.php b/src/Appwrite/Platform/Action.php
index 314d7ede20..3982acfbe4 100644
--- a/src/Appwrite/Platform/Action.php
+++ b/src/Appwrite/Platform/Action.php
@@ -15,8 +15,10 @@ use Utopia\Registry\Registry;
 use Utopia\Logger\Log;
 use Throwable;
 
-abstract class Action extends PlatformAction {
-    protected function logError(Registry $register, Throwable $error, string $action = 'syncUsageStats') {
+abstract class Action extends PlatformAction
+{
+    protected function logError(Registry $register, Throwable $error, string $action = 'syncUsageStats')
+    {
         $logger = $register->get('logger');
 
         if ($logger) {
@@ -107,4 +109,4 @@ abstract class Action extends PlatformAction {
         } while ($attempts < $max);
         return $database;
     }
-}
\ No newline at end of file
+}

From 2df3bc813a7243dd16ff998c8d5a327fea68b890 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 2 Aug 2022 01:32:46 +0000
Subject: [PATCH 11/65] refactor rename

---
 app/cli.php                                   |   7 +-
 app/tasks/doctor.php                          | 243 -----------------
 app/tasks/install.php                         | 242 -----------------
 app/tasks/maintenance.php                     | 151 ----------
 app/tasks/migrate.php                         |  84 ------
 app/tasks/sdks.php                            | 257 ------------------
 app/tasks/specs.php                           | 256 -----------------
 app/tasks/ssl.php                             |  24 --
 app/tasks/usage.php                           | 164 -----------
 app/tasks/vars.php                            |  25 --
 composer.lock                                 |   2 +-
 src/Appwrite/CLI/Tasks.php                    |  13 +
 src/Appwrite/{Task => CLI/Tasks}/Doctor.php   |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/Install.php  |   2 +-
 .../{Task => CLI/Tasks}/Maintenance.php       |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/Migrate.php  |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/SDKs.php     |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/SSL.php      |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/Specs.php    |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/Usage.php    |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/Vars.php     |   2 +-
 src/Appwrite/{Task => CLI/Tasks}/Version.php  |   2 +-
 .../{Task/Tasks.php => CLI/TasksService.php}  |  14 +-
 src/Appwrite/Task/CLIPlatform.php             |  13 -
 24 files changed, 40 insertions(+), 1475 deletions(-)
 delete mode 100644 app/tasks/doctor.php
 delete mode 100644 app/tasks/install.php
 delete mode 100644 app/tasks/maintenance.php
 delete mode 100644 app/tasks/migrate.php
 delete mode 100644 app/tasks/sdks.php
 delete mode 100644 app/tasks/specs.php
 delete mode 100644 app/tasks/ssl.php
 delete mode 100644 app/tasks/usage.php
 delete mode 100644 app/tasks/vars.php
 create mode 100644 src/Appwrite/CLI/Tasks.php
 rename src/Appwrite/{Task => CLI/Tasks}/Doctor.php (99%)
 rename src/Appwrite/{Task => CLI/Tasks}/Install.php (99%)
 rename src/Appwrite/{Task => CLI/Tasks}/Maintenance.php (99%)
 rename src/Appwrite/{Task => CLI/Tasks}/Migrate.php (99%)
 rename src/Appwrite/{Task => CLI/Tasks}/SDKs.php (99%)
 rename src/Appwrite/{Task => CLI/Tasks}/SSL.php (96%)
 rename src/Appwrite/{Task => CLI/Tasks}/Specs.php (99%)
 rename src/Appwrite/{Task => CLI/Tasks}/Usage.php (98%)
 rename src/Appwrite/{Task => CLI/Tasks}/Vars.php (96%)
 rename src/Appwrite/{Task => CLI/Tasks}/Version.php (92%)
 rename src/Appwrite/{Task/Tasks.php => CLI/TasksService.php} (64%)
 delete mode 100644 src/Appwrite/Task/CLIPlatform.php

diff --git a/app/cli.php b/app/cli.php
index 66c4208e14..ef0445e67f 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -3,13 +3,14 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';
 
-use Appwrite\Task\CLIPlatform;
+use Appwrite\CLI\Tasks;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Platform\Service;
 
 Authorization::disable();
 
-$cliPlatform = new CLIPlatform();
-$cliPlatform->init('CLI');
+$cliPlatform = new Tasks();
+$cliPlatform->init(Service::TYPE_CLI);
 
 $cli = $cliPlatform->getCli();
 $cli->run();
diff --git a/app/tasks/doctor.php b/app/tasks/doctor.php
deleted file mode 100644
index d79e8d530f..0000000000
--- a/app/tasks/doctor.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-
-global $cli;
-
-use Appwrite\ClamAV\Network;
-use Utopia\Logger\Logger;
-use Utopia\Storage\Device\Local;
-use Utopia\Storage\Storage;
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Domains\Domain;
-
-$cli
-    ->task('doctor')
-    ->desc('Validate server health')
-    ->action(function () use ($register) {
-        Console::log("  __   ____  ____  _  _  ____  __  ____  ____     __  __  
- / _\ (  _ \(  _ \/ )( \(  _ \(  )(_  _)(  __)   (  )/  \ 
-/    \ ) __/ ) __/\ /\ / )   / )(   )(   ) _)  _  )((  O )
-\_/\_/(__)  (__)  (_/\_)(__\_)(__) (__) (____)(_)(__)\__/ ");
-
-        Console::log("\n" . '👩‍⚕️ Running ' . APP_NAME . ' Doctor for version ' . App::getEnv('_APP_VERSION', 'UNKNOWN') . ' ...' . "\n");
-
-        Console::log('Checking for production best practices...');
-
-        $domain = new Domain(App::getEnv('_APP_DOMAIN'));
-
-        if (!$domain->isKnown() || $domain->isTest()) {
-            Console::log('🔴 Hostname has no public suffix (' . $domain->get() . ')');
-        } else {
-            Console::log('🟢 Hostname has a public suffix (' . $domain->get() . ')');
-        }
-
-        $domain = new Domain(App::getEnv('_APP_DOMAIN_TARGET'));
-
-        if (!$domain->isKnown() || $domain->isTest()) {
-            Console::log('🔴 CNAME target has no public suffix (' . $domain->get() . ')');
-        } else {
-            Console::log('🟢 CNAME target has a public suffix (' . $domain->get() . ')');
-        }
-
-        if (App::getEnv('_APP_OPENSSL_KEY_V1') === 'your-secret-key' || empty(App::getEnv('_APP_OPENSSL_KEY_V1'))) {
-            Console::log('🔴 Not using a unique secret key for encryption');
-        } else {
-            Console::log('🟢 Using a unique secret key for encryption');
-        }
-
-        if (App::getEnv('_APP_ENV', 'development') !== 'production') {
-            Console::log('🔴 App environment is set for development');
-        } else {
-            Console::log('🟢 App environment is set for production');
-        }
-
-        if ('enabled' !== App::getEnv('_APP_OPTIONS_ABUSE', 'disabled')) {
-            Console::log('🔴 Abuse protection is disabled');
-        } else {
-            Console::log('🟢 Abuse protection is enabled');
-        }
-
-        $authWhitelistRoot = App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', null);
-        $authWhitelistEmails = App::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null);
-        $authWhitelistIPs = App::getEnv('_APP_CONSOLE_WHITELIST_IPS', null);
-
-        if (
-            empty($authWhitelistRoot)
-            && empty($authWhitelistEmails)
-            && empty($authWhitelistIPs)
-        ) {
-            Console::log('🔴 Console access limits are disabled');
-        } else {
-            Console::log('🟢 Console access limits are enabled');
-        }
-
-        if ('enabled' !== App::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled')) {
-            Console::log('🔴 HTTPS force option is disabled');
-        } else {
-            Console::log('🟢 HTTPS force option is enabled');
-        }
-
-
-        $providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
-        $providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
-
-        if (empty($providerName) || empty($providerConfig) || !Logger::hasProvider($providerName)) {
-            Console::log('🔴 Logging adapter is disabled');
-        } else {
-            Console::log('🟢 Logging adapter is enabled (' . $providerName . ')');
-        }
-
-        \sleep(0.2);
-
-        try {
-            Console::log("\n" . 'Checking connectivity...');
-        } catch (\Throwable $th) {
-            //throw $th;
-        }
-
-        try {
-            $register->get('db'); /* @var $db PDO */
-            Console::success('Database............connected 👍');
-        } catch (\Throwable $th) {
-            Console::error('Database.........disconnected 👎');
-        }
-
-        try {
-            $register->get('cache');
-            Console::success('Queue...............connected 👍');
-        } catch (\Throwable $th) {
-            Console::error('Queue............disconnected 👎');
-        }
-
-        try {
-            $register->get('cache');
-            Console::success('Cache...............connected 👍');
-        } catch (\Throwable $th) {
-            Console::error('Cache............disconnected 👎');
-        }
-
-        if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled') { // Check if scans are enabled
-            try {
-                $antivirus = new Network(
-                    App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
-                    (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310)
-                );
-
-                if ((@$antivirus->ping())) {
-                    Console::success('Antivirus...........connected 👍');
-                } else {
-                    Console::error('Antivirus........disconnected 👎');
-                }
-            } catch (\Throwable $th) {
-                Console::error('Antivirus........disconnected 👎');
-            }
-        }
-
-        try {
-            $mail = $register->get('smtp'); /* @var $mail \PHPMailer\PHPMailer\PHPMailer */
-
-            $mail->addAddress('demo@example.com', 'Example.com');
-            $mail->Subject = 'Test SMTP Connection';
-            $mail->Body = 'Hello World';
-            $mail->AltBody = 'Hello World';
-
-            $mail->send();
-            Console::success('SMTP................connected 👍');
-        } catch (\Throwable $th) {
-            Console::error('SMTP.............disconnected 👎');
-        }
-
-        $host = App::getEnv('_APP_STATSD_HOST', 'telegraf');
-        $port = App::getEnv('_APP_STATSD_PORT', 8125);
-
-        if ($fp = @\fsockopen('udp://' . $host, $port, $errCode, $errStr, 2)) {
-            Console::success('StatsD..............connected 👍');
-            \fclose($fp);
-        } else {
-            Console::error('StatsD...........disconnected 👎');
-        }
-
-        $host = App::getEnv('_APP_INFLUXDB_HOST', '');
-        $port = App::getEnv('_APP_INFLUXDB_PORT', '');
-
-        if ($fp = @\fsockopen($host, $port, $errCode, $errStr, 2)) {
-            Console::success('InfluxDB............connected 👍');
-            \fclose($fp);
-        } else {
-            Console::error('InfluxDB.........disconnected 👎');
-        }
-
-        \sleep(0.2);
-
-        Console::log('');
-        Console::log('Checking volumes...');
-
-        foreach (
-            [
-            'Uploads' => APP_STORAGE_UPLOADS,
-            'Cache' => APP_STORAGE_CACHE,
-            'Config' => APP_STORAGE_CONFIG,
-            'Certs' => APP_STORAGE_CERTIFICATES
-            ] as $key => $volume
-        ) {
-            $device = new Local($volume);
-
-            if (\is_readable($device->getRoot())) {
-                Console::success('🟢 ' . $key . ' Volume is readable');
-            } else {
-                Console::error('🔴 ' . $key . ' Volume is unreadable');
-            }
-
-            if (\is_writable($device->getRoot())) {
-                Console::success('🟢 ' . $key . ' Volume is writeable');
-            } else {
-                Console::error('🔴 ' . $key . ' Volume is unwriteable');
-            }
-        }
-
-        \sleep(0.2);
-
-        Console::log('');
-        Console::log('Checking disk space usage...');
-
-        foreach (
-            [
-            'Uploads' => APP_STORAGE_UPLOADS,
-            'Cache' => APP_STORAGE_CACHE,
-            'Config' => APP_STORAGE_CONFIG,
-            'Certs' => APP_STORAGE_CERTIFICATES
-            ] as $key => $volume
-        ) {
-            $device = new Local($volume);
-
-            $percentage = (($device->getPartitionTotalSpace() - $device->getPartitionFreeSpace())
-            / $device->getPartitionTotalSpace()) * 100;
-
-            $message = $key . ' Volume has ' . Storage::human($device->getPartitionFreeSpace()) . ' free space (' . \round($percentage, 2) . '% used)';
-
-            if ($percentage < 80) {
-                Console::success('🟢 ' . $message);
-            } else {
-                Console::error('🔴 ' . $message);
-            }
-        }
-
-        try {
-            if (App::isProduction()) {
-                Console::log('');
-                $version = \json_decode(@\file_get_contents(App::getEnv('_APP_HOME', 'http://localhost') . '/v1/health/version'), true);
-
-                if ($version && isset($version['version'])) {
-                    if (\version_compare($version['version'], App::getEnv('_APP_VERSION', 'UNKNOWN')) === 0) {
-                        Console::info('You are running the latest version of ' . APP_NAME . '! 🥳');
-                    } else {
-                        Console::info('A new version (' . $version['version'] . ') is available! 🥳' . "\n");
-                    }
-                } else {
-                    Console::error('Failed to check for a newer version' . "\n");
-                }
-            }
-        } catch (\Throwable $th) {
-            Console::error('Failed to check for a newer version' . "\n");
-        }
-    });
diff --git a/app/tasks/install.php b/app/tasks/install.php
deleted file mode 100644
index 3519b58d0b..0000000000
--- a/app/tasks/install.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-global $cli;
-
-use Appwrite\Auth\Auth;
-use Appwrite\Docker\Compose;
-use Appwrite\Docker\Env;
-use Appwrite\Utopia\View;
-use Utopia\Analytics\GoogleAnalytics;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Validator\Text;
-
-$cli
-    ->task('install')
-    ->desc('Install Appwrite')
-    ->param('httpPort', '', new Text(4), 'Server HTTP port', true)
-    ->param('httpsPort', '', new Text(4), 'Server HTTPS port', true)
-    ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true)
-    ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
-    ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
-    ->action(function ($httpPort, $httpsPort, $organization, $image, $interactive) {
-        /**
-         * 1. Start - DONE
-         * 2. Check for older setup and get older version - DONE
-         *  2.1 If older version is equal or bigger(?) than current version, **stop setup**
-         *  2.2. Get ENV vars - DONE
-         *   2.2.1 Fetch from older docker-compose.yml file
-         *   2.2.2 Fetch from older .env file (manually parse)
-         *  2.3 Use old ENV vars as default values
-         *  2.4 Ask for all required vars not given as CLI args and if in interactive mode
-         *      Otherwise, just use default vars. - DONE
-         * 3. Ask user to backup important volumes, env vars, and SQL tables
-         *      In th future we can try and automate this for smaller/medium size setups
-         * 4. Drop new docker-compose.yml setup (located inside the container, no network dependencies with appwrite.io) - DONE
-         * 5. Run docker compose up -d - DONE
-         * 6. Run data migration
-         */
-        $config = Config::getParam('variables');
-        $path = '/usr/src/code/appwrite';
-        $defaultHTTPPort = '80';
-        $defaultHTTPSPort = '443';
-        $vars = [];
-
-        /**
-         * We are using a random value every execution for identification.
-         * This allows us to collect information without invading the privacy of our users.
-         */
-        $analytics = new GoogleAnalytics('UA-26264668-9', uniqid('server.', true));
-
-        foreach ($config as $category) {
-            foreach ($category['variables'] ?? [] as $var) {
-                $vars[] = $var;
-            }
-        }
-
-        Console::success('Starting Appwrite installation...');
-
-        // Create directory with write permissions
-        if (null !== $path && !\file_exists(\dirname($path))) {
-            if (!@\mkdir(\dirname($path), 0755, true)) {
-                Console::error('Can\'t create directory ' . \dirname($path));
-                Console::exit(1);
-            }
-        }
-
-        $data = @file_get_contents($path . '/docker-compose.yml');
-
-        if ($data !== false) {
-            $time = \time();
-            Console::info('Compose file found, creating backup: docker-compose.yml.' . $time . '.backup');
-            file_put_contents($path . '/docker-compose.yml.' . $time . '.backup', $data);
-            $compose = new Compose($data);
-            $appwrite = $compose->getService('appwrite');
-            $oldVersion = ($appwrite) ? $appwrite->getImageVersion() : null;
-            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
-                    if (!$service) {
-                        continue;
-                    }
-
-                    $env = $service->getEnvironment()->list();
-
-                    foreach ($env as $key => $value) {
-                        if (is_null($value)) {
-                            continue;
-                        }
-                        foreach ($vars as &$var) {
-                            if ($var['name'] === $key) {
-                                $var['default'] = $value;
-                            }
-                        }
-                    }
-                }
-
-                $data = @file_get_contents($path . '/.env');
-
-                if ($data !== false) { // Fetch all env vars from previous .env file
-                    Console::info('Env file found, creating backup: .env.' . $time . '.backup');
-                    file_put_contents($path . '/.env.' . $time . '.backup', $data);
-                    $env = new Env($data);
-
-                    foreach ($env->list() as $key => $value) {
-                        if (is_null($value)) {
-                            continue;
-                        }
-                        foreach ($vars as &$var) {
-                            if ($var['name'] === $key) {
-                                $var['default'] = $value;
-                            }
-                        }
-                    }
-                }
-
-                foreach ($ports as $key => $value) {
-                    if ($value === $defaultHTTPPort) {
-                        $defaultHTTPPort = $key;
-                    }
-
-                    if ($value === $defaultHTTPSPort) {
-                        $defaultHTTPSPort = $key;
-                    }
-                }
-            }
-        }
-
-        if (empty($httpPort)) {
-            $httpPort = Console::confirm('Choose your server HTTP port: (default: ' . $defaultHTTPPort . ')');
-            $httpPort = ($httpPort) ? $httpPort : $defaultHTTPPort;
-        }
-
-        if (empty($httpsPort)) {
-            $httpsPort = Console::confirm('Choose your server HTTPS port: (default: ' . $defaultHTTPSPort . ')');
-            $httpsPort = ($httpsPort) ? $httpsPort : $defaultHTTPSPort;
-        }
-
-        $input = [];
-
-        foreach ($vars as $key => $var) {
-            if (!empty($var['filter']) && ($interactive !== 'Y' || !Console::isInteractive())) {
-                if ($data && $var['default'] !== null) {
-                    $input[$var['name']] = $var['default'];
-                    continue;
-                }
-
-                if ($var['filter'] === 'token') {
-                    $input[$var['name']] = Auth::tokenGenerator();
-                    continue;
-                }
-
-                if ($var['filter'] === 'password') {
-                    $input[$var['name']] = Auth::passwordGenerator();
-                    continue;
-                }
-            }
-            if (!$var['required'] || !Console::isInteractive() || $interactive !== 'Y') {
-                $input[$var['name']] = $var['default'];
-                continue;
-            }
-
-            $input[$var['name']] = Console::confirm($var['question'] . ' (default: \'' . $var['default'] . '\')');
-
-            if (empty($input[$var['name']])) {
-                $input[$var['name']] = $var['default'];
-            }
-
-            if ($var['filter'] === 'domainTarget') {
-                if ($input[$var['name']] !== 'localhost') {
-                    Console::warning("\nIf you haven't already done so, set the following record for {$input[$var['name']]} on your DNS provider:\n");
-                    $mask = "%-15.15s %-10.10s %-30.30s\n";
-                    printf($mask, "Type", "Name", "Value");
-                    printf($mask, "A or AAAA", "@", "<YOUR PUBLIC IP>");
-                    Console::warning("\nUse 'AAAA' if you're using an IPv6 address and 'A' if you're using an IPv4 address.\n");
-                }
-            }
-        }
-
-        $templateForCompose = new View(__DIR__ . '/../views/install/compose.phtml');
-        $templateForEnv = new View(__DIR__ . '/../views/install/env.phtml');
-
-        $templateForCompose
-            ->setParam('httpPort', $httpPort)
-            ->setParam('httpsPort', $httpsPort)
-            ->setParam('version', APP_VERSION_STABLE)
-            ->setParam('organization', $organization)
-            ->setParam('image', $image)
-        ;
-
-        $templateForEnv
-            ->setParam('vars', $input)
-        ;
-
-        if (!file_put_contents($path . '/docker-compose.yml', $templateForCompose->render(false))) {
-            $message = 'Failed to save Docker Compose file';
-            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
-            Console::error($message);
-            Console::exit(1);
-        }
-
-        if (!file_put_contents($path . '/.env', $templateForEnv->render(false))) {
-            $message = 'Failed to save environment variables file';
-            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
-            Console::error($message);
-            Console::exit(1);
-        }
-
-        $env = '';
-        $stdout = '';
-        $stderr = '';
-
-        foreach ($input as $key => $value) {
-            if ($value) {
-                $env .= $key . '=' . \escapeshellarg($value) . ' ';
-            }
-        }
-
-        Console::log("Running \"docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
-
-        $exit = Console::execute("${env} docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
-
-        if ($exit !== 0) {
-            $message = 'Failed to install Appwrite dockers';
-            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
-            Console::error($message);
-            Console::error($stderr);
-            Console::exit($exit);
-        } else {
-            $message = 'Appwrite installed successfully';
-            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE . ' - ' . $message);
-            Console::success($message);
-        }
-    });
diff --git a/app/tasks/maintenance.php b/app/tasks/maintenance.php
deleted file mode 100644
index eb50dbc0e2..0000000000
--- a/app/tasks/maintenance.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-global $cli;
-global $register;
-
-use Appwrite\Auth\Auth;
-use Appwrite\Event\Certificate;
-use Appwrite\Event\Delete;
-use Utopia\App;
-use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Database;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-
-function getConsoleDB(): Database
-{
-    global $register;
-
-    $attempts = 0;
-
-    do {
-        try {
-            $attempts++;
-            $cache = new Cache(new RedisCache($register->get('cache')));
-            $database = new Database(new MariaDB($register->get('db')), $cache);
-            $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-            $database->setNamespace('_console'); // Main DB
-
-            if (!$database->exists($database->getDefaultDatabase(), 'certificates')) {
-                throw new \Exception('Console project not ready');
-            }
-
-            break; // leave loop if successful
-        } catch (\Exception $e) {
-            Console::warning("Database not ready. Retrying connection ({$attempts})...");
-            if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
-                throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-            }
-            sleep(DATABASE_RECONNECT_SLEEP);
-        }
-    } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-
-    return $database;
-}
-
-$cli
-    ->task('maintenance')
-    ->desc('Schedules maintenance tasks and publishes them to resque')
-    ->action(function () {
-        Console::title('Maintenance V1');
-        Console::success(APP_NAME . ' maintenance process v1 has started');
-
-        function notifyDeleteExecutionLogs(int $interval)
-        {
-            (new Delete())
-                ->setType(DELETE_TYPE_EXECUTIONS)
-                ->setTimestamp(time() - $interval)
-                ->trigger();
-        }
-
-        function notifyDeleteAbuseLogs(int $interval)
-        {
-            (new Delete())
-                ->setType(DELETE_TYPE_ABUSE)
-                ->setTimestamp(time() - $interval)
-                ->trigger();
-        }
-
-        function notifyDeleteAuditLogs(int $interval)
-        {
-            (new Delete())
-                ->setType(DELETE_TYPE_AUDIT)
-                ->setTimestamp(time() - $interval)
-                ->trigger();
-        }
-
-        function notifyDeleteUsageStats(int $interval30m, int $interval1d)
-        {
-            (new Delete())
-                ->setType(DELETE_TYPE_USAGE)
-                ->setTimestamp1d(time() - $interval1d)
-                ->setTimestamp30m(time() - $interval30m)
-                ->trigger();
-        }
-
-        function notifyDeleteConnections()
-        {
-            (new Delete())
-                ->setType(DELETE_TYPE_REALTIME)
-                ->setTimestamp(time() - 60)
-                ->trigger();
-        }
-
-        function notifyDeleteExpiredSessions()
-        {
-            (new Delete())
-                ->setType(DELETE_TYPE_SESSIONS)
-                ->setTimestamp(time() - Auth::TOKEN_EXPIRATION_LOGIN_LONG)
-                ->trigger();
-        }
-
-        function renewCertificates($dbForConsole)
-        {
-            $time = date('d-m-Y H:i:s', time());
-            $certificates = $dbForConsole->find('certificates', [
-                new Query('attempts', Query::TYPE_LESSEREQUAL, [5]), // Maximum 5 attempts
-                new Query('renewDate', Query::TYPE_LESSEREQUAL, [\time()]) // includes 60 days cooldown (we have 30 days to renew)
-            ], 200); // Limit 200 comes from LetsEncrypt (300 orders per 3 hours, keeping some for new domains)
-
-
-            if (\count($certificates) > 0) {
-                Console::info("[{$time}] Found " . \count($certificates) . " certificates for renewal, scheduling jobs.");
-
-                $event = new Certificate();
-                foreach ($certificates as $certificate) {
-                    $event
-                        ->setDomain(new Document([
-                            'domain' => $certificate->getAttribute('domain')
-                        ]))
-                        ->trigger();
-                }
-            } else {
-                Console::info("[{$time}] No certificates for renewal.");
-            }
-        }
-
-        // # of days in seconds (1 day = 86400s)
-        $interval = (int) App::getEnv('_APP_MAINTENANCE_INTERVAL', '86400');
-        $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600');
-        $auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', '1209600');
-        $abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', '86400');
-        $usageStatsRetention30m = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_30M', '129600'); //36 hours
-        $usageStatsRetention1d = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_1D', '8640000'); // 100 days
-
-        Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetention30m, $usageStatsRetention1d) {
-            $database = getConsoleDB();
-
-            $time = date('d-m-Y H:i:s', time());
-            Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
-            notifyDeleteExecutionLogs($executionLogsRetention);
-            notifyDeleteAbuseLogs($abuseLogsRetention);
-            notifyDeleteAuditLogs($auditLogRetention);
-            notifyDeleteUsageStats($usageStatsRetention30m, $usageStatsRetention1d);
-            notifyDeleteConnections();
-            notifyDeleteExpiredSessions();
-            renewCertificates($database);
-        }, $interval);
-    });
diff --git a/app/tasks/migrate.php b/app/tasks/migrate.php
deleted file mode 100644
index ff5ec3593f..0000000000
--- a/app/tasks/migrate.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-global $cli, $register;
-
-use Utopia\CLI\Console;
-use Appwrite\Migration\Migration;
-use Utopia\App;
-use Utopia\Cache\Cache;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Validator\Text;
-
-$cli
-    ->task('migrate')
-    ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
-    ->action(function ($version) use ($register) {
-        Authorization::disable();
-        if (!array_key_exists($version, Migration::$versions)) {
-            Console::error("Version {$version} not found.");
-            Console::exit(1);
-            return;
-        }
-
-        $app = new App('UTC');
-
-        Console::success('Starting Data Migration to version ' . $version);
-
-        $db = $register->get('db', true);
-        $redis = $register->get('cache', true);
-        $redis->flushAll();
-        $cache = new Cache(new RedisCache($redis));
-
-        $projectDB = new Database(new MariaDB($db), $cache);
-        $projectDB->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-
-        $consoleDB = new Database(new MariaDB($db), $cache);
-        $consoleDB->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-        $consoleDB->setNamespace('_project_console');
-
-        $console = $app->getResource('console');
-
-        $limit = 30;
-        $sum = 30;
-        $offset = 0;
-        $projects = [$console];
-        $count = 0;
-
-        try {
-            $totalProjects = $consoleDB->count('projects') + 1;
-        } catch (\Throwable $th) {
-            $consoleDB->setNamespace('_console');
-            $totalProjects = $consoleDB->count('projects') + 1;
-        }
-
-        $class = 'Appwrite\\Migration\\Version\\' . Migration::$versions[$version];
-        $migration = new $class();
-
-        while (!empty($projects)) {
-            foreach ($projects as $project) {
-                try {
-                    $migration
-                        ->setProject($project, $projectDB, $consoleDB)
-                        ->execute();
-                } catch (\Throwable $th) {
-                    throw $th;
-                    Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
-                }
-            }
-
-            $sum = \count($projects);
-            $projects = $consoleDB->find('projects', limit: $limit, offset: $offset);
-
-            $offset = $offset + $limit;
-            $count = $count + $sum;
-
-            Console::log('Migrated ' . $count . '/' . $totalProjects . ' projects...');
-        }
-
-        Swoole\Event::wait(); // Wait for Coroutines to finish
-        $redis->flushAll();
-        Console::success('Data Migration Completed');
-    });
diff --git a/app/tasks/sdks.php b/app/tasks/sdks.php
deleted file mode 100644
index d873167743..0000000000
--- a/app/tasks/sdks.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-use Utopia\Config\Config;
-use Utopia\CLI\Console;
-use Appwrite\Spec\Swagger2;
-use Appwrite\SDK\SDK;
-use Appwrite\SDK\Language\CLI;
-use Appwrite\SDK\Language\PHP;
-use Appwrite\SDK\Language\Web;
-use Appwrite\SDK\Language\Node;
-use Appwrite\SDK\Language\Python;
-use Appwrite\SDK\Language\Ruby;
-use Appwrite\SDK\Language\Dart;
-use Appwrite\SDK\Language\Deno;
-use Appwrite\SDK\Language\DotNet;
-use Appwrite\SDK\Language\Flutter;
-use Appwrite\SDK\Language\Go;
-use Appwrite\SDK\Language\Kotlin;
-use Appwrite\SDK\Language\Android;
-use Appwrite\SDK\Language\Swift;
-use Appwrite\SDK\Language\SwiftClient;
-
-$cli
-    ->task('sdks')
-    ->action(function () {
-        $platforms = Config::getParam('platforms');
-        $selected = \strtolower(Console::confirm('Choose SDK ("*" for all):'));
-        $version = Console::confirm('Choose an Appwrite version');
-        $git = (Console::confirm('Should we use git push? (yes/no)') == 'yes');
-        $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', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', 'latest'])) {
-            throw new Exception('Unknown version given');
-        }
-
-        foreach ($platforms as $key => $platform) {
-            foreach ($platform['languages'] as $language) {
-                if ($selected !== $language['key'] && $selected !== '*') {
-                    continue;
-                }
-
-                if (!$language['enabled']) {
-                    Console::warning($language['name'] . ' for ' . $platform['name'] . ' is disabled');
-                    continue;
-                }
-
-                Console::info('Fetching API Spec for ' . $language['name'] . ' for ' . $platform['name'] . ' (version: ' . $version . ')');
-
-                $spec = file_get_contents(__DIR__ . '/../config/specs/swagger2-' . $version . '-' . $language['family'] . '.json');
-
-                $cover = 'https://appwrite.io/images/github.png';
-                $result = \realpath(__DIR__ . '/..') . '/sdks/' . $key . '-' . $language['key'];
-                $resultExamples = \realpath(__DIR__ . '/../..') . '/docs/examples/' . $version . '/' . $key . '-' . $language['key'];
-                $target = \realpath(__DIR__ . '/..') . '/sdks/git/' . $language['key'] . '/';
-                $readme = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/README.md');
-                $readme = ($readme) ? \file_get_contents($readme) : '';
-                $gettingStarted = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/GETTING_STARTED.md');
-                $gettingStarted = ($gettingStarted) ? \file_get_contents($gettingStarted) : '';
-                $examples = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/EXAMPLES.md');
-                $examples = ($examples) ? \file_get_contents($examples) : '';
-                $changelog = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/CHANGELOG.md');
-                $changelog = ($changelog) ? \file_get_contents($changelog) : '# Change Log';
-                $warning = '**This SDK is compatible with Appwrite server version ' . $version . '. For older versions, please check [previous releases](' . $language['url'] . '/releases).**';
-                $license = 'BSD-3-Clause';
-                $licenseContent = 'Copyright (c) ' . date('Y') . ' Appwrite (https://appwrite.io) and individual contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-    3. Neither the name Appwrite nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.';
-
-                switch ($language['key']) {
-                    case 'web':
-                        $config = new Web();
-                        $config->setNPMPackage('appwrite');
-                        $config->setBowerPackage('appwrite');
-                        break;
-                    case 'cli':
-                        $config = new CLI();
-                        $config->setNPMPackage('appwrite-cli');
-                        $config->setExecutableName('appwrite');
-                        $config->setLogo(json_encode("
-    _                            _ _           ___   __   _____ 
-   /_\  _ __  _ ____      ___ __(_) |_ ___    / __\ / /   \_   \
-  //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \  / /   / /     / /\/
- /  _  \ |_) | |_) \ V  V /| |  | | ||  __/ / /___/ /___/\/ /_  
- \_/ \_/ .__/| .__/ \_/\_/ |_|  |_|\__\___| \____/\____/\____/  
-       |_|   |_|                                                
-
-"));
-                        $config->setLogoUnescaped("
-     _                            _ _           ___   __   _____ 
-    /_\  _ __  _ ____      ___ __(_) |_ ___    / __\ / /   \_   \
-   //_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \  / /   / /     / /\/
-  /  _  \ |_) | |_) \ V  V /| |  | | ||  __/ / /___/ /___/\/ /_  
-  \_/ \_/ .__/| .__/ \_/\_/ |_|  |_|\__\___| \____/\____/\____/  
-        |_|   |_|                                                ");
-                        break;
-                    case 'php':
-                        $config = new PHP();
-                        $config->setComposerVendor('appwrite');
-                        $config->setComposerPackage('appwrite');
-                        break;
-                    case 'nodejs':
-                        $config = new Node();
-                        $config->setNPMPackage('node-appwrite');
-                        $config->setBowerPackage('appwrite');
-                        $warning = $warning . "\n\n > This is the Node.js SDK for integrating with Appwrite from your Node.js server-side code.
-                            If you're looking to integrate from the browser, you should check [appwrite/sdk-for-web](https://github.com/appwrite/sdk-for-web)";
-                        break;
-                    case 'deno':
-                        $config = new Deno();
-                        break;
-                    case 'python':
-                        $config = new Python();
-                        $config->setPipPackage('appwrite');
-                        $license = 'BSD License'; // license edited due to classifiers in pypi
-                        break;
-                    case 'ruby':
-                        $config = new Ruby();
-                        $config->setGemPackage('appwrite');
-                        break;
-                    case 'flutter':
-                        $config = new Flutter();
-                        $config->setPackageName('appwrite');
-                        break;
-                    case 'flutter-dev':
-                        $config = new Flutter();
-                        $config->setPackageName('appwrite_dev');
-                        break;
-                    case 'dart':
-                        $config = new Dart();
-                        $config->setPackageName('dart_appwrite');
-                        $warning = $warning . "\n\n > This is the Dart SDK for integrating with Appwrite from your Dart server-side code. If you're looking for the Flutter SDK you should check [appwrite/sdk-for-flutter](https://github.com/appwrite/sdk-for-flutter)";
-                        break;
-                    case 'go':
-                        $config = new Go();
-                        break;
-                    case 'swift':
-                        $config = new Swift();
-                        $warning = $warning . "\n\n > This is the Swift SDK for integrating with Appwrite from your Swift server-side code. If you're looking for the Apple SDK you should check [appwrite/sdk-for-apple](https://github.com/appwrite/sdk-for-apple)";
-                        break;
-                    case 'apple':
-                        $config = new SwiftClient();
-                        break;
-                    case 'dotnet':
-                        $cover = '';
-                        $config = new DotNet();
-                        break;
-                    case 'android':
-                        $config = new Android();
-                        break;
-                    case 'kotlin':
-                        $config = new Kotlin();
-                        $warning = $warning . "\n\n > This is the Kotlin SDK for integrating with Appwrite from your Kotlin server-side code. If you're looking for the Android SDK you should check [appwrite/sdk-for-android](https://github.com/appwrite/sdk-for-android)";
-                        break;
-                    default:
-                        throw new Exception('Language "' . $language['key'] . '" not supported');
-                        break;
-                }
-
-                Console::info("Generating {$language['name']} SDK...");
-
-                $sdk = new SDK($config, new Swagger2($spec));
-
-                $sdk
-                    ->setName($language['name'])
-                    ->setNamespace('io appwrite')
-                    ->setDescription("Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the {$language['name']} SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)")
-                    ->setShortDescription('Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API')
-                    ->setLicense($license)
-                    ->setLicenseContent($licenseContent)
-                    ->setVersion($language['version'])
-                    ->setGitURL($language['url'])
-                    ->setGitRepo($language['gitUrl'])
-                    ->setGitRepoName($language['gitRepoName'])
-                    ->setGitUserName($language['gitUserName'])
-                    ->setLogo($cover)
-                    ->setURL('https://appwrite.io')
-                    ->setShareText('Appwrite is a backend as a service for building web or mobile apps')
-                    ->setShareURL('http://appwrite.io')
-                    ->setShareTags('JS,javascript,reactjs,angular,ios,android,serverless')
-                    ->setShareVia('appwrite')
-                    ->setWarning($warning)
-                    ->setReadme($readme)
-                    ->setGettingStarted($gettingStarted)
-                    ->setChangelog($changelog)
-                    ->setExamples($examples)
-                    ->setTwitter(APP_SOCIAL_TWITTER_HANDLE)
-                    ->setDiscord(APP_SOCIAL_DISCORD_CHANNEL, APP_SOCIAL_DISCORD)
-                    ->setDefaultHeaders([
-                        'X-Appwrite-Response-Format' => '0.15.0',
-                    ]);
-
-                try {
-                    $sdk->generate($result);
-                } catch (Exception $exception) {
-                    Console::error($exception->getMessage());
-                } catch (Throwable $exception) {
-                    Console::error($exception->getMessage());
-                }
-
-                $gitUrl = $language['gitUrl'];
-                $gitBranch = $language['gitBranch'];
-
-
-                if (!$production) {
-                    $gitUrl = 'git@github.com:aw-tests/' . $language['gitRepoName'] . '.git';
-                }
-
-                if ($git && !empty($gitUrl)) {
-                    \exec('rm -rf ' . $target . ' && \
-                        mkdir -p ' . $target . ' && \
-                        cd ' . $target . ' && \
-                        git init --initial-branch=' . $gitBranch . ' && \
-                        git remote add origin ' . $gitUrl . ' && \
-                        git fetch && \
-                        git pull ' . $gitUrl . ' && \
-                        rm -rf ' . $target . '/* && \
-                        cp -r ' . $result . '/* ' . $target . '/ && \
-                        git add . && \
-                        git commit -m "' . $message . '" && \
-                        git push -u origin ' . $gitBranch . '
-                    ');
-
-                    Console::success("Pushed {$language['name']} SDK to {$gitUrl}");
-
-                    \exec('rm -rf ' . $target);
-                    Console::success("Remove temp directory '{$target}' for {$language['name']} SDK");
-                }
-
-                $docDirectories = $language['docDirectories'] ?? [''];
-
-                if ($version === 'latest') {
-                    continue;
-                }
-
-                foreach ($docDirectories as $languageTitle => $path) {
-                    $languagePath = strtolower($languageTitle !== 0 ? '/' . $languageTitle : '');
-                    \exec(
-                        'mkdir -p ' . $resultExamples . $languagePath . ' && \
-                        cp -r ' . $result . '/docs/examples' . $languagePath . ' ' . $resultExamples
-                    );
-                    Console::success("Copied code examples for {$language['name']} SDK to: {$resultExamples}");
-                }
-            }
-        }
-
-        Console::exit();
-    });
diff --git a/app/tasks/specs.php b/app/tasks/specs.php
deleted file mode 100644
index 8e8fdb4e7c..0000000000
--- a/app/tasks/specs.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-global $cli;
-
-use Utopia\Validator\Text;
-use Appwrite\Specification\Format\OpenAPI3;
-use Appwrite\Specification\Format\Swagger2;
-use Appwrite\Specification\Specification;
-use Appwrite\Utopia\Response;
-use Swoole\Http\Response as HttpResponse;
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Request;
-use Utopia\Validator\WhiteList;
-
-$cli
-    ->task('specs')
-    ->param('version', 'latest', new Text(8), 'Spec version', true)
-    ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
-    ->action(function ($version, $mode) use ($register) {
-        $db = $register->get('db');
-        $redis = $register->get('cache');
-        $appRoutes = App::getRoutes();
-        $response = new Response(new HttpResponse());
-        $mocks = ($mode === 'mocks');
-
-        App::setResource('request', fn () => new Request());
-        App::setResource('response', fn () => $response);
-        App::setResource('db', fn () => $db);
-        App::setResource('cache', fn () => $redis);
-
-        $platforms = [
-            'client' => APP_PLATFORM_CLIENT,
-            'server' => APP_PLATFORM_SERVER,
-            'console' => APP_PLATFORM_CONSOLE,
-        ];
-
-        $authCounts = [
-            'client' => 1,
-            'server' => 2,
-            'console' => 1,
-        ];
-
-        $keys = [
-            APP_PLATFORM_CLIENT => [
-                'Project' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Project',
-                    'description' => 'Your project ID',
-                    'in' => 'header',
-                ],
-                'JWT' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-JWT',
-                    'description' => 'Your secret JSON Web Token',
-                    'in' => 'header',
-                ],
-                'Locale' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Locale',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-            ],
-            APP_PLATFORM_SERVER => [
-                'Project' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Project',
-                    'description' => 'Your project ID',
-                    'in' => 'header',
-                ],
-                'Key' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Key',
-                    'description' => 'Your secret API key',
-                    'in' => 'header',
-                ],
-                'JWT' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-JWT',
-                    'description' => 'Your secret JSON Web Token',
-                    'in' => 'header',
-                ],
-                'Locale' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Locale',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-            ],
-            APP_PLATFORM_CONSOLE => [
-                'Project' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Project',
-                    'description' => 'Your project ID',
-                    'in' => 'header',
-                ],
-                'Key' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Key',
-                    'description' => 'Your secret API key',
-                    'in' => 'header',
-                ],
-                'JWT' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-JWT',
-                    'description' => 'Your secret JSON Web Token',
-                    'in' => 'header',
-                ],
-                'Locale' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Locale',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-                'Mode' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Mode',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-            ],
-        ];
-
-        foreach ($platforms as $platform) {
-            $routes = [];
-            $models = [];
-            $services = [];
-
-            foreach ($appRoutes as $key => $method) {
-                foreach ($method as $route) {
-                    /** @var \Utopia\Route $route */
-                    $routeSecurity = $route->getLabel('sdk.auth', []);
-                    $sdkPlaforms = [];
-
-                    foreach ($routeSecurity as $value) {
-                        switch ($value) {
-                            case APP_AUTH_TYPE_SESSION:
-                                $sdkPlaforms[] = APP_PLATFORM_CLIENT;
-                                break;
-                            case APP_AUTH_TYPE_KEY:
-                                $sdkPlaforms[] = APP_PLATFORM_SERVER;
-                                break;
-                            case APP_AUTH_TYPE_JWT:
-                                $sdkPlaforms[] = APP_PLATFORM_SERVER;
-                                break;
-                            case APP_AUTH_TYPE_ADMIN:
-                                $sdkPlaforms[] = APP_PLATFORM_CONSOLE;
-                                break;
-                        }
-                    }
-
-                    if (empty($routeSecurity)) {
-                        $sdkPlaforms[] = APP_PLATFORM_CLIENT;
-                    }
-
-                    if (!$route->getLabel('docs', true)) {
-                        continue;
-                    }
-
-                    if ($route->getLabel('sdk.mock', false) && !$mocks) {
-                        continue;
-                    }
-
-                    if (!$route->getLabel('sdk.mock', false) && $mocks) {
-                        continue;
-                    }
-
-                    if (empty($route->getLabel('sdk.namespace', null))) {
-                        continue;
-                    }
-
-                    if ($platform !== APP_PLATFORM_CONSOLE && !\in_array($platforms[$platform], $sdkPlaforms)) {
-                        continue;
-                    }
-
-                    $routes[] = $route;
-                }
-            }
-
-            foreach (Config::getParam('services', []) as $service) {
-                if (
-                    !isset($service['docs']) // Skip service if not part of the public API
-                    || !isset($service['sdk'])
-                    || !$service['docs']
-                    || !$service['sdk']
-                ) {
-                    continue;
-                }
-
-                $services[] = [
-                    'name' => $service['key'] ?? '',
-                    'description' => $service['subtitle'] ?? '',
-                    'x-globalAttributes' => $service['globalAttributes'] ?? [],
-                ];
-            }
-
-            $models = $response->getModels();
-
-            foreach ($models as $key => $value) {
-                if ($platform !== APP_PLATFORM_CONSOLE && !$value->isPublic()) {
-                    unset($models[$key]);
-                }
-            }
-            // var_dump($models);
-            $arguments = [new App('UTC'), $services, $routes, $models, $keys[$platform], $authCounts[$platform] ?? 0];
-            foreach (['swagger2', 'open-api3'] as $format) {
-                $formatInstance = match ($format) {
-                    'swagger2' => new Swagger2(...$arguments),
-                    'open-api3' => new OpenAPI3(...$arguments),
-                    default => throw new Exception('Format not found: ' . $format)
-                };
-
-                $specs = new Specification($formatInstance);
-                $endpoint = App::getEnv('_APP_HOME', '[HOSTNAME]');
-                $email = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
-
-                $formatInstance
-                    ->setParam('name', APP_NAME)
-                    ->setParam('description', 'Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)')
-                    ->setParam('endpoint', 'https://HOSTNAME/v1')
-                    ->setParam('version', APP_VERSION_STABLE)
-                    ->setParam('terms', $endpoint . '/policy/terms')
-                    ->setParam('support.email', $email)
-                    ->setParam('support.url', $endpoint . '/support')
-                    ->setParam('contact.name', APP_NAME . ' Team')
-                    ->setParam('contact.email', $email)
-                    ->setParam('contact.url', $endpoint . '/support')
-                    ->setParam('license.name', 'BSD-3-Clause')
-                    ->setParam('license.url', 'https://raw.githubusercontent.com/appwrite/appwrite/master/LICENSE')
-                    ->setParam('docs.description', 'Full API docs, specs and tutorials')
-                    ->setParam('docs.url', $endpoint . '/docs');
-
-                if ($mocks) {
-                    $path = __DIR__ . '/../config/specs/' . $format . '-mocks-' . $platform . '.json';
-
-                    if (!file_put_contents($path, json_encode($specs->parse()))) {
-                        throw new Exception('Failed to save mocks spec file: ' . $path);
-                    }
-
-                    Console::success('Saved mocks spec file: ' . realpath($path));
-
-                    continue;
-                }
-
-                $path = __DIR__ . '/../config/specs/' . $format . '-' . $version . '-' . $platform . '.json';
-
-                if (!file_put_contents($path, json_encode($specs->parse()))) {
-                    throw new Exception('Failed to save spec file: ' . $path);
-                }
-
-                Console::success('Saved spec file: ' . realpath($path));
-            }
-        }
-    });
diff --git a/app/tasks/ssl.php b/app/tasks/ssl.php
deleted file mode 100644
index 345da1f22e..0000000000
--- a/app/tasks/ssl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-global $cli;
-
-use Appwrite\Event\Certificate;
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Database\Document;
-use Utopia\Validator\Hostname;
-
-$cli
-    ->task('ssl')
-    ->desc('Validate server certificates')
-    ->param('domain', App::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
-    ->action(function ($domain) {
-        Console::success('Scheduling a job to issue a TLS certificate for domain: ' . $domain);
-
-        (new Certificate())
-            ->setDomain(new Document([
-                'domain' => $domain
-            ]))
-            ->setSkipRenewCheck(true)
-            ->trigger();
-    });
diff --git a/app/tasks/usage.php b/app/tasks/usage.php
deleted file mode 100644
index 7a22d7e79f..0000000000
--- a/app/tasks/usage.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-global $cli, $register;
-
-use Appwrite\Stats\Usage;
-use Appwrite\Stats\UsageDB;
-use InfluxDB\Database as InfluxDatabase;
-use Utopia\App;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Registry\Registry;
-use Utopia\Logger\Log;
-
-Authorization::disable();
-Authorization::setDefaultStatus(false);
-
-function getDatabase(Registry &$register, string $namespace): Database
-{
-    $attempts = 0;
-
-    do {
-        try {
-            $attempts++;
-
-            $db = $register->get('db');
-            $redis = $register->get('cache');
-
-            $cache = new Cache(new RedisCache($redis));
-            $database = new Database(new MariaDB($db), $cache);
-            $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-            $database->setNamespace($namespace);
-
-            if (!$database->exists($database->getDefaultDatabase(), 'projects')) {
-                throw new Exception('Projects collection not ready');
-            }
-            break; // leave loop if successful
-        } catch (\Exception$e) {
-            Console::warning("Database not ready. Retrying connection ({$attempts})...");
-            if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
-                throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-            }
-            sleep(DATABASE_RECONNECT_SLEEP);
-        }
-    } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-
-    return $database;
-}
-
-function getInfluxDB(Registry &$register): InfluxDatabase
-{
-    /** @var InfluxDB\Client $client */
-    $client = $register->get('influxdb');
-    $attempts = 0;
-    $max = 10;
-    $sleep = 1;
-
-    do { // check if telegraf database is ready
-        try {
-            $attempts++;
-            $database = $client->selectDB('telegraf');
-            if (in_array('telegraf', $client->listDatabases())) {
-                break; // leave the do-while if successful
-            }
-        } catch (\Throwable$th) {
-            Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
-            if ($attempts >= $max) {
-                throw new \Exception('InfluxDB database not ready yet');
-            }
-            sleep($sleep);
-        }
-    } while ($attempts < $max);
-    return $database;
-}
-
-$logError = function (Throwable $error, string $action = 'syncUsageStats') use ($register) {
-    $logger = $register->get('logger');
-
-    if ($logger) {
-        $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
-
-        $log = new Log();
-        $log->setNamespace("usage");
-        $log->setServer(\gethostname());
-        $log->setVersion($version);
-        $log->setType(Log::TYPE_ERROR);
-        $log->setMessage($error->getMessage());
-
-        $log->addTag('code', $error->getCode());
-        $log->addTag('verboseType', get_class($error));
-
-        $log->addExtra('file', $error->getFile());
-        $log->addExtra('line', $error->getLine());
-        $log->addExtra('trace', $error->getTraceAsString());
-        $log->addExtra('detailedTrace', $error->getTrace());
-
-        $log->setAction($action);
-
-        $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
-        $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-        $responseCode = $logger->addLog($log);
-        Console::info('Usage stats log pushed with status code: ' . $responseCode);
-    }
-
-    Console::warning("Failed: {$error->getMessage()}");
-    Console::warning($error->getTraceAsString());
-};
-
-$cli
-    ->task('usage')
-    ->desc('Schedules syncing data from influxdb to Appwrite console db')
-    ->action(function () use ($register, $logError) {
-        Console::title('Usage Aggregation V1');
-        Console::success(APP_NAME . ' usage aggregation process v1 has started');
-
-        $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
-
-        $database = getDatabase($register, '_console');
-        $influxDB = getInfluxDB($register);
-
-        $usage = new Usage($database, $influxDB, $logError);
-        $usageDB = new UsageDB($database, $logError);
-
-        $iterations = 0;
-        Console::loop(function () use ($interval, $usage, $usageDB, &$iterations) {
-            $now = date('d-m-Y H:i:s', time());
-            Console::info("[{$now}] Aggregating usage data every {$interval} seconds");
-
-            $loopStart = microtime(true);
-
-            /**
-             * Aggregate InfluxDB every 30 seconds
-             */
-            $usage->collect();
-
-            if ($iterations % 30 != 0) { // return if 30 iterations has not passed
-                $iterations++;
-                $loopTook = microtime(true) - $loopStart;
-                $now = date('d-m-Y H:i:s', time());
-                Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-                return;
-            }
-
-            $iterations = 0; // Reset iterations to prevent overflow when running for long time
-            /**
-             * Aggregate MariaDB every 15 minutes
-             * Some of the queries here might contain full-table scans.
-             */
-            $now = date('d-m-Y H:i:s', time());
-            Console::info("[{$now}] Aggregating database counters.");
-
-            $usageDB->collect();
-
-            $iterations++;
-            $loopTook = microtime(true) - $loopStart;
-            $now = date('d-m-Y H:i:s', time());
-
-            Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-        }, $interval);
-    });
diff --git a/app/tasks/vars.php b/app/tasks/vars.php
deleted file mode 100644
index af972e218d..0000000000
--- a/app/tasks/vars.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-global $cli;
-
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-
-$cli
-    ->task('vars')
-    ->desc('List all the server environment variables')
-    ->action(function () {
-        $config = Config::getParam('variables', []);
-        $vars = [];
-
-        foreach ($config as $category) {
-            foreach ($category['variables'] ?? [] as $var) {
-                $vars[] = $var;
-            }
-        }
-
-        foreach ($vars as $key => $value) {
-            Console::log('- ' . $value['name'] . '=' . App::getEnv($value['name'], ''));
-        }
-    });
diff --git a/composer.lock b/composer.lock
index f2bc50530e..b94d95b84a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5441,5 +5441,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/src/Appwrite/CLI/Tasks.php b/src/Appwrite/CLI/Tasks.php
new file mode 100644
index 0000000000..7f07b8137a
--- /dev/null
+++ b/src/Appwrite/CLI/Tasks.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Appwrite\CLI;
+
+use Utopia\Platform\Platform;
+
+class Tasks extends Platform
+{
+    public function __construct()
+    {
+        $this->addService('cliTasks', new TasksService());
+    }
+}
diff --git a/src/Appwrite/Task/Doctor.php b/src/Appwrite/CLI/Tasks/Doctor.php
similarity index 99%
rename from src/Appwrite/Task/Doctor.php
rename to src/Appwrite/CLI/Tasks/Doctor.php
index 281efe4d35..35fe9d048e 100644
--- a/src/Appwrite/Task/Doctor.php
+++ b/src/Appwrite/CLI/Tasks/Doctor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\App;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/Task/Install.php b/src/Appwrite/CLI/Tasks/Install.php
similarity index 99%
rename from src/Appwrite/Task/Install.php
rename to src/Appwrite/CLI/Tasks/Install.php
index fe3fb826d4..fbf2ec5a3b 100644
--- a/src/Appwrite/Task/Install.php
+++ b/src/Appwrite/CLI/Tasks/Install.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Docker\Compose;
diff --git a/src/Appwrite/Task/Maintenance.php b/src/Appwrite/CLI/Tasks/Maintenance.php
similarity index 99%
rename from src/Appwrite/Task/Maintenance.php
rename to src/Appwrite/CLI/Tasks/Maintenance.php
index 8fbe282622..b535bdb7e1 100644
--- a/src/Appwrite/Task/Maintenance.php
+++ b/src/Appwrite/CLI/Tasks/Maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
diff --git a/src/Appwrite/Task/Migrate.php b/src/Appwrite/CLI/Tasks/Migrate.php
similarity index 99%
rename from src/Appwrite/Task/Migrate.php
rename to src/Appwrite/CLI/Tasks/Migrate.php
index d1c154a0df..1e5d06a7c7 100644
--- a/src/Appwrite/Task/Migrate.php
+++ b/src/Appwrite/CLI/Tasks/Migrate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/Task/SDKs.php b/src/Appwrite/CLI/Tasks/SDKs.php
similarity index 99%
rename from src/Appwrite/Task/SDKs.php
rename to src/Appwrite/CLI/Tasks/SDKs.php
index 0bbe10bbc9..ea9fc51452 100644
--- a/src/Appwrite/Task/SDKs.php
+++ b/src/Appwrite/CLI/Tasks/SDKs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\Config\Config;
diff --git a/src/Appwrite/Task/SSL.php b/src/Appwrite/CLI/Tasks/SSL.php
similarity index 96%
rename from src/Appwrite/Task/SSL.php
rename to src/Appwrite/CLI/Tasks/SSL.php
index f6067367dc..79400e9eb2 100644
--- a/src/Appwrite/Task/SSL.php
+++ b/src/Appwrite/CLI/Tasks/SSL.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\Platform\Action;
 use Appwrite\Event\Certificate;
diff --git a/src/Appwrite/Task/Specs.php b/src/Appwrite/CLI/Tasks/Specs.php
similarity index 99%
rename from src/Appwrite/Task/Specs.php
rename to src/Appwrite/CLI/Tasks/Specs.php
index d2e0f73f3c..bcf1911ff3 100644
--- a/src/Appwrite/Task/Specs.php
+++ b/src/Appwrite/CLI/Tasks/Specs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\Validator\Text;
diff --git a/src/Appwrite/Task/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
similarity index 98%
rename from src/Appwrite/Task/Usage.php
rename to src/Appwrite/CLI/Tasks/Usage.php
index 2093f32720..78b41c1e06 100644
--- a/src/Appwrite/Task/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Appwrite\Platform\Action;
 use Throwable;
diff --git a/src/Appwrite/Task/Vars.php b/src/Appwrite/CLI/Tasks/Vars.php
similarity index 96%
rename from src/Appwrite/Task/Vars.php
rename to src/Appwrite/CLI/Tasks/Vars.php
index cd9ff4de6f..442e1dc4ce 100644
--- a/src/Appwrite/Task/Vars.php
+++ b/src/Appwrite/CLI/Tasks/Vars.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\App;
 use Utopia\Config\Config;
diff --git a/src/Appwrite/Task/Version.php b/src/Appwrite/CLI/Tasks/Version.php
similarity index 92%
rename from src/Appwrite/Task/Version.php
rename to src/Appwrite/CLI/Tasks/Version.php
index e92a620368..0a53482ce1 100644
--- a/src/Appwrite/Task/Version.php
+++ b/src/Appwrite/CLI/Tasks/Version.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI\Tasks;
 
 use Utopia\App;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/Task/Tasks.php b/src/Appwrite/CLI/TasksService.php
similarity index 64%
rename from src/Appwrite/Task/Tasks.php
rename to src/Appwrite/CLI/TasksService.php
index 4a24e0ca9d..c91b3a9777 100644
--- a/src/Appwrite/Task/Tasks.php
+++ b/src/Appwrite/CLI/TasksService.php
@@ -1,10 +1,20 @@
 <?php
 
-namespace Appwrite\Task;
+namespace Appwrite\CLI;
 
 use Utopia\Platform\Service;
+use Appwrite\CLI\Tasks\Doctor;
+use Appwrite\CLI\Tasks\Install;
+use Appwrite\CLI\Tasks\Maintenance;
+use Appwrite\CLI\Tasks\Migrate;
+use Appwrite\CLI\Tasks\SDKs;
+use Appwrite\CLI\Tasks\Specs;
+use Appwrite\CLI\Tasks\SSL;
+use Appwrite\CLI\Tasks\Usage;
+use Appwrite\CLI\Tasks\Vars;
+use Appwrite\CLI\Tasks\Version;
 
-class Tasks extends Service
+class TasksService extends Service
 {
     public function __construct()
     {
diff --git a/src/Appwrite/Task/CLIPlatform.php b/src/Appwrite/Task/CLIPlatform.php
deleted file mode 100644
index 063c6b6ca8..0000000000
--- a/src/Appwrite/Task/CLIPlatform.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Appwrite\Task;
-
-use Utopia\Platform\Platform;
-
-class CLIPlatform extends Platform
-{
-    public function __construct()
-    {
-        $this->addService('cliTasks', new Tasks());
-    }
-}

From 0331776614740532f856026de14e99fe871ca502 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 2 Aug 2022 01:37:00 +0000
Subject: [PATCH 12/65] more naming refactor

---
 src/Appwrite/CLI/Tasks/Usage.php | 4 ++--
 src/Appwrite/Platform/Action.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index 78b41c1e06..810388cd8c 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -2,7 +2,7 @@
 
 namespace Appwrite\CLI\Tasks;
 
-use Appwrite\Platform\Action;
+use Appwrite\Platform\Task;
 use Throwable;
 use Exception;
 use Appwrite\Stats\Usage as InfluxUsage;
@@ -11,7 +11,7 @@ use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Database\Validator\Authorization;
 
-class Usage extends Action
+class Usage extends Task
 {
     public const NAME = 'usage';
 
diff --git a/src/Appwrite/Platform/Action.php b/src/Appwrite/Platform/Action.php
index 3982acfbe4..21c3f53159 100644
--- a/src/Appwrite/Platform/Action.php
+++ b/src/Appwrite/Platform/Action.php
@@ -3,7 +3,7 @@
 namespace Appwrite\Platform;
 
 use Utopia\Database\Database;
-use Utopia\Platform\Action as PlatformAction;
+use Utopia\Platform\Action;
 use Exception;
 use InfluxDB\Database as InfluxDatabase;
 use Utopia\App;
@@ -15,7 +15,7 @@ use Utopia\Registry\Registry;
 use Utopia\Logger\Log;
 use Throwable;
 
-abstract class Action extends PlatformAction
+abstract class Task extends Action
 {
     protected function logError(Registry $register, Throwable $error, string $action = 'syncUsageStats')
     {

From b6ddf2a45149ca576b8d2d9f2aaaf2052173dacd Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 2 Aug 2022 01:41:12 +0000
Subject: [PATCH 13/65] remove unused import

---
 src/Appwrite/CLI/Tasks/Usage.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index 810388cd8c..1b58809155 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -4,7 +4,6 @@ namespace Appwrite\CLI\Tasks;
 
 use Appwrite\Platform\Task;
 use Throwable;
-use Exception;
 use Appwrite\Stats\Usage as InfluxUsage;
 use Appwrite\Stats\UsageDB;
 use Utopia\App;

From 6b2b9d0fdeeeaea28f11a58371fb387c72119d57 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 2 Aug 2022 01:58:36 +0000
Subject: [PATCH 14/65] tasks get name function

---
 src/Appwrite/CLI/Tasks/Doctor.php      |  5 ++++-
 src/Appwrite/CLI/Tasks/Install.php     |  5 ++++-
 src/Appwrite/CLI/Tasks/Maintenance.php |  5 ++++-
 src/Appwrite/CLI/Tasks/Migrate.php     |  6 +++++-
 src/Appwrite/CLI/Tasks/SDKs.php        |  6 +++++-
 src/Appwrite/CLI/Tasks/SSL.php         |  5 ++++-
 src/Appwrite/CLI/Tasks/Specs.php       |  6 +++++-
 src/Appwrite/CLI/Tasks/Usage.php       |  5 ++++-
 src/Appwrite/CLI/Tasks/Vars.php        |  5 ++++-
 src/Appwrite/CLI/Tasks/Version.php     |  5 ++++-
 src/Appwrite/CLI/TasksService.php      | 20 ++++++++++----------
 11 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Doctor.php b/src/Appwrite/CLI/Tasks/Doctor.php
index 35fe9d048e..600be03a2f 100644
--- a/src/Appwrite/CLI/Tasks/Doctor.php
+++ b/src/Appwrite/CLI/Tasks/Doctor.php
@@ -13,7 +13,10 @@ use Utopia\Platform\Action;
 
 class Doctor extends Action
 {
-    public const NAME = 'doctor';
+    public static function getName(): string
+    {
+        return 'doctor';
+    } 
 
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Install.php b/src/Appwrite/CLI/Tasks/Install.php
index fbf2ec5a3b..9bcc2e7096 100644
--- a/src/Appwrite/CLI/Tasks/Install.php
+++ b/src/Appwrite/CLI/Tasks/Install.php
@@ -14,7 +14,10 @@ use Utopia\Platform\Action;
 
 class Install extends Action
 {
-    public const NAME = 'install';
+    public static function getName(): string
+    {
+        return 'install';
+    }
 
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Maintenance.php b/src/Appwrite/CLI/Tasks/Maintenance.php
index b535bdb7e1..7aae40cc11 100644
--- a/src/Appwrite/CLI/Tasks/Maintenance.php
+++ b/src/Appwrite/CLI/Tasks/Maintenance.php
@@ -17,7 +17,10 @@ use Utopia\Platform\Action;
 
 class Maintenance extends Action
 {
-    public const NAME = 'maintenance';
+    public static function getName(): string
+    {
+        return 'maintenance';
+    }
 
     protected function getConsoleDB(): Database
     {
diff --git a/src/Appwrite/CLI/Tasks/Migrate.php b/src/Appwrite/CLI/Tasks/Migrate.php
index 1e5d06a7c7..d1e41a02f0 100644
--- a/src/Appwrite/CLI/Tasks/Migrate.php
+++ b/src/Appwrite/CLI/Tasks/Migrate.php
@@ -16,11 +16,15 @@ use Swoole\Event;
 
 class Migrate extends Action
 {
-    public const NAME = 'migrate';
+    public static function getName(): string
+    {
+        return 'migrate';
+    }
 
     public function __construct()
     {
         $this
+            ->desc('Migrate Appwrite to new version')
             ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
             ->callback(fn ($version) => $this->action($version));
     }
diff --git a/src/Appwrite/CLI/Tasks/SDKs.php b/src/Appwrite/CLI/Tasks/SDKs.php
index ea9fc51452..a9be206fbe 100644
--- a/src/Appwrite/CLI/Tasks/SDKs.php
+++ b/src/Appwrite/CLI/Tasks/SDKs.php
@@ -27,11 +27,15 @@ use Throwable;
 
 class SDKs extends Action
 {
-    public const NAME = 'sdks';
+    public static function getName(): string
+    {
+        return 'sdks';
+    }
 
     public function __construct()
     {
         $this
+            ->desc('Generate Appwrite SDKs')
             ->callback(fn () => $this->action());
     }
 
diff --git a/src/Appwrite/CLI/Tasks/SSL.php b/src/Appwrite/CLI/Tasks/SSL.php
index 79400e9eb2..6379253789 100644
--- a/src/Appwrite/CLI/Tasks/SSL.php
+++ b/src/Appwrite/CLI/Tasks/SSL.php
@@ -11,7 +11,10 @@ use Utopia\Validator\Hostname;
 
 class SSL extends Action
 {
-    public const NAME = 'ssl';
+    public static function getName(): string
+    {
+        return 'ssl';
+    }
 
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Specs.php b/src/Appwrite/CLI/Tasks/Specs.php
index bcf1911ff3..5c030a4880 100644
--- a/src/Appwrite/CLI/Tasks/Specs.php
+++ b/src/Appwrite/CLI/Tasks/Specs.php
@@ -18,11 +18,15 @@ use Exception;
 
 class Specs extends Action
 {
-    public const NAME = 'specs';
+    public static function getName(): string
+    {
+        return 'specs';
+    }
 
     public function __construct()
     {
         $this
+            ->desc('Generate Appwrite API specifications')
             ->param('version', 'latest', new Text(8), 'Spec version', true)
             ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
             ->callback(fn ($version, $mode) => $this->action($version, $mode));
diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index 1b58809155..b40f17c069 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -12,7 +12,10 @@ use Utopia\Database\Validator\Authorization;
 
 class Usage extends Task
 {
-    public const NAME = 'usage';
+    public static function getName(): string
+    {
+        return 'usage';
+    }
 
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Vars.php b/src/Appwrite/CLI/Tasks/Vars.php
index 442e1dc4ce..7286cc5382 100644
--- a/src/Appwrite/CLI/Tasks/Vars.php
+++ b/src/Appwrite/CLI/Tasks/Vars.php
@@ -9,7 +9,10 @@ use Utopia\Platform\Action;
 
 class Vars extends Action
 {
-    public const NAME = 'vars';
+    public static function getName(): string
+    {
+        return 'vars';
+    }
 
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Version.php b/src/Appwrite/CLI/Tasks/Version.php
index 0a53482ce1..164b8b0766 100644
--- a/src/Appwrite/CLI/Tasks/Version.php
+++ b/src/Appwrite/CLI/Tasks/Version.php
@@ -8,7 +8,10 @@ use Utopia\Platform\Action;
 
 class Version extends Action
 {
-    public const NAME = 'version';
+    public static function getName(): string
+    {
+        return 'version';
+    }
 
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/TasksService.php b/src/Appwrite/CLI/TasksService.php
index c91b3a9777..c6dba81dbc 100644
--- a/src/Appwrite/CLI/TasksService.php
+++ b/src/Appwrite/CLI/TasksService.php
@@ -20,15 +20,15 @@ class TasksService extends Service
     {
         $this->type = self::TYPE_CLI;
         $this
-            ->addAction(Version::NAME, new Version())
-            ->addAction(Usage::NAME, new Usage())
-            ->addAction(Vars::NAME, new Vars())
-            ->addAction(SSL::NAME, new SSL())
-            ->addAction(Doctor::NAME, new Doctor())
-            ->addAction(Install::NAME, new Install())
-            ->addAction(Maintenance::NAME, new Maintenance())
-            ->addAction(Migrate::NAME, new Migrate())
-            ->addAction(SDKs::NAME, new SDKs())
-            ->addAction(Specs::NAME, new Specs());
+            ->addAction(Version::getName(), new Version())
+            ->addAction(Usage::getName(), new Usage())
+            ->addAction(Vars::getName(), new Vars())
+            ->addAction(SSL::getName(), new SSL())
+            ->addAction(Doctor::getName(), new Doctor())
+            ->addAction(Install::getName(), new Install())
+            ->addAction(Maintenance::getName(), new Maintenance())
+            ->addAction(Migrate::getName(), new Migrate())
+            ->addAction(SDKs::getName(), new SDKs())
+            ->addAction(Specs::getName(), new Specs());
     }
 }

From fda6ba7c8cb364329ce289b659bd09d9f638bd5e Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 2 Aug 2022 02:03:30 +0000
Subject: [PATCH 15/65] fix lint error

---
 src/Appwrite/CLI/Tasks/Doctor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Appwrite/CLI/Tasks/Doctor.php b/src/Appwrite/CLI/Tasks/Doctor.php
index 600be03a2f..85d389b846 100644
--- a/src/Appwrite/CLI/Tasks/Doctor.php
+++ b/src/Appwrite/CLI/Tasks/Doctor.php
@@ -16,7 +16,7 @@ class Doctor extends Action
     public static function getName(): string
     {
         return 'doctor';
-    } 
+    }
 
     public function __construct()
     {

From b28d10ad65193defa5d55a0e3aae5ccbc2b87681 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 3 Aug 2022 04:41:48 +0000
Subject: [PATCH 16/65] upgrade framework

---
 composer.json |  2 +-
 composer.lock | 25 ++++++++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 65ae9d60b4..31341f9018 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
         "ext-sockets": "*",
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.10.*",
-        "utopia-php/framework": "dev-master as 0.19.21",
+        "utopia-php/framework": "0.20.*",
         "utopia-php/logger": "0.3.*",
         "utopia-php/abuse": "0.7.*",
         "utopia-php/analytics": "0.2.*",
diff --git a/composer.lock b/composer.lock
index b94d95b84a..8188b14fac 100644
--- a/composer.lock
+++ b/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": "39572e8195342eb83dd40d12314f2e6c",
+    "content-hash": "4f3868304dc2774906290ca8d36b0d06",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2169,7 +2169,7 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "dev-master",
+            "version": "0.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
@@ -2188,7 +2188,6 @@
                 "phpunit/phpunit": "^9.5.10",
                 "vimeo/psalm": "4.13.1"
             },
-            "default-branch": true,
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -2213,7 +2212,7 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/master"
+                "source": "https://github.com/utopia-php/framework/tree/0.20.0"
             },
             "time": "2022-07-30T09:55:28+00:00"
         },
@@ -2447,14 +2446,14 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "9d5fd12dfa1b3932313362a90ffafd5467525be0"
+                "reference": "cc41247d0636648ba854afba8ebf68be441cfd1b"
             },
             "require": {
                 "ext-json": "*",
                 "ext-redis": "*",
                 "php": ">=8.0",
                 "utopia-php/cli": "0.13.*",
-                "utopia-php/framework": "dev-master as 0.19.21"
+                "utopia-php/framework": "0.20.*"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
@@ -2499,7 +2498,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-08-01T06:39:29+00:00"
+            "time": "2022-08-03T04:41:22+00:00"
         },
         {
             "name": "utopia-php/preloader",
@@ -5407,17 +5406,9 @@
             "time": "2022-05-17T05:48:52+00:00"
         }
     ],
-    "aliases": [
-        {
-            "package": "utopia-php/framework",
-            "version": "9999999-dev",
-            "alias": "0.19.21",
-            "alias_normalized": "0.19.21.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "utopia-php/framework": 20,
         "utopia-php/platform": 20
     },
     "prefer-stable": false,
@@ -5441,5 +5432,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 0d62f30d7bdd1108a64f1c017b60d5158751ca3d Mon Sep 17 00:00:00 2001
From: Damodar Lohani <lohanidamodar@users.noreply.github.com>
Date: Thu, 4 Aug 2022 12:36:04 +0545
Subject: [PATCH 17/65] rename file

---
 src/Appwrite/Platform/{Action.php => Task.php} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Appwrite/Platform/{Action.php => Task.php} (100%)

diff --git a/src/Appwrite/Platform/Action.php b/src/Appwrite/Platform/Task.php
similarity index 100%
rename from src/Appwrite/Platform/Action.php
rename to src/Appwrite/Platform/Task.php

From bd1d9834bee5c1f78691c15e246e7c4abfb509e5 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 14 Oct 2022 09:32:17 +0000
Subject: [PATCH 18/65] fix install task

---
 src/Appwrite/CLI/Tasks/Install.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Appwrite/CLI/Tasks/Install.php b/src/Appwrite/CLI/Tasks/Install.php
index 9bcc2e7096..b1e980b7f4 100644
--- a/src/Appwrite/CLI/Tasks/Install.php
+++ b/src/Appwrite/CLI/Tasks/Install.php
@@ -186,6 +186,16 @@ class Install extends Action
             if (empty($input[$var['name']])) {
                 $input[$var['name']] = $var['default'];
             }
+
+            if ($var['filter'] === 'domainTarget') {
+                if ($input[$var['name']] !== 'localhost') {
+                    Console::warning("\nIf you haven't already done so, set the following record for {$input[$var['name']]} on your DNS provider:\n");
+                    $mask = "%-15.15s %-10.10s %-30.30s\n";
+                    printf($mask, "Type", "Name", "Value");
+                    printf($mask, "A or AAAA", "@", "<YOUR PUBLIC IP>");
+                    Console::warning("\nUse 'AAAA' if you're using an IPv6 address and 'A' if you're using an IPv4 address.\n");
+                }
+            }
         }
 
         $templateForCompose = new View(__DIR__ . '/../views/install/compose.phtml');

From e5b3d74515ac3cdad1a4307be62c6446cf1fd2b3 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 14 Oct 2022 09:34:02 +0000
Subject: [PATCH 19/65] update migrate task

---
 src/Appwrite/CLI/Tasks/Migrate.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Migrate.php b/src/Appwrite/CLI/Tasks/Migrate.php
index b28f0f6b82..e9f0f0dec3 100644
--- a/src/Appwrite/CLI/Tasks/Migrate.php
+++ b/src/Appwrite/CLI/Tasks/Migrate.php
@@ -13,7 +13,6 @@ use Utopia\Database\Database;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\Text;
-use Swoole\Event;
 
 class Migrate extends Action
 {
@@ -105,7 +104,7 @@ class Migrate extends Action
             Console::log('Migrated ' . $count . '/' . $totalProjects . ' projects...');
         }
 
-        Event::wait(); // Wait for Coroutines to finish
+        Swoole\Event::wait(); // Wait for Coroutines to finish
         $redis->flushAll();
         Console::success('Data Migration Completed');
     }

From e5ad8d63f03e05451a9be9f31c314f4f42c9ffe8 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 14 Oct 2022 09:42:48 +0000
Subject: [PATCH 20/65] fix usage task

---
 src/Appwrite/CLI/Tasks/Usage.php | 96 +++++++++++++++++---------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index b40f17c069..addf682be3 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -3,12 +3,14 @@
 namespace Appwrite\CLI\Tasks;
 
 use Appwrite\Platform\Task;
-use Throwable;
-use Appwrite\Stats\Usage as InfluxUsage;
-use Appwrite\Stats\UsageDB;
+use Appwrite\Usage\Calculators\Aggregator;
+use Appwrite\Usage\Calculators\Database;
+use Appwrite\Usage\Calculators\TimeSeries;
+use InfluxDB\Database as InfluxDatabase;
 use Utopia\App;
 use Utopia\CLI\Console;
-use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Database as UtopiaDatabase;
+use Utopia\Validator\WhiteList;
 
 class Usage extends Task
 {
@@ -20,65 +22,67 @@ class Usage extends Task
     public function __construct()
     {
         $this
+            ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
             ->desc('Schedules syncing data from influxdb to Appwrite console db')
-            ->callback(fn () => $this->action());
+            ->callback(fn ($type) => $this->action($type));
     }
 
-    public function action()
+
+    protected function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void
     {
-        global $register;
+        $interval = (int) App::getEnv('_APP_USAGE_TIMESERIES_INTERVAL', '30'); // 30 seconds (by default)
+        $usage = new TimeSeries($database, $influxDB, $logError);
 
-        Authorization::disable();
-        Authorization::setDefaultStatus(false);
-
-        $logError = fn(Throwable $error, string $action = 'syncUsageStats') => $this->logError($register, $error, $action);
-
-        Console::title('Usage Aggregation V1');
-        Console::success(APP_NAME . ' usage aggregation process v1 has started');
-
-        $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
-
-        $database = self::getDatabase($register, '_console');
-        $influxDB = self::getInfluxDB($register);
-
-        $usage = new InfluxUsage($database, $influxDB, $logError);
-        $usageDB = new UsageDB($database, $logError);
-
-        $iterations = 0;
-        Console::loop(function () use ($interval, $usage, $usageDB, &$iterations) {
+        Console::loop(function () use ($interval, $usage) {
             $now = date('d-m-Y H:i:s', time());
-            Console::info("[{$now}] Aggregating usage data every {$interval} seconds");
-
+            Console::info("[{$now}] Aggregating Timeseries Usage data every {$interval} seconds");
             $loopStart = microtime(true);
 
-            /**
-             * Aggregate InfluxDB every 30 seconds
-             */
             $usage->collect();
 
-            if ($iterations % 30 != 0) { // return if 30 iterations has not passed
-                $iterations++;
-                $loopTook = microtime(true) - $loopStart;
-                $now = date('d-m-Y H:i:s', time());
-                Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-                return;
-            }
-
-            $iterations = 0; // Reset iterations to prevent overflow when running for long time
-            /**
-             * Aggregate MariaDB every 15 minutes
-             * Some of the queries here might contain full-table scans.
-             */
+            $loopTook = microtime(true) - $loopStart;
             $now = date('d-m-Y H:i:s', time());
-            Console::info("[{$now}] Aggregating database counters.");
+            Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+        }, $interval);
+    }
 
-            $usageDB->collect();
+    protected function aggregateDatabase(UtopiaDatabase $database, callable $logError): void
+    {
+        $interval = (int) App::getEnv('_APP_USAGE_DATABASE_INTERVAL', '900'); // 15 minutes (by default)
+        $usage = new Database($database, $logError);
+        $aggregrator = new Aggregator($database, $logError);
 
-            $iterations++;
+        Console::loop(function () use ($interval, $usage, $aggregrator) {
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregating database usage every {$interval} seconds.");
+            $loopStart = microtime(true);
+            $usage->collect();
+            $aggregrator->collect();
             $loopTook = microtime(true) - $loopStart;
             $now = date('d-m-Y H:i:s', time());
 
             Console::info("[{$now}] Aggregation took {$loopTook} seconds");
         }, $interval);
     }
+
+    public function action(string $type)
+    {
+        global $register;
+        Console::title('Usage Aggregation V1');
+        Console::success(APP_NAME . ' usage aggregation process v1 has started');
+
+        $database = $this->getDatabase($register, '_console');
+        $influxDB = $this->getInfluxDB($register);
+
+        switch ($type) {
+            case 'timeseries':
+                $this->aggregateTimeseries($database, $influxDB, $this->logError);
+                break;
+            case 'database':
+                $this->aggregateDatabase($database, $this->logError);
+                break;
+            default:
+                Console::error("Unsupported usage aggregation type");
+        }
+    }
 }

From 72e112ade8486870416bf695911f6932b6972f5a Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 14 Oct 2022 11:01:45 +0000
Subject: [PATCH 21/65] fix usage task error

---
 src/Appwrite/CLI/Tasks/Usage.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index addf682be3..d5360e1091 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -11,6 +11,7 @@ use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Database\Database as UtopiaDatabase;
 use Utopia\Validator\WhiteList;
+use Throwable;
 
 class Usage extends Task
 {
@@ -73,13 +74,14 @@ class Usage extends Task
 
         $database = $this->getDatabase($register, '_console');
         $influxDB = $this->getInfluxDB($register);
+        $logError = fn(Throwable $error, string $action = 'syncUsageStats') => $this->logError($register, $error, $action);
 
         switch ($type) {
             case 'timeseries':
-                $this->aggregateTimeseries($database, $influxDB, $this->logError);
+                $this->aggregateTimeseries($database, $influxDB, $logError);
                 break;
             case 'database':
-                $this->aggregateDatabase($database, $this->logError);
+                $this->aggregateDatabase($database, $logError);
                 break;
             default:
                 Console::error("Unsupported usage aggregation type");

From 8269ec225d18dd36cc5b24b1a4a2e81349cab0ae Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 16 Oct 2022 07:10:47 +0000
Subject: [PATCH 22/65] use latest releases

---
 composer.json |  4 ++--
 composer.lock | 57 ++++++++++++++++++++++++---------------------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/composer.json b/composer.json
index 3dc7fae747..939b99aef6 100644
--- a/composer.json
+++ b/composer.json
@@ -43,13 +43,13 @@
         "ext-sockets": "*",
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.11.*",
-        "utopia-php/framework": "0.21.*",
+        "utopia-php/framework": "0.22.*",
         "utopia-php/logger": "0.3.*",
         "utopia-php/abuse": "0.13.*",
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.14.*",
         "utopia-php/cache": "0.6.*",
-        "utopia-php/platform": "dev-feat-upgrade-framework",
+        "utopia-php/platform": "0.2.*",
         "utopia-php/cli": "0.13.*",
         "utopia-php/config": "0.2.*",
         "utopia-php/database": "0.25.*",
diff --git a/composer.lock b/composer.lock
index cd38d1180f..33ff9a06b0 100644
--- a/composer.lock
+++ b/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": "b55f1a94691129653bc6ff0ac5f66e13",
+    "content-hash": "a19fd30d9ecff10a0ab60808a1f62495",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2178,24 +2178,24 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.21.1",
+            "version": "0.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "c81789b87a917da2daf336738170ebe01f50ea18"
+                "reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/c81789b87a917da2daf336738170ebe01f50ea18",
-                "reference": "c81789b87a917da2daf336738170ebe01f50ea18",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/9f35d36ed4b8fa1c92962c77ef02b49c2f5919df",
+                "reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5.10",
-                "vimeo/psalm": "4.13.1"
+                "phpunit/phpunit": "^9.5.25",
+                "vimeo/psalm": "^4.27.0"
             },
             "type": "library",
             "autoload": {
@@ -2221,9 +2221,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.21.1"
+                "source": "https://github.com/utopia-php/framework/tree/0.22.1"
             },
-            "time": "2022-09-07T09:56:28+00:00"
+            "time": "2022-10-07T14:51:40+00:00"
         },
         {
             "name": "utopia-php/image",
@@ -2451,18 +2451,18 @@
         },
         {
             "name": "utopia-php/platform",
-            "version": "dev-feat-upgrade-framework",
+            "version": "0.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "4c2fcb8b9f046948ab812552e4e448057efef936"
+                "reference": "5a3640f4f34b394ed34efda351101c7928643819"
             },
             "require": {
                 "ext-json": "*",
                 "ext-redis": "*",
                 "php": ">=8.0",
                 "utopia-php/cli": "0.13.*",
-                "utopia-php/framework": "0.21.*"
+                "utopia-php/framework": "0.22.*"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
@@ -2493,12 +2493,6 @@
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Eldad Fux",
-                    "email": "eldad@appwrite.io"
-                }
-            ],
             "description": "Light and Fast Platform Library",
             "keywords": [
                 "cache",
@@ -2507,7 +2501,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-09-01T11:59:42+00:00"
+            "time": "2022-10-16T07:08:51+00:00"
         },
         {
             "name": "utopia-php/preloader",
@@ -3479,25 +3473,30 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
+                "reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
                 "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-phpunit": "^1.1",
+                "phpunit/phpunit": "^9.5",
+                "rector/rector": "^0.13.9",
+                "vimeo/psalm": "^4.25"
             },
             "type": "library",
             "extra": {
@@ -3523,9 +3522,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
             },
-            "time": "2022-03-15T21:29:03+00:00"
+            "time": "2022-10-14T12:47:21+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -5420,9 +5419,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "utopia-php/platform": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From d7b1224628d76d66fbde1298627f790a76640011 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 16 Oct 2022 08:21:53 +0000
Subject: [PATCH 23/65] fix upgrade utopia swoole

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 939b99aef6..f8eee2eca2 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
         "utopia-php/registry": "0.5.*",
         "utopia-php/preloader": "0.2.*",
         "utopia-php/domains": "1.1.*",
-        "utopia-php/swoole": "0.3.*",
+        "utopia-php/swoole": "0.4.*",
         "utopia-php/storage": "0.11.*",
         "utopia-php/websocket": "0.1.0",
         "utopia-php/image": "0.5.*",
diff --git a/composer.lock b/composer.lock
index 33ff9a06b0..f845b953ac 100644
--- a/composer.lock
+++ b/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": "a19fd30d9ecff10a0ab60808a1f62495",
+    "content-hash": "c2fa5b94159eb9fc1e0d414ae507ba9e",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2665,16 +2665,16 @@
         },
         {
             "name": "utopia-php/swoole",
-            "version": "0.3.3",
+            "version": "0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/swoole.git",
-                "reference": "8312df69233b5dcd3992de88f131f238002749de"
+                "reference": "536e1f3e78fc0197e4a8ed81b1bf2636a3bc4538"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/8312df69233b5dcd3992de88f131f238002749de",
-                "reference": "8312df69233b5dcd3992de88f131f238002749de",
+                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/536e1f3e78fc0197e4a8ed81b1bf2636a3bc4538",
+                "reference": "536e1f3e78fc0197e4a8ed81b1bf2636a3bc4538",
                 "shasum": ""
             },
             "require": {
@@ -2715,9 +2715,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/swoole/issues",
-                "source": "https://github.com/utopia-php/swoole/tree/0.3.3"
+                "source": "https://github.com/utopia-php/swoole/tree/0.4.0"
             },
-            "time": "2022-01-20T09:58:43+00:00"
+            "time": "2022-10-08T14:32:43+00:00"
         },
         {
             "name": "utopia-php/system",

From 904b8aca8d90f45422042937da36646e27791123 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 02:37:39 +0000
Subject: [PATCH 24/65] latest cli version

---
 composer.json |  6 ++---
 composer.lock | 73 ++++++++++++++++++++++++---------------------------
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/composer.json b/composer.json
index f52586277a..9bc0cfdeda 100644
--- a/composer.json
+++ b/composer.json
@@ -49,8 +49,8 @@
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.15.*",
         "utopia-php/cache": "0.6.*",
-        "utopia-php/platform": "0.2.*",
-        "utopia-php/cli": "0.13.*",
+        "utopia-php/platform": "dev-feat-cli-update",
+        "utopia-php/cli": "0.14.*",
         "utopia-php/config": "0.2.*",
         "utopia-php/database": "0.26.*",
         "utopia-php/locale": "0.4.*",
@@ -61,7 +61,7 @@
         "utopia-php/storage": "0.11.*",
         "utopia-php/websocket": "0.1.0",
         "utopia-php/image": "0.5.*",
-        "utopia-php/orchestration": "0.6.*",
+        "utopia-php/orchestration": "dev-feat-cli-update",
         "resque/php-resque": "1.3.6",
         "matomo/device-detector": "6.0.0",
         "dragonmantank/cron-expression": "3.3.1",
diff --git a/composer.lock b/composer.lock
index 1f69ffffca..72180816f0 100644
--- a/composer.lock
+++ b/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": "3bcc6cfb6966fef9fdba36dd31f07b5b",
+    "content-hash": "32ae4fa68179e9a5e4b18840ab9db57f",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -693,16 +693,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.1",
+            "version": "2.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
+                "reference": "67c26b443f348a51926030c83481b85718457d3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
+                "reference": "67c26b443f348a51926030c83481b85718457d3d",
                 "shasum": ""
             },
             "require": {
@@ -792,7 +792,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.3"
             },
             "funding": [
                 {
@@ -808,7 +808,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:45:39+00:00"
+            "time": "2022-10-26T14:07:24+00:00"
         },
         {
             "name": "influxdb/influxdb-php",
@@ -1950,16 +1950,16 @@
         },
         {
             "name": "utopia-php/cli",
-            "version": "0.13.0",
+            "version": "0.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/cli.git",
-                "reference": "69e68f8ed525fe162fae950a0507ed28a0f179bc"
+                "reference": "c30ef985a4e739758a0d95eb0706b357b6d8c086"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cli/zipball/69e68f8ed525fe162fae950a0507ed28a0f179bc",
-                "reference": "69e68f8ed525fe162fae950a0507ed28a0f179bc",
+                "url": "https://api.github.com/repos/utopia-php/cli/zipball/c30ef985a4e739758a0d95eb0706b357b6d8c086",
+                "reference": "c30ef985a4e739758a0d95eb0706b357b6d8c086",
                 "shasum": ""
             },
             "require": {
@@ -1968,7 +1968,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
-                "vimeo/psalm": "4.0.1"
+                "squizlabs/php_codesniffer": "^3.6"
             },
             "type": "library",
             "autoload": {
@@ -1997,9 +1997,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/cli/issues",
-                "source": "https://github.com/utopia-php/cli/tree/0.13.0"
+                "source": "https://github.com/utopia-php/cli/tree/0.14.0"
             },
-            "time": "2022-04-26T08:41:22+00:00"
+            "time": "2022-10-09T10:19:07+00:00"
         },
         {
             "name": "utopia-php/config",
@@ -2390,21 +2390,21 @@
         },
         {
             "name": "utopia-php/orchestration",
-            "version": "0.6.0",
+            "version": "dev-feat-cli-update",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/orchestration.git",
-                "reference": "94263976413871efb6b16157a7101a81df3b6d78"
+                "reference": "dd6d30e70d3d71e49a10f6281fc8e7c0b9fd901a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/94263976413871efb6b16157a7101a81df3b6d78",
-                "reference": "94263976413871efb6b16157a7101a81df3b6d78",
+                "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/dd6d30e70d3d71e49a10f6281fc8e7c0b9fd901a",
+                "reference": "dd6d30e70d3d71e49a10f6281fc8e7c0b9fd901a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.0",
-                "utopia-php/cli": "0.13.*"
+                "utopia-php/cli": "0.14.*"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
@@ -2420,12 +2420,6 @@
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Eldad Fux",
-                    "email": "eldad@appwrite.io"
-                }
-            ],
             "description": "Lite & fast micro PHP abstraction library for container orchestration",
             "keywords": [
                 "docker",
@@ -2439,23 +2433,23 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/orchestration/issues",
-                "source": "https://github.com/utopia-php/orchestration/tree/0.6.0"
+                "source": "https://github.com/utopia-php/orchestration/tree/feat-cli-update"
             },
-            "time": "2022-07-13T16:47:18+00:00"
+            "time": "2022-10-28T02:36:14+00:00"
         },
         {
             "name": "utopia-php/platform",
-            "version": "0.2.0",
+            "version": "dev-feat-cli-update",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "5a3640f4f34b394ed34efda351101c7928643819"
+                "reference": "accc17f6dd6ae404f86691e768dd73eecb0778e0"
             },
             "require": {
                 "ext-json": "*",
                 "ext-redis": "*",
                 "php": ">=8.0",
-                "utopia-php/cli": "0.13.*",
+                "utopia-php/cli": "0.14.*",
                 "utopia-php/framework": "0.22.*"
             },
             "require-dev": {
@@ -2495,7 +2489,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-10-16T07:08:51+00:00"
+            "time": "2022-10-28T02:27:04+00:00"
         },
         {
             "name": "utopia-php/preloader",
@@ -3589,16 +3583,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.17",
+            "version": "9.2.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
                 "shasum": ""
             },
             "require": {
@@ -3654,7 +3648,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18"
             },
             "funding": [
                 {
@@ -3662,7 +3656,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-30T12:24:04+00:00"
+            "time": "2022-10-27T13:35:33+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -5413,7 +5407,10 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "utopia-php/platform": 20,
+        "utopia-php/orchestration": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From f080bd3e68477c77f75559bdb35954f9ce16bbc0 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 03:36:20 +0000
Subject: [PATCH 25/65] using dependency injection in CLI

---
 app/cli.php                       | 41 +++++++++++++++++++++++++++++++
 composer.lock                     |  4 +--
 src/Appwrite/CLI/Tasks/Doctor.php |  8 +++---
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index ef0445e67f..3060adc636 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -4,11 +4,52 @@ require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';
 
 use Appwrite\CLI\Tasks;
+use Utopia\CLI\CLI;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Platform\Service;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Cache;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Database;
 
 Authorization::disable();
 
+CLI::setResource('register', fn()=>$register);
+
+$attempts = 0;
+$max = 10;
+$sleep = 1;
+
+do {
+    try {
+        $attempts++;
+        $db = $register->get('db');
+        $redis = $register->get('cache');
+        break; // leave the do-while if successful
+    } catch (\Exception $e) {
+        Console::warning("Database not ready. Retrying connection ({$attempts})...");
+        if ($attempts >= $max) {
+            throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+        }
+        sleep($sleep);
+    }
+} while ($attempts < $max);
+
+CLI::setResource('db', fn () => $db);
+CLI::setResource('cache', fn () => $redis);
+
+CLI::setResource('dbForConsole', function ($db, $cache) {
+    $cache = new Cache(new RedisCache($cache));
+
+    $database = new Database(new MariaDB($db), $cache);
+    $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+    $database->setNamespace('_console');
+
+    return $database;
+}, ['db', 'cache']);
+
 $cliPlatform = new Tasks();
 $cliPlatform->init(Service::TYPE_CLI);
 
diff --git a/composer.lock b/composer.lock
index 72180816f0..416a5c1376 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2443,7 +2443,7 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "accc17f6dd6ae404f86691e768dd73eecb0778e0"
+                "reference": "07e825132492c7d7c9920dbeb527833bda21155d"
             },
             "require": {
                 "ext-json": "*",
@@ -2489,7 +2489,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-10-28T02:27:04+00:00"
+            "time": "2022-10-28T03:15:57+00:00"
         },
         {
             "name": "utopia-php/preloader",
diff --git a/src/Appwrite/CLI/Tasks/Doctor.php b/src/Appwrite/CLI/Tasks/Doctor.php
index 85d389b846..2b728b47c8 100644
--- a/src/Appwrite/CLI/Tasks/Doctor.php
+++ b/src/Appwrite/CLI/Tasks/Doctor.php
@@ -10,6 +10,7 @@ use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 use Utopia\Domains\Domain;
 use Utopia\Platform\Action;
+use Utopia\Registry\Registry;
 
 class Doctor extends Action
 {
@@ -22,13 +23,12 @@ class Doctor extends Action
     {
         $this
             ->desc('Validate server health')
-            ->callback(fn () => $this->action());
+            ->inject('register')
+            ->callback(fn (Registry $register) => $this->action($register));
     }
 
-    public function action(): void
+    public function action(Registry $register): void
     {
-        global $register;
-
         Console::log("  __   ____  ____  _  _  ____  __  ____  ____     __  __  
  / _\ (  _ \(  _ \/ )( \(  _ \(  )(_  _)(  __)   (  )/  \ 
 /    \ ) __/ ) __/\ /\ / )   / )(   )(   ) _)  _  )((  O )

From 592b2dcd978f4a3fdd53eba7fbfa613c72815f70 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 03:57:59 +0000
Subject: [PATCH 26/65] use injection

---
 src/Appwrite/CLI/Tasks/Maintenance.php | 42 +++-----------------------
 1 file changed, 5 insertions(+), 37 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Maintenance.php b/src/Appwrite/CLI/Tasks/Maintenance.php
index 252dc25a93..85973e6500 100644
--- a/src/Appwrite/CLI/Tasks/Maintenance.php
+++ b/src/Appwrite/CLI/Tasks/Maintenance.php
@@ -23,45 +23,15 @@ class Maintenance extends Action
         return 'maintenance';
     }
 
-    protected function getConsoleDB(): Database
-    {
-        global $register;
-
-        $attempts = 0;
-
-        do {
-            try {
-                $attempts++;
-                $cache = new Cache(new RedisCache($register->get('cache')));
-                $database = new Database(new MariaDB($register->get('db')), $cache);
-                $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-                $database->setNamespace('_console'); // Main DB
-
-                if (!$database->exists($database->getDefaultDatabase(), 'certificates')) {
-                    throw new \Exception('Console project not ready');
-                }
-
-                break; // leave loop if successful
-            } catch (\Exception $e) {
-                Console::warning("Database not ready. Retrying connection ({$attempts})...");
-                if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
-                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-                }
-                sleep(DATABASE_RECONNECT_SLEEP);
-            }
-        } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-
-        return $database;
-    }
-
     public function __construct()
     {
         $this
             ->desc('Schedules maintenance tasks and publishes them to resque')
-            ->callback(fn () => $this->action());
+            ->inject('dbForConsole')
+            ->callback(fn (Database $dbForConsole) => $this->action($dbForConsole));
     }
 
-    public function action(): void
+    public function action(Database $dbForConsole): void
     {
         Console::title('Maintenance V1');
         Console::success(APP_NAME . ' maintenance process v1 has started');
@@ -160,9 +130,7 @@ class Maintenance extends Action
         $usageStatsRetention1d = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_1D', '8640000'); // 100 days
         $cacheRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_CACHE', '2592000'); // 30 days
 
-        Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetention30m, $usageStatsRetention1d, $cacheRetention) {
-            $database = $this->getConsoleDB();
-
+        Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetention30m, $usageStatsRetention1d, $cacheRetention, $dbForConsole) {
             $time = DateTime::now();
 
             Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
@@ -172,7 +140,7 @@ class Maintenance extends Action
             notifyDeleteUsageStats($usageStatsRetention30m, $usageStatsRetention1d);
             notifyDeleteConnections();
             notifyDeleteExpiredSessions();
-            renewCertificates($database);
+            renewCertificates($dbForConsole);
             notifyDeleteCache($cacheRetention);
         }, $interval);
     }

From 85794beb959e10215db5efaade2c9032badecc49 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 04:00:44 +0000
Subject: [PATCH 27/65] inject dependency for spec

---
 src/Appwrite/CLI/Tasks/Specs.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Specs.php b/src/Appwrite/CLI/Tasks/Specs.php
index ebca58abf6..dab6827b33 100644
--- a/src/Appwrite/CLI/Tasks/Specs.php
+++ b/src/Appwrite/CLI/Tasks/Specs.php
@@ -12,6 +12,7 @@ use Swoole\Http\Response as HttpResponse;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
+use Utopia\Registry\Registry;
 use Utopia\Request;
 use Utopia\Validator\WhiteList;
 
@@ -28,13 +29,12 @@ class Specs extends Action
             ->desc('Generate Appwrite API specifications')
             ->param('version', 'latest', new Text(16), 'Spec version', true)
             ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
-            ->callback(fn ($version, $mode) => $this->action($version, $mode));
+            ->inject('register')
+            ->callback(fn (string $version, string $mode, Registry $register) => $this->action($version, $mode, $register));
     }
 
-    public function action(string $version, string $mode): void
+    public function action(string $version, string $mode, Registry $register): void
     {
-        global $register;
-
         $db = $register->get('db');
         $redis = $register->get('cache');
         $appRoutes = App::getRoutes();

From 30a541a5c996de4dead62e8cd6fffbcee9ac1044 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 04:09:34 +0000
Subject: [PATCH 28/65] dependency injection in usage task

---
 app/cli.php                      | 23 ++++++++++++
 src/Appwrite/CLI/Tasks/Usage.php | 19 +++++-----
 src/Appwrite/Platform/Task.php   | 62 ++------------------------------
 3 files changed, 35 insertions(+), 69 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 3060adc636..0dd4fad71e 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -50,6 +50,29 @@ CLI::setResource('dbForConsole', function ($db, $cache) {
     return $database;
 }, ['db', 'cache']);
 
+/** @var InfluxDB\Client $client */
+$client = $register->get('influxdb');
+$attempts = 0;
+$max = 10;
+$sleep = 1;
+
+do { // check if telegraf database is ready
+    try {
+        $attempts++;
+        $database = $client->selectDB('telegraf');
+        if (in_array('telegraf', $client->listDatabases())) {
+            break; // leave the do-while if successful
+        }
+    } catch (\Throwable$th) {
+        Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+        if ($attempts >= $max) {
+            throw new \Exception('InfluxDB database not ready yet');
+        }
+        sleep($sleep);
+    }
+} while ($attempts < $max);
+CLI::setResource('influxdb', fn() => $database);
+
 $cliPlatform = new Tasks();
 $cliPlatform->init(Service::TYPE_CLI);
 
diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index d5360e1091..3ac9ec0d51 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -12,6 +12,7 @@ use Utopia\CLI\Console;
 use Utopia\Database\Database as UtopiaDatabase;
 use Utopia\Validator\WhiteList;
 use Throwable;
+use Utopia\Registry\Registry;
 
 class Usage extends Task
 {
@@ -23,9 +24,12 @@ class Usage extends Task
     public function __construct()
     {
         $this
-            ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
             ->desc('Schedules syncing data from influxdb to Appwrite console db')
-            ->callback(fn ($type) => $this->action($type));
+            ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
+            ->inject('dbForConsole')
+            ->inject('influxdb')
+            ->inject('register')
+            ->callback(fn ($type, $dbForConsole, $influxDB, $register) => $this->action($type, $dbForConsole, $influxDB, $register));
     }
 
 
@@ -66,22 +70,19 @@ class Usage extends Task
         }, $interval);
     }
 
-    public function action(string $type)
+    public function action(string $type, UtopiaDatabase $dbForConsole, InfluxDatabase $influxDB, Registry $register)
     {
-        global $register;
         Console::title('Usage Aggregation V1');
         Console::success(APP_NAME . ' usage aggregation process v1 has started');
 
-        $database = $this->getDatabase($register, '_console');
-        $influxDB = $this->getInfluxDB($register);
-        $logError = fn(Throwable $error, string $action = 'syncUsageStats') => $this->logError($register, $error, $action);
+        $logError = fn(Throwable $error, string $action = 'syncUsageStats') => $this->logError($register, $error, "usage", $action);
 
         switch ($type) {
             case 'timeseries':
-                $this->aggregateTimeseries($database, $influxDB, $logError);
+                $this->aggregateTimeseries($dbForConsole, $influxDB, $logError);
                 break;
             case 'database':
-                $this->aggregateDatabase($database, $logError);
+                $this->aggregateDatabase($dbForConsole, $logError);
                 break;
             default:
                 Console::error("Unsupported usage aggregation type");
diff --git a/src/Appwrite/Platform/Task.php b/src/Appwrite/Platform/Task.php
index 21c3f53159..23f73c222b 100644
--- a/src/Appwrite/Platform/Task.php
+++ b/src/Appwrite/Platform/Task.php
@@ -17,7 +17,7 @@ use Throwable;
 
 abstract class Task extends Action
 {
-    protected function logError(Registry $register, Throwable $error, string $action = 'syncUsageStats')
+    protected function logError(Registry $register, Throwable $error, string $namespace, string $action)
     {
         $logger = $register->get('logger');
 
@@ -25,7 +25,7 @@ abstract class Task extends Action
             $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
 
             $log = new Log();
-            $log->setNamespace("usage");
+            $log->setNamespace($namespace);
             $log->setServer(\gethostname());
             $log->setVersion($version);
             $log->setType(Log::TYPE_ERROR);
@@ -51,62 +51,4 @@ abstract class Task extends Action
         Console::warning("Failed: {$error->getMessage()}");
         Console::warning($error->getTraceAsString());
     }
-
-    protected function getDatabase(Registry &$register, string $namespace): Database
-    {
-        $attempts = 0;
-
-        do {
-            try {
-                $attempts++;
-
-                $db = $register->get('db');
-                $redis = $register->get('cache');
-
-                $cache = new Cache(new RedisCache($redis));
-                $database = new Database(new MariaDB($db), $cache);
-                $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-                $database->setNamespace($namespace);
-
-                if (!$database->exists($database->getDefaultDatabase(), 'projects')) {
-                    throw new Exception('Projects collection not ready');
-                }
-                break; // leave loop if successful
-            } catch (\Exception$e) {
-                Console::warning("Database not ready. Retrying connection ({$attempts})...");
-                if ($attempts >= DATABASE_RECONNECT_MAX_ATTEMPTS) {
-                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-                }
-                sleep(DATABASE_RECONNECT_SLEEP);
-            }
-        } while ($attempts < DATABASE_RECONNECT_MAX_ATTEMPTS);
-
-        return $database;
-    }
-
-    protected function getInfluxDB(Registry &$register): InfluxDatabase
-    {
-        /** @var InfluxDB\Client $client */
-        $client = $register->get('influxdb');
-        $attempts = 0;
-        $max = 10;
-        $sleep = 1;
-
-        do { // check if telegraf database is ready
-            try {
-                $attempts++;
-                $database = $client->selectDB('telegraf');
-                if (in_array('telegraf', $client->listDatabases())) {
-                    break; // leave the do-while if successful
-                }
-            } catch (\Throwable$th) {
-                Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
-                if ($attempts >= $max) {
-                    throw new \Exception('InfluxDB database not ready yet');
-                }
-                sleep($sleep);
-            }
-        } while ($attempts < $max);
-        return $database;
-    }
 }

From dedd24254a857ef476ad38ce47a232fd5efe4f2f Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 07:35:03 +0000
Subject: [PATCH 29/65] update depending libraries

---
 composer.json |  4 ++--
 composer.lock | 25 +++++++++++--------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index 9bc0cfdeda..b47b8c79a8 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.15.*",
         "utopia-php/cache": "0.6.*",
-        "utopia-php/platform": "dev-feat-cli-update",
+        "utopia-php/platform": "0.3.*",
         "utopia-php/cli": "0.14.*",
         "utopia-php/config": "0.2.*",
         "utopia-php/database": "0.26.*",
@@ -61,7 +61,7 @@
         "utopia-php/storage": "0.11.*",
         "utopia-php/websocket": "0.1.0",
         "utopia-php/image": "0.5.*",
-        "utopia-php/orchestration": "dev-feat-cli-update",
+        "utopia-php/orchestration": "0.7.*",
         "resque/php-resque": "1.3.6",
         "matomo/device-detector": "6.0.0",
         "dragonmantank/cron-expression": "3.3.1",
diff --git a/composer.lock b/composer.lock
index 416a5c1376..5ce55529cd 100644
--- a/composer.lock
+++ b/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": "32ae4fa68179e9a5e4b18840ab9db57f",
+    "content-hash": "f767c5ed523160615244a04e770a7f79",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2390,16 +2390,16 @@
         },
         {
             "name": "utopia-php/orchestration",
-            "version": "dev-feat-cli-update",
+            "version": "0.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/orchestration.git",
-                "reference": "dd6d30e70d3d71e49a10f6281fc8e7c0b9fd901a"
+                "reference": "484df2c9275a77722fe05f3630cf0e346dcb372e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/dd6d30e70d3d71e49a10f6281fc8e7c0b9fd901a",
-                "reference": "dd6d30e70d3d71e49a10f6281fc8e7c0b9fd901a",
+                "url": "https://api.github.com/repos/utopia-php/orchestration/zipball/484df2c9275a77722fe05f3630cf0e346dcb372e",
+                "reference": "484df2c9275a77722fe05f3630cf0e346dcb372e",
                 "shasum": ""
             },
             "require": {
@@ -2433,17 +2433,17 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/orchestration/issues",
-                "source": "https://github.com/utopia-php/orchestration/tree/feat-cli-update"
+                "source": "https://github.com/utopia-php/orchestration/tree/0.7.0"
             },
-            "time": "2022-10-28T02:36:14+00:00"
+            "time": "2022-10-28T07:23:38+00:00"
         },
         {
             "name": "utopia-php/platform",
-            "version": "dev-feat-cli-update",
+            "version": "0.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "07e825132492c7d7c9920dbeb527833bda21155d"
+                "reference": "9cebec37b96e9f38c1cc0a68a793304606423897"
             },
             "require": {
                 "ext-json": "*",
@@ -2489,7 +2489,7 @@
                 "upf",
                 "utopia"
             ],
-            "time": "2022-10-28T03:15:57+00:00"
+            "time": "2022-10-28T07:26:09+00:00"
         },
         {
             "name": "utopia-php/preloader",
@@ -5407,10 +5407,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "utopia-php/platform": 20,
-        "utopia-php/orchestration": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From 14aca37d2ef16c8efcfdf91577b4bab91adff51a Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 07:36:02 +0000
Subject: [PATCH 30/65] inject register on migrate

---
 src/Appwrite/CLI/Tasks/Migrate.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Migrate.php b/src/Appwrite/CLI/Tasks/Migrate.php
index e9f0f0dec3..7e36247a55 100644
--- a/src/Appwrite/CLI/Tasks/Migrate.php
+++ b/src/Appwrite/CLI/Tasks/Migrate.php
@@ -12,6 +12,7 @@ use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Registry\Registry;
 use Utopia\Validator\Text;
 
 class Migrate extends Action
@@ -26,12 +27,12 @@ class Migrate extends Action
         $this
             ->desc('Migrate Appwrite to new version')
             ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
-            ->callback(fn ($version) => $this->action($version));
+            ->inject('register')
+            ->callback(fn ($version, $register) => $this->action($version, $register));
     }
 
-    public function action($version)
+    public function action(string $version, Registry $register)
     {
-        global $register;
         Authorization::disable();
         if (!array_key_exists($version, Migration::$versions)) {
             Console::error("Version {$version} not found.");

From e7a7267c9fd7022e9c5dad3c9d7bd325b3927450 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 08:49:05 +0000
Subject: [PATCH 31/65] move resource code inside the callback

---
 app/cli.php | 82 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 43 insertions(+), 39 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 0dd4fad71e..d0b0cf66a1 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -13,31 +13,33 @@ use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Cache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
+use Utopia\Registry\Registry;
 
 Authorization::disable();
 
 CLI::setResource('register', fn()=>$register);
 
-$attempts = 0;
-$max = 10;
-$sleep = 1;
-
-do {
-    try {
-        $attempts++;
-        $db = $register->get('db');
-        $redis = $register->get('cache');
-        break; // leave the do-while if successful
-    } catch (\Exception $e) {
-        Console::warning("Database not ready. Retrying connection ({$attempts})...");
-        if ($attempts >= $max) {
-            throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+CLI::setResource('db', function(Registry $register) {
+    $attempts = 0;
+    $max = 10;
+    $sleep = 1;
+    do {
+        try {
+            $attempts++;
+            $db = $register->get('db');
+            $redis = $register->get('cache');
+            break; // leave the do-while if successful
+        } catch (\Exception $e) {
+            Console::warning("Database not ready. Retrying connection ({$attempts})...");
+            if ($attempts >= $max) {
+                throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+            }
+            sleep($sleep);
         }
-        sleep($sleep);
-    }
-} while ($attempts < $max);
+    } while ($attempts < $max);
+    return $db;
+}, ['register']);
 
-CLI::setResource('db', fn () => $db);
 CLI::setResource('cache', fn () => $redis);
 
 CLI::setResource('dbForConsole', function ($db, $cache) {
@@ -50,28 +52,30 @@ CLI::setResource('dbForConsole', function ($db, $cache) {
     return $database;
 }, ['db', 'cache']);
 
-/** @var InfluxDB\Client $client */
-$client = $register->get('influxdb');
-$attempts = 0;
-$max = 10;
-$sleep = 1;
-
-do { // check if telegraf database is ready
-    try {
-        $attempts++;
-        $database = $client->selectDB('telegraf');
-        if (in_array('telegraf', $client->listDatabases())) {
-            break; // leave the do-while if successful
+CLI::setResource('influxdb', function(Registry $register){
+    /** @var InfluxDB\Client $client */
+    $client = $register->get('influxdb');
+    $attempts = 0;
+    $max = 10;
+    $sleep = 1;
+    
+    do { // check if telegraf database is ready
+        try {
+            $attempts++;
+            $database = $client->selectDB('telegraf');
+            if (in_array('telegraf', $client->listDatabases())) {
+                break; // leave the do-while if successful
+            }
+        } catch (\Throwable$th) {
+            Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+            if ($attempts >= $max) {
+                throw new \Exception('InfluxDB database not ready yet');
+            }
+            sleep($sleep);
         }
-    } catch (\Throwable$th) {
-        Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
-        if ($attempts >= $max) {
-            throw new \Exception('InfluxDB database not ready yet');
-        }
-        sleep($sleep);
-    }
-} while ($attempts < $max);
-CLI::setResource('influxdb', fn() => $database);
+    } while ($attempts < $max);
+    return $database;
+}, ['register']);
 
 $cliPlatform = new Tasks();
 $cliPlatform->init(Service::TYPE_CLI);

From 4acd10f2e1e29a8de387444107811a2373b0e4a3 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 08:56:45 +0000
Subject: [PATCH 32/65] error logger in resources

---
 app/cli.php                      | 38 ++++++++++++++++++++++++++++++
 src/Appwrite/CLI/Tasks/Usage.php | 11 +++++----
 src/Appwrite/Platform/Task.php   | 40 +-------------------------------
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index d0b0cf66a1..dc2e62c88c 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -13,6 +13,7 @@ use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Cache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
+use Utopia\Logger\Log;
 use Utopia\Registry\Registry;
 
 Authorization::disable();
@@ -77,6 +78,43 @@ CLI::setResource('influxdb', function(Registry $register){
     return $database;
 }, ['register']);
 
+CLI::setResource('logError', function(Registry $register){
+    return function(Throwable $error, string $namespace, string $action) use($register)
+    {
+        $logger = $register->get('logger');
+
+        if ($logger) {
+            $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
+
+            $log = new Log();
+            $log->setNamespace($namespace);
+            $log->setServer(\gethostname());
+            $log->setVersion($version);
+            $log->setType(Log::TYPE_ERROR);
+            $log->setMessage($error->getMessage());
+
+            $log->addTag('code', $error->getCode());
+            $log->addTag('verboseType', get_class($error));
+
+            $log->addExtra('file', $error->getFile());
+            $log->addExtra('line', $error->getLine());
+            $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('detailedTrace', $error->getTrace());
+
+            $log->setAction($action);
+
+            $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            $responseCode = $logger->addLog($log);
+            Console::info('Usage stats log pushed with status code: ' . $responseCode);
+        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
+    };
+});
+
 $cliPlatform = new Tasks();
 $cliPlatform->init(Service::TYPE_CLI);
 
diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index 3ac9ec0d51..fbd7d38277 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -29,7 +29,8 @@ class Usage extends Task
             ->inject('dbForConsole')
             ->inject('influxdb')
             ->inject('register')
-            ->callback(fn ($type, $dbForConsole, $influxDB, $register) => $this->action($type, $dbForConsole, $influxDB, $register));
+            ->inject('logError')
+            ->callback(fn ($type, $dbForConsole, $influxDB, $register, $logError) => $this->action($type, $dbForConsole, $influxDB, $register, $logError));
     }
 
 
@@ -70,19 +71,19 @@ class Usage extends Task
         }, $interval);
     }
 
-    public function action(string $type, UtopiaDatabase $dbForConsole, InfluxDatabase $influxDB, Registry $register)
+    public function action(string $type, UtopiaDatabase $dbForConsole, InfluxDatabase $influxDB, Registry $register, callable $logError)
     {
         Console::title('Usage Aggregation V1');
         Console::success(APP_NAME . ' usage aggregation process v1 has started');
 
-        $logError = fn(Throwable $error, string $action = 'syncUsageStats') => $this->logError($register, $error, "usage", $action);
+        $errorLogger = fn(Throwable $error, string $action = 'syncUsageStats') => $logError($register, $error, "usage", $action);
 
         switch ($type) {
             case 'timeseries':
-                $this->aggregateTimeseries($dbForConsole, $influxDB, $logError);
+                $this->aggregateTimeseries($dbForConsole, $influxDB, $errorLogger);
                 break;
             case 'database':
-                $this->aggregateDatabase($dbForConsole, $logError);
+                $this->aggregateDatabase($dbForConsole, $errorLogger);
                 break;
             default:
                 Console::error("Unsupported usage aggregation type");
diff --git a/src/Appwrite/Platform/Task.php b/src/Appwrite/Platform/Task.php
index 23f73c222b..1376ab1d9f 100644
--- a/src/Appwrite/Platform/Task.php
+++ b/src/Appwrite/Platform/Task.php
@@ -2,53 +2,15 @@
 
 namespace Appwrite\Platform;
 
-use Utopia\Database\Database;
 use Utopia\Platform\Action;
 use Exception;
-use InfluxDB\Database as InfluxDatabase;
 use Utopia\App;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
-use Utopia\Database\Adapter\MariaDB;
 use Utopia\Registry\Registry;
 use Utopia\Logger\Log;
 use Throwable;
 
 abstract class Task extends Action
 {
-    protected function logError(Registry $register, Throwable $error, string $namespace, string $action)
-    {
-        $logger = $register->get('logger');
-
-        if ($logger) {
-            $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
-
-            $log = new Log();
-            $log->setNamespace($namespace);
-            $log->setServer(\gethostname());
-            $log->setVersion($version);
-            $log->setType(Log::TYPE_ERROR);
-            $log->setMessage($error->getMessage());
-
-            $log->addTag('code', $error->getCode());
-            $log->addTag('verboseType', get_class($error));
-
-            $log->addExtra('file', $error->getFile());
-            $log->addExtra('line', $error->getLine());
-            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());
-
-            $log->setAction($action);
-
-            $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
-            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-            $responseCode = $logger->addLog($log);
-            Console::info('Usage stats log pushed with status code: ' . $responseCode);
-        }
-
-        Console::warning("Failed: {$error->getMessage()}");
-        Console::warning($error->getTraceAsString());
-    }
+    
 }

From 5a0a197355e868b7f41bae45df1ca0d9db17cc76 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 08:58:09 +0000
Subject: [PATCH 33/65] composer update

---
 composer.json |  4 ----
 composer.lock | 31 +++++++++++++------------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index b47b8c79a8..092f6131dc 100644
--- a/composer.json
+++ b/composer.json
@@ -75,10 +75,6 @@
         {
             "url": "https://github.com/appwrite/runtimes.git",
             "type": "git"
-        },
-        {
-            "url": "https://github.com/utopia-php/platform.git",
-            "type": "git"
         }
     ],
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 97849946dd..b3fa99e3fe 100644
--- a/composer.lock
+++ b/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": "f767c5ed523160615244a04e770a7f79",
+    "content-hash": "1c3cf7fd488e2eb61af0ddad1f43a446",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2445,6 +2445,12 @@
                 "url": "https://github.com/utopia-php/platform.git",
                 "reference": "9cebec37b96e9f38c1cc0a68a793304606423897"
             },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/utopia-php/platform/zipball/9cebec37b96e9f38c1cc0a68a793304606423897",
+                "reference": "9cebec37b96e9f38c1cc0a68a793304606423897",
+                "shasum": ""
+            },
             "require": {
                 "ext-json": "*",
                 "ext-redis": "*",
@@ -2462,22 +2468,7 @@
                     "Utopia\\Platform\\": "src/Platform"
                 }
             },
-            "autoload-dev": {
-                "psr-4": {
-                    "Utopia\\Tests\\": "tests/Platform"
-                }
-            },
-            "scripts": {
-                "format": [
-                    "vendor/bin/phpcbf"
-                ],
-                "lint": [
-                    "vendor/bin/phpcs"
-                ],
-                "test": [
-                    "docker-compose up -d && sleep 10 && docker-compose exec web vendor/bin/phpunit --configuration phpunit.xml"
-                ]
-            },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -2489,6 +2480,10 @@
                 "upf",
                 "utopia"
             ],
+            "support": {
+                "issues": "https://github.com/utopia-php/platform/issues",
+                "source": "https://github.com/utopia-php/platform/tree/0.3.0"
+            },
             "time": "2022-10-28T07:26:09+00:00"
         },
         {
@@ -5431,5 +5426,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }

From 07a2aed52fd6562c2bf421e7484db7da17dc397e Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Fri, 28 Oct 2022 09:00:59 +0000
Subject: [PATCH 34/65] fix formatting

---
 app/cli.php                    | 11 +++++------
 src/Appwrite/Platform/Task.php |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index dc2e62c88c..2c5bbc8d30 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -20,7 +20,7 @@ Authorization::disable();
 
 CLI::setResource('register', fn()=>$register);
 
-CLI::setResource('db', function(Registry $register) {
+CLI::setResource('db', function (Registry $register) {
     $attempts = 0;
     $max = 10;
     $sleep = 1;
@@ -53,13 +53,13 @@ CLI::setResource('dbForConsole', function ($db, $cache) {
     return $database;
 }, ['db', 'cache']);
 
-CLI::setResource('influxdb', function(Registry $register){
+CLI::setResource('influxdb', function (Registry $register) {
     /** @var InfluxDB\Client $client */
     $client = $register->get('influxdb');
     $attempts = 0;
     $max = 10;
     $sleep = 1;
-    
+
     do { // check if telegraf database is ready
         try {
             $attempts++;
@@ -78,9 +78,8 @@ CLI::setResource('influxdb', function(Registry $register){
     return $database;
 }, ['register']);
 
-CLI::setResource('logError', function(Registry $register){
-    return function(Throwable $error, string $namespace, string $action) use($register)
-    {
+CLI::setResource('logError', function (Registry $register) {
+    return function (Throwable $error, string $namespace, string $action) use ($register) {
         $logger = $register->get('logger');
 
         if ($logger) {
diff --git a/src/Appwrite/Platform/Task.php b/src/Appwrite/Platform/Task.php
index 1376ab1d9f..d1eb7fa88b 100644
--- a/src/Appwrite/Platform/Task.php
+++ b/src/Appwrite/Platform/Task.php
@@ -12,5 +12,4 @@ use Throwable;
 
 abstract class Task extends Action
 {
-    
 }

From 826a9540d057a951c98121cb400ed32ce13fb20a Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 30 Oct 2022 05:36:31 +0000
Subject: [PATCH 35/65] fix cache

---
 app/cli.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 2c5bbc8d30..c80ec6df06 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -28,7 +28,6 @@ CLI::setResource('db', function (Registry $register) {
         try {
             $attempts++;
             $db = $register->get('db');
-            $redis = $register->get('cache');
             break; // leave the do-while if successful
         } catch (\Exception $e) {
             Console::warning("Database not ready. Retrying connection ({$attempts})...");
@@ -41,7 +40,7 @@ CLI::setResource('db', function (Registry $register) {
     return $db;
 }, ['register']);
 
-CLI::setResource('cache', fn () => $redis);
+CLI::setResource('cache', fn ($register) => $register->get('cache'), ['register']);
 
 CLI::setResource('dbForConsole', function ($db, $cache) {
     $cache = new Cache(new RedisCache($cache));

From f56a29476090d69b5fe6dd741e41a9664d4c0b92 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 30 Oct 2022 05:38:22 +0000
Subject: [PATCH 36/65] fix error logger callback

---
 app/cli.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/cli.php b/app/cli.php
index c80ec6df06..a1a080fc31 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -111,7 +111,7 @@ CLI::setResource('logError', function (Registry $register) {
         Console::warning("Failed: {$error->getMessage()}");
         Console::warning($error->getTraceAsString());
     };
-});
+}, ['register']);
 
 $cliPlatform = new Tasks();
 $cliPlatform->init(Service::TYPE_CLI);

From a74ddc70261e3ed52c8f30befeeb2789988ebfa2 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 31 Oct 2022 08:02:32 +0000
Subject: [PATCH 37/65] composer update

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index b3fa99e3fe..c3b63a95a0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5426,5 +5426,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 9cdce06d96bade481d974d84ad29cad9bfbf9110 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Wed, 2 Nov 2022 06:23:31 +0000
Subject: [PATCH 38/65] fix usage task

---
 src/Appwrite/CLI/Tasks/Usage.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index fbd7d38277..e3e9db865a 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -28,9 +28,8 @@ class Usage extends Task
             ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
             ->inject('dbForConsole')
             ->inject('influxdb')
-            ->inject('register')
             ->inject('logError')
-            ->callback(fn ($type, $dbForConsole, $influxDB, $register, $logError) => $this->action($type, $dbForConsole, $influxDB, $register, $logError));
+            ->callback(fn ($type, $dbForConsole, $influxDB, $logError) => $this->action($type, $dbForConsole, $influxDB, $logError));
     }
 
 
@@ -71,12 +70,12 @@ class Usage extends Task
         }, $interval);
     }
 
-    public function action(string $type, UtopiaDatabase $dbForConsole, InfluxDatabase $influxDB, Registry $register, callable $logError)
+    public function action(string $type, UtopiaDatabase $dbForConsole, InfluxDatabase $influxDB, callable $logError)
     {
         Console::title('Usage Aggregation V1');
         Console::success(APP_NAME . ' usage aggregation process v1 has started');
 
-        $errorLogger = fn(Throwable $error, string $action = 'syncUsageStats') => $logError($register, $error, "usage", $action);
+        $errorLogger = fn(Throwable $error, string $action = 'syncUsageStats') => $logError($error, "usage", $action);
 
         switch ($type) {
             case 'timeseries':

From f5484d4548d022809a5b2e951e625066274ad0a6 Mon Sep 17 00:00:00 2001
From: Christy Jacob <christyjacob4@gmail.com>
Date: Mon, 7 Nov 2022 19:54:50 +0530
Subject: [PATCH 39/65] feat: update mariadb images

---
 .env                              |  6 +++---
 app/controllers/api/databases.php |  1 -
 docker-compose.yml                | 34 +++++++++++++++----------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.env b/.env
index b28a75a9de..ea7f385c96 100644
--- a/.env
+++ b/.env
@@ -17,14 +17,14 @@ _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
 _APP_REDIS_USER=
-_APP_DB_HOST=mysql
+_APP_DB_HOST=mariadb
 _APP_DB_PORT=3306
 _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mysql://user:password@mysql:3306/appwrite
-_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mysql://user:password@mysql:3306/appwrite
+_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb://user:password@mariadb:3306/appwrite
+_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appwrite
 _APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379
 _APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379
 _APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index c3056db574..2b791e6ea9 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -20,7 +20,6 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\DateTime;
 use Utopia\Database\Query;
-use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\Permissions;
diff --git a/docker-compose.yml b/docker-compose.yml
index f6687493aa..16626f7bc4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -85,7 +85,7 @@ services:
       - ./src:/usr/src/code/src
       - ./dev:/usr/local/dev
     depends_on:
-      - mysql
+      - mariadb
       - redis
       # - clamav
     entrypoint: 
@@ -208,7 +208,7 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
-      - mysql
+      - mariadb
       - redis
     environment:
       - _APP_ENV
@@ -244,7 +244,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -276,7 +276,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
       - request-catcher
     environment:
       - _APP_ENV
@@ -299,7 +299,7 @@ services:
       - appwrite
     depends_on:
       - redis
-      - mysql
+      - mariadb
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -362,7 +362,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -394,7 +394,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -425,7 +425,7 @@ services:
       - appwrite
     depends_on:
       - redis
-      - mysql
+      - mariadb
     volumes: 
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -465,7 +465,7 @@ services:
       - ./src:/usr/src/code/src
     depends_on:
       - redis
-      - mysql
+      - mariadb
       - appwrite-executor
     environment:
       - _APP_ENV
@@ -510,7 +510,7 @@ services:
       - /tmp:/tmp:rw
     depends_on:
       - redis
-      - mysql
+      - mariadb
       - appwrite
     environment:
       - _APP_ENV
@@ -670,7 +670,7 @@ services:
       - ./dev:/usr/local/dev
     depends_on:
       - influxdb
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -708,7 +708,7 @@ services:
       - ./dev:/usr/local/dev
     depends_on:
       - influxdb
-      - mysql
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -751,14 +751,14 @@ services:
       - _APP_REDIS_PASS
       - _APP_CONNECTIONS_QUEUE
 
-  mysql:
-    image: mysql:8.0.28-oracle # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite-mysql
+  mariadb:
+    image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
+    container_name: mariadb
     <<: *x-logging
     networks:
       - appwrite
     volumes:
-      - appwrite-mysql:/var/lib/mysql:rw
+      - appwrite-mariadb:/var/lib/mysql:rw
     ports:
       - "3306:3306"
     environment:
@@ -917,7 +917,7 @@ networks:
   runtimes:
 
 volumes:
-  appwrite-mysql:
+  appwrite-mariadb:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads:

From a52ff7372a7d6cb0f5a1f0a0b5d3b10b1a6b2400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 8 Nov 2022 08:49:45 +0000
Subject: [PATCH 40/65] Add Open Runtimes Executor

---
 .env                              |  20 +-
 Dockerfile                        |   6 -
 app/config/variables.php          |  18 +-
 app/controllers/api/functions.php |  12 +-
 app/executor.php                  | 802 ------------------------------
 app/views/install/compose.phtml   |  60 ---
 app/workers/builds.php            |  14 +-
 app/workers/deletes.php           |  36 +-
 app/workers/functions.php         |  12 +-
 bin/executor                      |   3 -
 composer.lock                     |  99 +++-
 docker-compose.yml                | 111 ++---
 src/Executor/Executor.php         | 157 ++----
 13 files changed, 221 insertions(+), 1129 deletions(-)
 delete mode 100644 app/executor.php
 delete mode 100644 bin/executor

diff --git a/.env b/.env
index 65fb54cb04..1835f6af59 100644
--- a/.env
+++ b/.env
@@ -63,14 +63,6 @@ _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
-_APP_FUNCTIONS_CONTAINERS=10
-_APP_FUNCTIONS_CPUS=0
-_APP_FUNCTIONS_MEMORY=0
-_APP_FUNCTIONS_MEMORY_SWAP=0
-_APP_FUNCTIONS_INACTIVE_THRESHOLD=60
-OPEN_RUNTIMES_NETWORK=appwrite_runtimes
-_APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://appwrite-executor/v1
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
@@ -81,6 +73,12 @@ _APP_USAGE_DATABASE_INTERVAL=15
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
-DOCKERHUB_PULL_USERNAME=
-DOCKERHUB_PULL_PASSWORD=
-DOCKERHUB_PULL_EMAIL=
\ No newline at end of file
+_APP_EXECUTOR_SECRET=your-secret-key
+_APP_EXECUTOR_HOST=http://appwrite-executor/v1
+
+OPR_EXECUTOR_RUNTIMES=php-8.0 # same as _APP_FUNCTIONS_RUNTIMES
+OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
+OPR_EXECUTOR_INACTIVE_TRESHOLD=60
+OPR_EXECUTOR_NETWORK=openruntimes-runtimes
+OPR_EXECUTOR_DOCKER_HUB_USERNAME=
+OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a7cae38502..cde0c09302 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -236,13 +236,8 @@ ENV _APP_SERVER=swoole \
     _APP_SMS_FROM= \
     _APP_FUNCTIONS_SIZE_LIMIT=30000000 \
     _APP_FUNCTIONS_TIMEOUT=900 \
-    _APP_FUNCTIONS_CONTAINERS=10 \
-    _APP_FUNCTIONS_CPUS=1 \
-    _APP_FUNCTIONS_MEMORY=128 \
-    _APP_FUNCTIONS_MEMORY_SWAP=128 \
     _APP_EXECUTOR_SECRET=a-random-secret \
     _APP_EXECUTOR_HOST=http://appwrite-executor/v1 \
-    _APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes \
     _APP_SETUP=self-hosted \
     _APP_VERSION=$VERSION \
     _APP_USAGE_STATS=enabled \
@@ -336,7 +331,6 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/install && \
     chmod +x /usr/local/bin/migrate && \
     chmod +x /usr/local/bin/realtime && \
-    chmod +x /usr/local/bin/executor && \
     chmod +x /usr/local/bin/schedule && \
     chmod +x /usr/local/bin/sdks && \
     chmod +x /usr/local/bin/specs && \
diff --git a/app/config/variables.php b/app/config/variables.php
index 9f3bc018e8..f864ee83b0 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -683,7 +683,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CONTAINERS',
-                'description' => 'The maximum number of containers Appwrite is allowed to keep alive in the background for function environments. Running containers allow faster execution time as there is no need to recreate each container every time a function gets executed. The default value is 10.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum number of containers Appwrite is allowed to keep alive in the background for function environments. Running containers allow faster execution time as there is no need to recreate each container every time a function gets executed. The default value is 10.',
                 'introduction' => '0.7.0',
                 'default' => '10',
                 'required' => false,
@@ -692,7 +692,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -701,7 +701,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -710,7 +710,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY_SWAP',
-                'description' => 'The maximum amount of swap memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, swap memory limit will be disabled.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum amount of swap memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, swap memory limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -764,7 +764,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
                 'introduction' => '0.13.0',
                 'default' => '60',
                 'required' => false,
@@ -773,7 +773,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_USERNAME',
-                'description' => 'The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -782,7 +782,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_PASSWORD',
-                'description' => 'The password for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The password for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -791,7 +791,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_EMAIL',
-                'description' => 'The email for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The email for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -800,7 +800,7 @@ return [
             ],
             [
                 'name' => 'OPEN_RUNTIMES_NETWORK',
-                'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
+                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
                 'introduction' => '0.13.0',
                 'default' => 'appwrite_runtimes',
                 'required' => false,
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 55997ce029..ab7c96e450 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -1150,13 +1150,13 @@ App::post('/v1/functions/:functionId/executions')
             $executionResponse = $executor->createExecution(
                 projectId: $project->getId(),
                 deploymentId: $deployment->getId(),
-                path: $build->getAttribute('outputPath', ''),
-                vars: $vars,
-                data: $data,
-                entrypoint: $deployment->getAttribute('entrypoint', ''),
-                runtime: $function->getAttribute('runtime', ''),
+                payload: $data,
+                variables: $vars,
                 timeout: $function->getAttribute('timeout', 0),
-                baseImage: $runtime['image']
+
+                image: $runtime['image'],
+                source: $build->getAttribute('outputPath', ''),
+                entrypoint: $deployment->getAttribute('entrypoint', ''),
             );
 
             /** Update execution status */
diff --git a/app/executor.php b/app/executor.php
deleted file mode 100644
index fba8c4c416..0000000000
--- a/app/executor.php
+++ /dev/null
@@ -1,802 +0,0 @@
-<?php
-
-require_once __DIR__ . '/../vendor/autoload.php';
-
-use Appwrite\Runtimes\Runtimes;
-use Swoole\ConnectionPool;
-use Swoole\Http\Request as SwooleRequest;
-use Swoole\Http\Response as SwooleResponse;
-use Swoole\Http\Server;
-use Swoole\Process;
-use Swoole\Runtime;
-use Swoole\Timer;
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Database\DateTime;
-use Utopia\Logger\Log;
-use Utopia\Logger\Logger;
-use Utopia\Orchestration\Adapter\DockerCLI;
-use Utopia\Orchestration\Orchestration;
-use Utopia\Storage\Device;
-use Utopia\Storage\Device\Local;
-use Utopia\Storage\Device\Backblaze;
-use Utopia\Storage\Device\DOSpaces;
-use Utopia\Storage\Device\Linode;
-use Utopia\Storage\Device\Wasabi;
-use Utopia\Storage\Device\S3;
-use Utopia\Storage\Storage;
-use Utopia\Swoole\Request;
-use Utopia\Swoole\Response;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Assoc;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-
-
-Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL);
-
-/** Constants */
-const MAINTENANCE_INTERVAL = 3600; // 3600 seconds = 1 hour
-
-/**
-* Create a Swoole table to store runtime information
-*/
-$activeRuntimes = new Swoole\Table(1024);
-$activeRuntimes->column('id', Swoole\Table::TYPE_STRING, 256);
-$activeRuntimes->column('created', Swoole\Table::TYPE_INT, 8);
-$activeRuntimes->column('updated', Swoole\Table::TYPE_INT, 8);
-$activeRuntimes->column('name', Swoole\Table::TYPE_STRING, 128);
-$activeRuntimes->column('status', Swoole\Table::TYPE_STRING, 128);
-$activeRuntimes->column('key', Swoole\Table::TYPE_STRING, 256);
-$activeRuntimes->create();
-
-/**
- * Create orchestration pool
- */
-$orchestrationPool = new ConnectionPool(function () {
-    $dockerUser = App::getEnv('DOCKERHUB_PULL_USERNAME', null);
-    $dockerPass = App::getEnv('DOCKERHUB_PULL_PASSWORD', null);
-    $orchestration = new Orchestration(new DockerCLI($dockerUser, $dockerPass));
-    return $orchestration;
-}, 10);
-
-
-/**
- * Create logger instance
- */
-$providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
-$providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
-$logger = null;
-
-if (!empty($providerName) && !empty($providerConfig) && Logger::hasProvider($providerName)) {
-    $classname = '\\Utopia\\Logger\\Adapter\\' . \ucfirst($providerName);
-    $adapter = new $classname($providerConfig);
-    $logger = new Logger($adapter);
-}
-
-function logError(Throwable $error, string $action, Utopia\Route $route = null)
-{
-    global $logger;
-
-    if ($logger) {
-        $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
-
-        $log = new Log();
-        $log->setNamespace("executor");
-        $log->setServer(\gethostname());
-        $log->setVersion($version);
-        $log->setType(Log::TYPE_ERROR);
-        $log->setMessage($error->getMessage());
-
-        if ($route) {
-            $log->addTag('method', $route->getMethod());
-            $log->addTag('url', $route->getPath());
-        }
-
-        $log->addTag('code', $error->getCode());
-        $log->addTag('verboseType', get_class($error));
-
-        $log->addExtra('file', $error->getFile());
-        $log->addExtra('line', $error->getLine());
-        $log->addExtra('trace', $error->getTraceAsString());
-        $log->addExtra('detailedTrace', $error->getTrace());
-
-        $log->setAction($action);
-
-        $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
-        $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-        $responseCode = $logger->addLog($log);
-        Console::info('Executor log pushed with status code: ' . $responseCode);
-    }
-
-    Console::error('[Error] Type: ' . get_class($error));
-    Console::error('[Error] Message: ' . $error->getMessage());
-    Console::error('[Error] File: ' . $error->getFile());
-    Console::error('[Error] Line: ' . $error->getLine());
-}
-
-function getStorageDevice($root): Device
-{
-    switch (App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL)) {
-        case Storage::DEVICE_LOCAL:
-        default:
-            return new Local($root);
-        case Storage::DEVICE_S3:
-            $s3AccessKey = App::getEnv('_APP_STORAGE_S3_ACCESS_KEY', '');
-            $s3SecretKey = App::getEnv('_APP_STORAGE_S3_SECRET', '');
-            $s3Region = App::getEnv('_APP_STORAGE_S3_REGION', '');
-            $s3Bucket = App::getEnv('_APP_STORAGE_S3_BUCKET', '');
-            $s3Acl = 'private';
-            return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
-        case Storage::DEVICE_DO_SPACES:
-            $doSpacesAccessKey = App::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
-            $doSpacesSecretKey = App::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
-            $doSpacesRegion = App::getEnv('_APP_STORAGE_DO_SPACES_REGION', '');
-            $doSpacesBucket = App::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', '');
-            $doSpacesAcl = 'private';
-            return new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl);
-        case Storage::DEVICE_BACKBLAZE:
-            $backblazeAccessKey = App::getEnv('_APP_STORAGE_BACKBLAZE_ACCESS_KEY', '');
-            $backblazeSecretKey = App::getEnv('_APP_STORAGE_BACKBLAZE_SECRET', '');
-            $backblazeRegion = App::getEnv('_APP_STORAGE_BACKBLAZE_REGION', '');
-            $backblazeBucket = App::getEnv('_APP_STORAGE_BACKBLAZE_BUCKET', '');
-            $backblazeAcl = 'private';
-            return new Backblaze($root, $backblazeAccessKey, $backblazeSecretKey, $backblazeBucket, $backblazeRegion, $backblazeAcl);
-        case Storage::DEVICE_LINODE:
-            $linodeAccessKey = App::getEnv('_APP_STORAGE_LINODE_ACCESS_KEY', '');
-            $linodeSecretKey = App::getEnv('_APP_STORAGE_LINODE_SECRET', '');
-            $linodeRegion = App::getEnv('_APP_STORAGE_LINODE_REGION', '');
-            $linodeBucket = App::getEnv('_APP_STORAGE_LINODE_BUCKET', '');
-            $linodeAcl = 'private';
-            return new Linode($root, $linodeAccessKey, $linodeSecretKey, $linodeBucket, $linodeRegion, $linodeAcl);
-        case Storage::DEVICE_WASABI:
-            $wasabiAccessKey = App::getEnv('_APP_STORAGE_WASABI_ACCESS_KEY', '');
-            $wasabiSecretKey = App::getEnv('_APP_STORAGE_WASABI_SECRET', '');
-            $wasabiRegion = App::getEnv('_APP_STORAGE_WASABI_REGION', '');
-            $wasabiBucket = App::getEnv('_APP_STORAGE_WASABI_BUCKET', '');
-            $wasabiAcl = 'private';
-            return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl);
-    }
-}
-
-App::post('/v1/runtimes')
-    ->desc("Create a new runtime server")
-    ->param('runtimeId', '', new Text(64), 'Unique runtime ID.')
-    ->param('source', '', new Text(0), 'Path to source files.')
-    ->param('destination', '', new Text(0), 'Destination folder to store build files into.', true)
-    ->param('vars', [], new Assoc(), 'Environment Variables required for the build.')
-    ->param('commands', [], new ArrayList(new Text(1024), 100), 'Commands required to build the container. Maximum of 100 commands are allowed, each 1024 characters long.')
-    ->param('runtime', '', new Text(128), 'Runtime for the cloud function.')
-    ->param('baseImage', '', new Text(128), 'Base image name of the runtime.')
-    ->param('entrypoint', '', new Text(256), 'Entrypoint of the code file.', true)
-    ->param('remove', false, new Boolean(), 'Remove a runtime after execution.')
-    ->param('workdir', '', new Text(256), 'Working directory.', true)
-    ->inject('orchestrationPool')
-    ->inject('activeRuntimes')
-    ->inject('response')
-    ->action(function (string $runtimeId, string $source, string $destination, array $vars, array $commands, string $runtime, string $baseImage, string $entrypoint, bool $remove, string $workdir, $orchestrationPool, $activeRuntimes, Response $response) {
-        if ($activeRuntimes->exists($runtimeId)) {
-            if ($activeRuntimes->get($runtimeId)['status'] == 'pending') {
-                throw new \Exception('A runtime with the same ID is already being created. Attempt a execution soon.', 500);
-            }
-
-            throw new Exception('Runtime already exists.', 409);
-        }
-
-        $container = [];
-        $containerId = '';
-        $stdout = '';
-        $stderr = '';
-        $startTime = DateTime::now();
-        $startTimeUnix = (new \DateTime($startTime))->getTimestamp();
-        $endTimeUnix = 0;
-        $orchestration = $orchestrationPool->get();
-
-        $secret = \bin2hex(\random_bytes(16));
-
-        if (!$remove) {
-            $activeRuntimes->set($runtimeId, [
-                'id' => $containerId,
-                'name' => $runtimeId,
-                'created' => $startTimeUnix,
-                'updated' => $endTimeUnix,
-                'status' => 'pending',
-                'key' => $secret,
-            ]);
-        }
-
-        try {
-            Console::info('Building container : ' . $runtimeId);
-
-            /**
-             * Temporary file paths in the executor
-             */
-            $tmpSource = "/tmp/$runtimeId/src/code.tar.gz";
-            $tmpBuild = "/tmp/$runtimeId/builds/code.tar.gz";
-
-            /**
-             * Copy code files from source to a temporary location on the executor
-             */
-            $sourceDevice = getStorageDevice("/");
-            $localDevice = new Local();
-            $buffer = $sourceDevice->read($source);
-            if (!$localDevice->write($tmpSource, $buffer)) {
-                throw new Exception('Failed to copy source code to temporary directory', 500);
-            };
-
-            /**
-             * Create the mount folder
-             */
-            if (!\file_exists(\dirname($tmpBuild))) {
-                if (!@\mkdir(\dirname($tmpBuild), 0755, true)) {
-                    throw new Exception("Failed to create temporary directory", 500);
-                }
-            }
-
-            /**
-             * Create container
-             */
-            $vars = \array_merge($vars, [
-                'INTERNAL_RUNTIME_KEY' => $secret,
-                'INTERNAL_RUNTIME_ENTRYPOINT' => $entrypoint,
-            ]);
-            $vars = array_map(fn ($v) => strval($v), $vars);
-            $orchestration
-                ->setCpus((int) App::getEnv('_APP_FUNCTIONS_CPUS', 0))
-                ->setMemory((int) App::getEnv('_APP_FUNCTIONS_MEMORY', 0))
-                ->setSwap((int) App::getEnv('_APP_FUNCTIONS_MEMORY_SWAP', 0));
-
-            /** Keep the container alive if we have commands to be executed */
-            $entrypoint = !empty($commands) ? [
-                'tail',
-                '-f',
-                '/dev/null'
-            ] : [];
-
-            $containerId = $orchestration->run(
-                image: $baseImage,
-                name: $runtimeId,
-                hostname: $runtimeId,
-                vars: $vars,
-                command: $entrypoint,
-                labels: [
-                    'openruntimes-id' => $runtimeId,
-                    'openruntimes-type' => 'runtime',
-                    'openruntimes-created' => strval($startTimeUnix),
-                    'openruntimes-runtime' => $runtime,
-                ],
-                workdir: $workdir,
-                volumes: [
-                    \dirname($tmpSource) . ':/tmp:rw',
-                    \dirname($tmpBuild) . ':/usr/code:rw'
-                ]
-            );
-
-            if (empty($containerId)) {
-                throw new Exception('Failed to create build container', 500);
-            }
-
-            $orchestration->networkConnect($runtimeId, App::getEnv('OPEN_RUNTIMES_NETWORK', 'appwrite_runtimes'));
-
-            /**
-             * Execute any commands if they were provided
-             */
-            if (!empty($commands)) {
-                $status = $orchestration->execute(
-                    name: $runtimeId,
-                    command: $commands,
-                    stdout: $stdout,
-                    stderr: $stderr,
-                    timeout: App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900)
-                );
-
-                if (!$status) {
-                    throw new Exception('Failed to build dependenices ' . $stderr, 500);
-                }
-            }
-
-            /**
-             * Move built code to expected build directory
-             */
-            if (!empty($destination)) {
-                // Check if the build was successful by checking if file exists
-                if (!\file_exists($tmpBuild)) {
-                    throw new Exception('Something went wrong during the build process', 500);
-                }
-
-                $destinationDevice = getStorageDevice($destination);
-                $outputPath = $destinationDevice->getPath(\uniqid() . '.' . \pathinfo('code.tar.gz', PATHINFO_EXTENSION));
-
-                $buffer = $localDevice->read($tmpBuild);
-                if (!$destinationDevice->write($outputPath, $buffer, $localDevice->getFileMimeType($tmpBuild))) {
-                    throw new Exception('Failed to move built code to storage', 500);
-                };
-
-                $container['outputPath'] = $outputPath;
-            }
-
-            if (empty($stdout)) {
-                $stdout = 'Build Successful!';
-            }
-
-            $endTime = DateTime::now();
-            $endTimeUnix = (new \DateTime($endTime))->getTimestamp();
-            $duration = $endTimeUnix - $startTimeUnix;
-
-            $container = array_merge($container, [
-                'status' => 'ready',
-                'response' => \mb_strcut($stdout, 0, 1000000), // Limit to 1MB
-                'stderr' => \mb_strcut($stderr, 0, 1000000), // Limit to 1MB
-                'startTime' => $startTime,
-                'endTime' => $endTime,
-                'duration' => $duration,
-            ]);
-
-
-            if (!$remove) {
-                $activeRuntimes->set($runtimeId, [
-                    'id' => $containerId,
-                    'name' => $runtimeId,
-                    'created' => $startTimeUnix,
-                    'updated' => $endTimeUnix,
-                    'status' => 'Up ' . \round($duration, 2) . 's',
-                    'key' => $secret,
-                ]);
-            }
-
-            Console::success('Build Stage completed in ' . ($duration) . ' seconds');
-        } catch (Throwable $th) {
-            Console::error('Build failed: ' . $th->getMessage() . $stdout);
-
-            throw new Exception($th->getMessage() . $stdout, 500);
-        } finally {
-            // Container cleanup
-            if ($remove) {
-                if (!empty($containerId)) {
-                    // If container properly created
-                    $orchestration->remove($containerId, true);
-                    $activeRuntimes->del($runtimeId);
-                } else {
-                    // If whole creation failed, but container might have been initialized
-                    try {
-                        // Try to remove with contaier name instead of ID
-                        $orchestration->remove($runtimeId, true);
-                        $activeRuntimes->del($runtimeId);
-                    } catch (Throwable $th) {
-                        // If fails, means initialization also failed.
-                        // Contianer is not there, no need to remove
-                    }
-                }
-            }
-
-            // Release orchestration back to pool, we are done with it
-            $orchestrationPool->put($orchestration);
-        }
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->json($container);
-    });
-
-
-App::get('/v1/runtimes')
-    ->desc("List currently active runtimes")
-    ->inject('activeRuntimes')
-    ->inject('response')
-    ->action(function ($activeRuntimes, Response $response) {
-        $runtimes = [];
-
-        foreach ($activeRuntimes as $runtime) {
-            $runtimes[] = $runtime;
-        }
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_OK)
-            ->json($runtimes);
-    });
-
-App::get('/v1/runtimes/:runtimeId')
-    ->desc("Get a runtime by its ID")
-    ->param('runtimeId', '', new Text(64), 'Runtime unique ID.')
-    ->inject('activeRuntimes')
-    ->inject('response')
-    ->action(function ($runtimeId, $activeRuntimes, Response $response) {
-
-        if (!$activeRuntimes->exists($runtimeId)) {
-            throw new Exception('Runtime not found', 404);
-        }
-
-        $runtime = $activeRuntimes->get($runtimeId);
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_OK)
-            ->json($runtime);
-    });
-
-App::delete('/v1/runtimes/:runtimeId')
-    ->desc('Delete a runtime')
-    ->param('runtimeId', '', new Text(64), 'Runtime unique ID.', false)
-    ->inject('orchestrationPool')
-    ->inject('activeRuntimes')
-    ->inject('response')
-    ->action(function (string $runtimeId, $orchestrationPool, $activeRuntimes, Response $response) {
-
-        if (!$activeRuntimes->exists($runtimeId)) {
-            throw new Exception('Runtime not found', 404);
-        }
-
-        Console::info('Deleting runtime: ' . $runtimeId);
-
-        try {
-            $orchestration = $orchestrationPool->get();
-            $orchestration->remove($runtimeId, true);
-            $activeRuntimes->del($runtimeId);
-            Console::success('Removed runtime container: ' . $runtimeId);
-        } finally {
-            $orchestrationPool->put($orchestration);
-        }
-
-        // Remove all the build containers with that same  ID
-        // TODO:: Delete build containers
-        // foreach ($buildIds as $buildId) {
-        //     try {
-        //         Console::info('Deleting build container : ' . $buildId);
-        //         $status = $orchestration->remove('build-' . $buildId, true);
-        //     } catch (Throwable $th) {
-        //         Console::error($th->getMessage());
-        //     }
-        // }
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_OK)
-            ->send();
-    });
-
-
-App::post('/v1/execution')
-    ->desc('Create an execution')
-    ->param('runtimeId', '', new Text(64), 'The runtimeID to execute.')
-    ->param('vars', [], new Assoc(), 'Environment variables required for the build.')
-    ->param('data', '', new Text(8192), 'Data to be forwarded to the function, this is user specified.', true)
-    ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Function maximum execution time in seconds.')
-    ->inject('activeRuntimes')
-    ->inject('response')
-    ->action(
-        function (string $runtimeId, array $vars, string $data, $timeout, $activeRuntimes, Response $response) {
-            if (!$activeRuntimes->exists($runtimeId)) {
-                throw new Exception('Runtime not found. Please create the runtime.', 404);
-            }
-
-            for ($i = 0; $i < 5; $i++) {
-                if ($activeRuntimes->get($runtimeId)['status'] === 'pending') {
-                    Console::info('Waiting for runtime to be ready...');
-                    sleep(1);
-                } else {
-                    break;
-                }
-
-                if ($i === 4) {
-                    throw new Exception('Runtime failed to launch in allocated time.', 500);
-                }
-            }
-
-            $runtime = $activeRuntimes->get($runtimeId);
-            $secret = $runtime['key'];
-            if (empty($secret)) {
-                throw new Exception('Runtime secret not found. Please re-create the runtime.', 500);
-            }
-
-            Console::info('Executing Runtime: ' . $runtimeId);
-
-            $execution = [];
-            $executionStart = \microtime(true);
-            $stdout = '';
-            $stderr = '';
-            $res = '';
-            $statusCode = 0;
-            $errNo = -1;
-            $executorResponse = '';
-
-            $timeout ??= (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900);
-
-            $ch = \curl_init();
-            $body = \json_encode([
-                'variables' => $vars,
-                'payload' => $data,
-                'timeout' => $timeout
-            ]);
-            \curl_setopt($ch, CURLOPT_URL, "http://" . $runtimeId . ":3000/");
-            \curl_setopt($ch, CURLOPT_POST, true);
-            \curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
-            \curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-            \curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-            \curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-
-            \curl_setopt($ch, CURLOPT_HTTPHEADER, [
-                'Content-Type: application/json',
-                'Content-Length: ' . \strlen($body),
-                'x-internal-challenge: ' . $secret,
-                'host: null'
-            ]);
-
-            $executorResponse = \curl_exec($ch);
-            $executorResponse = json_decode($executorResponse, true);
-
-            $statusCode = \curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-            $error = \curl_error($ch);
-
-            $errNo = \curl_errno($ch);
-
-            \curl_close($ch);
-
-            switch (true) {
-                /** No Error. */
-                case $errNo === 0:
-                    break;
-                /** Runtime not ready for requests yet. 111 is the swoole error code for Connection Refused - see https://openswoole.com/docs/swoole-error-code */
-                case $errNo === 111:
-                    throw new Exception('An internal curl error has occurred within the executor! Error Msg: ' . $error, 406);
-                /** Any other CURL error */
-                default:
-                    throw new Exception('An internal curl error has occurred within the executor! Error Msg: ' . $error, 500);
-            }
-
-            switch (true) {
-                case $statusCode >= 500:
-                    $stderr = ($executorResponse ?? [])['stderr'] ?? 'Internal Runtime error.';
-                    $stdout = ($executorResponse ?? [])['stdout'] ?? 'Internal Runtime error.';
-                    break;
-                case $statusCode >= 100:
-                    $stdout = $executorResponse['stdout'];
-                    $res = $executorResponse['response'];
-                    if (is_array($res)) {
-                        $res = json_encode($res, JSON_UNESCAPED_UNICODE);
-                    }
-                    break;
-                default:
-                    $stderr = ($executorResponse ?? [])['stderr'] ?? 'Execution failed.';
-                    $stdout = ($executorResponse ?? [])['stdout'] ?? '';
-                    break;
-            }
-
-            $executionEnd = \microtime(true);
-            $executionTime = ($executionEnd - $executionStart);
-            $functionStatus = ($statusCode >= 500) ? 'failed' : 'completed';
-
-            Console::success('Function executed in ' . $executionTime . ' seconds, status: ' . $functionStatus);
-
-            $execution = [
-                'status' => $functionStatus,
-                'statusCode' => $statusCode,
-                'response' => \mb_strcut($res, 0, 1000000), // Limit to 1MB
-                'stdout' => \mb_strcut($stdout, 0, 1000000), // Limit to 1MB
-                'stderr' => \mb_strcut($stderr, 0, 1000000), // Limit to 1MB
-                'duration' => $executionTime,
-            ];
-
-            /** Update swoole table */
-            $runtime['updated'] = \time();
-            $activeRuntimes->set($runtimeId, $runtime);
-
-            $response
-                ->setStatusCode(Response::STATUS_CODE_OK)
-                ->json($execution);
-        }
-    );
-
-App::setMode(App::MODE_TYPE_PRODUCTION); // Define Mode
-
-$http = new Server("0.0.0.0", 80);
-
-/** Set Resources */
-App::setResource('orchestrationPool', fn() => $orchestrationPool);
-App::setResource('activeRuntimes', fn() => $activeRuntimes);
-
-/** Set callbacks */
-App::error()
-    ->inject('utopia')
-    ->inject('error')
-    ->inject('request')
-    ->inject('response')
-    ->action(function (App $utopia, throwable $error, Request $request, Response $response) {
-        $route = $utopia->match($request);
-        logError($error, "httpError", $route);
-
-        switch ($error->getCode()) {
-            case 400: // Error allowed publicly
-            case 401: // Error allowed publicly
-            case 402: // Error allowed publicly
-            case 403: // Error allowed publicly
-            case 404: // Error allowed publicly
-            case 406: // Error allowed publicly
-            case 409: // Error allowed publicly
-            case 412: // Error allowed publicly
-            case 425: // Error allowed publicly
-            case 429: // Error allowed publicly
-            case 501: // Error allowed publicly
-            case 503: // Error allowed publicly
-                $code = $error->getCode();
-                break;
-            default:
-                $code = 500; // All other errors get the generic 500 server error status code
-        }
-
-        $output = [
-            'message' => $error->getMessage(),
-            'code' => $error->getCode(),
-            'file' => $error->getFile(),
-            'line' => $error->getLine(),
-            'trace' => $error->getTrace(),
-            'version' => App::getEnv('_APP_VERSION', 'UNKNOWN')
-        ];
-
-        $response
-            ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
-            ->addHeader('Expires', '0')
-            ->addHeader('Pragma', 'no-cache')
-            ->setStatusCode($code);
-
-        $response->json($output);
-    });
-
-App::init()
-    ->inject('request')
-    ->action(function (Request $request) {
-        $secretKey = $request->getHeader('x-appwrite-executor-key', '');
-        if (empty($secretKey)) {
-            throw new Exception('Missing executor key', 401);
-        }
-
-        if ($secretKey !== App::getEnv('_APP_EXECUTOR_SECRET', '')) {
-            throw new Exception('Missing executor key', 401);
-        }
-    });
-
-
-$http->on('start', function ($http) {
-    global $orchestrationPool;
-    global $activeRuntimes;
-
-    /**
-     * Warmup: make sure images are ready to run fast 🚀
-     */
-    $runtimes = new Runtimes('v2');
-    $allowList = empty(App::getEnv('_APP_FUNCTIONS_RUNTIMES')) ? [] : \explode(',', App::getEnv('_APP_FUNCTIONS_RUNTIMES'));
-    $runtimes = $runtimes->getAll(true, $allowList);
-    foreach ($runtimes as $runtime) {
-        go(function () use ($runtime, $orchestrationPool) {
-            try {
-                $orchestration = $orchestrationPool->get();
-                Console::info('Warming up ' . $runtime['name'] . ' ' . $runtime['version'] . ' environment...');
-                $response = $orchestration->pull($runtime['image']);
-                if ($response) {
-                    Console::success("Successfully Warmed up {$runtime['name']} {$runtime['version']}!");
-                } else {
-                    Console::warning("Failed to Warmup {$runtime['name']} {$runtime['version']}!");
-                }
-            } catch (\Throwable $th) {
-            } finally {
-                $orchestrationPool->put($orchestration);
-            }
-        });
-    }
-
-    /**
-     * Remove residual runtimes
-     */
-    Console::info('Removing orphan runtimes...');
-    try {
-        $orchestration = $orchestrationPool->get();
-        $orphans = $orchestration->list(['label' => 'openruntimes-type=runtime']);
-    } finally {
-        $orchestrationPool->put($orchestration);
-    }
-
-    foreach ($orphans as $runtime) {
-        go(function () use ($runtime, $orchestrationPool) {
-            try {
-                $orchestration = $orchestrationPool->get();
-                $orchestration->remove($runtime->getName(), true);
-                Console::success("Successfully removed {$runtime->getName()}");
-            } catch (\Throwable $th) {
-                Console::error('Orphan runtime deletion failed: ' . $th->getMessage());
-            } finally {
-                $orchestrationPool->put($orchestration);
-            }
-        });
-    }
-
-    /**
-     * Register handlers for shutdown
-     */
-    @Process::signal(SIGINT, function () use ($http) {
-        $http->shutdown();
-    });
-
-    @Process::signal(SIGQUIT, function () use ($http) {
-        $http->shutdown();
-    });
-
-    @Process::signal(SIGKILL, function () use ($http) {
-        $http->shutdown();
-    });
-
-    @Process::signal(SIGTERM, function () use ($http) {
-        $http->shutdown();
-    });
-
-    /**
-     * Run a maintenance worker every MAINTENANCE_INTERVAL seconds to remove inactive runtimes
-     */
-    Timer::tick(MAINTENANCE_INTERVAL * 1000, function () use ($orchestrationPool, $activeRuntimes) {
-        Console::warning("Running maintenance task ...");
-        foreach ($activeRuntimes as $runtime) {
-            $inactiveThreshold = \time() - App::getEnv('_APP_FUNCTIONS_INACTIVE_THRESHOLD', 60);
-            if ($runtime['updated'] < $inactiveThreshold) {
-                go(function () use ($runtime, $orchestrationPool, $activeRuntimes) {
-                    try {
-                        $orchestration = $orchestrationPool->get();
-                        $orchestration->remove($runtime['name'], true);
-                        $activeRuntimes->del($runtime['name']);
-                        Console::success("Successfully removed {$runtime['name']}");
-                    } catch (\Throwable $th) {
-                        Console::error('Inactive Runtime deletion failed: ' . $th->getMessage());
-                    } finally {
-                        $orchestrationPool->put($orchestration);
-                    }
-                });
-            }
-        }
-    });
-});
-
-
-$http->on('beforeShutdown', function () {
-    global $orchestrationPool;
-    Console::info('Cleaning up containers before shutdown...');
-
-    $orchestration = $orchestrationPool->get();
-    $functionsToRemove = $orchestration->list(['label' => 'openruntimes-type=runtime']);
-    $orchestrationPool->put($orchestration);
-
-    foreach ($functionsToRemove as $container) {
-        go(function () use ($orchestrationPool, $container) {
-            try {
-                $orchestration = $orchestrationPool->get();
-                $orchestration->remove($container->getId(), true);
-                Console::info('Removed container ' . $container->getName());
-            } catch (\Throwable $th) {
-                Console::error('Failed to remove container: ' . $container->getName());
-            } finally {
-                $orchestrationPool->put($orchestration);
-            }
-        });
-    }
-});
-
-
-$http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) {
-    $request = new Request($swooleRequest);
-    $response = new Response($swooleResponse);
-    $app = new App('UTC');
-
-    try {
-        $app->run($request, $response);
-    } catch (\Throwable $th) {
-        logError($th, "serverError");
-        $swooleResponse->setStatusCode(500);
-        $output = [
-            'message' => 'Error: ' . $th->getMessage(),
-            'code' => 500,
-            'file' => $th->getFile(),
-            'line' => $th->getLine(),
-            'trace' => $th->getTrace()
-        ];
-        $swooleResponse->end(\json_encode($output));
-    }
-});
-
-$http->start();
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 0442d8456b..5bd2b24565 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -395,7 +395,6 @@ services:
     depends_on:
       - redis
       - mariadb
-      - appwrite-executor
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -415,64 +414,6 @@ services:
       - DOCKERHUB_PULL_USERNAME
       - DOCKERHUB_PULL_PASSWORD
 
-  appwrite-executor:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: executor
-    <<: *x-logging
-    container_name: appwrite-executor
-    restart: unless-stopped
-    stop_signal: SIGINT
-    networks:
-      appwrite:
-      runtimes:
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - appwrite-functions:/storage/functions:rw
-      - appwrite-builds:/storage/builds:rw
-      - /tmp:/tmp:rw
-    depends_on:
-      - redis
-      - mariadb
-      - appwrite
-    environment:
-      - _APP_ENV
-      - _APP_VERSION
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CONTAINERS
-      - _APP_FUNCTIONS_RUNTIMES
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_MEMORY_SWAP
-      - _APP_FUNCTIONS_INACTIVE_THRESHOLD
-      - _APP_EXECUTOR_SECRET
-      - OPEN_RUNTIMES_NETWORK
-      - _APP_LOGGING_PROVIDER
-      - _APP_LOGGING_CONFIG
-      - _APP_STORAGE_DEVICE
-      - _APP_STORAGE_S3_ACCESS_KEY
-      - _APP_STORAGE_S3_SECRET
-      - _APP_STORAGE_S3_REGION
-      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
-      - _APP_STORAGE_DO_SPACES_SECRET
-      - _APP_STORAGE_DO_SPACES_REGION
-      - _APP_STORAGE_DO_SPACES_BUCKET
-      - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
-      - _APP_STORAGE_BACKBLAZE_SECRET
-      - _APP_STORAGE_BACKBLAZE_REGION
-      - _APP_STORAGE_BACKBLAZE_BUCKET
-      - _APP_STORAGE_LINODE_ACCESS_KEY
-      - _APP_STORAGE_LINODE_SECRET
-      - _APP_STORAGE_LINODE_REGION
-      - _APP_STORAGE_LINODE_BUCKET
-      - _APP_STORAGE_WASABI_ACCESS_KEY
-      - _APP_STORAGE_WASABI_SECRET
-      - _APP_STORAGE_WASABI_REGION
-      - _APP_STORAGE_WASABI_BUCKET
-      - DOCKERHUB_PULL_USERNAME
-      - DOCKERHUB_PULL_PASSWORD
-
   appwrite-worker-mails:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: worker-mails
@@ -707,4 +648,3 @@ volumes:
   appwrite-builds:
   appwrite-influxdb:
   appwrite-config:
-  appwrite-executor:
diff --git a/app/workers/builds.php b/app/workers/builds.php
index bf780c6464..d1337f980d 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -152,20 +152,18 @@ class BuildsV1 extends Worker
             return $carry;
         }, []);
 
-        $baseImage = $runtime['image'];
-
         try {
             $response = $this->executor->createRuntime(
                 projectId: $project->getId(),
                 deploymentId: $deployment->getId(),
-                entrypoint: $deployment->getAttribute('entrypoint'),
                 source: $source,
-                destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
-                vars: $vars,
-                runtime: $key,
-                baseImage: $baseImage,
-                workdir: '/usr/code',
+                image: $runtime['image'],
                 remove: true,
+
+                entrypoint: $deployment->getAttribute('entrypoint'),
+                workdir: '/usr/code',
+                destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
+                variables: $vars,
                 commands: [
                     'sh', '-c',
                     'tar -zxf /tmp/code.tar.gz -C /usr/code && \
diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index b015043b1d..de078d3676 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -465,16 +465,17 @@ class DeletesV1 extends Worker
 
         /**
          * Request executor to delete all deployment containers
+         * TODO: Re-enable. Disabled for now because of proxy. Container killed after inactivity automatically.
          */
-        Console::info("Requesting executor to delete all deployment containers for function " . $functionId);
-        $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
-        foreach ($deploymentIds as $deploymentId) {
-            try {
-                $executor->deleteRuntime($projectId, $deploymentId);
-            } catch (Throwable $th) {
-                Console::error($th->getMessage());
-            }
-        }
+        // Console::info("Requesting executor to delete all deployment containers for function " . $functionId);
+        // $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
+        // foreach ($deploymentIds as $deploymentId) {
+        //     try {
+        //         $executor->deleteRuntime($projectId, $deploymentId);
+        //     } catch (Throwable $th) {
+        //         Console::error($th->getMessage());
+        //     }
+        // }
     }
 
     /**
@@ -514,15 +515,16 @@ class DeletesV1 extends Worker
         });
 
         /**
-         * Request executor to delete the deployment container
+         * Request executor to delete the deployment container.
+         * TODO: Re-enable. Disabled for now because of proxy. Container killed after inactivity automatically.
          */
-        Console::info("Requesting executor to delete deployment container for deployment " . $deploymentId);
-        try {
-            $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
-            $executor->deleteRuntime($projectId, $deploymentId);
-        } catch (Throwable $th) {
-            Console::error($th->getMessage());
-        }
+        // Console::info("Requesting executor to delete deployment container for deployment " . $deploymentId);
+        // try {
+        //     $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
+        //     $executor->deleteRuntime($projectId, $deploymentId);
+        // } catch (Throwable $th) {
+        //     Console::error($th->getMessage());
+        // }
     }
 
 
diff --git a/app/workers/functions.php b/app/workers/functions.php
index 1df776383f..c8da46a673 100644
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@@ -289,13 +289,13 @@ class FunctionsV1 extends Worker
             $executionResponse = $this->executor->createExecution(
                 projectId: $project->getId(),
                 deploymentId: $deploymentId,
-                path: $build->getAttribute('outputPath', ''),
-                vars: $vars,
-                entrypoint: $deployment->getAttribute('entrypoint', ''),
-                data: $vars['APPWRITE_FUNCTION_DATA'] ?? '',
-                runtime: $function->getAttribute('runtime', ''),
+                payload: $vars['APPWRITE_FUNCTION_DATA'] ?? '',
+                variables: $vars,
                 timeout: $function->getAttribute('timeout', 0),
-                baseImage: $runtime['image']
+
+                image: $runtime['image'],
+                source: $build->getAttribute('outputPath', ''),
+                entrypoint: $deployment->getAttribute('entrypoint', ''),
             );
 
             /** Update execution status */
diff --git a/bin/executor b/bin/executor
deleted file mode 100644
index f08bd68e42..0000000000
--- a/bin/executor
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php -e /usr/src/code/app/executor.php -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index c0320c77da..f3847c2239 100644
--- a/composer.lock
+++ b/composer.lock
@@ -115,15 +115,15 @@
         },
         {
             "name": "appwrite/php-runtimes",
-            "version": "0.11.0",
+            "version": "0.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/runtimes.git",
-                "reference": "547fc026e11c0946846a8ac690898f5bf53be101"
+                "reference": "9d74a477ba3333cbcfac565c46fcf19606b7b603"
             },
             "require": {
                 "php": ">=8.0",
-                "utopia-php/system": "0.4.*"
+                "utopia-php/system": "0.6.*"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
@@ -154,7 +154,7 @@
                 "php",
                 "runtimes"
             ],
-            "time": "2022-08-15T14:03:36+00:00"
+            "time": "2022-11-07T16:45:52+00:00"
         },
         {
             "name": "chillerlan/php-qrcode",
@@ -803,6 +803,72 @@
             },
             "time": "2020-12-26T17:45:17+00:00"
         },
+        {
+            "name": "laravel/pint",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/pint.git",
+                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/1d276e4c803397a26cc337df908f55c2a4e90d86",
+                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-tokenizer": "*",
+                "ext-xml": "*",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.11.0",
+                "illuminate/view": "^9.27",
+                "laravel-zero/framework": "^9.1.3",
+                "mockery/mockery": "^1.5.0",
+                "nunomaduro/larastan": "^2.2",
+                "nunomaduro/termwind": "^1.14.0",
+                "pestphp/pest": "^1.22.1"
+            },
+            "bin": [
+                "builds/pint"
+            ],
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "App\\": "app/",
+                    "Database\\Seeders\\": "database/seeders/",
+                    "Database\\Factories\\": "database/factories/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "An opinionated code formatter for PHP.",
+            "homepage": "https://laravel.com",
+            "keywords": [
+                "format",
+                "formatter",
+                "lint",
+                "linter",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/pint/issues",
+                "source": "https://github.com/laravel/pint"
+            },
+            "time": "2022-09-13T15:07:15+00:00"
+        },
         {
             "name": "matomo/device-detector",
             "version": "6.0.0",
@@ -2368,23 +2434,25 @@
         },
         {
             "name": "utopia-php/system",
-            "version": "0.4.0",
+            "version": "0.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/system.git",
-                "reference": "67c92c66ce8f0cc925a00bca89f7a188bf9183c0"
+                "reference": "289c4327713deadc9c748b5317d248133a02f245"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/system/zipball/67c92c66ce8f0cc925a00bca89f7a188bf9183c0",
-                "reference": "67c92c66ce8f0cc925a00bca89f7a188bf9183c0",
+                "url": "https://api.github.com/repos/utopia-php/system/zipball/289c4327713deadc9c748b5317d248133a02f245",
+                "reference": "289c4327713deadc9c748b5317d248133a02f245",
                 "shasum": ""
             },
             "require": {
+                "laravel/pint": "1.2.*",
                 "php": ">=7.4"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
+                "squizlabs/php_codesniffer": "^3.6",
                 "vimeo/psalm": "4.0.1"
             },
             "type": "library",
@@ -2417,9 +2485,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/system/issues",
-                "source": "https://github.com/utopia-php/system/tree/0.4.0"
+                "source": "https://github.com/utopia-php/system/tree/0.6.0"
             },
-            "time": "2021-02-04T14:14:49+00:00"
+            "time": "2022-11-07T13:51:59+00:00"
         },
         {
             "name": "utopia-php/websocket",
@@ -5064,14 +5132,7 @@
             "time": "2022-09-28T08:42:51+00:00"
         }
     ],
-    "aliases": [
-        {
-            "package": "utopia-php/database",
-            "version": "0.28.0.0",
-            "alias": "0.26.99",
-            "alias_normalized": "0.26.99.0"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
     "prefer-stable": false,
@@ -5097,5 +5158,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index ea9241a9d3..aac166beec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -76,7 +76,7 @@ services:
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
-      - appwrite-functions:/storage/functions:rw
+      - openruntimes-functions:/storage/functions:rw
       - ./phpunit.xml:/usr/src/code/phpunit.xml
       - ./tests:/usr/src/code/tests
       - ./app:/usr/src/code/app
@@ -155,10 +155,6 @@ services:
       - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CONTAINERS
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_RUNTIMES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
@@ -287,8 +283,8 @@ services:
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
-      - appwrite-functions:/storage/functions:rw
-      - appwrite-builds:/storage/builds:rw
+      - openruntimes-functions:/storage/functions:rw
+      - openruntimes-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
@@ -435,7 +431,6 @@ services:
     depends_on:
       - redis
       - mariadb
-      - appwrite-executor
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
@@ -455,67 +450,6 @@ services:
       - DOCKERHUB_PULL_USERNAME
       - DOCKERHUB_PULL_PASSWORD
 
-  appwrite-executor:
-    container_name: appwrite-executor
-    <<: *x-logging
-    entrypoint: executor
-    stop_signal: SIGINT
-    image: appwrite-dev
-    networks:
-      appwrite:
-      runtimes:
-    ports:
-      - 9519:80
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-      - appwrite-functions:/storage/functions:rw
-      - appwrite-builds:/storage/builds:rw
-      - /tmp:/tmp:rw
-    depends_on:
-      - redis
-      - mariadb
-      - appwrite
-    environment:
-      - _APP_ENV
-      - _APP_VERSION
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CONTAINERS
-      - _APP_FUNCTIONS_RUNTIMES
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_MEMORY_SWAP
-      - _APP_FUNCTIONS_INACTIVE_THRESHOLD
-      - _APP_EXECUTOR_SECRET
-      - OPEN_RUNTIMES_NETWORK
-      - _APP_LOGGING_PROVIDER
-      - _APP_LOGGING_CONFIG
-      - _APP_STORAGE_DEVICE
-      - _APP_STORAGE_S3_ACCESS_KEY
-      - _APP_STORAGE_S3_SECRET
-      - _APP_STORAGE_S3_REGION
-      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
-      - _APP_STORAGE_DO_SPACES_SECRET
-      - _APP_STORAGE_DO_SPACES_REGION
-      - _APP_STORAGE_DO_SPACES_BUCKET
-      - _APP_STORAGE_BACKBLAZE_ACCESS_KEY
-      - _APP_STORAGE_BACKBLAZE_SECRET
-      - _APP_STORAGE_BACKBLAZE_REGION
-      - _APP_STORAGE_BACKBLAZE_BUCKET
-      - _APP_STORAGE_LINODE_ACCESS_KEY
-      - _APP_STORAGE_LINODE_SECRET
-      - _APP_STORAGE_LINODE_REGION
-      - _APP_STORAGE_LINODE_BUCKET
-      - _APP_STORAGE_WASABI_ACCESS_KEY
-      - _APP_STORAGE_WASABI_SECRET
-      - _APP_STORAGE_WASABI_REGION
-      - _APP_STORAGE_WASABI_BUCKET
-      - DOCKERHUB_PULL_USERNAME
-      - DOCKERHUB_PULL_PASSWORD
-
   appwrite-worker-mails:
     entrypoint: worker-mails
     <<: *x-logging
@@ -692,6 +626,37 @@ services:
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
 
+  openruntimes-executor:
+    container_name: openruntimes-executor
+    hostname: exc1
+    <<: *x-logging
+    stop_signal: SIGINT
+    image: openruntimes/executor:0.1.0
+    networks:
+      - appwrite
+      - openruntimes-runtimes
+    ports:
+      - 9900:80
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./app:/usr/local/app:rw
+      - ./src:/usr/local/src:rw
+      - openruntimes-builds:/storage/builds:rw
+      - openruntimes-functions:/storage/functions:rw
+      - /tmp:/tmp:rw
+      - ./tests/resources/functions:/storage/functions:rw
+    environment:
+      - OPR_EXECUTOR_RUNTIMES
+      - OPR_EXECUTOR_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD
+      - OPR_EXECUTOR_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_ENV=$_APP_ENV
+      - OPR_EXECUTOR_SECRET=_APP_EXECUTOR_SECRET
+      - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+
   mariadb:
     image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
@@ -860,7 +825,8 @@ services:
 networks:
   gateway:
   appwrite:
-  runtimes:
+  openruntimes-runtimes:
+    name: openruntimes-runtimes
 
 volumes:
   appwrite-mariadb:
@@ -868,9 +834,8 @@ volumes:
   appwrite-cache:
   appwrite-uploads:
   appwrite-certificates:
-  appwrite-functions:
-  appwrite-builds:
   appwrite-influxdb:
   appwrite-config:
-  appwrite-executor:
+  openruntimes-functions:
+  openruntimes-builds:
   # appwrite-chronograf:
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index 416d47ab82..b3eba44a9f 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -42,45 +42,44 @@ class Executor
      * @param string $deploymentId
      * @param string $projectId
      * @param string $source
-     * @param string $runtime
-     * @param string $baseImage
+     * @param string $image
      * @param bool $remove
      * @param string $entrypoint
      * @param string $workdir
-     * @param string $destinaction
-     * @param string $network
-     * @param array $vars
+     * @param string $destination
+     * @param array $variables
      * @param array $commands
      */
     public function createRuntime(
         string $deploymentId,
         string $projectId,
         string $source,
-        string $runtime,
-        string $baseImage,
+        string $image,
         bool $remove = false,
         string $entrypoint = '',
         string $workdir = '',
         string $destination = '',
-        array $vars = [],
+        array $variables = [],
         array $commands = []
     ) {
         $route = "/runtimes";
         $headers = [
             'content-type' => 'application/json',
-            'x-appwrite-executor-key' => App::getEnv('_APP_EXECUTOR_SECRET', '')
+            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', '')
         ];
         $params = [
             'runtimeId' => "$projectId-$deploymentId",
             'source' => $source,
             'destination' => $destination,
-            'runtime' => $runtime,
-            'baseImage' => $baseImage,
+            'image' => $image,
             'entrypoint' => $entrypoint,
             'workdir' => $workdir,
-            'vars' => $vars,
+            'variables' => $variables,
             'remove' => $remove,
-            'commands' => $commands
+            'commands' => $commands,
+            'timeout' => 600,
+            'cpus' => 1,
+            'memory' => 128,
         ];
 
         $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
@@ -96,25 +95,52 @@ class Executor
     }
 
     /**
-     * Delete Runtime
-     *
-     * Deletes a runtime and cleans up any containers remaining.
+     * Create an execution
      *
      * @param string $projectId
      * @param string $deploymentId
+     * @param string $payload
+     * @param array $variables
+     * @param int $timeout
+     * @param string $image
+     * @param string $source
+     * @param string $entrypoint
+     *
+     * @return array
      */
-    public function deleteRuntime(string $projectId, string $deploymentId)
-    {
+    public function createExecution(
+        string $projectId,
+        string $deploymentId,
+        string $payload,
+        array $variables,
+        int $timeout,
+
+        string $image,
+        string $source,
+        string $entrypoint,
+    ) {
         $runtimeId = "$projectId-$deploymentId";
-        $route = "/runtimes/$runtimeId";
+        $route = '/runtimes/' . $runtimeId . '/execution';
         $headers = [
             'content-type' =>  'application/json',
-            'x-appwrite-executor-key' => App::getEnv('_APP_EXECUTOR_SECRET', '')
+            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', '')
+        ];
+        $params = [
+            'runtimeId' => $runtimeId,
+            'variables' => $variables,
+            'payload' => $payload,
+            'timeout' => $timeout,
+
+            'image' => $image,
+            'source' => $source,
+            'entrypoint' => $entrypoint,
+            'cpus' => 1,
+            'memory' => 128,
         ];
 
-        $params = [];
+        $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
 
-        $response = $this->call(self::METHOD_DELETE, $route, $headers, $params, true, 30);
+        $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $timeout);
 
         $status = $response['headers']['status-code'];
         if ($status >= 400) {
@@ -124,93 +150,6 @@ class Executor
         return $response['body'];
     }
 
-    /**
-     * Create an execution
-     *
-     * @param string $projectId
-     * @param string $deploymentId
-     * @param string $path
-     * @param array $vars
-     * @param string $entrypoint
-     * @param string $data
-     * @param string runtime
-     * @param string $baseImage
-     * @param int $timeout
-     *
-     * @return array
-     */
-    public function createExecution(
-        string $projectId,
-        string $deploymentId,
-        string $path,
-        array $vars,
-        string $entrypoint,
-        string $data,
-        string $runtime,
-        string $baseImage,
-        $timeout
-    ) {
-        $route = "/execution";
-        $headers = [
-            'content-type' =>  'application/json',
-            'x-appwrite-executor-key' => App::getEnv('_APP_EXECUTOR_SECRET', '')
-        ];
-        $params = [
-            'runtimeId' => "$projectId-$deploymentId",
-            'vars' => $vars,
-            'data' => $data,
-            'timeout' => $timeout,
-        ];
-
-        /* Add 2 seconds as a buffer to the actual timeout value since there can be a slight variance*/
-        $requestTimeout  = $timeout + 2;
-
-        $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
-        $status = $response['headers']['status-code'];
-
-        for ($attempts = 0; $attempts < 10; $attempts++) {
-            try {
-                switch (true) {
-                    case $status < 400:
-                        return $response['body'];
-                    case $status === 404:
-                        $response = $this->createRuntime(
-                            deploymentId: $deploymentId,
-                            projectId: $projectId,
-                            source: $path,
-                            runtime: $runtime,
-                            baseImage: $baseImage,
-                            vars: $vars,
-                            entrypoint: $entrypoint,
-                            commands: []
-                        );
-                        $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
-                        $status = $response['headers']['status-code'];
-
-                        if ($status < 400) {
-                            return $response['body'];
-                        }
-                        break;
-                    case $status === 406:
-                        $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $requestTimeout);
-                        $status = $response['headers']['status-code'];
-
-                        if ($status < 400) {
-                            return $response['body'];
-                        }
-                        break;
-                    default:
-                        throw new \Exception($response['body']['message'], $status);
-                }
-            } catch (\Exception $e) {
-                throw new \Exception($e->getMessage(), $e->getCode());
-            }
-            sleep(2);
-        }
-
-        throw new Exception($response['body']['message'], 503);
-    }
-
     /**
      * Call
      *

From 80b49452f4a0341d4eefcb22dcbd91bf45c6f3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 8 Nov 2022 10:02:22 +0000
Subject: [PATCH 41/65] Fix executor bugs, Add Open Runtimes Proxy

---
 .env                   | 12 +++++++++---
 app/workers/builds.php |  9 ++++++---
 docker-compose.yml     | 30 ++++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index 1835f6af59..76d6f33c39 100644
--- a/.env
+++ b/.env
@@ -74,11 +74,17 @@ _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://appwrite-executor/v1
+_APP_EXECUTOR_HOST=http://proxy1/v1
+_APP_FUNCTIONS_RUNTIMES=php-8.0
 
-OPR_EXECUTOR_RUNTIMES=php-8.0 # same as _APP_FUNCTIONS_RUNTIMES
 OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
 OPR_EXECUTOR_INACTIVE_TRESHOLD=60
 OPR_EXECUTOR_NETWORK=openruntimes-runtimes
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
-OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
\ No newline at end of file
+OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
+
+OPR_PROXY_ALGORITHM=round-robin
+OPR_PROXY_EXECUTORS=exc1
+OPR_PROXY_HEALTHCHECK=enabled
+OPR_PROXY_HEALTHCHECK_INTERVAL=5000
+OPR_PROXY_EXECUTOR_SECRET=executor-secret-key
\ No newline at end of file
diff --git a/app/workers/builds.php b/app/workers/builds.php
index d1337f980d..af8e0e2717 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -171,13 +171,16 @@ class BuildsV1 extends Worker
                 ]
             );
 
+            $endTime = new \DateTime();
+            $endTime->setTimestamp($response['endTimeUnix']);
+
             /** Update the build document */
-            $build->setAttribute('endTime', $response['endTime']);
-            $build->setAttribute('duration', $response['duration']);
+            $build->setAttribute('endTime', DateTime::format($endTime));
+            $build->setAttribute('duration', \intval($response['duration']));
             $build->setAttribute('status', $response['status']);
             $build->setAttribute('outputPath', $response['outputPath']);
             $build->setAttribute('stderr', $response['stderr']);
-            $build->setAttribute('stdout', $response['response']);
+            $build->setAttribute('stdout', $response['stdout']);
 
             Console::success("Build id: $buildId created");
 
diff --git a/docker-compose.yml b/docker-compose.yml
index aac166beec..757f142c4c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -633,30 +633,46 @@ services:
     stop_signal: SIGINT
     image: openruntimes/executor:0.1.0
     networks:
-      - appwrite
       - openruntimes-runtimes
+      - openruntimes-executors
     ports:
       - 9900:80
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ./app:/usr/local/app:rw
-      - ./src:/usr/local/src:rw
       - openruntimes-builds:/storage/builds:rw
       - openruntimes-functions:/storage/functions:rw
       - /tmp:/tmp:rw
-      - ./tests/resources/functions:/storage/functions:rw
     environment:
-      - OPR_EXECUTOR_RUNTIMES
       - OPR_EXECUTOR_CONNECTION_STORAGE
       - OPR_EXECUTOR_INACTIVE_TRESHOLD
       - OPR_EXECUTOR_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_SECRET=_APP_EXECUTOR_SECRET
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_SECRET=$OPR_PROXY_EXECUTOR_SECRET
       - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
+  openruntimes-proxy:
+    container_name: openruntimes-proxy
+    hostname: proxy1
+    <<: *x-logging
+    image: openruntimes/proxy:0.3.0
+    networks:
+      - appwrite
+      - openruntimes-executors
+    environment:
+      - OPR_PROXY_ALGORITHM
+      - OPR_PROXY_EXECUTORS
+      - OPR_PROXY_HEALTHCHECK
+      - OPR_PROXY_HEALTHCHECK_INTERVAL
+      - OPR_PROXY_EXECUTOR_SECRET
+      - OPR_PROXY_ENV=$_APP_ENV
+      - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
+      - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+      - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+
   mariadb:
     image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
@@ -827,6 +843,8 @@ networks:
   appwrite:
   openruntimes-runtimes:
     name: openruntimes-runtimes
+  openruntimes-executors:
+    name: openruntimes-executors
 
 volumes:
   appwrite-mariadb:

From d275fa0111e68a7ed2a16036070b5ebc91c5fd17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 8 Nov 2022 12:34:14 +0000
Subject: [PATCH 42/65] Fix tests

---
 .env                              | 16 ++++++------
 app/controllers/api/functions.php |  1 -
 app/workers/builds.php            |  1 -
 app/workers/functions.php         |  1 -
 docker-compose.yml                | 41 ++++++++++++++++---------------
 src/Executor/Executor.php         | 14 ++++++-----
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.env b/.env
index 76d6f33c39..ad82b0b336 100644
--- a/.env
+++ b/.env
@@ -74,17 +74,17 @@ _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://proxy1/v1
-_APP_FUNCTIONS_RUNTIMES=php-8.0
+_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_FUNCTIONS_RUNTIMES=
 
 OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
-OPR_EXECUTOR_INACTIVE_TRESHOLD=60
+OPR_EXECUTOR_INACTIVE_TRESHOLD=600
 OPR_EXECUTOR_NETWORK=openruntimes-runtimes
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
 OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
 
-OPR_PROXY_ALGORITHM=round-robin
-OPR_PROXY_EXECUTORS=exc1
-OPR_PROXY_HEALTHCHECK=enabled
-OPR_PROXY_HEALTHCHECK_INTERVAL=5000
-OPR_PROXY_EXECUTOR_SECRET=executor-secret-key
\ No newline at end of file
+# OPR_PROXY_ALGORITHM=round-robin
+# OPR_PROXY_EXECUTORS=exc1
+# OPR_PROXY_HEALTHCHECK=enabled
+# OPR_PROXY_HEALTHCHECK_INTERVAL=5000
+# OPR_PROXY_EXECUTOR_SECRET=your-secret-key
\ No newline at end of file
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index ab7c96e450..07d593617a 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -1153,7 +1153,6 @@ App::post('/v1/functions/:functionId/executions')
                 payload: $data,
                 variables: $vars,
                 timeout: $function->getAttribute('timeout', 0),
-
                 image: $runtime['image'],
                 source: $build->getAttribute('outputPath', ''),
                 entrypoint: $deployment->getAttribute('entrypoint', ''),
diff --git a/app/workers/builds.php b/app/workers/builds.php
index af8e0e2717..ca7ed3550b 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -159,7 +159,6 @@ class BuildsV1 extends Worker
                 source: $source,
                 image: $runtime['image'],
                 remove: true,
-
                 entrypoint: $deployment->getAttribute('entrypoint'),
                 workdir: '/usr/code',
                 destination: APP_STORAGE_BUILDS . "/app-{$project->getId()}",
diff --git a/app/workers/functions.php b/app/workers/functions.php
index c8da46a673..5e10eb5b48 100644
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@@ -292,7 +292,6 @@ class FunctionsV1 extends Worker
                 payload: $vars['APPWRITE_FUNCTION_DATA'] ?? '',
                 variables: $vars,
                 timeout: $function->getAttribute('timeout', 0),
-
                 image: $runtime['image'],
                 source: $build->getAttribute('outputPath', ''),
                 entrypoint: $deployment->getAttribute('entrypoint', ''),
diff --git a/docker-compose.yml b/docker-compose.yml
index 757f142c4c..4d69eef059 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -633,8 +633,9 @@ services:
     stop_signal: SIGINT
     image: openruntimes/executor:0.1.0
     networks:
+      - appwrite # Remove this when using OPR Proxy
+      # - openruntimes-executors
       - openruntimes-runtimes
-      - openruntimes-executors
     ports:
       - 9900:80
     volumes:
@@ -650,28 +651,28 @@ services:
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
       - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
-      - OPR_EXECUTOR_SECRET=$OPR_PROXY_EXECUTOR_SECRET
+      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET # If using OPR proxy, use OPR_PROXY_EXECUTOR_SECRET instead
       - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
-  openruntimes-proxy:
-    container_name: openruntimes-proxy
-    hostname: proxy1
-    <<: *x-logging
-    image: openruntimes/proxy:0.3.0
-    networks:
-      - appwrite
-      - openruntimes-executors
-    environment:
-      - OPR_PROXY_ALGORITHM
-      - OPR_PROXY_EXECUTORS
-      - OPR_PROXY_HEALTHCHECK
-      - OPR_PROXY_HEALTHCHECK_INTERVAL
-      - OPR_PROXY_EXECUTOR_SECRET
-      - OPR_PROXY_ENV=$_APP_ENV
-      - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
-      - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+  # openruntimes-proxy:
+  #   container_name: openruntimes-proxy
+  #   hostname: proxy1
+  #   <<: *x-logging
+  #   image: openruntimes/proxy:0.3.0
+  #   networks:
+  #     - appwrite
+  #     - openruntimes-executors
+  #   environment:
+  #     - OPR_PROXY_ALGORITHM
+  #     - OPR_PROXY_EXECUTORS
+  #     - OPR_PROXY_HEALTHCHECK
+  #     - OPR_PROXY_HEALTHCHECK_INTERVAL
+  #     - OPR_PROXY_EXECUTOR_SECRET
+  #     - OPR_PROXY_ENV=$_APP_ENV
+  #     - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
+  #     - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+  #     - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
   mariadb:
     image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index b3eba44a9f..ff79350553 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -26,6 +26,10 @@ class Executor
         'content-type' => '',
     ];
 
+    protected int $cpus = 2;
+
+    protected int $memory = 512;
+
     public function __construct(string $endpoint)
     {
         if (!filter_var($endpoint, FILTER_VALIDATE_URL)) {
@@ -77,9 +81,8 @@ class Executor
             'variables' => $variables,
             'remove' => $remove,
             'commands' => $commands,
-            'timeout' => 600,
-            'cpus' => 1,
-            'memory' => 128,
+            'cpus' => $this->cpus,
+            'memory' => $this->memory,
         ];
 
         $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);
@@ -114,7 +117,6 @@ class Executor
         string $payload,
         array $variables,
         int $timeout,
-
         string $image,
         string $source,
         string $entrypoint,
@@ -134,8 +136,8 @@ class Executor
             'image' => $image,
             'source' => $source,
             'entrypoint' => $entrypoint,
-            'cpus' => 1,
-            'memory' => 128,
+            'cpus' => $this->cpus,
+            'memory' => $this->memory,
         ];
 
         $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);

From f6b738fddd7c02a031fef1c54cc39daabcf58573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 8 Nov 2022 17:30:18 +0000
Subject: [PATCH 43/65] Add proxy and fix bugs

---
 .env                      | 12 +++----
 composer.lock             | 11 ++++--
 docker-compose.yml        | 72 ++++++++++++++++++++++++++-------------
 src/Executor/Executor.php |  9 +++--
 4 files changed, 69 insertions(+), 35 deletions(-)

diff --git a/.env b/.env
index 7e9a5858f3..79a216c72f 100644
--- a/.env
+++ b/.env
@@ -79,7 +79,7 @@ _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_EXECUTOR_HOST=http://proxy1/v1
 _APP_FUNCTIONS_RUNTIMES=
 
 OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
@@ -88,8 +88,8 @@ OPR_EXECUTOR_NETWORK=openruntimes-runtimes
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
 OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
 
-# OPR_PROXY_ALGORITHM=round-robin
-# OPR_PROXY_EXECUTORS=exc1
-# OPR_PROXY_HEALTHCHECK=enabled
-# OPR_PROXY_HEALTHCHECK_INTERVAL=5000
-# OPR_PROXY_EXECUTOR_SECRET=your-secret-key
\ No newline at end of file
+OPR_PROXY_ALGORITHM=round-robin
+OPR_PROXY_EXECUTORS=exc1,exc2
+OPR_PROXY_HEALTHCHECK=enabled
+OPR_PROXY_HEALTHCHECK_INTERVAL=5000
+OPR_PROXY_EXECUTOR_SECRET=your-secret-key
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index de2a363a80..7f0bcd7fdb 100644
--- a/composer.lock
+++ b/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": "51f81d435f4b5b7a9a6ea8f81b470353",
+    "content-hash": "1c15c309c6fcefe30360915fdac8adad",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -5175,7 +5175,14 @@
             "time": "2022-09-28T08:42:51+00:00"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "utopia-php/pools",
+            "version": "dev-feat-optimize-filling",
+            "alias": "0.3.0",
+            "alias_normalized": "0.3.0.0"
+        }
+    ],
     "minimum-stability": "stable",
     "stability-flags": {
         "utopia-php/pools": 20
diff --git a/docker-compose.yml b/docker-compose.yml
index 14c53b3123..0a41df7237 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -690,13 +690,11 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.1.0
+    image: openruntimes/executor:0.1.1
     networks:
-      - appwrite # Remove this when using OPR Proxy
-      # - openruntimes-executors
+      # - appwrite # If not using OPR proxy, uncomment this
+      - openruntimes-executors
       - openruntimes-runtimes
-    ports:
-      - 9900:80
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - openruntimes-builds:/storage/builds:rw
@@ -710,28 +708,54 @@ services:
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
       - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
-      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET # If using OPR proxy, use OPR_PROXY_EXECUTOR_SECRET instead
+      - OPR_EXECUTOR_SECRET=$OPR_PROXY_EXECUTOR_SECRET # If not using OPR proxy, set to $_APP_EXECUTOR_SECRET
       - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
-  # openruntimes-proxy:
-  #   container_name: openruntimes-proxy
-  #   hostname: proxy1
-  #   <<: *x-logging
-  #   image: openruntimes/proxy:0.3.0
-  #   networks:
-  #     - appwrite
-  #     - openruntimes-executors
-  #   environment:
-  #     - OPR_PROXY_ALGORITHM
-  #     - OPR_PROXY_EXECUTORS
-  #     - OPR_PROXY_HEALTHCHECK
-  #     - OPR_PROXY_HEALTHCHECK_INTERVAL
-  #     - OPR_PROXY_EXECUTOR_SECRET
-  #     - OPR_PROXY_ENV=$_APP_ENV
-  #     - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
-  #     - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
-  #     - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+  openruntimes-proxy:
+    container_name: openruntimes-proxy
+    hostname: proxy1
+    <<: *x-logging
+    image: openruntimes/proxy:0.2.2
+    networks:
+      - appwrite
+      - openruntimes-executors
+    environment:
+      - OPR_PROXY_ALGORITHM
+      - OPR_PROXY_EXECUTORS
+      - OPR_PROXY_HEALTHCHECK
+      - OPR_PROXY_HEALTHCHECK_INTERVAL
+      - OPR_PROXY_EXECUTOR_SECRET
+      - OPR_PROXY_ENV=$_APP_ENV
+      - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
+      - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+      - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+
+  openruntimes-executor2:
+    container_name: openruntimes-executor2
+    hostname: exc2
+    <<: *x-logging
+    stop_signal: SIGINT
+    image: openruntimes/executor:0.1.1
+    networks:
+      - openruntimes-executors
+      - openruntimes-runtimes
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - openruntimes-builds:/storage/builds:rw
+      - openruntimes-functions:/storage/functions:rw
+      - /tmp:/tmp:rw
+    environment:
+      - OPR_EXECUTOR_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD
+      - OPR_EXECUTOR_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_ENV=$_APP_ENV
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_SECRET=$OPR_PROXY_EXECUTOR_SECRET
+      - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
   mariadb:
     image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index ff79350553..8f4113b07d 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -66,13 +66,15 @@ class Executor
         array $variables = [],
         array $commands = []
     ) {
+        $runtimeId = "$projectId-$deploymentId";
         $route = "/runtimes";
         $headers = [
             'content-type' => 'application/json',
-            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', '')
+            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
+            'x-opr-runtime-id' => $runtimeId
         ];
         $params = [
-            'runtimeId' => "$projectId-$deploymentId",
+            'runtimeId' => $runtimeId,
             'source' => $source,
             'destination' => $destination,
             'image' => $image,
@@ -125,7 +127,8 @@ class Executor
         $route = '/runtimes/' . $runtimeId . '/execution';
         $headers = [
             'content-type' =>  'application/json',
-            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', '')
+            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
+            'x-opr-runtime-id' => $runtimeId
         ];
         $params = [
             'runtimeId' => $runtimeId,

From 87a75bafa08945f0f8ce88c3521862b7960f7469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 09:15:32 +0000
Subject: [PATCH 44/65] Introduce env vars for runtime resources limit

---
 .env                      | 11 +++--------
 composer.lock             | 12 ++++++------
 src/Executor/Executor.php |  7 +++++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index 79a216c72f..36765f728d 100644
--- a/.env
+++ b/.env
@@ -68,6 +68,8 @@ _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
+_APP_FUNCTIONS_CPUS=1
+_APP_FUNCTIONS_MEMORY=512
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
@@ -81,15 +83,8 @@ _APP_LOGGING_CONFIG=
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://proxy1/v1
 _APP_FUNCTIONS_RUNTIMES=
-
 OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
 OPR_EXECUTOR_INACTIVE_TRESHOLD=600
 OPR_EXECUTOR_NETWORK=openruntimes-runtimes
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
-OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
-
-OPR_PROXY_ALGORITHM=round-robin
-OPR_PROXY_EXECUTORS=exc1,exc2
-OPR_PROXY_HEALTHCHECK=enabled
-OPR_PROXY_HEALTHCHECK_INTERVAL=5000
-OPR_PROXY_EXECUTOR_SECRET=your-secret-key
\ No newline at end of file
+OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 7f0bcd7fdb..af264e7b30 100644
--- a/composer.lock
+++ b/composer.lock
@@ -300,16 +300,16 @@
         },
         {
             "name": "colinmollenhour/credis",
-            "version": "v1.13.1",
+            "version": "v1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "85df015088e00daf8ce395189de22c8eb45c8d49"
+                "reference": "dccc8a46586475075fbb012d8bd523b8a938c2dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/85df015088e00daf8ce395189de22c8eb45c8d49",
-                "reference": "85df015088e00daf8ce395189de22c8eb45c8d49",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/dccc8a46586475075fbb012d8bd523b8a938c2dc",
+                "reference": "dccc8a46586475075fbb012d8bd523b8a938c2dc",
                 "shasum": ""
             },
             "require": {
@@ -341,9 +341,9 @@
             "homepage": "https://github.com/colinmollenhour/credis",
             "support": {
                 "issues": "https://github.com/colinmollenhour/credis/issues",
-                "source": "https://github.com/colinmollenhour/credis/tree/v1.13.1"
+                "source": "https://github.com/colinmollenhour/credis/tree/v1.14.0"
             },
-            "time": "2022-06-20T22:56:59+00:00"
+            "time": "2022-11-09T01:18:39+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index 8f4113b07d..b87b208e0a 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -26,16 +26,19 @@ class Executor
         'content-type' => '',
     ];
 
-    protected int $cpus = 2;
+    protected int $cpus;
 
-    protected int $memory = 512;
+    protected int $memory;
 
     public function __construct(string $endpoint)
     {
         if (!filter_var($endpoint, FILTER_VALIDATE_URL)) {
             throw new Exception('Unsupported endpoint');
         }
+
         $this->endpoint = $endpoint;
+        $this->cpus = \intval(App::getEnv('_APP_FUNCTIONS_CPUS', '1'));
+        $this->memory = intval(App::getEnv('_APP_FUNCTIONS_MEMORY', '512'));
     }
 
     /**

From 5c44a77eaec440c9bcd6b49acf1348b210202eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 09:18:04 +0000
Subject: [PATCH 45/65] Reorder ENV vars

---
 .env | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 36765f728d..d349afe7cf 100644
--- a/.env
+++ b/.env
@@ -70,6 +70,9 @@ _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=512
+_APP_EXECUTOR_SECRET=your-secret-key
+_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_FUNCTIONS_RUNTIMES=
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
@@ -80,9 +83,6 @@ _APP_USAGE_DATABASE_INTERVAL=15
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
-_APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://proxy1/v1
-_APP_FUNCTIONS_RUNTIMES=
 OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
 OPR_EXECUTOR_INACTIVE_TRESHOLD=600
 OPR_EXECUTOR_NETWORK=openruntimes-runtimes

From 6c6e1caefc29a91e14698ccf1db27df0d5b183d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 09:37:49 +0000
Subject: [PATCH 46/65] Improve ENV vars documentation

---
 .env                            |  4 +--
 Dockerfile                      | 10 ++++--
 app/config/variables.php        | 63 ++++++++++++++++++++++++++++-----
 app/views/install/compose.phtml | 17 +++++----
 docker-compose.yml              | 54 +++-------------------------
 5 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/.env b/.env
index d349afe7cf..0f85260154 100644
--- a/.env
+++ b/.env
@@ -70,6 +70,8 @@ _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=512
+OPR_EXECUTOR_INACTIVE_TRESHOLD=600
+OPR_EXECUTOR_NETWORK=openruntimes-runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=
@@ -84,7 +86,5 @@ _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
 OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
-OPR_EXECUTOR_INACTIVE_TRESHOLD=600
-OPR_EXECUTOR_NETWORK=openruntimes-runtimes
 OPR_EXECUTOR_DOCKER_HUB_USERNAME=
 OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 6604d260ed..594cd69cb2 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -246,8 +246,10 @@ ENV _APP_SERVER=swoole \
     _APP_SMS_FROM= \
     _APP_FUNCTIONS_SIZE_LIMIT=30000000 \
     _APP_FUNCTIONS_TIMEOUT=900 \
+    _APP_FUNCTIONS_CPUS=1 \
+    _APP_FUNCTIONS_MEMORY=128 \
     _APP_EXECUTOR_SECRET=a-random-secret \
-    _APP_EXECUTOR_HOST=http://appwrite-executor/v1 \
+    _APP_EXECUTOR_HOST=http://exc1/v1 \
     _APP_SETUP=self-hosted \
     _APP_VERSION=$VERSION \
     _APP_USAGE_STATS=enabled \
@@ -260,7 +262,11 @@ ENV _APP_SERVER=swoole \
     _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
     _APP_MAINTENANCE_INTERVAL=86400 \
     _APP_LOGGING_PROVIDER= \
-    _APP_LOGGING_CONFIG=
+    OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost \
+    OPR_EXECUTOR_INACTIVE_TRESHOLD=600 \
+    OPR_EXECUTOR_NETWORK=openruntimes-runtimes \
+    OPR_EXECUTOR_DOCKER_HUB_USERNAME= \
+    OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
diff --git a/app/config/variables.php b/app/config/variables.php
index dbe1a9748a..7e02656620 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -701,7 +701,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CONTAINERS',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum number of containers Appwrite is allowed to keep alive in the background for function environments. Running containers allow faster execution time as there is no need to recreate each container every time a function gets executed. The default value is 10.',
+                'description' => 'Deprecated since 1.2.0. Runtimes now timeout by inactivity using \'OPR_EXECUTOR_INACTIVE_TRESHOLD\'.',
                 'introduction' => '0.7.0',
                 'default' => '10',
                 'required' => false,
@@ -710,7 +710,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
+                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -719,7 +719,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
+                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -728,7 +728,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY_SWAP',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The maximum amount of swap memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, swap memory limit will be disabled.',
+                'description' => 'Deprecated since 1.2.0. High use of swap memory is not recommended to preserve harddrive health.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -782,7 +782,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
+                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_INACTIVE_TRESHOLD\' instead!',
                 'introduction' => '0.13.0',
                 'default' => '60',
                 'required' => false,
@@ -791,7 +791,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_USERNAME',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_DOCKER_HUB_USERNAME\' instead!',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -800,7 +800,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_PASSWORD',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The password for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_DOCKER_HUB_PASSWORD\' instead!',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -809,7 +809,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_EMAIL',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The email for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'description' => 'Deprecated since 1.2.0. Email is no longer needed.',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -818,13 +818,58 @@ return [
             ],
             [
                 'name' => 'OPEN_RUNTIMES_NETWORK',
-                'description' => 'Deprecated since 1.1.0. Use Open Runtimes Executor instead. The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
+                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_NETWORK\' instead!',
                 'introduction' => '0.13.0',
                 'default' => 'appwrite_runtimes',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => 'OPR_EXECUTOR_INACTIVE_TRESHOLD',
+                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
+                'introduction' => '1.2.0',
+                'default' => '60',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => 'OPR_EXECUTOR_NETWORK',
+                'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
+                'introduction' => '1.2.0',
+                'default' => 'appwrite_runtimes',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => 'OPR_EXECUTOR_DOCKER_HUB_USERNAME',
+                'description' => 'The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'introduction' => '1.2.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => 'OPR_EXECUTOR_DOCKER_HUB_PASSWORD',
+                'description' => 'The password for hub.docker.com. This variable is used to pull images from hub.docker.com.',
+                'introduction' => '1.2.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => 'OPR_EXECUTOR_CONNECTION_STORAGE',
+                'description' => 'DSN record of storage driver where Open Runtimes Executor stores output of Appwrite Function Deployment builds.',
+                'introduction' => '1.2.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ]
         ],
     ],
     [
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 6bdbaf54d5..b5edb41412 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -66,7 +66,7 @@ services:
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
-      - appwrite-functions:/storage/functions:rw
+      - openruntimes-functions:/storage/functions:rw
     depends_on:
       - mariadb
       - redis
@@ -259,8 +259,8 @@ services:
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
-      - appwrite-functions:/storage/functions:rw
-      - appwrite-builds:/storage/builds:rw
+      - openruntimes-functions:/storage/functions:rw
+      - openruntimes-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
     environment:
       - _APP_ENV
@@ -637,8 +637,13 @@ services:
 
 networks:
   gateway:
+    name: gateway
   appwrite:
-  runtimes:
+    name: appwrite
+  openruntimes-runtimes:
+    name: openruntimes-runtimes
+  openruntimes-executors:
+    name: openruntimes-executors
 
 volumes:
   appwrite-mariadb:
@@ -646,7 +651,7 @@ volumes:
   appwrite-cache:
   appwrite-uploads:
   appwrite-certificates:
-  appwrite-functions:
-  appwrite-builds:
   appwrite-influxdb:
   appwrite-config:
+  openruntimes-functions:
+  openruntimes-builds:
diff --git a/docker-compose.yml b/docker-compose.yml
index 0a41df7237..d1a011ad7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -690,55 +690,9 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.1.1
-    networks:
-      # - appwrite # If not using OPR proxy, uncomment this
-      - openruntimes-executors
-      - openruntimes-runtimes
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - openruntimes-builds:/storage/builds:rw
-      - openruntimes-functions:/storage/functions:rw
-      - /tmp:/tmp:rw
-    environment:
-      - OPR_EXECUTOR_CONNECTION_STORAGE
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD
-      - OPR_EXECUTOR_NETWORK
-      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
-      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
-      - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
-      - OPR_EXECUTOR_SECRET=$OPR_PROXY_EXECUTOR_SECRET # If not using OPR proxy, set to $_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
-      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
-
-  openruntimes-proxy:
-    container_name: openruntimes-proxy
-    hostname: proxy1
-    <<: *x-logging
-    image: openruntimes/proxy:0.2.2
+    image: openruntimes/executor:0.1.3
     networks:
       - appwrite
-      - openruntimes-executors
-    environment:
-      - OPR_PROXY_ALGORITHM
-      - OPR_PROXY_EXECUTORS
-      - OPR_PROXY_HEALTHCHECK
-      - OPR_PROXY_HEALTHCHECK_INTERVAL
-      - OPR_PROXY_EXECUTOR_SECRET
-      - OPR_PROXY_ENV=$_APP_ENV
-      - OPR_PROXY_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_PROXY_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
-      - OPR_PROXY_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
-
-  openruntimes-executor2:
-    container_name: openruntimes-executor2
-    hostname: exc2
-    <<: *x-logging
-    stop_signal: SIGINT
-    image: openruntimes/executor:0.1.1
-    networks:
-      - openruntimes-executors
       - openruntimes-runtimes
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -753,7 +707,7 @@ services:
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
       - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
-      - OPR_EXECUTOR_SECRET=$OPR_PROXY_EXECUTOR_SECRET
+      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
       - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
 
@@ -919,11 +873,11 @@ services:
 
 networks:
   gateway:
+    name: gateway
   appwrite:
+    name: appwrite
   openruntimes-runtimes:
     name: openruntimes-runtimes
-  openruntimes-executors:
-    name: openruntimes-executors
 
 volumes:
   appwrite-mariadb:

From b6a410cc1737de9cc8f2a7e9767ca04315b27f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 09:40:15 +0000
Subject: [PATCH 47/65] Finish changes documentation

---
 CHANGES.md                      |  4 ++++
 app/views/install/compose.phtml | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 2c649ab5f0..7cec7da82a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+# Version 1.2.0
+
+- Replace Appwrite executor with OpenRuntimes Executor [#4650](https://github.com/appwrite/appwrite/pull/4650)
+
 # Version 1.1.0
 
 ## Bugs
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index b5edb41412..e163ecac8e 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -574,6 +574,32 @@ services:
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
 
+  openruntimes-executor:
+    container_name: openruntimes-executor
+    hostname: exc1
+    <<: *x-logging
+    stop_signal: SIGINT
+    image: openruntimes/executor:0.1.3
+    networks:
+      - appwrite
+      - openruntimes-runtimes
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - openruntimes-builds:/storage/builds:rw
+      - openruntimes-functions:/storage/functions:rw
+      - /tmp:/tmp:rw
+    environment:
+      - OPR_EXECUTOR_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD
+      - OPR_EXECUTOR_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_ENV=$_APP_ENV
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
+      - OPR_EXECUTOR_LOGGING_PROVIDER=$_APP_LOGGING_PROVIDER
+      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
+
   mariadb:
     image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb

From 192cf2e20d2f5cf0f24e4778e8adedbf9287aa84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 12:04:49 +0000
Subject: [PATCH 48/65] PR review changes + fix test

---
 .env                                          | 10 +++----
 Dockerfile                                    |  6 +---
 app/config/variables.php                      | 29 +++++++------------
 app/views/install/compose.phtml               | 14 ++++-----
 composer.lock                                 | 28 +++++++++---------
 docker-compose.yml                            | 12 ++++----
 src/Executor/Executor.php                     | 24 ++++++---------
 .../Functions/FunctionsCustomServerTest.php   |  4 +--
 8 files changed, 53 insertions(+), 74 deletions(-)

diff --git a/.env b/.env
index 0f85260154..74315daa87 100644
--- a/.env
+++ b/.env
@@ -70,8 +70,9 @@ _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
 _APP_FUNCTIONS_MEMORY=512
-OPR_EXECUTOR_INACTIVE_TRESHOLD=600
-OPR_EXECUTOR_NETWORK=openruntimes-runtimes
+_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_RUNTIMES_NETWORK=openruntimes-runtimes
+_APP_FUNCTIONS_CONNECTION_STORAGE=file://localhost
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://exc1/v1
 _APP_FUNCTIONS_RUNTIMES=
@@ -85,6 +86,5 @@ _APP_USAGE_DATABASE_INTERVAL=15
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
-OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost
-OPR_EXECUTOR_DOCKER_HUB_USERNAME=
-OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
\ No newline at end of file
+_APP_DOCKER_HUB_USERNAME=
+_APP_DOCKER_HUB_PASSWORD=
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 594cd69cb2..543f39cd62 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -262,11 +262,7 @@ ENV _APP_SERVER=swoole \
     _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
     _APP_MAINTENANCE_INTERVAL=86400 \
     _APP_LOGGING_PROVIDER= \
-    OPR_EXECUTOR_CONNECTION_STORAGE=file://localhost \
-    OPR_EXECUTOR_INACTIVE_TRESHOLD=600 \
-    OPR_EXECUTOR_NETWORK=openruntimes-runtimes \
-    OPR_EXECUTOR_DOCKER_HUB_USERNAME= \
-    OPR_EXECUTOR_DOCKER_HUB_PASSWORD=
+    _APP_LOGGING_CONFIG=
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
diff --git a/app/config/variables.php b/app/config/variables.php
index 7e02656620..7434f09b81 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -701,7 +701,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CONTAINERS',
-                'description' => 'Deprecated since 1.2.0. Runtimes now timeout by inactivity using \'OPR_EXECUTOR_INACTIVE_TRESHOLD\'.',
+                'description' => 'Deprecated since 1.2.0. Runtimes now timeout by inactivity using \'_APP_FUNCTIONS_INACTIVE_THRESHOLD\'.',
                 'introduction' => '0.7.0',
                 'default' => '10',
                 'required' => false,
@@ -782,7 +782,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_INACTIVE_TRESHOLD\' instead!',
+                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds.',
                 'introduction' => '0.13.0',
                 'default' => '60',
                 'required' => false,
@@ -791,7 +791,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_USERNAME',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_DOCKER_HUB_USERNAME\' instead!',
+                'description' => 'Deprecated with 1.2.0, use \'_APP_DOCKER_HUB_USERNAME\' instead!',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -800,7 +800,7 @@ return [
             ],
             [
                 'name' => 'DOCKERHUB_PULL_PASSWORD',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_DOCKER_HUB_PASSWORD\' instead!',
+                'description' => 'Deprecated with 1.2.0, use \'_APP_DOCKER_HUB_PASSWORD\' instead!',
                 'introduction' => '0.10.0',
                 'default' => '',
                 'required' => false,
@@ -818,7 +818,7 @@ return [
             ],
             [
                 'name' => 'OPEN_RUNTIMES_NETWORK',
-                'description' => 'Deprecated with 1.2.0, use \'OPR_EXECUTOR_NETWORK\' instead!',
+                'description' => 'Deprecated with 1.2.0, use \'_APP_FUNCTIONS_RUNTIMES_NETWORK\' instead!',
                 'introduction' => '0.13.0',
                 'default' => 'appwrite_runtimes',
                 'required' => false,
@@ -826,25 +826,16 @@ return [
                 'filter' => ''
             ],
             [
-                'name' => 'OPR_EXECUTOR_INACTIVE_TRESHOLD',
-                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
-                'introduction' => '1.2.0',
-                'default' => '60',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => 'OPR_EXECUTOR_NETWORK',
+                'name' => '_APP_FUNCTIONS_RUNTIMES_NETWORK',
                 'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
                 'introduction' => '1.2.0',
-                'default' => 'appwrite_runtimes',
+                'default' => 'openruntimes-runtimes',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
             [
-                'name' => 'OPR_EXECUTOR_DOCKER_HUB_USERNAME',
+                'name' => '_APP_DOCKER_HUB_USERNAME',
                 'description' => 'The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                 'introduction' => '1.2.0',
                 'default' => '',
@@ -853,7 +844,7 @@ return [
                 'filter' => ''
             ],
             [
-                'name' => 'OPR_EXECUTOR_DOCKER_HUB_PASSWORD',
+                'name' => '_APP_DOCKER_HUB_PASSWORD',
                 'description' => 'The password for hub.docker.com. This variable is used to pull images from hub.docker.com.',
                 'introduction' => '1.2.0',
                 'default' => '',
@@ -862,7 +853,7 @@ return [
                 'filter' => ''
             ],
             [
-                'name' => 'OPR_EXECUTOR_CONNECTION_STORAGE',
+                'name' => '_APP_FUNCTIONS_CONNECTION_STORAGE',
                 'description' => 'DSN record of storage driver where Open Runtimes Executor stores output of Appwrite Function Deployment builds.',
                 'introduction' => '1.2.0',
                 'default' => '',
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index e163ecac8e..915a09158a 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -134,10 +134,8 @@ services:
       - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CONTAINERS
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_RUNTIMES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
@@ -413,8 +411,6 @@ services:
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_USAGE_STATS
-      - DOCKERHUB_PULL_USERNAME
-      - DOCKERHUB_PULL_PASSWORD
 
   appwrite-worker-mails:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -589,11 +585,11 @@ services:
       - openruntimes-functions:/storage/functions:rw
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_CONNECTION_STORAGE
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD
-      - OPR_EXECUTOR_NETWORK
-      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
-      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_FUNCTIONS_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
       - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
       - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
diff --git a/composer.lock b/composer.lock
index af264e7b30..d0ecd343a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4836,16 +4836,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                 "shasum": ""
             },
             "require": {
@@ -4860,7 +4860,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4898,7 +4898,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -4914,20 +4914,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                 "shasum": ""
             },
             "require": {
@@ -4942,7 +4942,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4981,7 +4981,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -4997,7 +4997,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "textalk/websocket",
diff --git a/docker-compose.yml b/docker-compose.yml
index d1a011ad7f..2ab76ef805 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -160,6 +160,8 @@ services:
       - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
@@ -700,11 +702,11 @@ services:
       - openruntimes-functions:/storage/functions:rw
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_CONNECTION_STORAGE
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD
-      - OPR_EXECUTOR_NETWORK
-      - OPR_EXECUTOR_DOCKER_HUB_USERNAME
-      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD
+      - OPR_EXECUTOR_CONNECTION_STORAGE=$_APP_FUNCTIONS_CONNECTION_STORAGE
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
+      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
       - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
       - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index b87b208e0a..ca0d3b5208 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -18,13 +18,11 @@ class Executor
     public const METHOD_CONNECT = 'CONNECT';
     public const METHOD_TRACE = 'TRACE';
 
-    private $endpoint;
+    private bool $selfSigned = false;
 
-    private $selfSigned = false;
+    private string $endpoint;
 
-    protected $headers = [
-        'content-type' => '',
-    ];
+    protected array $headers;
 
     protected int $cpus;
 
@@ -39,6 +37,10 @@ class Executor
         $this->endpoint = $endpoint;
         $this->cpus = \intval(App::getEnv('_APP_FUNCTIONS_CPUS', '1'));
         $this->memory = intval(App::getEnv('_APP_FUNCTIONS_MEMORY', '512'));
+        $this->headers = [
+            'content-type' => 'application/json',
+            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
+        ];
     }
 
     /**
@@ -71,11 +73,7 @@ class Executor
     ) {
         $runtimeId = "$projectId-$deploymentId";
         $route = "/runtimes";
-        $headers = [
-            'content-type' => 'application/json',
-            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
-            'x-opr-runtime-id' => $runtimeId
-        ];
+        $headers = array_merge($this->headers, [ 'x-opr-runtime-id' => $runtimeId ]);
         $params = [
             'runtimeId' => $runtimeId,
             'source' => $source,
@@ -128,11 +126,7 @@ class Executor
     ) {
         $runtimeId = "$projectId-$deploymentId";
         $route = '/runtimes/' . $runtimeId . '/execution';
-        $headers = [
-            'content-type' =>  'application/json',
-            'authorization' => 'Bearer ' . App::getEnv('_APP_EXECUTOR_SECRET', ''),
-            'x-opr-runtime-id' => $runtimeId
-        ];
+        $headers = array_merge($this->headers, [ 'x-opr-runtime-id' => $runtimeId ]);
         $params = [
             'runtimeId' => $runtimeId,
             'variables' => $variables,
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index 5e498368ea..6c047a4f09 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -631,7 +631,7 @@ class FunctionsCustomServerTest extends Scope
         $this->assertStringContainsString('8.0', $execution['body']['response']);
         $this->assertStringContainsString('êä', $execution['body']['response']); // tests unknown utf-8 chars
         $this->assertEquals('', $execution['body']['stderr']);
-        $this->assertLessThan(0.500, $execution['body']['duration']);
+        $this->assertLessThan(1.500, $execution['body']['duration']);
 
         /**
          * Test for FAILURE
@@ -750,7 +750,7 @@ class FunctionsCustomServerTest extends Scope
         $this->assertStringContainsString('PHP', $execution['body']['response']);
         $this->assertStringContainsString('8.0', $execution['body']['response']);
         $this->assertStringContainsString('êä', $execution['body']['response']); // tests unknown utf-8 chars
-        $this->assertLessThan(0.500, $execution['body']['duration']);
+        $this->assertLessThan(1.500, $execution['body']['duration']);
 
         return $data;
     }

From 5d48d2ace014ee2206dcf2bb245d6e2a6b3230c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 14:00:44 +0000
Subject: [PATCH 49/65] PR review changes

---
 app/views/install/compose.phtml | 1 +
 src/Executor/Executor.php       | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 915a09158a..b5bae37733 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -395,6 +395,7 @@ services:
     depends_on:
       - redis
       - mariadb
+      - openrutntimes-executor
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
index ca0d3b5208..5ca738c302 100644
--- a/src/Executor/Executor.php
+++ b/src/Executor/Executor.php
@@ -73,7 +73,7 @@ class Executor
     ) {
         $runtimeId = "$projectId-$deploymentId";
         $route = "/runtimes";
-        $headers = array_merge($this->headers, [ 'x-opr-runtime-id' => $runtimeId ]);
+        $headers = [ 'x-opr-runtime-id' => $runtimeId ];
         $params = [
             'runtimeId' => $runtimeId,
             'source' => $source,
@@ -126,7 +126,7 @@ class Executor
     ) {
         $runtimeId = "$projectId-$deploymentId";
         $route = '/runtimes/' . $runtimeId . '/execution';
-        $headers = array_merge($this->headers, [ 'x-opr-runtime-id' => $runtimeId ]);
+        $headers = [ 'x-opr-runtime-id' => $runtimeId ];
         $params = [
             'runtimeId' => $runtimeId,
             'variables' => $variables,

From 902bcfc3beba8292e03a0dc59aa28e11d920a5ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Thu, 10 Nov 2022 14:23:11 +0000
Subject: [PATCH 50/65] Increase OPR version

---
 app/views/install/compose.phtml | 2 +-
 docker-compose.yml              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index b5bae37733..fd5ff00981 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -576,7 +576,7 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.1.3
+    image: openruntimes/executor:0.1.4
     networks:
       - appwrite
       - openruntimes-runtimes
diff --git a/docker-compose.yml b/docker-compose.yml
index 2ab76ef805..2676c9078d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -692,7 +692,7 @@ services:
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.1.3
+    image: openruntimes/executor:0.1.4
     networks:
       - appwrite
       - openruntimes-runtimes

From f468248f452b52c359bf78d72ba171778dd84d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Sat, 12 Nov 2022 12:51:54 +0000
Subject: [PATCH 51/65] Fix typo

---
 app/views/install/compose.phtml | 2 +-
 docker-compose.yml              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index fd5ff00981..3ba1e8f124 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -395,7 +395,7 @@ services:
     depends_on:
       - redis
       - mariadb
-      - openrutntimes-executor
+      - openruntimes-executor
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1
diff --git a/docker-compose.yml b/docker-compose.yml
index 2676c9078d..5bd2576431 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -464,6 +464,7 @@ services:
     depends_on:
       - redis
       - mariadb
+      - openruntimes-executor
     environment:
       - _APP_ENV
       - _APP_OPENSSL_KEY_V1

From 23258c6e43a30618256d4d4c7dc8cc94d66c6eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Sat, 12 Nov 2022 13:56:23 +0000
Subject: [PATCH 52/65] Comment out Dart test

---
 .../Functions/FunctionsCustomServerTest.php   | 182 +++++++++---------
 1 file changed, 91 insertions(+), 91 deletions(-)

diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index 6c047a4f09..2d5a0aeafd 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -1264,118 +1264,118 @@ class FunctionsCustomServerTest extends Scope
         $this->assertEquals(204, $response['headers']['status-code']);
     }
 
-    public function testCreateCustomDartExecution()
-    {
-        $name = 'dart-2.15';
-        $folder = 'dart';
-        $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
-        $this->packageCode($folder);
+    // public function testCreateCustomDartExecution()
+    // {
+    //     $name = 'dart-2.15';
+    //     $folder = 'dart';
+    //     $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
+    //     $this->packageCode($folder);
 
-        $entrypoint = 'main.dart';
-        $timeout = 2;
+    //     $entrypoint = 'main.dart';
+    //     $timeout = 2;
 
-        $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'functionId' => ID::unique(),
-            'name' => 'Test ' . $name,
-            'runtime' => $name,
-            'events' => [],
-            'schedule' => '',
-            'timeout' => $timeout,
-        ]);
+    //     $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //     ], $this->getHeaders()), [
+    //         'functionId' => ID::unique(),
+    //         'name' => 'Test ' . $name,
+    //         'runtime' => $name,
+    //         'events' => [],
+    //         'schedule' => '',
+    //         'timeout' => $timeout,
+    //     ]);
 
-        $functionId = $function['body']['$id'] ?? '';
+    //     $functionId = $function['body']['$id'] ?? '';
 
-        $this->assertEquals(201, $function['headers']['status-code']);
+    //     $this->assertEquals(201, $function['headers']['status-code']);
 
-        /** Create Variables */
-        $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'key' => 'CUSTOM_VARIABLE',
-            'value' => 'variable',
-        ]);
+    //     /** Create Variables */
+    //     $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //     ], $this->getHeaders()), [
+    //         'key' => 'CUSTOM_VARIABLE',
+    //         'value' => 'variable',
+    //     ]);
 
-        $this->assertEquals(201, $variable['headers']['status-code']);
+    //     $this->assertEquals(201, $variable['headers']['status-code']);
 
-        $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
-            'content-type' => 'multipart/form-data',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'entrypoint' => $entrypoint,
-            'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
-            'activate' => true,
-        ]);
+    //     $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
+    //         'content-type' => 'multipart/form-data',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //     ], $this->getHeaders()), [
+    //         'entrypoint' => $entrypoint,
+    //         'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+    //         'activate' => true,
+    //     ]);
 
-        $deploymentId = $deployment['body']['$id'] ?? '';
-        $this->assertEquals(202, $deployment['headers']['status-code']);
+    //     $deploymentId = $deployment['body']['$id'] ?? '';
+    //     $this->assertEquals(202, $deployment['headers']['status-code']);
 
-        // Allow build step to run
-        sleep(80);
+    //     // Allow build step to run
+    //     sleep(80);
 
-        $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'data' => 'foobar',
-            'async' => true
-        ]);
+    //     $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //     ], $this->getHeaders()), [
+    //         'data' => 'foobar',
+    //         'async' => true
+    //     ]);
 
-        $executionId = $execution['body']['$id'] ?? '';
+    //     $executionId = $execution['body']['$id'] ?? '';
 
-        $this->assertEquals(202, $execution['headers']['status-code']);
+    //     $this->assertEquals(202, $execution['headers']['status-code']);
 
-        $executionId = $execution['body']['$id'] ?? '';
+    //     $executionId = $execution['body']['$id'] ?? '';
 
-        sleep(20);
+    //     sleep(20);
 
-        $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $executionId, array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+    //     $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $executionId, array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //     ], $this->getHeaders()));
 
-        $output = json_decode($executions['body']['response'], true);
+    //     $output = json_decode($executions['body']['response'], true);
 
-        $this->assertEquals(200, $executions['headers']['status-code']);
-        $this->assertEquals('completed', $executions['body']['status']);
-        $this->assertEquals($functionId, $output['APPWRITE_FUNCTION_ID']);
-        $this->assertEquals('Test ' . $name, $output['APPWRITE_FUNCTION_NAME']);
-        $this->assertEquals($deploymentId, $output['APPWRITE_FUNCTION_DEPLOYMENT']);
-        $this->assertEquals('http', $output['APPWRITE_FUNCTION_TRIGGER']);
-        $this->assertEquals('Dart', $output['APPWRITE_FUNCTION_RUNTIME_NAME']);
-        $this->assertEquals('2.15', $output['APPWRITE_FUNCTION_RUNTIME_VERSION']);
-        $this->assertEquals('', $output['APPWRITE_FUNCTION_EVENT']);
-        $this->assertEquals('', $output['APPWRITE_FUNCTION_EVENT_DATA']);
-        $this->assertEquals('foobar', $output['APPWRITE_FUNCTION_DATA']);
-        $this->assertEquals('', $output['APPWRITE_FUNCTION_USER_ID']);
-        $this->assertEmpty($output['APPWRITE_FUNCTION_JWT']);
-        $this->assertEquals($this->getProject()['$id'], $output['APPWRITE_FUNCTION_PROJECT_ID']);
+    //     $this->assertEquals(200, $executions['headers']['status-code']);
+    //     $this->assertEquals('completed', $executions['body']['status']);
+    //     $this->assertEquals($functionId, $output['APPWRITE_FUNCTION_ID']);
+    //     $this->assertEquals('Test ' . $name, $output['APPWRITE_FUNCTION_NAME']);
+    //     $this->assertEquals($deploymentId, $output['APPWRITE_FUNCTION_DEPLOYMENT']);
+    //     $this->assertEquals('http', $output['APPWRITE_FUNCTION_TRIGGER']);
+    //     $this->assertEquals('Dart', $output['APPWRITE_FUNCTION_RUNTIME_NAME']);
+    //     $this->assertEquals('2.15', $output['APPWRITE_FUNCTION_RUNTIME_VERSION']);
+    //     $this->assertEquals('', $output['APPWRITE_FUNCTION_EVENT']);
+    //     $this->assertEquals('', $output['APPWRITE_FUNCTION_EVENT_DATA']);
+    //     $this->assertEquals('foobar', $output['APPWRITE_FUNCTION_DATA']);
+    //     $this->assertEquals('', $output['APPWRITE_FUNCTION_USER_ID']);
+    //     $this->assertEmpty($output['APPWRITE_FUNCTION_JWT']);
+    //     $this->assertEquals($this->getProject()['$id'], $output['APPWRITE_FUNCTION_PROJECT_ID']);
 
-        $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
+    //     $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //     ], $this->getHeaders()));
 
-        $this->assertEquals($executions['headers']['status-code'], 200);
-        $this->assertEquals($executions['body']['total'], 1);
-        $this->assertIsArray($executions['body']['executions']);
-        $this->assertCount(1, $executions['body']['executions']);
-        $this->assertEquals($executions['body']['executions'][0]['$id'], $executionId);
-        $this->assertEquals($executions['body']['executions'][0]['trigger'], 'http');
-        $this->assertStringContainsString('foobar', $executions['body']['executions'][0]['response']);
+    //     $this->assertEquals($executions['headers']['status-code'], 200);
+    //     $this->assertEquals($executions['body']['total'], 1);
+    //     $this->assertIsArray($executions['body']['executions']);
+    //     $this->assertCount(1, $executions['body']['executions']);
+    //     $this->assertEquals($executions['body']['executions'][0]['$id'], $executionId);
+    //     $this->assertEquals($executions['body']['executions'][0]['trigger'], 'http');
+    //     $this->assertStringContainsString('foobar', $executions['body']['executions'][0]['response']);
 
-        // Cleanup : Delete function
-        $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-key' => $this->getProject()['apiKey'],
-        ], []);
+    //     // Cleanup : Delete function
+    //     $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
+    //         'content-type' => 'application/json',
+    //         'x-appwrite-project' => $this->getProject()['$id'],
+    //         'x-appwrite-key' => $this->getProject()['apiKey'],
+    //     ], []);
 
-        $this->assertEquals(204, $response['headers']['status-code']);
-    }
+    //     $this->assertEquals(204, $response['headers']['status-code']);
+    // }
 
     #[Retry(count: 1)]
     public function testCreateCustomRubyExecution()

From f5e66a96e7efc38994c32c46f0268a0e04c9f7bd Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 13 Nov 2022 08:36:31 +0000
Subject: [PATCH 53/65] fix volume sync task

---
 .../Tasks/{volume-sync.php => VolumeSync.php} | 30 ++++++++++++++-----
 src/Appwrite/CLI/TasksService.php             |  2 ++
 2 files changed, 24 insertions(+), 8 deletions(-)
 rename src/Appwrite/CLI/Tasks/{volume-sync.php => VolumeSync.php} (58%)

diff --git a/src/Appwrite/CLI/Tasks/volume-sync.php b/src/Appwrite/CLI/Tasks/VolumeSync.php
similarity index 58%
rename from src/Appwrite/CLI/Tasks/volume-sync.php
rename to src/Appwrite/CLI/Tasks/VolumeSync.php
index 8d5fec201b..3fd84c7d22 100644
--- a/src/Appwrite/CLI/Tasks/volume-sync.php
+++ b/src/Appwrite/CLI/Tasks/VolumeSync.php
@@ -4,16 +4,29 @@ global $cli;
 
 use Utopia\CLI\Console;
 use Utopia\Database\DateTime;
+use Utopia\Platform\Action;
 use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
 
-$cli
-    ->task('volume-sync')
-    ->desc('Runs rsync to sync certificates between the storage mount and traefik.')
-    ->param('source', null, new Text(255), 'Source path to sync from.', false)
-    ->param('destination', null, new Text(255), 'Destination path to sync to.', false)
-    ->param('interval', null, new Integer(true), 'Interval to run rsync', false)
-    ->action(function ($source, $destination, $interval) {
+class VolumeSync extends Action
+{
+    public static function getName(): string
+    {
+        return 'volume-sync';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->desc('Runs rsync to sync certificates between the storage mount and traefik.')
+            ->param('source', null, new Text(255), 'Source path to sync from.', false)
+            ->param('destination', null, new Text(255), 'Destination path to sync to.', false)
+            ->param('interval', null, new Integer(true), 'Interval to run rsync', false)
+            ->callback(fn ($source, $destination, $interval) => $this->action($source, $destination, $interval));
+    }
+
+    public function action(string $source, string $destination, int $interval)
+    {
 
         Console::title('RSync V1');
         Console::success(APP_NAME . ' rsync process v1 has started');
@@ -42,4 +55,5 @@ $cli
             Console::success($stdout);
             Console::error($stderr);
         }, $interval);
-    });
+    }
+}
diff --git a/src/Appwrite/CLI/TasksService.php b/src/Appwrite/CLI/TasksService.php
index c6dba81dbc..12617ec33f 100644
--- a/src/Appwrite/CLI/TasksService.php
+++ b/src/Appwrite/CLI/TasksService.php
@@ -13,6 +13,7 @@ use Appwrite\CLI\Tasks\SSL;
 use Appwrite\CLI\Tasks\Usage;
 use Appwrite\CLI\Tasks\Vars;
 use Appwrite\CLI\Tasks\Version;
+use VolumeSync;
 
 class TasksService extends Service
 {
@@ -29,6 +30,7 @@ class TasksService extends Service
             ->addAction(Maintenance::getName(), new Maintenance())
             ->addAction(Migrate::getName(), new Migrate())
             ->addAction(SDKs::getName(), new SDKs())
+            ->addAction(VolumeSync::getName(), new VolumeSync())
             ->addAction(Specs::getName(), new Specs());
     }
 }

From 2dea0ec3b8c6027721ba459840927f14bf504ad4 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Sun, 13 Nov 2022 10:29:53 +0000
Subject: [PATCH 54/65] use latest framework version

---
 composer.json |  2 +-
 composer.lock | 34 ++++++++++++++--------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/composer.json b/composer.json
index 40e17b5fe6..25ab2a3f86 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.11.*",
         "utopia-php/platform": "0.3.*",
-        "utopia-php/framework": "0.22.*",
+        "utopia-php/framework": "0.25.*",
         "utopia-php/logger": "0.3.*",
         "utopia-php/abuse": "0.16.*",
         "utopia-php/analytics": "0.2.*",
diff --git a/composer.lock b/composer.lock
index a816d587b6..a66a959b7c 100644
--- a/composer.lock
+++ b/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": "87af69017761fb788e8be70ab5c37bba",
+    "content-hash": "bd99fe9f008b3bf3a68b1e3d0b515cc9",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1945,16 +1945,16 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.22.1",
+            "version": "0.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df"
+                "reference": "c524f681254255c8204fbf7919c53bf3b4982636"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/9f35d36ed4b8fa1c92962c77ef02b49c2f5919df",
-                "reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/c524f681254255c8204fbf7919c53bf3b4982636",
+                "reference": "c524f681254255c8204fbf7919c53bf3b4982636",
                 "shasum": ""
             },
             "require": {
@@ -1974,12 +1974,6 @@
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Eldad Fux",
-                    "email": "eldad@appwrite.io"
-                }
-            ],
             "description": "A simple, light and advanced PHP framework",
             "keywords": [
                 "framework",
@@ -1988,9 +1982,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.22.1"
+                "source": "https://github.com/utopia-php/framework/tree/0.25.0"
             },
-            "time": "2022-10-07T14:51:40+00:00"
+            "time": "2022-11-02T09:49:57+00:00"
         },
         {
             "name": "utopia-php/image",
@@ -2212,16 +2206,16 @@
         },
         {
             "name": "utopia-php/platform",
-            "version": "0.3.0",
+            "version": "0.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/platform.git",
-                "reference": "9cebec37b96e9f38c1cc0a68a793304606423897"
+                "reference": "fe9f64420957dc8fb6201d22b499572f021411e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/platform/zipball/9cebec37b96e9f38c1cc0a68a793304606423897",
-                "reference": "9cebec37b96e9f38c1cc0a68a793304606423897",
+                "url": "https://api.github.com/repos/utopia-php/platform/zipball/fe9f64420957dc8fb6201d22b499572f021411e4",
+                "reference": "fe9f64420957dc8fb6201d22b499572f021411e4",
                 "shasum": ""
             },
             "require": {
@@ -2229,7 +2223,7 @@
                 "ext-redis": "*",
                 "php": ">=8.0",
                 "utopia-php/cli": "0.14.*",
-                "utopia-php/framework": "0.22.*"
+                "utopia-php/framework": "0.25.*"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.3",
@@ -2255,9 +2249,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/platform/issues",
-                "source": "https://github.com/utopia-php/platform/tree/0.3.0"
+                "source": "https://github.com/utopia-php/platform/tree/0.3.1"
             },
-            "time": "2022-10-28T07:26:09+00:00"
+            "time": "2022-11-10T07:04:24+00:00"
         },
         {
             "name": "utopia-php/pools",

From f5fe47535ddcc6437355f9fe4273bbcfc4668d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Mon, 14 Nov 2022 07:49:36 +0000
Subject: [PATCH 55/65] Fix realtime startup

---
 composer.lock      | 12 ++++++------
 docker-compose.yml |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index d0ecd343a2..6a9bcf4d43 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2954,16 +2954,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.15.1",
+            "version": "v4.15.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
                 "shasum": ""
             },
             "require": {
@@ -3004,9 +3004,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
             },
-            "time": "2022-09-04T07:30:47+00:00"
+            "time": "2022-11-12T15:38:23+00:00"
         },
         {
             "name": "phar-io/manifest",
diff --git a/docker-compose.yml b/docker-compose.yml
index 5bd2576431..f0445f1eca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -226,6 +226,7 @@ services:
       - _APP_CONNECTIONS_DB_PROJECT
       - _APP_CONNECTIONS_CACHE
       - _APP_CONNECTIONS_PUBSUB
+      - _APP_CONNECTIONS_QUEUE
       - _APP_USAGE_STATS
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG

From ab7eb01438ca7347c85b99f75ca003fa794cbe54 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <lohanidamodar@users.noreply.github.com>
Date: Mon, 14 Nov 2022 15:35:49 +0545
Subject: [PATCH 56/65] Update src/Appwrite/CLI/Tasks/Usage.php

Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
---
 src/Appwrite/CLI/Tasks/Usage.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/CLI/Tasks/Usage.php
index e3e9db865a..9231c90f66 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/CLI/Tasks/Usage.php
@@ -32,7 +32,6 @@ class Usage extends Task
             ->callback(fn ($type, $dbForConsole, $influxDB, $logError) => $this->action($type, $dbForConsole, $influxDB, $logError));
     }
 
-
     protected function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void
     {
         $interval = (int) App::getEnv('_APP_USAGE_TIMESERIES_INTERVAL', '30'); // 30 seconds (by default)

From ae0b9e78aa19424f76667101c4fec168da653d34 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:01:41 +0000
Subject: [PATCH 57/65] refactor namespace and naming

---
 composer.lock                                 |  2 +-
 src/Appwrite/CLI/Tasks.php                    | 13 ----------
 src/Appwrite/Platform/Appwrite.php            | 13 ++++++++++
 .../TasksService.php => Platform/Tasks.php}   | 26 +++++++++----------
 .../{CLI => Platform}/Tasks/Doctor.php        |  2 +-
 .../{CLI => Platform}/Tasks/Install.php       |  2 +-
 .../{CLI => Platform}/Tasks/Maintenance.php   |  2 +-
 .../{CLI => Platform}/Tasks/Migrate.php       |  2 +-
 src/Appwrite/{CLI => Platform}/Tasks/SDKs.php |  2 +-
 src/Appwrite/{CLI => Platform}/Tasks/SSL.php  |  2 +-
 .../{CLI => Platform}/Tasks/Specs.php         |  2 +-
 .../{CLI => Platform}/Tasks/Usage.php         |  2 +-
 src/Appwrite/{CLI => Platform}/Tasks/Vars.php |  2 +-
 .../{CLI => Platform}/Tasks/Version.php       |  2 +-
 .../{CLI => Platform}/Tasks/VolumeSync.php    |  2 +-
 15 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 src/Appwrite/CLI/Tasks.php
 create mode 100644 src/Appwrite/Platform/Appwrite.php
 rename src/Appwrite/{CLI/TasksService.php => Platform/Tasks.php} (62%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Doctor.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Install.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Maintenance.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Migrate.php (98%)
 rename src/Appwrite/{CLI => Platform}/Tasks/SDKs.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/SSL.php (96%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Specs.php (99%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Usage.php (98%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Vars.php (95%)
 rename src/Appwrite/{CLI => Platform}/Tasks/Version.php (92%)
 rename src/Appwrite/{CLI => Platform}/Tasks/VolumeSync.php (98%)

diff --git a/composer.lock b/composer.lock
index a66a959b7c..fbc8d019d7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -5245,5 +5245,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/src/Appwrite/CLI/Tasks.php b/src/Appwrite/CLI/Tasks.php
deleted file mode 100644
index 7f07b8137a..0000000000
--- a/src/Appwrite/CLI/Tasks.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Appwrite\CLI;
-
-use Utopia\Platform\Platform;
-
-class Tasks extends Platform
-{
-    public function __construct()
-    {
-        $this->addService('cliTasks', new TasksService());
-    }
-}
diff --git a/src/Appwrite/Platform/Appwrite.php b/src/Appwrite/Platform/Appwrite.php
new file mode 100644
index 0000000000..187cabdeea
--- /dev/null
+++ b/src/Appwrite/Platform/Appwrite.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Appwrite\Platform;
+
+use Utopia\Platform\Platform;
+
+class Appwrite extends Platform
+{
+    public function __construct()
+    {
+        $this->addService('tasks', new Tasks());
+    }
+}
diff --git a/src/Appwrite/CLI/TasksService.php b/src/Appwrite/Platform/Tasks.php
similarity index 62%
rename from src/Appwrite/CLI/TasksService.php
rename to src/Appwrite/Platform/Tasks.php
index 12617ec33f..2ca169a201 100644
--- a/src/Appwrite/CLI/TasksService.php
+++ b/src/Appwrite/Platform/Tasks.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Appwrite\CLI;
+namespace Appwrite\Platform;
 
 use Utopia\Platform\Service;
-use Appwrite\CLI\Tasks\Doctor;
-use Appwrite\CLI\Tasks\Install;
-use Appwrite\CLI\Tasks\Maintenance;
-use Appwrite\CLI\Tasks\Migrate;
-use Appwrite\CLI\Tasks\SDKs;
-use Appwrite\CLI\Tasks\Specs;
-use Appwrite\CLI\Tasks\SSL;
-use Appwrite\CLI\Tasks\Usage;
-use Appwrite\CLI\Tasks\Vars;
-use Appwrite\CLI\Tasks\Version;
-use VolumeSync;
+use Appwrite\Platform\Tasks\Doctor;
+use Appwrite\Platform\Tasks\Install;
+use Appwrite\Platform\Tasks\Maintenance;
+use Appwrite\Platform\Tasks\Migrate;
+use Appwrite\Platform\Tasks\SDKs;
+use Appwrite\Platform\Tasks\Specs;
+use Appwrite\Platform\Tasks\SSL;
+use Appwrite\Platform\Tasks\Usage;
+use Appwrite\Platform\Tasks\Vars;
+use Appwrite\Platform\Tasks\Version;
+use Appwrite\Platform\Tasks\VolumeSync;
 
-class TasksService extends Service
+class Tasks extends Service
 {
     public function __construct()
     {
diff --git a/src/Appwrite/CLI/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Doctor.php
rename to src/Appwrite/Platform/Tasks/Doctor.php
index fbbc5e0230..38af7c7376 100644
--- a/src/Appwrite/CLI/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\App;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/CLI/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Install.php
rename to src/Appwrite/Platform/Tasks/Install.php
index b1e980b7f4..219a03129d 100644
--- a/src/Appwrite/CLI/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Docker\Compose;
diff --git a/src/Appwrite/CLI/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Maintenance.php
rename to src/Appwrite/Platform/Tasks/Maintenance.php
index 01b950dad8..fe659c8746 100644
--- a/src/Appwrite/CLI/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
diff --git a/src/Appwrite/CLI/Tasks/Migrate.php b/src/Appwrite/Platform/Tasks/Migrate.php
similarity index 98%
rename from src/Appwrite/CLI/Tasks/Migrate.php
rename to src/Appwrite/Platform/Tasks/Migrate.php
index 49878bc6f5..d7f591ac1a 100644
--- a/src/Appwrite/CLI/Tasks/Migrate.php
+++ b/src/Appwrite/Platform/Tasks/Migrate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/CLI/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/SDKs.php
rename to src/Appwrite/Platform/Tasks/SDKs.php
index e3d34b56f4..fe312f8ef2 100644
--- a/src/Appwrite/CLI/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\Config\Config;
diff --git a/src/Appwrite/CLI/Tasks/SSL.php b/src/Appwrite/Platform/Tasks/SSL.php
similarity index 96%
rename from src/Appwrite/CLI/Tasks/SSL.php
rename to src/Appwrite/Platform/Tasks/SSL.php
index 6379253789..43026b0753 100644
--- a/src/Appwrite/CLI/Tasks/SSL.php
+++ b/src/Appwrite/Platform/Tasks/SSL.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Appwrite\Event\Certificate;
diff --git a/src/Appwrite/CLI/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
similarity index 99%
rename from src/Appwrite/CLI/Tasks/Specs.php
rename to src/Appwrite/Platform/Tasks/Specs.php
index 7c2d242786..10f322f196 100644
--- a/src/Appwrite/CLI/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\Platform\Action;
 use Utopia\Validator\Text;
diff --git a/src/Appwrite/CLI/Tasks/Usage.php b/src/Appwrite/Platform/Tasks/Usage.php
similarity index 98%
rename from src/Appwrite/CLI/Tasks/Usage.php
rename to src/Appwrite/Platform/Tasks/Usage.php
index 9231c90f66..89859c883b 100644
--- a/src/Appwrite/CLI/Tasks/Usage.php
+++ b/src/Appwrite/Platform/Tasks/Usage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Platform\Task;
 use Appwrite\Usage\Calculators\Aggregator;
diff --git a/src/Appwrite/CLI/Tasks/Vars.php b/src/Appwrite/Platform/Tasks/Vars.php
similarity index 95%
rename from src/Appwrite/CLI/Tasks/Vars.php
rename to src/Appwrite/Platform/Tasks/Vars.php
index 7286cc5382..c97f77a9da 100644
--- a/src/Appwrite/CLI/Tasks/Vars.php
+++ b/src/Appwrite/Platform/Tasks/Vars.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\App;
 use Utopia\Config\Config;
diff --git a/src/Appwrite/CLI/Tasks/Version.php b/src/Appwrite/Platform/Tasks/Version.php
similarity index 92%
rename from src/Appwrite/CLI/Tasks/Version.php
rename to src/Appwrite/Platform/Tasks/Version.php
index 164b8b0766..4a9cbf9dcf 100644
--- a/src/Appwrite/CLI/Tasks/Version.php
+++ b/src/Appwrite/Platform/Tasks/Version.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\CLI\Tasks;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\App;
 use Utopia\CLI\Console;
diff --git a/src/Appwrite/CLI/Tasks/VolumeSync.php b/src/Appwrite/Platform/Tasks/VolumeSync.php
similarity index 98%
rename from src/Appwrite/CLI/Tasks/VolumeSync.php
rename to src/Appwrite/Platform/Tasks/VolumeSync.php
index 3fd84c7d22..6197b20fbd 100644
--- a/src/Appwrite/CLI/Tasks/VolumeSync.php
+++ b/src/Appwrite/Platform/Tasks/VolumeSync.php
@@ -1,6 +1,6 @@
 <?php
 
-global $cli;
+namespace Appwrite\Platform\Tasks;
 
 use Utopia\CLI\Console;
 use Utopia\Database\DateTime;

From cb9bfb2b5456a08034bcd7cd14f822e02694a257 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:09:39 +0000
Subject: [PATCH 58/65] remove base action

---
 src/Appwrite/Platform/Task.php        | 15 ---------------
 src/Appwrite/Platform/Tasks/Usage.php |  5 ++---
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 src/Appwrite/Platform/Task.php

diff --git a/src/Appwrite/Platform/Task.php b/src/Appwrite/Platform/Task.php
deleted file mode 100644
index d1eb7fa88b..0000000000
--- a/src/Appwrite/Platform/Task.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Appwrite\Platform;
-
-use Utopia\Platform\Action;
-use Exception;
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Registry\Registry;
-use Utopia\Logger\Log;
-use Throwable;
-
-abstract class Task extends Action
-{
-}
diff --git a/src/Appwrite/Platform/Tasks/Usage.php b/src/Appwrite/Platform/Tasks/Usage.php
index 89859c883b..73686109d8 100644
--- a/src/Appwrite/Platform/Tasks/Usage.php
+++ b/src/Appwrite/Platform/Tasks/Usage.php
@@ -2,7 +2,6 @@
 
 namespace Appwrite\Platform\Tasks;
 
-use Appwrite\Platform\Task;
 use Appwrite\Usage\Calculators\Aggregator;
 use Appwrite\Usage\Calculators\Database;
 use Appwrite\Usage\Calculators\TimeSeries;
@@ -12,9 +11,9 @@ use Utopia\CLI\Console;
 use Utopia\Database\Database as UtopiaDatabase;
 use Utopia\Validator\WhiteList;
 use Throwable;
-use Utopia\Registry\Registry;
+use Utopia\Platform\Action;
 
-class Usage extends Task
+class Usage extends Action
 {
     public static function getName(): string
     {

From bbcce5e0189ce396887765ab0268d6484dc49695 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:10:47 +0000
Subject: [PATCH 59/65] refactor service namespace

---
 src/Appwrite/Platform/Appwrite.php             | 1 +
 src/Appwrite/Platform/{ => Services}/Tasks.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename src/Appwrite/Platform/{ => Services}/Tasks.php (96%)

diff --git a/src/Appwrite/Platform/Appwrite.php b/src/Appwrite/Platform/Appwrite.php
index 187cabdeea..9ef6f38c36 100644
--- a/src/Appwrite/Platform/Appwrite.php
+++ b/src/Appwrite/Platform/Appwrite.php
@@ -2,6 +2,7 @@
 
 namespace Appwrite\Platform;
 
+use Appwrite\Platform\Services\Tasks;
 use Utopia\Platform\Platform;
 
 class Appwrite extends Platform
diff --git a/src/Appwrite/Platform/Tasks.php b/src/Appwrite/Platform/Services/Tasks.php
similarity index 96%
rename from src/Appwrite/Platform/Tasks.php
rename to src/Appwrite/Platform/Services/Tasks.php
index 2ca169a201..7f6a062ed4 100644
--- a/src/Appwrite/Platform/Tasks.php
+++ b/src/Appwrite/Platform/Services/Tasks.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform;
+namespace Appwrite\Platform\Services;
 
 use Utopia\Platform\Service;
 use Appwrite\Platform\Tasks\Doctor;

From d15af1ae17ea2b0f1675fce914d6ef61c5198de4 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:24:16 +0000
Subject: [PATCH 60/65] update callback code

---
 src/Appwrite/Platform/Tasks/Doctor.php      | 2 +-
 src/Appwrite/Platform/Tasks/Install.php     | 2 +-
 src/Appwrite/Platform/Tasks/Maintenance.php | 2 +-
 src/Appwrite/Platform/Tasks/Migrate.php     | 2 +-
 src/Appwrite/Platform/Tasks/SDKs.php        | 2 +-
 src/Appwrite/Platform/Tasks/SSL.php         | 2 +-
 src/Appwrite/Platform/Tasks/Specs.php       | 2 +-
 src/Appwrite/Platform/Tasks/Usage.php       | 2 +-
 src/Appwrite/Platform/Tasks/Vars.php        | 2 +-
 src/Appwrite/Platform/Tasks/VolumeSync.php  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Appwrite/Platform/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
index 38af7c7376..9f32aed746 100644
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -25,7 +25,7 @@ class Doctor extends Action
         $this
             ->desc('Validate server health')
             ->inject('register')
-            ->callback(fn (Registry $register) => $this->action($register));
+            ->callback($this->action);
     }
 
     public function action(Registry $register): void
diff --git a/src/Appwrite/Platform/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php
index 219a03129d..d7dcbcc1fb 100644
--- a/src/Appwrite/Platform/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@@ -28,7 +28,7 @@ class Install extends Action
             ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true)
             ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
             ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
-            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive));
+            ->callback($this->action);
     }
 
     public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive): void
diff --git a/src/Appwrite/Platform/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
index fe659c8746..b084ed0901 100644
--- a/src/Appwrite/Platform/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -25,7 +25,7 @@ class Maintenance extends Action
         $this
             ->desc('Schedules maintenance tasks and publishes them to resque')
             ->inject('dbForConsole')
-            ->callback(fn (Database $dbForConsole) => $this->action($dbForConsole));
+            ->callback($this->action);
     }
 
     public function action(Database $dbForConsole): void
diff --git a/src/Appwrite/Platform/Tasks/Migrate.php b/src/Appwrite/Platform/Tasks/Migrate.php
index d7f591ac1a..a27a27c256 100644
--- a/src/Appwrite/Platform/Tasks/Migrate.php
+++ b/src/Appwrite/Platform/Tasks/Migrate.php
@@ -25,7 +25,7 @@ class Migrate extends Action
             ->desc('Migrate Appwrite to new version')
             ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
             ->inject('register')
-            ->callback(fn ($version, $register) => $this->action($version, $register));
+            ->callback($this->action);
     }
 
     public function action(string $version, Registry $register)
diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index fe312f8ef2..a7e6379d8e 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -36,7 +36,7 @@ class SDKs extends Action
     {
         $this
             ->desc('Generate Appwrite SDKs')
-            ->callback(fn () => $this->action());
+            ->callback($this->action);
     }
 
     public function action(): void
diff --git a/src/Appwrite/Platform/Tasks/SSL.php b/src/Appwrite/Platform/Tasks/SSL.php
index 43026b0753..b98d9772f1 100644
--- a/src/Appwrite/Platform/Tasks/SSL.php
+++ b/src/Appwrite/Platform/Tasks/SSL.php
@@ -21,7 +21,7 @@ class SSL extends Action
         $this
             ->desc('Validate server certificates')
             ->param('domain', App::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
-            ->callback(fn ($domain) => $this->action($domain));
+            ->callback($this->action);
     }
 
     public function action(string $domain): void
diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
index 10f322f196..c948459f84 100644
--- a/src/Appwrite/Platform/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -35,7 +35,7 @@ class Specs extends Action
             ->param('version', 'latest', new Text(16), 'Spec version', true)
             ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
             ->inject('register')
-            ->callback(fn (string $version, string $mode, Registry $register) => $this->action($version, $mode, $register));
+            ->callback($this->action);
     }
 
     public function action(string $version, string $mode, Registry $register): void
diff --git a/src/Appwrite/Platform/Tasks/Usage.php b/src/Appwrite/Platform/Tasks/Usage.php
index 73686109d8..169e2ee536 100644
--- a/src/Appwrite/Platform/Tasks/Usage.php
+++ b/src/Appwrite/Platform/Tasks/Usage.php
@@ -28,7 +28,7 @@ class Usage extends Action
             ->inject('dbForConsole')
             ->inject('influxdb')
             ->inject('logError')
-            ->callback(fn ($type, $dbForConsole, $influxDB, $logError) => $this->action($type, $dbForConsole, $influxDB, $logError));
+            ->callback($this->action);
     }
 
     protected function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void
diff --git a/src/Appwrite/Platform/Tasks/Vars.php b/src/Appwrite/Platform/Tasks/Vars.php
index c97f77a9da..3f4e71bc4b 100644
--- a/src/Appwrite/Platform/Tasks/Vars.php
+++ b/src/Appwrite/Platform/Tasks/Vars.php
@@ -18,7 +18,7 @@ class Vars extends Action
     {
         $this
             ->desc('List all the server environment variables')
-            ->callback(fn () => $this->action());
+            ->callback($this->action);
     }
 
     public function action(): void
diff --git a/src/Appwrite/Platform/Tasks/VolumeSync.php b/src/Appwrite/Platform/Tasks/VolumeSync.php
index 6197b20fbd..56a61c52ef 100644
--- a/src/Appwrite/Platform/Tasks/VolumeSync.php
+++ b/src/Appwrite/Platform/Tasks/VolumeSync.php
@@ -22,7 +22,7 @@ class VolumeSync extends Action
             ->param('source', null, new Text(255), 'Source path to sync from.', false)
             ->param('destination', null, new Text(255), 'Destination path to sync to.', false)
             ->param('interval', null, new Integer(true), 'Interval to run rsync', false)
-            ->callback(fn ($source, $destination, $interval) => $this->action($source, $destination, $interval));
+            ->callback($this->action);
     }
 
     public function action(string $source, string $destination, int $interval)

From 5fbf961a9a6c4e80143e99e7045895609794be11 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:29:10 +0000
Subject: [PATCH 61/65] fix cli

---
 app/cli.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index a1a080fc31..b4be840172 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -3,7 +3,7 @@
 require_once __DIR__ . '/init.php';
 require_once __DIR__ . '/controllers/general.php';
 
-use Appwrite\CLI\Tasks;
+use Appwrite\Platform\Appwrite;
 use Utopia\CLI\CLI;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Platform\Service;
@@ -113,8 +113,8 @@ CLI::setResource('logError', function (Registry $register) {
     };
 }, ['register']);
 
-$cliPlatform = new Tasks();
-$cliPlatform->init(Service::TYPE_CLI);
+$platform = new Appwrite();
+$platform->init(Service::TYPE_CLI);
 
-$cli = $cliPlatform->getCli();
+$cli = $platform->getCli();
 $cli->run();

From 0570e26a48d2a999226d9c6d4ae1b67d7c4c0714 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:36:21 +0000
Subject: [PATCH 62/65] revert back callback changes

---
 src/Appwrite/Platform/Tasks/Doctor.php      | 2 +-
 src/Appwrite/Platform/Tasks/Install.php     | 2 +-
 src/Appwrite/Platform/Tasks/Maintenance.php | 2 +-
 src/Appwrite/Platform/Tasks/Migrate.php     | 2 +-
 src/Appwrite/Platform/Tasks/SDKs.php        | 2 +-
 src/Appwrite/Platform/Tasks/SSL.php         | 2 +-
 src/Appwrite/Platform/Tasks/Specs.php       | 2 +-
 src/Appwrite/Platform/Tasks/Usage.php       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Appwrite/Platform/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
index 9f32aed746..38af7c7376 100644
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -25,7 +25,7 @@ class Doctor extends Action
         $this
             ->desc('Validate server health')
             ->inject('register')
-            ->callback($this->action);
+            ->callback(fn (Registry $register) => $this->action($register));
     }
 
     public function action(Registry $register): void
diff --git a/src/Appwrite/Platform/Tasks/Install.php b/src/Appwrite/Platform/Tasks/Install.php
index d7dcbcc1fb..219a03129d 100644
--- a/src/Appwrite/Platform/Tasks/Install.php
+++ b/src/Appwrite/Platform/Tasks/Install.php
@@ -28,7 +28,7 @@ class Install extends Action
             ->param('organization', 'appwrite', new Text(0), 'Docker Registry organization', true)
             ->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
             ->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
-            ->callback($this->action);
+            ->callback(fn ($httpPort, $httpsPort, $organization, $image, $interactive) => $this->action($httpPort, $httpsPort, $organization, $image, $interactive));
     }
 
     public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive): void
diff --git a/src/Appwrite/Platform/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
index b084ed0901..fe659c8746 100644
--- a/src/Appwrite/Platform/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -25,7 +25,7 @@ class Maintenance extends Action
         $this
             ->desc('Schedules maintenance tasks and publishes them to resque')
             ->inject('dbForConsole')
-            ->callback($this->action);
+            ->callback(fn (Database $dbForConsole) => $this->action($dbForConsole));
     }
 
     public function action(Database $dbForConsole): void
diff --git a/src/Appwrite/Platform/Tasks/Migrate.php b/src/Appwrite/Platform/Tasks/Migrate.php
index a27a27c256..d7f591ac1a 100644
--- a/src/Appwrite/Platform/Tasks/Migrate.php
+++ b/src/Appwrite/Platform/Tasks/Migrate.php
@@ -25,7 +25,7 @@ class Migrate extends Action
             ->desc('Migrate Appwrite to new version')
             ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
             ->inject('register')
-            ->callback($this->action);
+            ->callback(fn ($version, $register) => $this->action($version, $register));
     }
 
     public function action(string $version, Registry $register)
diff --git a/src/Appwrite/Platform/Tasks/SDKs.php b/src/Appwrite/Platform/Tasks/SDKs.php
index a7e6379d8e..fe312f8ef2 100644
--- a/src/Appwrite/Platform/Tasks/SDKs.php
+++ b/src/Appwrite/Platform/Tasks/SDKs.php
@@ -36,7 +36,7 @@ class SDKs extends Action
     {
         $this
             ->desc('Generate Appwrite SDKs')
-            ->callback($this->action);
+            ->callback(fn () => $this->action());
     }
 
     public function action(): void
diff --git a/src/Appwrite/Platform/Tasks/SSL.php b/src/Appwrite/Platform/Tasks/SSL.php
index b98d9772f1..43026b0753 100644
--- a/src/Appwrite/Platform/Tasks/SSL.php
+++ b/src/Appwrite/Platform/Tasks/SSL.php
@@ -21,7 +21,7 @@ class SSL extends Action
         $this
             ->desc('Validate server certificates')
             ->param('domain', App::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
-            ->callback($this->action);
+            ->callback(fn ($domain) => $this->action($domain));
     }
 
     public function action(string $domain): void
diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
index c948459f84..10f322f196 100644
--- a/src/Appwrite/Platform/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -35,7 +35,7 @@ class Specs extends Action
             ->param('version', 'latest', new Text(16), 'Spec version', true)
             ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
             ->inject('register')
-            ->callback($this->action);
+            ->callback(fn (string $version, string $mode, Registry $register) => $this->action($version, $mode, $register));
     }
 
     public function action(string $version, string $mode, Registry $register): void
diff --git a/src/Appwrite/Platform/Tasks/Usage.php b/src/Appwrite/Platform/Tasks/Usage.php
index 169e2ee536..73686109d8 100644
--- a/src/Appwrite/Platform/Tasks/Usage.php
+++ b/src/Appwrite/Platform/Tasks/Usage.php
@@ -28,7 +28,7 @@ class Usage extends Action
             ->inject('dbForConsole')
             ->inject('influxdb')
             ->inject('logError')
-            ->callback($this->action);
+            ->callback(fn ($type, $dbForConsole, $influxDB, $logError) => $this->action($type, $dbForConsole, $influxDB, $logError));
     }
 
     protected function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void

From f469d1ba450c8011867fa0b38bf5e3cac06e1d74 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:38:17 +0000
Subject: [PATCH 63/65] fix volume sync

---
 src/Appwrite/Platform/Tasks/VolumeSync.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Appwrite/Platform/Tasks/VolumeSync.php b/src/Appwrite/Platform/Tasks/VolumeSync.php
index 56a61c52ef..6197b20fbd 100644
--- a/src/Appwrite/Platform/Tasks/VolumeSync.php
+++ b/src/Appwrite/Platform/Tasks/VolumeSync.php
@@ -22,7 +22,7 @@ class VolumeSync extends Action
             ->param('source', null, new Text(255), 'Source path to sync from.', false)
             ->param('destination', null, new Text(255), 'Destination path to sync to.', false)
             ->param('interval', null, new Integer(true), 'Interval to run rsync', false)
-            ->callback($this->action);
+            ->callback(fn ($source, $destination, $interval) => $this->action($source, $destination, $interval));
     }
 
     public function action(string $source, string $destination, int $interval)

From 920cff8ce73d1eb592c0f4b1ca569e4cd524a1b7 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:39:37 +0000
Subject: [PATCH 64/65] fix vars

---
 src/Appwrite/Platform/Tasks/Vars.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Appwrite/Platform/Tasks/Vars.php b/src/Appwrite/Platform/Tasks/Vars.php
index 3f4e71bc4b..c97f77a9da 100644
--- a/src/Appwrite/Platform/Tasks/Vars.php
+++ b/src/Appwrite/Platform/Tasks/Vars.php
@@ -18,7 +18,7 @@ class Vars extends Action
     {
         $this
             ->desc('List all the server environment variables')
-            ->callback($this->action);
+            ->callback(fn () => $this->action());
     }
 
     public function action(): void

From 2c255a73942f420f1b3127e9d9485e8ccf32b204 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Mon, 14 Nov 2022 10:46:11 +0000
Subject: [PATCH 65/65] fix cli

---
 app/cli.php | 83 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index b4be840172..b176326191 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -9,52 +9,75 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Platform\Service;
 use Utopia\App;
 use Utopia\CLI\Console;
-use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
-use Utopia\Database\Adapter\MariaDB;
+use Utopia\Config\Config;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Logger\Log;
+use Utopia\Pools\Group;
 use Utopia\Registry\Registry;
 
 Authorization::disable();
 
 CLI::setResource('register', fn()=>$register);
 
-CLI::setResource('db', function (Registry $register) {
-    $attempts = 0;
-    $max = 10;
-    $sleep = 1;
-    do {
-        try {
-            $attempts++;
-            $db = $register->get('db');
-            break; // leave the do-while if successful
-        } catch (\Exception $e) {
-            Console::warning("Database not ready. Retrying connection ({$attempts})...");
-            if ($attempts >= $max) {
-                throw new \Exception('Failed to connect to database: ' . $e->getMessage());
-            }
-            sleep($sleep);
-        }
-    } while ($attempts < $max);
-    return $db;
+CLI::setResource('cache', function ($pools) {
+    $list = Config::getParam('pools-cache', []);
+    $adapters = [];
+
+    foreach ($list as $value) {
+        $adapters[] = $pools
+            ->get($value)
+            ->pop()
+            ->getResource()
+        ;
+    }
+
+    return new Cache(new Sharding($adapters));
+}, ['pools']);
+
+CLI::setResource('pools', function (Registry $register) {
+    return $register->get('pools');
 }, ['register']);
 
-CLI::setResource('cache', fn ($register) => $register->get('cache'), ['register']);
+CLI::setResource('dbForConsole', function ($pools, $cache) {
+    $dbAdapter = $pools
+        ->get('console')
+        ->pop()
+        ->getResource()
+    ;
 
-CLI::setResource('dbForConsole', function ($db, $cache) {
-    $cache = new Cache(new RedisCache($cache));
+    $database = new Database($dbAdapter, $cache);
 
-    $database = new Database(new MariaDB($db), $cache);
-    $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-    $database->setNamespace('_console');
+    $database->setNamespace('console');
 
     return $database;
-}, ['db', 'cache']);
+}, ['pools', 'cache']);
+
+CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
+    $getProjectDB = function (Document $project) use ($pools, $dbForConsole, $cache) {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            return $dbForConsole;
+        }
+
+        $dbAdapter = $pools
+            ->get($project->getAttribute('database'))
+            ->pop()
+            ->getResource()
+        ;
+
+        $database = new Database($dbAdapter, $cache);
+        $database->setNamespace('_' . $project->getInternalId());
+
+        return $database;
+    };
+
+    return $getProjectDB;
+}, ['pools', 'dbForConsole', 'cache']);
 
 CLI::setResource('influxdb', function (Registry $register) {
-    /** @var InfluxDB\Client $client */
-    $client = $register->get('influxdb');
+    $client = $register->get('influxdb'); /** @var InfluxDB\Client $client */
     $attempts = 0;
     $max = 10;
     $sleep = 1;
@@ -66,7 +89,7 @@ CLI::setResource('influxdb', function (Registry $register) {
             if (in_array('telegraf', $client->listDatabases())) {
                 break; // leave the do-while if successful
             }
-        } catch (\Throwable$th) {
+        } catch (\Throwable $th) {
             Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
             if ($attempts >= $max) {
                 throw new \Exception('InfluxDB database not ready yet');