Feat-eldad2-coroutines

.github/workflows/codeql-phpstan.yml

@@ -0,0 +1,16 @@
+name: "CodeQL"
+
+on: [pull_request]
+jobs:
+ lint:
+ name: CodeQL
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@v2
+
+ - name: Run CodeQL
+ run: |
+ docker run --rm -v $PWD:/app composer sh -c \
+ "composer install --profile --ignore-platform-reqs && composer check"

CHANGES.md

@@ -384,7 +384,7 @@
 * Bump console to version 3.2.7 [#7148](https://github.com/appwrite/appwrite/pull/7148)
 * Chore update database to 0.45.2 [#7138](https://github.com/appwrite/appwrite/pull/7138)
 * Implement queue thresholds for the health API [#7123](https://github.com/appwrite/appwrite/pull/7123)
-* Add Authorization::skip to the usage worker [#7124](https://github.com/appwrite/appwrite/pull/7124)
+* Add $auth->skip to the usage worker [#7124](https://github.com/appwrite/appwrite/pull/7124)
 
 ## Bug fixes
 * fix: use queueForDeletes in git installation delete endpoint [#7140](https://github.com/appwrite/appwrite/pull/7140)

app/cli.php

@@ -8,6 +8,7 @@
 use Appwrite\Event\Func;
 use Appwrite\Event\Hamster;
 use Appwrite\Platform\Appwrite;
+use Appwrite\Utopia\Queue\Connections;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
@@ -16,52 +17,56 @@
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Http\Http;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
 use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
 
-Authorization::disable();
+global $register;
 
 CLI::setResource('register', fn () => $register);
 
-CLI::setResource('cache', function ($pools) {
+CLI::setResource('connections', function () {
+ return new Connections();
+});
+
+CLI::setResource('cache', function ($pools, Connections $connections) {
  $list = Config::getParam('pools-cache', []);
  $adapters = [];
 
  foreach ($list as $value) {
- $adapters[] = $pools
- ->get($value)
- ->pop()
- ->getResource()
- ;
+ $connection = $pools->get($value)->pop();
+ $connections->add($connection);
+ $adapters[] = $connection->getResource();
  }
 
  return new Cache(new Sharding($adapters));
-}, ['pools']);
+}, ['pools', 'connections']);
 
 CLI::setResource('pools', function (Registry $register) {
  return $register->get('pools');
 }, ['register']);
 
-CLI::setResource('dbForConsole', function ($pools, $cache) {
+CLI::setResource('dbForConsole', function ($pools, $cache, $auth, Connections $connections) {
  $sleep = 3;
  $maxAttempts = 5;
  $attempts = 0;
  $ready = false;
 
+ $connection = null;
+
  do {
  $attempts++;
  try {
  // Prepare database connection
- $dbAdapter = $pools
- ->get('console')
- ->pop()
- ->getResource();
+ $connection = $pools->get('console')->pop();
+ $dbAdapter = $connection->getResource();
 
  $dbForConsole = new Database($dbAdapter, $cache);
+ $dbForConsole->setAuthorization($auth);
 
  $dbForConsole
  ->setNamespace('_console')
@@ -78,23 +83,31 @@
 
  $ready = true;
  } catch (\Throwable $err) {
+ if($connection !== null) {
+ $connection->reclaim();
+ $connection = null;
+ }
+
  Console::warning($err->getMessage());
- $pools->get('console')->reclaim();
  sleep($sleep);
  }
  } while ($attempts < $maxAttempts && !$ready);
 
+ if($connection !== null) {
+ $connections->add($connection);
+ }
+
  if (!$ready) {
  throw new Exception("Console is not ready yet. Please try again later.");
  }
 
  return $dbForConsole;
-}, ['pools', 'cache']);
+}, ['pools', 'cache', 'auth', 'connections']);
 
-CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
+CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache, $auth, Connections $connections) {
  $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
- return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
+ return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases, $auth, $connections) {
  if ($project->isEmpty() || $project->getId() === 'console') {
  return $dbForConsole;
  }
@@ -107,12 +120,12 @@
  return $database;
  }
 
- $dbAdapter = $pools
- ->get($databaseName)
- ->pop()
- ->getResource();
+ $connection = $pools->get($databaseName)->pop();
+ $connections->add($connection);
+ $dbAdapter = $connection->getResource();
 
  $database = new Database($dbAdapter, $cache);
+ $database->setAuthorization($auth);
 
  $databases[$databaseName] = $database;
 
@@ -123,11 +136,13 @@
 
  return $database;
  };
-}, ['pools', 'dbForConsole', 'cache']);
+}, ['pools', 'dbForConsole', 'cache', 'auth', 'connections']);
 
-CLI::setResource('queue', function (Group $pools) {
- return $pools->get('queue')->pop()->getResource();
-}, ['pools']);
+CLI::setResource('queue', function (Group $pools, Connections $connections) {
+ $connection = $pools->get('queue')->pop();
+ $connections->add($connection);
+ return $connection->getResource();
+}, ['pools', 'connections']);
 CLI::setResource('queueForFunctions', function (Connection $queue) {
  return new Func($queue);
 }, ['queue']);
@@ -165,6 +180,7 @@
  $log->setAction($action);
 
  $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+
  $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
 
  $responseCode = $logger->addLog($log);
@@ -176,11 +192,20 @@
  };
 }, ['register']);
 
+CLI::setResource('auth', fn () => new Authorization());
+
 $platform = new Appwrite();
 $platform->init(Service::TYPE_CLI);
 
 $cli = $platform->getCli();
 
+$cli
+ ->init()
+ ->inject('auth')
+ ->action(function (Authorization $auth) {
+ $auth->disable();
+ });
+
 $cli
  ->error()
  ->inject('error')