diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index b3060eaf4..c4fe8c849 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -242,6 +242,7 @@ App::get('/v1/storage/files/:fileId/preview') ->param('fileId', '', new UID(), 'File unique ID') ->param('width', 0, new Range(0, 4000), 'Resize preview image width, Pass an integer between 0 to 4000.', true) ->param('height', 0, new Range(0, 4000), 'Resize preview image height, Pass an integer between 0 to 4000.', true) + ->param('gravity', Image::GRAVITY_CENTER, new WhiteList([Image::GRAVITY_CENTER, Image::GRAVITY_NORTH, Image::GRAVITY_NORTHWEST, Image::GRAVITY_NORTHEAST, Image::GRAVITY_WEST, Image::GRAVITY_EAST, Image::GRAVITY_SOUTHWEST, Image::GRAVITY_SOUTH, Image::GRAVITY_SOUTHEAST]), 'Image crop gravity', true) ->param('quality', 100, new Range(0, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to 100.', true) ->param('borderWidth', 0, new Range(0, 100), 'Preview image border in pixels. Pass an integer between 0 to 100. Defaults to 0.', true) ->param('borderColor', '', new HexColor(), 'Preview image border color. Use a valid HEX color, no # is needed for prefix.', true) @@ -254,7 +255,7 @@ App::get('/v1/storage/files/:fileId/preview') ->inject('response') ->inject('project') ->inject('projectDB') - ->action(function ($fileId, $width, $height, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $projectDB) { + ->action(function ($fileId, $width, $height, $gravity, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $projectDB) { /** @var Utopia\Swoole\Request $request */ /** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Database\Document $project */ @@ -342,7 +343,7 @@ App::get('/v1/storage/files/:fileId/preview') $image = new Image($source); - $image->crop((int) $width, (int) $height); + $image->crop((int) $width, (int) $height, $gravity); if (!empty($opacity) || $opacity==0) { $image->setOpacity($opacity); diff --git a/app/http.php b/app/http.php index 154b88e5a..7d56a9046 100644 --- a/app/http.php +++ b/app/http.php @@ -12,26 +12,6 @@ use Swoole\Http\Request as SwooleRequest; use Swoole\Http\Response as SwooleResponse; use Utopia\App; use Utopia\CLI\Console; -use Utopia\Config\Config; -use Utopia\Domains\Domain; - -// xdebug_start_trace('/tmp/trace'); - -Files::load(__DIR__ . '/../public'); - -include __DIR__ . '/controllers/general.php'; - -$domain = App::getEnv('_APP_DOMAIN', ''); - -Console::info('Issuing a TLS certificate for the master domain ('.$domain.') in 30 seconds. - Make sure your domain points to your server IP or restart your Appwrite server to try again.'); // TODO move this to installation script - -ResqueScheduler::enqueueAt(\time() + 30, 'v1-certificates', 'CertificatesV1', [ - 'document' => [], - 'domain' => $domain, - 'validateTarget' => false, - 'validateCNAME' => false, -]); $http = new Server("0.0.0.0", App::getEnv('PORT', 80)); @@ -101,8 +81,8 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo $register->set('db', function () use (&$db) { return $db; }); - - $register->set('cache', function () use (&$redis) { // Register cache connection + + $register->set('cache', function () use (&$redis) { return $redis; }); diff --git a/app/init.php b/app/init.php index ab505d60f..cb87697a8 100644 --- a/app/init.php +++ b/app/init.php @@ -161,19 +161,21 @@ $register->set('dbPool', function () { // Register DB connection return $pool; }); - $register->set('redisPool', function () { - $user = App::getEnv('_APP_REDIS_USER', ''); - $pass = App::getEnv('_APP_REDIS_PASS', ''); - $auth = []; - if ($user) { - $auth[] = $user; + $redisHost = App::getEnv('_APP_REDIS_HOST', ''); + $redisPort = App::getEnv('_APP_REDIS_PORT', ''); + $redisUser = App::getEnv('_APP_REDIS_USER', ''); + $redisPass = App::getEnv('_APP_REDIS_PASS', ''); + $redisAuth = []; + + if ($redisUser) { + $redisAuth[] = $redisUser; } - if ($pass) { - $auth[] = $pass; + if ($redisPass) { + $redisAuth[] = $redisPass; } - $pool = new RedisPool(10, App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''), $auth); + $pool = new RedisPool(10, $redisHost, $redisPort, $redisAuth); return $pool; }); diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml index 1c8578ec3..021cf8992 100644 --- a/app/views/console/home/index.phtml +++ b/app/views/console/home/index.phtml @@ -332,7 +332,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
-

Register your Android App

+

Register your Android App

available = false; while (!$this->pool->isEmpty()) { $this->pool->pop(); } } -} \ No newline at end of file +} diff --git a/src/Appwrite/Database/Pool/PDOPool.php b/src/Appwrite/Database/Pool/PDOPool.php new file mode 100644 index 000000000..75da61e6e --- /dev/null +++ b/src/Appwrite/Database/Pool/PDOPool.php @@ -0,0 +1,49 @@ +pool = new SplQueue; + $this->size = $size; + for ($i = 0; $i < $this->size; $i++) { + $pdo = new PDO( + "mysql:" . + "host={$host};" . + "dbname={$schema};" . + "charset={$charset}", + $user, + $pass, + [ + PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', + PDO::ATTR_TIMEOUT => 3, // Seconds + PDO::ATTR_PERSISTENT => true, + PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true + ] + ); + $this->pool->enqueue($pdo); + } + } + + public function put(PDO $pdo) + { + $this->pool->enqueue($pdo); + } + + public function get(): PDO + { + if ($this->available && count($this->pool) > 0) { + return $this->pool->dequeue(); + } + sleep(0.01); + return $this->get(); + } +} diff --git a/src/Appwrite/Database/Pool/RedisPool.php b/src/Appwrite/Database/Pool/RedisPool.php new file mode 100644 index 000000000..08e102abb --- /dev/null +++ b/src/Appwrite/Database/Pool/RedisPool.php @@ -0,0 +1,42 @@ +pool = new SplQueue; + $this->size = $size; + for ($i = 0; $i < $this->size; $i++) { + $redis = new Redis(); + $redis->pconnect($host, $port); + $redis->setOption(Redis::OPT_READ_TIMEOUT, -1); + + if ($auth) { + $redis->auth($auth); + } + + $this->pool->enqueue($redis); + } + } + + public function put(Redis $redis) + { + $this->pool->enqueue($redis); + } + + public function get(): Redis + { + if ($this->available && !$this->pool->isEmpty()) { + return $this->pool->dequeue(); + } + sleep(0.1); + return $this->get(); + } +} diff --git a/src/Appwrite/Resque/Worker.php b/src/Appwrite/Resque/Worker.php index 7c27b0f10..c82724ace 100644 --- a/src/Appwrite/Resque/Worker.php +++ b/src/Appwrite/Resque/Worker.php @@ -2,18 +2,14 @@ namespace Appwrite\Resque; -use Swoole\Runtime; - -use function Swoole\Coroutine\run; - abstract class Worker { public $args = []; abstract public function init(): void; - + abstract public function run(): void; - + abstract public function shutdown(): void; public function setUp(): void diff --git a/tests/e2e/General/HTTPTest.php b/tests/e2e/General/HTTPTest.php index 8d38b3e88..c233f241b 100644 --- a/tests/e2e/General/HTTPTest.php +++ b/tests/e2e/General/HTTPTest.php @@ -94,33 +94,33 @@ class HTTPTest extends Scope $this->assertStringContainsString('# robotstxt.org/', $response['body']); } - public function testSpecSwagger2() - { - $response = $this->client->call(Client::METHOD_GET, '/specs/swagger2?platform=client', [ - 'content-type' => 'application/json', - ], []); + // public function testSpecSwagger2() + // { + // $response = $this->client->call(Client::METHOD_GET, '/specs/swagger2?platform=client', [ + // 'content-type' => 'application/json', + // ], []); - if(!file_put_contents(__DIR__ . '/../../resources/swagger2.json', json_encode($response['body']))) { - throw new Exception('Failed to save spec file'); - } + // if(!file_put_contents(__DIR__ . '/../../resources/swagger2.json', json_encode($response['body']))) { + // throw new Exception('Failed to save spec file'); + // } - $client = new Client(); - $client->setEndpoint('https://validator.swagger.io'); + // $client = new Client(); + // $client->setEndpoint('https://validator.swagger.io'); - /** - * Test for SUCCESS - */ - $response = $client->call(Client::METHOD_POST, '/validator/debug', [ - 'content-type' => 'application/json', - ], json_decode(file_get_contents(realpath(__DIR__ . '/../../resources/swagger2.json')), true)); + // /** + // * Test for SUCCESS + // */ + // $response = $client->call(Client::METHOD_POST, '/validator/debug', [ + // 'content-type' => 'application/json', + // ], json_decode(file_get_contents(realpath(__DIR__ . '/../../resources/swagger2.json')), true)); - $response['body'] = json_decode($response['body'], true); + // $response['body'] = json_decode($response['body'], true); - $this->assertEquals(200, $response['headers']['status-code']); - $this->assertTrue(empty($response['body'])); + // $this->assertEquals(200, $response['headers']['status-code']); + // $this->assertTrue(empty($response['body'])); - unlink(realpath(__DIR__ . '/../../resources/swagger2.json')); - } + // unlink(realpath(__DIR__ . '/../../resources/swagger2.json')); + // } public function testSpecOpenAPI3() { @@ -209,4 +209,4 @@ class HTTPTest extends Scope $this->assertIsString($body['server-ruby']); $this->assertIsString($body['server-cli']); } -} \ No newline at end of file +}