Merge pull request #7747 from appwrite/sync-main-1.5.x-3
sync: main 1.5.x 3
This commit is contained in:
commit
050f93628a
18 changed files with 219 additions and 126 deletions
2
.env
2
.env
|
@ -79,7 +79,7 @@ _APP_MAINTENANCE_RETENTION_CACHE=2592000
|
||||||
_APP_MAINTENANCE_RETENTION_EXECUTION=1209600
|
_APP_MAINTENANCE_RETENTION_EXECUTION=1209600
|
||||||
_APP_MAINTENANCE_RETENTION_ABUSE=86400
|
_APP_MAINTENANCE_RETENTION_ABUSE=86400
|
||||||
_APP_MAINTENANCE_RETENTION_AUDIT=1209600
|
_APP_MAINTENANCE_RETENTION_AUDIT=1209600
|
||||||
_APP_USAGE_AGGREGATION_INTERVAL=20
|
_APP_USAGE_AGGREGATION_INTERVAL=30
|
||||||
_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
|
_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
|
||||||
_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
|
_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
|
||||||
_APP_USAGE_STATS=enabled
|
_APP_USAGE_STATS=enabled
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
> Great news! Appwrite Cloud is now in public beta! Sign up at [cloud.appwrite.io](https://cloud.appwrite.io) for a hassle-free, hosted experience. Join us in the Cloud today! ☁️🎉
|
> Our Appwrite Init event has concluded. You can check out all the new and upcoming features [on our Init website](https://appwrite.io/init) 🚀
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<p align="center">
|
<p align="center">
|
||||||
|
|
|
@ -34,6 +34,28 @@ $commonCollections = [
|
||||||
'array' => false,
|
'array' => false,
|
||||||
'filters' => [],
|
'filters' => [],
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
'$id' => 'resourceType',
|
||||||
|
'type' => Database::VAR_STRING,
|
||||||
|
'format' => '',
|
||||||
|
'size' => 255,
|
||||||
|
'signed' => true,
|
||||||
|
'required' => false,
|
||||||
|
'default' => null,
|
||||||
|
'array' => false,
|
||||||
|
'filters' => [],
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'$id' => ID::custom('mimeType'),
|
||||||
|
'type' => Database::VAR_STRING,
|
||||||
|
'format' => '',
|
||||||
|
'size' => 255, // https://tools.ietf.org/html/rfc4288#section-4.2
|
||||||
|
'signed' => true,
|
||||||
|
'required' => false,
|
||||||
|
'default' => null,
|
||||||
|
'array' => false,
|
||||||
|
'filters' => [],
|
||||||
|
],
|
||||||
[
|
[
|
||||||
'$id' => 'accessedAt',
|
'$id' => 'accessedAt',
|
||||||
'type' => Database::VAR_DATETIME,
|
'type' => Database::VAR_DATETIME,
|
||||||
|
|
|
@ -2237,7 +2237,7 @@ App::get('/v1/account/logs')
|
||||||
}
|
}
|
||||||
|
|
||||||
$response->dynamic(new Document([
|
$response->dynamic(new Document([
|
||||||
'total' => $audit->countLogsByUser($user->getId()),
|
'total' => $audit->countLogsByUser($user->getInternalId()),
|
||||||
'logs' => $output,
|
'logs' => $output,
|
||||||
]), Response::MODEL_LOG_LIST);
|
]), Response::MODEL_LOG_LIST);
|
||||||
});
|
});
|
||||||
|
|
|
@ -76,7 +76,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($gitHubSession)) {
|
if (empty($gitHubSession)) {
|
||||||
throw new Exception(Exception::GENERAL_UNKNOWN, 'GitHub session not found.');
|
throw new Exception(Exception::USER_SESSION_NOT_FOUND, 'GitHub session not found.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$provider = $gitHubSession->getAttribute('provider', '');
|
$provider = $gitHubSession->getAttribute('provider', '');
|
||||||
|
|
|
@ -659,6 +659,60 @@ App::get('/v1/health/queue/functions')
|
||||||
$response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
|
$response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
|
||||||
}, ['response']);
|
}, ['response']);
|
||||||
|
|
||||||
|
App::get('/v1/health/queue/usage')
|
||||||
|
->desc('Get usage queue')
|
||||||
|
->groups(['api', 'health'])
|
||||||
|
->label('scope', 'health.read')
|
||||||
|
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
|
||||||
|
->label('sdk.namespace', 'health')
|
||||||
|
->label('sdk.method', 'getQueueUsage')
|
||||||
|
->label('sdk.description', '/docs/references/health/get-queue-usage.md')
|
||||||
|
->label('sdk.response.code', Response::STATUS_CODE_OK)
|
||||||
|
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
|
||||||
|
->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
|
||||||
|
->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
|
||||||
|
->inject('queue')
|
||||||
|
->inject('response')
|
||||||
|
->action(function (int|string $threshold, Connection $queue, Response $response) {
|
||||||
|
$threshold = \intval($threshold);
|
||||||
|
|
||||||
|
$client = new Client(Event::USAGE_QUEUE_NAME, $queue);
|
||||||
|
$size = $client->getQueueSize();
|
||||||
|
|
||||||
|
if ($size >= $threshold) {
|
||||||
|
throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
|
||||||
|
});
|
||||||
|
|
||||||
|
App::get('/v1/health/queue/usage-dump')
|
||||||
|
->desc('Get usage dump queue')
|
||||||
|
->groups(['api', 'health'])
|
||||||
|
->label('scope', 'health.read')
|
||||||
|
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
|
||||||
|
->label('sdk.namespace', 'health')
|
||||||
|
->label('sdk.method', 'getQueueUsage')
|
||||||
|
->label('sdk.description', '/docs/references/health/get-queue-usage-dump.md')
|
||||||
|
->label('sdk.response.code', Response::STATUS_CODE_OK)
|
||||||
|
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
|
||||||
|
->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
|
||||||
|
->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
|
||||||
|
->inject('queue')
|
||||||
|
->inject('response')
|
||||||
|
->action(function (int|string $threshold, Connection $queue, Response $response) {
|
||||||
|
$threshold = \intval($threshold);
|
||||||
|
|
||||||
|
$client = new Client(Event::USAGE_DUMP_QUEUE_NAME, $queue);
|
||||||
|
$size = $client->getQueueSize();
|
||||||
|
|
||||||
|
if ($size >= $threshold) {
|
||||||
|
throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
|
||||||
|
}
|
||||||
|
|
||||||
|
$response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
|
||||||
|
});
|
||||||
|
|
||||||
App::get('/v1/health/storage/local')
|
App::get('/v1/health/storage/local')
|
||||||
->desc('Get local storage')
|
->desc('Get local storage')
|
||||||
->groups(['api', 'health'])
|
->groups(['api', 'health'])
|
||||||
|
@ -796,6 +850,7 @@ App::get('/v1/health/queue/failed/:name')
|
||||||
Event::MAILS_QUEUE_NAME,
|
Event::MAILS_QUEUE_NAME,
|
||||||
Event::FUNCTIONS_QUEUE_NAME,
|
Event::FUNCTIONS_QUEUE_NAME,
|
||||||
Event::USAGE_QUEUE_NAME,
|
Event::USAGE_QUEUE_NAME,
|
||||||
|
Event::USAGE_DUMP_QUEUE_NAME,
|
||||||
Event::WEBHOOK_CLASS_NAME,
|
Event::WEBHOOK_CLASS_NAME,
|
||||||
Event::CERTIFICATES_QUEUE_NAME,
|
Event::CERTIFICATES_QUEUE_NAME,
|
||||||
Event::BUILDS_QUEUE_NAME,
|
Event::BUILDS_QUEUE_NAME,
|
||||||
|
|
|
@ -1481,6 +1481,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
|
||||||
if ($deviceDeleted) {
|
if ($deviceDeleted) {
|
||||||
$queueForDeletes
|
$queueForDeletes
|
||||||
->setType(DELETE_TYPE_CACHE_BY_RESOURCE)
|
->setType(DELETE_TYPE_CACHE_BY_RESOURCE)
|
||||||
|
->setResourceType('bucket/' . $bucket->getId())
|
||||||
->setResource('file/' . $fileId)
|
->setResource('file/' . $fileId)
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -813,6 +813,9 @@ App::get('/v1/users/:userId/logs')
|
||||||
|
|
||||||
$output[$i] = new Document([
|
$output[$i] = new Document([
|
||||||
'event' => $log['event'],
|
'event' => $log['event'],
|
||||||
|
'userId' => ID::custom($log['data']['userId']),
|
||||||
|
'userEmail' => $log['data']['userEmail'] ?? null,
|
||||||
|
'userName' => $log['data']['userName'] ?? null,
|
||||||
'ip' => $log['ip'],
|
'ip' => $log['ip'],
|
||||||
'time' => $log['time'],
|
'time' => $log['time'],
|
||||||
'osCode' => $os['osCode'],
|
'osCode' => $os['osCode'],
|
||||||
|
@ -841,7 +844,7 @@ App::get('/v1/users/:userId/logs')
|
||||||
}
|
}
|
||||||
|
|
||||||
$response->dynamic(new Document([
|
$response->dynamic(new Document([
|
||||||
'total' => $audit->countLogsByUser($user->getId()),
|
'total' => $audit->countLogsByUser($user->getInternalId()),
|
||||||
'logs' => $output,
|
'logs' => $output,
|
||||||
]), Response::MODEL_LOG_LIST);
|
]), Response::MODEL_LOG_LIST);
|
||||||
});
|
});
|
||||||
|
|
|
@ -404,23 +404,21 @@ App::init()
|
||||||
;
|
;
|
||||||
|
|
||||||
$useCache = $route->getLabel('cache', false);
|
$useCache = $route->getLabel('cache', false);
|
||||||
|
|
||||||
if ($useCache) {
|
if ($useCache) {
|
||||||
$key = md5($request->getURI() . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
|
$key = md5($request->getURI() . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
|
||||||
|
$cacheLog = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
|
||||||
$cache = new Cache(
|
$cache = new Cache(
|
||||||
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
|
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
|
||||||
);
|
);
|
||||||
$timestamp = 60 * 60 * 24 * 30;
|
$timestamp = 60 * 60 * 24 * 30;
|
||||||
$data = $cache->load($key, $timestamp);
|
$data = $cache->load($key, $timestamp);
|
||||||
|
|
||||||
if (!empty($data)) {
|
if (!empty($data) && !$cacheLog->isEmpty()) {
|
||||||
$data = json_decode($data, true);
|
$parts = explode('/', $cacheLog->getAttribute('resourceType'));
|
||||||
$parts = explode('/', $data['resourceType']);
|
|
||||||
$type = $parts[0] ?? null;
|
$type = $parts[0] ?? null;
|
||||||
|
|
||||||
if ($type === 'bucket') {
|
if ($type === 'bucket') {
|
||||||
$bucketId = $parts[1] ?? null;
|
$bucketId = $parts[1] ?? null;
|
||||||
|
|
||||||
$bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
|
$bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
|
||||||
|
|
||||||
$isAPIKey = Auth::isAppUser(Authorization::getRoles());
|
$isAPIKey = Auth::isAppUser(Authorization::getRoles());
|
||||||
|
@ -433,11 +431,12 @@ App::init()
|
||||||
$fileSecurity = $bucket->getAttribute('fileSecurity', false);
|
$fileSecurity = $bucket->getAttribute('fileSecurity', false);
|
||||||
$validator = new Authorization(Database::PERMISSION_READ);
|
$validator = new Authorization(Database::PERMISSION_READ);
|
||||||
$valid = $validator->isValid($bucket->getRead());
|
$valid = $validator->isValid($bucket->getRead());
|
||||||
|
|
||||||
if (!$fileSecurity && !$valid) {
|
if (!$fileSecurity && !$valid) {
|
||||||
throw new Exception(Exception::USER_UNAUTHORIZED);
|
throw new Exception(Exception::USER_UNAUTHORIZED);
|
||||||
}
|
}
|
||||||
|
|
||||||
$parts = explode('/', $data['resource']);
|
$parts = explode('/', $cacheLog->getAttribute('resource'));
|
||||||
$fileId = $parts[1] ?? null;
|
$fileId = $parts[1] ?? null;
|
||||||
|
|
||||||
if ($fileSecurity && !$valid) {
|
if ($fileSecurity && !$valid) {
|
||||||
|
@ -454,8 +453,8 @@ App::init()
|
||||||
$response
|
$response
|
||||||
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $timestamp) . ' GMT')
|
->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $timestamp) . ' GMT')
|
||||||
->addHeader('X-Appwrite-Cache', 'hit')
|
->addHeader('X-Appwrite-Cache', 'hit')
|
||||||
->setContentType($data['contentType'])
|
->setContentType($cacheLog->getAttribute('mimeType'))
|
||||||
->send(base64_decode($data['payload']))
|
->send($data)
|
||||||
;
|
;
|
||||||
} else {
|
} else {
|
||||||
$response->addHeader('X-Appwrite-Cache', 'miss');
|
$response->addHeader('X-Appwrite-Cache', 'miss');
|
||||||
|
@ -651,7 +650,6 @@ App::shutdown()
|
||||||
if ($useCache) {
|
if ($useCache) {
|
||||||
$resource = $resourceType = null;
|
$resource = $resourceType = null;
|
||||||
$data = $response->getPayload();
|
$data = $response->getPayload();
|
||||||
|
|
||||||
if (!empty($data['payload'])) {
|
if (!empty($data['payload'])) {
|
||||||
$pattern = $route->getLabel('cache.resource', null);
|
$pattern = $route->getLabel('cache.resource', null);
|
||||||
if (!empty($pattern)) {
|
if (!empty($pattern)) {
|
||||||
|
@ -663,15 +661,8 @@ App::shutdown()
|
||||||
$resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
|
$resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
|
||||||
}
|
}
|
||||||
|
|
||||||
$key = md5($request->getURI() . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
|
$key = md5($request->getURI() . '*' . implode('*', $request->getParams())) . '*' . APP_CACHE_BUSTER;
|
||||||
$data = json_encode([
|
$signature = md5($data['payload']);
|
||||||
'resourceType' => $resourceType,
|
|
||||||
'resource' => $resource,
|
|
||||||
'contentType' => $response->getContentType(),
|
|
||||||
'payload' => base64_encode($data['payload']),
|
|
||||||
]) ;
|
|
||||||
|
|
||||||
$signature = md5($data);
|
|
||||||
$cacheLog = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
|
$cacheLog = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
|
||||||
$accessedAt = $cacheLog->getAttribute('accessedAt', '');
|
$accessedAt = $cacheLog->getAttribute('accessedAt', '');
|
||||||
$now = DateTime::now();
|
$now = DateTime::now();
|
||||||
|
@ -679,6 +670,8 @@ App::shutdown()
|
||||||
Authorization::skip(fn () => $dbForProject->createDocument('cache', new Document([
|
Authorization::skip(fn () => $dbForProject->createDocument('cache', new Document([
|
||||||
'$id' => $key,
|
'$id' => $key,
|
||||||
'resource' => $resource,
|
'resource' => $resource,
|
||||||
|
'resourceType' => $resourceType,
|
||||||
|
'mimeType' => $response->getContentType(),
|
||||||
'accessedAt' => $now,
|
'accessedAt' => $now,
|
||||||
'signature' => $signature,
|
'signature' => $signature,
|
||||||
])));
|
])));
|
||||||
|
@ -691,7 +684,7 @@ App::shutdown()
|
||||||
$cache = new Cache(
|
$cache = new Cache(
|
||||||
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
|
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
|
||||||
);
|
);
|
||||||
$cache->save($key, $data);
|
$cache->save($key, $data['payload']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -971,6 +971,7 @@ services:
|
||||||
# - appwrite
|
# - appwrite
|
||||||
# volumes:
|
# volumes:
|
||||||
# - appwrite-uploads:/storage/uploads
|
# - appwrite-uploads:/storage/uploads
|
||||||
|
|
||||||
# Dev Tools Start ------------------------------------------------------------------------------------------
|
# Dev Tools Start ------------------------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
# The Appwrite Team uses the following tools to help debug, monitor and diagnose the Appwrite stack
|
# The Appwrite Team uses the following tools to help debug, monitor and diagnose the Appwrite stack
|
||||||
|
|
1
docs/references/health/get-queue-usage-dump.md
Normal file
1
docs/references/health/get-queue-usage-dump.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Get the number of projects containing metrics that are waiting to be processed in the Appwrite internal queue server.
|
1
docs/references/health/get-queue-usage.md
Normal file
1
docs/references/health/get-queue-usage.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Get the number of metrics that are waiting to be processed in the Appwrite internal queue server.
|
|
@ -10,6 +10,7 @@ class Delete extends Event
|
||||||
{
|
{
|
||||||
protected string $type = '';
|
protected string $type = '';
|
||||||
protected ?Document $document = null;
|
protected ?Document $document = null;
|
||||||
|
protected ?string $resourceType = null;
|
||||||
protected ?string $resource = null;
|
protected ?string $resource = null;
|
||||||
protected ?string $datetime = null;
|
protected ?string $datetime = null;
|
||||||
protected ?string $hourlyUsageRetentionDatetime = null;
|
protected ?string $hourlyUsageRetentionDatetime = null;
|
||||||
|
@ -107,6 +108,19 @@ class Delete extends Event
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the resource type for the delete event.
|
||||||
|
*
|
||||||
|
* @param string $resourceType
|
||||||
|
* @return self
|
||||||
|
*/
|
||||||
|
public function setResourceType(string $resourceType): self
|
||||||
|
{
|
||||||
|
$this->resourceType = $resourceType;
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the set document for the delete event.
|
* Returns the set document for the delete event.
|
||||||
*
|
*
|
||||||
|
@ -133,6 +147,7 @@ class Delete extends Event
|
||||||
'type' => $this->type,
|
'type' => $this->type,
|
||||||
'document' => $this->document,
|
'document' => $this->document,
|
||||||
'resource' => $this->resource,
|
'resource' => $this->resource,
|
||||||
|
'resourceType' => $this->resourceType,
|
||||||
'datetime' => $this->datetime,
|
'datetime' => $this->datetime,
|
||||||
'hourlyUsageRetentionDatetime' => $this->hourlyUsageRetentionDatetime
|
'hourlyUsageRetentionDatetime' => $this->hourlyUsageRetentionDatetime
|
||||||
]);
|
]);
|
||||||
|
|
|
@ -142,6 +142,29 @@ class V20 extends Migration
|
||||||
$this->createCollection('challenges');
|
$this->createCollection('challenges');
|
||||||
$this->createCollection('authenticators');
|
$this->createCollection('authenticators');
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'cache':
|
||||||
|
|
||||||
|
// Create resourceType attribute
|
||||||
|
try {
|
||||||
|
$this->createAttributeFromCollection($this->projectDB, $id, 'resourceType');
|
||||||
|
} catch (Throwable $th) {
|
||||||
|
Console::warning("'resourceType' from {$id}: {$th->getMessage()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create mimeType attribute
|
||||||
|
try {
|
||||||
|
$this->createAttributeFromCollection($this->projectDB, $id, 'mimeType');
|
||||||
|
} catch (Throwable $th) {
|
||||||
|
Console::warning("'mimeType' from {$id}: {$th->getMessage()}");
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
$this->projectDB->purgeCachedCollection($id);
|
||||||
|
} catch (Throwable $th) {
|
||||||
|
Console::warning("Purge cache from {$id}: {$th->getMessage()}");
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'stats':
|
case 'stats':
|
||||||
try {
|
try {
|
||||||
|
|
|
@ -71,6 +71,7 @@ class Deletes extends Action
|
||||||
$datetime = $payload['datetime'] ?? null;
|
$datetime = $payload['datetime'] ?? null;
|
||||||
$hourlyUsageRetentionDatetime = $payload['hourlyUsageRetentionDatetime'] ?? null;
|
$hourlyUsageRetentionDatetime = $payload['hourlyUsageRetentionDatetime'] ?? null;
|
||||||
$resource = $payload['resource'] ?? null;
|
$resource = $payload['resource'] ?? null;
|
||||||
|
$resourceType = $payload['resourceType'] ?? null;
|
||||||
$document = new Document($payload['document'] ?? []);
|
$document = new Document($payload['document'] ?? []);
|
||||||
$project = new Document($payload['project'] ?? []);
|
$project = new Document($payload['project'] ?? []);
|
||||||
|
|
||||||
|
@ -80,12 +81,6 @@ class Deletes extends Action
|
||||||
switch (\strval($type)) {
|
switch (\strval($type)) {
|
||||||
case DELETE_TYPE_DOCUMENT:
|
case DELETE_TYPE_DOCUMENT:
|
||||||
switch ($document->getCollection()) {
|
switch ($document->getCollection()) {
|
||||||
case DELETE_TYPE_DATABASES:
|
|
||||||
$this->deleteDatabase($getProjectDB, $document, $project);
|
|
||||||
break;
|
|
||||||
case DELETE_TYPE_COLLECTIONS:
|
|
||||||
$this->deleteCollection($getProjectDB, $document, $project);
|
|
||||||
break;
|
|
||||||
case DELETE_TYPE_PROJECTS:
|
case DELETE_TYPE_PROJECTS:
|
||||||
$this->deleteProject($dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $document);
|
$this->deleteProject($dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $document);
|
||||||
break;
|
break;
|
||||||
|
@ -114,10 +109,6 @@ class Deletes extends Action
|
||||||
$this->deleteRule($dbForConsole, $document);
|
$this->deleteRule($dbForConsole, $document);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (\str_starts_with($document->getCollection(), 'database_')) {
|
|
||||||
$this->deleteCollection($getProjectDB, $document, $project);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
Console::error('No lazy delete operation available for document of type: ' . $document->getCollection());
|
Console::error('No lazy delete operation available for document of type: ' . $document->getCollection());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -147,7 +138,7 @@ class Deletes extends Action
|
||||||
$this->deleteUsageStats($project, $getProjectDB, $hourlyUsageRetentionDatetime);
|
$this->deleteUsageStats($project, $getProjectDB, $hourlyUsageRetentionDatetime);
|
||||||
break;
|
break;
|
||||||
case DELETE_TYPE_CACHE_BY_RESOURCE:
|
case DELETE_TYPE_CACHE_BY_RESOURCE:
|
||||||
$this->deleteCacheByResource($project, $getProjectDB, $resource);
|
$this->deleteCacheByResource($project, $getProjectDB, $resource, $resourceType);
|
||||||
break;
|
break;
|
||||||
case DELETE_TYPE_CACHE_BY_TIMESTAMP:
|
case DELETE_TYPE_CACHE_BY_TIMESTAMP:
|
||||||
$this->deleteCacheByDate($project, $getProjectDB, $datetime);
|
$this->deleteCacheByDate($project, $getProjectDB, $datetime);
|
||||||
|
@ -332,22 +323,28 @@ class Deletes extends Action
|
||||||
* @param string $resource
|
* @param string $resource
|
||||||
* @return void
|
* @return void
|
||||||
* @throws Authorization
|
* @throws Authorization
|
||||||
|
* @param string|null $resourceType
|
||||||
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource): void
|
private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, string $resourceType = null): void
|
||||||
{
|
{
|
||||||
$projectId = $project->getId();
|
$projectId = $project->getId();
|
||||||
$dbForProject = $getProjectDB($project);
|
$dbForProject = $getProjectDB($project);
|
||||||
$document = $dbForProject->findOne('cache', [Query::equal('resource', [$resource])]);
|
|
||||||
|
|
||||||
if ($document) {
|
|
||||||
$cache = new Cache(
|
$cache = new Cache(
|
||||||
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId)
|
new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId)
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->deleteById(
|
$query[] = Query::equal('resource', [$resource]);
|
||||||
$document,
|
if (!empty($resourceType)) {
|
||||||
|
$query[] = Query::equal('resourceType', [$resourceType]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->deleteByGroup(
|
||||||
|
'cache',
|
||||||
|
$query,
|
||||||
$dbForProject,
|
$dbForProject,
|
||||||
function ($document) use ($cache, $projectId) {
|
function (Document $document) use ($cache, $projectId) {
|
||||||
$path = APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId . DIRECTORY_SEPARATOR . $document->getId();
|
$path = APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $projectId . DIRECTORY_SEPARATOR . $document->getId();
|
||||||
|
|
||||||
if ($cache->purge($document->getId())) {
|
if ($cache->purge($document->getId())) {
|
||||||
|
@ -358,7 +355,6 @@ class Deletes extends Action
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Document $project
|
* Document $project
|
||||||
|
@ -397,72 +393,6 @@ class Deletes extends Action
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param callable $getProjectDB
|
|
||||||
* @param Document $document
|
|
||||||
* @param Document $project
|
|
||||||
* @return void
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
private function deleteDatabase(callable $getProjectDB, Document $document, Document $project): void
|
|
||||||
{
|
|
||||||
$databaseId = $document->getId();
|
|
||||||
$dbForProject = $getProjectDB($project);
|
|
||||||
|
|
||||||
$this->deleteByGroup('database_' . $document->getInternalId(), [], $dbForProject, function ($document) use ($getProjectDB, $project) {
|
|
||||||
$this->deleteCollection($getProjectDB, $document, $project);
|
|
||||||
});
|
|
||||||
|
|
||||||
$dbForProject->deleteCollection('database_' . $document->getInternalId());
|
|
||||||
$this->deleteAuditLogsByResource($getProjectDB, 'database/' . $databaseId, $project);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param callable $getProjectDB
|
|
||||||
* @param Document $document teams document
|
|
||||||
* @param Document $project
|
|
||||||
* @return void
|
|
||||||
* @throws Exception
|
|
||||||
*/
|
|
||||||
private function deleteCollection(callable $getProjectDB, Document $document, Document $project): void
|
|
||||||
{
|
|
||||||
$collectionId = $document->getId();
|
|
||||||
$collectionInternalId = $document->getInternalId();
|
|
||||||
$databaseId = $document->getAttribute('databaseId');
|
|
||||||
$databaseInternalId = $document->getAttribute('databaseInternalId');
|
|
||||||
|
|
||||||
$dbForProject = $getProjectDB($project);
|
|
||||||
|
|
||||||
$relationships = \array_filter(
|
|
||||||
$document->getAttribute('attributes'),
|
|
||||||
fn ($attribute) => $attribute['type'] === Database::VAR_RELATIONSHIP
|
|
||||||
);
|
|
||||||
|
|
||||||
foreach ($relationships as $relationship) {
|
|
||||||
if (!$relationship['twoWay']) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$relatedCollection = $dbForProject->getDocument('database_' . $databaseInternalId, $relationship['relatedCollection']);
|
|
||||||
$dbForProject->deleteDocument('attributes', $databaseInternalId . '_' . $relatedCollection->getInternalId() . '_' . $relationship['twoWayKey']);
|
|
||||||
$dbForProject->deleteCachedDocument('database_' . $databaseInternalId, $relatedCollection->getId());
|
|
||||||
$dbForProject->deleteCachedCollection('database_' . $databaseInternalId . '_collection_' . $relatedCollection->getInternalId());
|
|
||||||
}
|
|
||||||
|
|
||||||
$dbForProject->deleteCollection('database_' . $databaseInternalId . '_collection_' . $document->getInternalId());
|
|
||||||
|
|
||||||
$this->deleteByGroup('attributes', [
|
|
||||||
Query::equal('databaseInternalId', [$databaseInternalId]),
|
|
||||||
Query::equal('collectionInternalId', [$collectionInternalId])
|
|
||||||
], $dbForProject);
|
|
||||||
|
|
||||||
$this->deleteByGroup('indexes', [
|
|
||||||
Query::equal('databaseInternalId', [$databaseInternalId]),
|
|
||||||
Query::equal('collectionInternalId', [$collectionInternalId])
|
|
||||||
], $dbForProject);
|
|
||||||
|
|
||||||
$this->deleteAuditLogsByResource($getProjectDB, 'database/' . $databaseId . '/collection/' . $collectionId, $project);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param Database $dbForConsole
|
* @param Database $dbForConsole
|
||||||
* @param callable $getProjectDB
|
* @param callable $getProjectDB
|
||||||
|
|
|
@ -291,7 +291,7 @@ class OpenAPI3 extends Format
|
||||||
case 'Utopia\Database\Validator\UID':
|
case 'Utopia\Database\Validator\UID':
|
||||||
case 'Utopia\Validator\Text':
|
case 'Utopia\Validator\Text':
|
||||||
$node['schema']['type'] = $validator->getType();
|
$node['schema']['type'] = $validator->getType();
|
||||||
$node['schema']['x-example'] = '[' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . ']';
|
$node['schema']['x-example'] = '<' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . '>';
|
||||||
break;
|
break;
|
||||||
case 'Utopia\Validator\Boolean':
|
case 'Utopia\Validator\Boolean':
|
||||||
$node['schema']['type'] = $validator->getType();
|
$node['schema']['type'] = $validator->getType();
|
||||||
|
@ -302,7 +302,7 @@ class OpenAPI3 extends Format
|
||||||
$node['schema']['x-upload-id'] = true;
|
$node['schema']['x-upload-id'] = true;
|
||||||
}
|
}
|
||||||
$node['schema']['type'] = $validator->getType();
|
$node['schema']['type'] = $validator->getType();
|
||||||
$node['schema']['x-example'] = '[' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . ']';
|
$node['schema']['x-example'] = '<' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . '>';
|
||||||
break;
|
break;
|
||||||
case 'Utopia\Database\Validator\DatetimeValidator':
|
case 'Utopia\Database\Validator\DatetimeValidator':
|
||||||
$node['schema']['type'] = $validator->getType();
|
$node['schema']['type'] = $validator->getType();
|
||||||
|
|
|
@ -290,7 +290,7 @@ class Swagger2 extends Format
|
||||||
case 'Utopia\Validator\Text':
|
case 'Utopia\Validator\Text':
|
||||||
case 'Utopia\Database\Validator\UID':
|
case 'Utopia\Database\Validator\UID':
|
||||||
$node['type'] = $validator->getType();
|
$node['type'] = $validator->getType();
|
||||||
$node['x-example'] = '[' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . ']';
|
$node['x-example'] = '<' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . '>';
|
||||||
break;
|
break;
|
||||||
case 'Utopia\Validator\Boolean':
|
case 'Utopia\Validator\Boolean':
|
||||||
$node['type'] = $validator->getType();
|
$node['type'] = $validator->getType();
|
||||||
|
@ -301,7 +301,7 @@ class Swagger2 extends Format
|
||||||
$node['x-upload-id'] = true;
|
$node['x-upload-id'] = true;
|
||||||
}
|
}
|
||||||
$node['type'] = $validator->getType();
|
$node['type'] = $validator->getType();
|
||||||
$node['x-example'] = '[' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . ']';
|
$node['x-example'] = '<' . \strtoupper(Template::fromCamelCaseToSnake($node['name'])) . '>';
|
||||||
break;
|
break;
|
||||||
case 'Utopia\Database\Validator\DatetimeValidator':
|
case 'Utopia\Database\Validator\DatetimeValidator':
|
||||||
$node['type'] = $validator->getType();
|
$node['type'] = $validator->getType();
|
||||||
|
|
|
@ -511,4 +511,52 @@ class HealthCustomServerTest extends Scope
|
||||||
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testUsageSuccess()
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Test for SUCCESS
|
||||||
|
*/
|
||||||
|
$response = $this->client->call(Client::METHOD_GET, '/health/queue/usage', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
], $this->getHeaders()), []);
|
||||||
|
|
||||||
|
$this->assertEquals(200, $response['headers']['status-code']);
|
||||||
|
$this->assertIsInt($response['body']['size']);
|
||||||
|
$this->assertLessThan(100, $response['body']['size']);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for FAILURE
|
||||||
|
*/
|
||||||
|
$response = $this->client->call(Client::METHOD_GET, '/health/queue/usage?threshold=0', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
], $this->getHeaders()), []);
|
||||||
|
$this->assertEquals(503, $response['headers']['status-code']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testUsageDumpSuccess()
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Test for SUCCESS
|
||||||
|
*/
|
||||||
|
$response = $this->client->call(Client::METHOD_GET, '/health/queue/usage-dump', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
], $this->getHeaders()), []);
|
||||||
|
|
||||||
|
$this->assertEquals(200, $response['headers']['status-code']);
|
||||||
|
$this->assertIsInt($response['body']['size']);
|
||||||
|
$this->assertLessThan(100, $response['body']['size']);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test for FAILURE
|
||||||
|
*/
|
||||||
|
$response = $this->client->call(Client::METHOD_GET, '/health/queue/usage-dump?threshold=0', array_merge([
|
||||||
|
'content-type' => 'application/json',
|
||||||
|
'x-appwrite-project' => $this->getProject()['$id'],
|
||||||
|
], $this->getHeaders()), []);
|
||||||
|
$this->assertEquals(503, $response['headers']['status-code']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue