Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7.x' into '1.8.x'.

Browse Source
This commit is contained in:
Darshan
2025-07-01 14:41:20 +05:30
parent a24c941e07 e561a38524
commit e66201bad5
244 changed files with 1223 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Appwrite/Event/Database.php
+10
View File
@@ -61,6 +61,16 @@ class Database extends Event
return $this;
}
/**
* Returns set database for this event.
*
* @return null|Document
*/
public function getDatabase(): ?Document
{
return $this->database;
}
/**
* Set the table for this database event.
*
src/Appwrite/GraphQL/Types/Mapper.php
+1 -1
View File
@@ -226,7 +226,7 @@ class Mapper
];
if (!$rule['required']) {
$fields[$escapedKey]['defaultValue'] = $rule['default'];
$fields[$escapedKey]['defaultValue'] = $rule['default'] ?? null;
}
}
src/Appwrite/Platform/Action.php
+62
View File
@@ -3,7 +3,10 @@
namespace Appwrite\Platform;
use Swoole\Coroutine as Co;
use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Query;
use Utopia\Platform\Action as UtopiaAction;
@@ -16,6 +19,12 @@ class Action extends UtopiaAction
*/
protected mixed $logError;
protected array $filters = [
'subQueryKeys', 'subQueryWebhooks', 'subQueryPlatforms', 'subQueryProjectVariables', 'subQueryBlocks', 'subQueryDevKeys', // Project
'subQueryAuthenticators', 'subQuerySessions', 'subQueryTokens', 'subQueryChallenges', 'subQueryMemberships', 'subQueryTargets', 'subQueryTopicTargets',// Users
'subQueryVariables', // Sites
];
/**
* Foreach Document
* Call provided callback for each document in the collection
@@ -87,4 +96,57 @@ class Action extends UtopiaAction
$latestDocument = $results[array_key_last($results)];
}
}
public function disableSubqueries()
{
$filters = $this->filters;
foreach ($filters as $filter) {
Database::addFilter(
$filter,
function (mixed $value) {
return;
},
function (mixed $value, Document $document, Database $database) {
return [];
}
);
}
}
/**
* Dump Log Message
*
* Logs messages to console with timestamp, method context, and project details.
* Supports multiple log types: success, error, log, warning, and info (default).
*
* @param string $method The calling method name
* @param string $log The log message
* @param string $type The log type (success, error, log, warning, info)
* @param Document|null $project The project document for context
* @param string $collectionId The collection identifier
* @return void
*/
public function dump(string $method, string $log, string $type = 'info', ?Document $project = null, string $collectionId = ''): void
{
if (empty($project)) {
$project = new Document([]);
}
switch ($type) {
case 'success':
Console::success("[" . DateTime::now() . "] " . $method . ' ' . $type . ' ' . $project->getSequence() . ' ' . $project->getId() . ' ' . $collectionId . ' ' . $log);
break;
case 'error':
Console::error("[" . DateTime::now() . "] " . $method . ' ' . $type . ' ' . $project->getSequence() . ' ' . $project->getId() . ' ' . $collectionId . ' ' . $log);
break;
case 'log':
Console::log("[" . DateTime::now() . "] " . $method . ' ' . $type . ' ' . $project->getSequence() . ' ' . $project->getId() . ' ' . $collectionId . ' ' . $log);
break;
case 'warning':
Console::warning("[" . DateTime::now() . "] " . $method . ' ' . $type . ' ' . $project->getSequence() . ' ' . $project->getId() . ' ' . $collectionId . ' ' . $log);
break;
default:
Console::info("[" . DateTime::now() . "] " . $method . ' ' . $type . ' ' . $project->getSequence() . ' ' . $project->getId() . ' ' . $collectionId . ' ' . $log);
}
}
}
src/Appwrite/Platform/Modules/Compute/Base.php
+68
View File
@@ -6,6 +6,7 @@ use Appwrite\Event\Build;
use Appwrite\Extend\Exception;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role;
@@ -226,6 +227,73 @@ class Base extends Action
]))
);
if (!empty($commitDetails['commitHash'])) {
$domain = "commit-" . substr($commitDetails['commitHash'], 0, 16) . ".{$sitesDomain}";
$ruleId = md5($domain);
try {
Authorization::skip(
fn () => $dbForPlatform->createDocument('rules', new Document([
'$id' => $ruleId,
'projectId' => $project->getId(),
'projectInternalId' => $project->getSequence(),
'domain' => $domain,
'type' => 'deployment',
'trigger' => 'deployment',
'deploymentId' => $deployment->getId(),
'deploymentInternalId' => $deployment->getSequence(),
'deploymentResourceType' => 'site',
'deploymentResourceId' => $site->getId(),
'deploymentResourceInternalId' => $site->getSequence(),
'deploymentVcsProviderBranch' => $providerBranch,
'status' => 'verified',
'certificateId' => '',
'search' => implode(' ', [$ruleId, $domain]),
'owner' => 'Appwrite',
'region' => $project->getAttribute('region')
]))
);
} catch (Duplicate $err) {
// Ignore, rule already exists; will be updated by builds worker
}
}
// VCS branch preview
if (!empty($providerBranch)) {
$branchPrefix = substr($providerBranch, 0, 16);
if (strlen($providerBranch) > 16) {
$remainingChars = substr($providerBranch, 16);
$branchPrefix .= '-' . substr(hash('sha256', $remainingChars), 0, 7);
}
$resourceProjectHash = substr(hash('sha256', $site->getId() . $project->getId()), 0, 7);
$domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
$ruleId = md5($domain);
try {
Authorization::skip(
fn () => $dbForPlatform->createDocument('rules', new Document([
'$id' => $ruleId,
'projectId' => $project->getId(),
'projectInternalId' => $project->getSequence(),
'domain' => $domain,
'type' => 'deployment',
'trigger' => 'deployment',
'deploymentId' => $deployment->getId(),
'deploymentInternalId' => $deployment->getSequence(),
'deploymentResourceType' => 'site',
'deploymentResourceId' => $site->getId(),
'deploymentResourceInternalId' => $site->getSequence(),
'deploymentVcsProviderBranch' => $providerBranch,
'status' => 'verified',
'certificateId' => '',
'search' => implode(' ', [$ruleId, $domain]),
'owner' => 'Appwrite',
'region' => $project->getAttribute('region')
]))
);
} catch (Duplicate $err) {
// Ignore, rule already exists; will be updated by builds worker
}
}
$queueForBuilds
->setType(BUILD_TYPE_DEPLOYMENT)
->setResource($site)
src/Appwrite/Platform/Modules/Console/Http/Resources/Get.php
+1 -1
View File
@@ -57,7 +57,7 @@ class Get extends Action
->param('type', '', new WhiteList(['rules']), 'Resource type.')
->inject('response')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Databases/Workers/Databases.php
+16
View File
@@ -64,6 +64,14 @@ class Databases extends Action
$collection = new Document($payload['table'] ?? $payload['collection'] ?? []);
$database = new Document($payload['database'] ?? []);
Console::info("Processing database operation: \n" . \json_encode([
'type' => $type,
'projectId' => $project->getId(),
'databaseId' => $database->getId(),
'collectionId' => $collection->getId(),
'documentId' => $document->getId(),
], JSON_PRETTY_PRINT));
$log->addTag('projectId', $project->getId());
$log->addTag('type', $type);
@@ -82,6 +90,14 @@ class Databases extends Action
DATABASE_TYPE_DELETE_INDEX => $this->deleteIndex($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $queueForRealtime),
default => throw new Exception('No database operation for type: ' . \strval($type)),
};
Console::info("Finished processing database operation: \n" . \json_encode([
'type' => $type,
'projectId' => $project->getId(),
'databaseId' => $database->getId(),
'collectionId' => $collection->getId(),
'documentId' => $document->getId(),
], JSON_PRETTY_PRINT));
}
/**
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php
+1 -1
View File
@@ -87,7 +87,7 @@ class Create extends Action
->inject('deviceForLocal')
->inject('queueForBuilds')
->inject('plan')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Delete.php
+1 -1
View File
@@ -62,7 +62,7 @@ class Delete extends Action
->inject('queueForDeletes')
->inject('queueForEvents')
->inject('deviceForFunctions')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php
+1 -1
View File
@@ -61,7 +61,7 @@ class Get extends Action
->inject('dbForProject')
->inject('deviceForFunctions')
->inject('deviceForBuilds')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
+1 -1
View File
@@ -62,7 +62,7 @@ class Create extends Action
->inject('queueForEvents')
->inject('queueForBuilds')
->inject('deviceForFunctions')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Action
->param('deploymentId', '', new UID(), 'Deployment ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Status/Update.php
+1 -1
View File
@@ -59,7 +59,7 @@ class Update extends Action
->inject('project')
->inject('queueForEvents')
->inject('executor')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
+1 -1
View File
@@ -75,7 +75,7 @@ class Create extends Base
->inject('project')
->inject('queueForBuilds')
->inject('gitHub')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php
+1 -1
View File
@@ -72,7 +72,7 @@ class Create extends Base
->inject('queueForEvents')
->inject('queueForBuilds')
->inject('gitHub')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Deployments/XList.php
+1 -1
View File
@@ -57,7 +57,7 @@ class XList extends Action
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
+1 -1
View File
@@ -94,7 +94,7 @@ class Create extends Base
->inject('queueForFunctions')
->inject('geodb')
->inject('executor')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Executions/Delete.php
+1 -1
View File
@@ -62,7 +62,7 @@ class Delete extends Base
->inject('dbForProject')
->inject('dbForPlatform')
->inject('queueForEvents')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Executions/Get.php
+1 -1
View File
@@ -52,7 +52,7 @@ class Get extends Base
->param('executionId', '', new UID(), 'Execution ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Executions/XList.php
+1 -1
View File
@@ -58,7 +58,7 @@ class XList extends Base
->param('queries', [], new Executions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
+1 -1
View File
@@ -114,7 +114,7 @@ class Create extends Base
->inject('dbForPlatform')
->inject('request')
->inject('gitHub')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php
+1 -1
View File
@@ -61,7 +61,7 @@ class Delete extends Base
->inject('queueForDeletes')
->inject('queueForEvents')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
+1 -1
View File
@@ -62,7 +62,7 @@ class Update extends Base
->inject('dbForProject')
->inject('queueForEvents')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Functions/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Base
->param('functionId', '', new UID(), 'Function ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php
+1 -1
View File
@@ -104,7 +104,7 @@ class Update extends Base
->inject('dbForPlatform')
->inject('gitHub')
->inject('executor')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Functions/XList.php
+1 -1
View File
@@ -56,7 +56,7 @@ class XList extends Base
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Runtimes/XList.php
+1 -1
View File
@@ -47,7 +47,7 @@ class XList extends Base
]
))
->inject('response')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Response $response)
src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php
+1 -1
View File
@@ -48,7 +48,7 @@ class XList extends Base
))
->inject('response')
->inject('plan')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Response $response, array $plan)
src/Appwrite/Platform/Modules/Functions/Http/Templates/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Base
))
->param('templateId', '', new Text(128), 'Template ID.')
->inject('response')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $templateId, Response $response)
src/Appwrite/Platform/Modules/Functions/Http/Templates/XList.php
+1 -1
View File
@@ -53,7 +53,7 @@ class XList extends Base
->param('limit', 25, new Range(1, 5000), 'Limit the number of templates returned in the response. Default limit is 25, and maximum limit is 5000.', true)
->param('offset', 0, new Range(0, 5000), 'Offset the list of returned templates. Maximum offset is 5000.', true)
->inject('response')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(array $runtimes, array $usecases, int $limit, int $offset, Response $response)
src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php
+1 -1
View File
@@ -55,7 +55,7 @@ class Get extends Base
->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $functionId, string $range, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php
+1 -1
View File
@@ -52,7 +52,7 @@ class XList extends Base
->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $range, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Functions/Http/Variables/Create.php
+1 -1
View File
@@ -65,7 +65,7 @@ class Create extends Base
->inject('dbForProject')
->inject('dbForPlatform')
->inject('project')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Variables/Delete.php
+1 -1
View File
@@ -57,7 +57,7 @@ class Delete extends Base
->inject('response')
->inject('dbForProject')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Variables/Get.php
+1 -1
View File
@@ -53,7 +53,7 @@ class Get extends Base
->param('variableId', '', new UID(), 'Variable unique ID.', false)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $functionId, string $variableId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Functions/Http/Variables/Update.php
+1 -1
View File
@@ -61,7 +61,7 @@ class Update extends Base
->inject('response')
->inject('dbForProject')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Functions/Http/Variables/XList.php
+1 -1
View File
@@ -53,7 +53,7 @@ class XList extends Base
->param('functionId', '', new UID(), 'Function unique ID.', false)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $functionId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+45 -36
View File
@@ -75,7 +75,7 @@ class Builds extends Action
->inject('log')
->inject('executor')
->inject('plan')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
@@ -209,6 +209,9 @@ class Builds extends Action
Executor $executor,
array $plan
): void {
$startTime = DateTime::now();
$durationStart = \microtime(true);
$resourceKey = match ($resource->getCollection()) {
'functions' => 'functionId',
'sites' => 'siteId',
@@ -260,9 +263,6 @@ class Builds extends Action
->setParam($resourceKey, $resource->getId())
->setParam('deploymentId', $deployment->getId());
$startTime = DateTime::now();
$durationStart = \microtime(true);
if ($deployment->getAttribute('status') === 'canceled') {
Console::info('Build has been canceled');
return;
@@ -747,6 +747,13 @@ class Builds extends Action
if ($separator !== false) {
$logs = \substr($logs, 0, $separator);
$insideSeparation = true;
$leftover = \substr($logs, $separator + strlen('{APPWRITE_DETECTION_SEPARATOR_START}'));
$separator = \strpos($leftover, '{APPWRITE_DETECTION_SEPARATOR_END}');
if ($separator !== false) {
$logs .= \substr($leftover, $separator + strlen('{APPWRITE_DETECTION_SEPARATOR_END}'));
$insideSeparation = false;
}
}
} else {
$separator = \strpos($logs, '{APPWRITE_DETECTION_SEPARATOR_END}');
@@ -810,9 +817,6 @@ class Builds extends Action
throw $err;
}
$endTime = DateTime::now();
$durationEnd = \microtime(true);
$buildSizeLimit = (int)System::getEnv('_APP_COMPUTE_BUILD_SIZE_LIMIT', '2000000000');
if (isset($plan['buildSize'])) {
$buildSizeLimit = $plan['buildSize'] * 1000 * 1000;
@@ -821,10 +825,6 @@ class Builds extends Action
throw new \Exception('Build size should be less than ' . number_format($buildSizeLimit / (1000 * 1000), 2) . ' MBs.');
}
/** Update the build document */
$deployment->setAttribute('buildStartedAt', DateTime::format((new \DateTime())->setTimestamp(floor($response['startTime']))));
$deployment->setAttribute('buildEndedAt', $endTime);
$deployment->setAttribute('buildDuration', \intval(\ceil($durationEnd - $durationStart)));
$deployment->setAttribute('buildPath', $response['path']);
$deployment->setAttribute('buildSize', $response['size']);
$deployment->setAttribute('totalSize', $deployment->getAttribute('buildSize', 0) + $deployment->getAttribute('sourceSize', 0));
@@ -836,18 +836,10 @@ class Builds extends Action
// Separate logs for SSR detection
$detectionLogs = '';
$separator = \strpos($logs, '{APPWRITE_DETECTION_SEPARATOR_START}');
if ($separator !== false) {
$detectionLogs = \substr($logs, $separator + strlen('{APPWRITE_DETECTION_SEPARATOR}'));
$separatorEnd = \strpos($detectionLogs, '{APPWRITE_DETECTION_SEPARATOR_END}');
$logs .= \substr($detectionLogs, $separatorEnd + strlen('{APPWRITE_DETECTION_SEPARATOR_END}'));
$detectionLogs = \substr($detectionLogs, 0, $separatorEnd);
$logs = \substr($logs, 0, $separator);
}
if ($resource->getCollection() === 'sites') {
$date = \date('H:i:s');
$logs .= "[$date] [appwrite] Screenshot capturing started. \n";
if (\str_contains($logs, '{APPWRITE_DETECTION_SEPARATOR_START}')) {
[$logsBefore, $detectionLogsStart] = \explode('{APPWRITE_DETECTION_SEPARATOR_START}', $logs, 2);
[$detectionLogs, $logsAfter] = \explode('{APPWRITE_DETECTION_SEPARATOR_END}', $detectionLogsStart, 2);
$logs = ($logsBefore ?? '') . ($logsAfter ?? '');
}
$deployment->setAttribute('buildLogs', $logs);
@@ -877,16 +869,24 @@ class Builds extends Action
}
}
$deployment->setAttribute('buildLogs', $logs);
$this->afterBuildSuccess($dbForProject, $deployment);
$deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
$queueForRealtime
->setPayload($deployment->getArrayCopy())
->trigger();
$this->afterBuildSuccess($queueForRealtime, $dbForProject, $deployment);
$logs = $deployment->getAttribute('buildLogs', '');
if ($resource->getCollection() === 'sites') {
$date = \date('H:i:s');
$logs .= "[$date] [appwrite] Screenshot capturing started. \n";
$deployment->setAttribute('buildLogs', $logs);
$deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
$queueForRealtime
->setPayload($deployment->getArrayCopy())
->trigger();
}
/** Screenshot site */
if ($resource->getCollection() === 'sites') {
try {
@@ -1032,6 +1032,7 @@ class Builds extends Action
$date = \date('H:i:s');
$logs .= "[$date] [appwrite] Screenshot capturing finished. \n";
$deployment->setAttribute('buildLogs', $logs);
$deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
$queueForRealtime
@@ -1046,6 +1047,7 @@ class Builds extends Action
$date = \date('H:i:s');
$logs .= "[$date] [appwrite] Screenshot capturing failed. Deployment will continue. \n";
$deployment->setAttribute('buildLogs', $logs);
$deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
}
}
@@ -1189,6 +1191,15 @@ class Builds extends Action
}
}
$endTime = DateTime::now();
$durationEnd = \microtime(true);
$deployment->setAttribute('buildEndedAt', $endTime);
$deployment->setAttribute('buildDuration', \intval(\ceil($durationEnd - $durationStart)));
$deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
$queueForRealtime
->setPayload($deployment->getArrayCopy())
->trigger();
if ($dbForProject->getDocument('deployments', $deploymentId)->getAttribute('status') === 'canceled') {
Console::info('Build has been canceled');
return;
@@ -1223,16 +1234,12 @@ class Builds extends Action
$message = "" . $message;
}
$separator = \strpos($message, '{APPWRITE_DETECTION_SEPARATOR_START}');
if ($separator !== false) {
$error = \substr($message, $separator + strlen('{APPWRITE_DETECTION_SEPARATOR_START}'));
$message = \substr($message, 0, $separator);
$message .= "\n" . $error;
}
$message = \str_replace('{APPWRITE_DETECTION_SEPARATOR_START}', '', $message);
$message = \str_replace('{APPWRITE_DETECTION_SEPARATOR_END}', '', $message);
// Combine with previous logs if deployment got past build process
$previousLogs = '';
if (!empty($deployment->getAttribute('buildEndedAt', ''))) {
if (!is_null($deployment->getAttribute('buildSize', null))) {
$previousLogs = $deployment->getAttribute('buildLogs', '');
if (!empty($previousLogs)) {
$message = $previousLogs . "\n" . $message;
@@ -1317,12 +1324,14 @@ class Builds extends Action
/**
* Hook to run after build success
*
* @param Realtime $queueForRealtime
* @param Database $dbForProject
* @param Document $deployment
* @return void
*/
protected function afterBuildSuccess(Database $dbForProject, Document &$deployment): void
protected function afterBuildSuccess(Realtime $queueForRealtime, Database $dbForProject, Document &$deployment): void
{
assert($queueForRealtime instanceof Realtime);
assert($dbForProject instanceof Database);
assert($deployment instanceof Document);
}
src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Create.php
+1 -1
View File
@@ -57,7 +57,7 @@ class Create extends Action
->inject('user')
->inject('response')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $projectId, string $name, ?string $expire, Document $user, Response $response, Database $dbForPlatform)
src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Delete.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Delete extends Action
->param('keyId', '', new UID(), 'Key unique ID.')
->inject('response')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $projectId, string $keyId, Response $response, Database $dbForPlatform)
src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Action
->param('keyId', '', new UID(), 'Key unique ID.')
->inject('response')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $projectId, string $keyId, Response $response, Database $dbForPlatform)
src/Appwrite/Platform/Modules/Projects/Http/DevKeys/Update.php
+1 -1
View File
@@ -52,7 +52,7 @@ class Update extends Action
->param('expire', null, new DatetimeValidator(), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format.')
->inject('response')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $projectId, string $keyId, string $name, ?string $expire, Response $response, Database $dbForPlatform)
{
src/Appwrite/Platform/Modules/Projects/Http/DevKeys/XList.php
+1 -1
View File
@@ -53,7 +53,7 @@ class XList extends Action
->param('queries', [], new DevKeys(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', DevKeys::ALLOWED_ATTRIBUTES), true)
->inject('response')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $projectId, ?array $queries, Response $response, Database $dbForPlatform)
src/Appwrite/Platform/Modules/Proxy/Http/Rules/API/Create.php
+1 -1
View File
@@ -66,7 +66,7 @@ class Create extends Action
->inject('queueForCertificates')
->inject('queueForEvents')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $domain, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform)
src/Appwrite/Platform/Modules/Proxy/Http/Rules/Function/Create.php
+1 -1
View File
@@ -71,7 +71,7 @@ class Create extends Action
->inject('queueForEvents')
->inject('dbForPlatform')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $domain, string $functionId, string $branch, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject)
src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
+1 -1
View File
@@ -74,7 +74,7 @@ class Create extends Action
->inject('queueForEvents')
->inject('dbForPlatform')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $domain, string $url, int $statusCode, string $resourceId, string $resourceType, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject)
src/Appwrite/Platform/Modules/Proxy/Http/Rules/Site/Create.php
+1 -1
View File
@@ -71,7 +71,7 @@ class Create extends Action
->inject('queueForEvents')
->inject('dbForPlatform')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $domain, string $siteId, string $branch, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Create.php
+1 -1
View File
@@ -86,7 +86,7 @@ class Create extends Action
->inject('deviceForLocal')
->inject('queueForBuilds')
->inject('plan')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Delete.php
+1 -1
View File
@@ -62,7 +62,7 @@ class Delete extends Action
->inject('queueForDeletes')
->inject('queueForEvents')
->inject('deviceForSites')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Download/Get.php
+1 -1
View File
@@ -60,7 +60,7 @@ class Get extends Action
->inject('dbForProject')
->inject('deviceForSites')
->inject('deviceForBuilds')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
+1 -1
View File
@@ -65,7 +65,7 @@ class Create extends Action
->inject('queueForEvents')
->inject('queueForBuilds')
->inject('deviceForSites')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Action
->param('deploymentId', '', new UID(), 'Deployment ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, string $deploymentId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Status/Update.php
+1 -1
View File
@@ -57,7 +57,7 @@ class Update extends Action
->inject('project')
->inject('queueForEvents')
->inject('executor')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
+1 -1
View File
@@ -77,7 +77,7 @@ class Create extends Base
->inject('queueForEvents')
->inject('queueForBuilds')
->inject('gitHub')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/Vcs/Create.php
+1 -1
View File
@@ -72,7 +72,7 @@ class Create extends Base
->inject('queueForEvents')
->inject('queueForBuilds')
->inject('gitHub')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Deployments/XList.php
+1 -1
View File
@@ -57,7 +57,7 @@ class XList extends Action
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, array $queries, string $search, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Frameworks/XList.php
+1 -1
View File
@@ -46,7 +46,7 @@ class XList extends Base
]
))
->inject('response')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Response $response)
src/Appwrite/Platform/Modules/Sites/Http/Logs/Delete.php
+1 -1
View File
@@ -55,7 +55,7 @@ class Delete extends Base
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, string $logId, Response $response, Database $dbForProject, Event $queueForEvents)
src/Appwrite/Platform/Modules/Sites/Http/Logs/Get.php
+1 -1
View File
@@ -50,7 +50,7 @@ class Get extends Base
->param('logId', '', new UID(), 'Log ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, string $logId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Logs/XList.php
+1 -1
View File
@@ -57,7 +57,7 @@ class XList extends Base
->param('queries', [], new Logs(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, array $queries, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php
+1 -1
View File
@@ -89,7 +89,7 @@ class Create extends Base
->inject('project')
->inject('queueForEvents')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Sites/Delete.php
+1 -1
View File
@@ -58,7 +58,7 @@ class Delete extends Base
->inject('dbForProject')
->inject('queueForDeletes')
->inject('queueForEvents')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
+1 -1
View File
@@ -60,7 +60,7 @@ class Update extends Base
->inject('dbForProject')
->inject('queueForEvents')
->inject('dbForPlatform')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Sites/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Base
->param('siteId', '', new UID(), 'Site ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php
+1 -1
View File
@@ -97,7 +97,7 @@ class Update extends Base
->inject('dbForPlatform')
->inject('gitHub')
->inject('executor')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Sites/XList.php
+1 -1
View File
@@ -56,7 +56,7 @@ class XList extends Base
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(array $queries, string $search, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Specifications/XList.php
+1 -1
View File
@@ -48,7 +48,7 @@ class XList extends Base
))
->inject('response')
->inject('plan')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Response $response, array $plan)
src/Appwrite/Platform/Modules/Sites/Http/Templates/Get.php
+1 -1
View File
@@ -49,7 +49,7 @@ class Get extends Base
))
->param('templateId', '', new Text(128), 'Template ID.')
->inject('response')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $templateId, Response $response)
src/Appwrite/Platform/Modules/Sites/Http/Templates/XList.php
+1 -1
View File
@@ -53,7 +53,7 @@ class XList extends Base
->param('limit', 25, new Range(1, 5000), 'Limit the number of templates returned in the response. Default limit is 25, and maximum limit is 5000.', true)
->param('offset', 0, new Range(0, 5000), 'Offset the list of returned templates. Maximum offset is 5000.', true)
->inject('response')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Usage/Get.php
+1 -1
View File
@@ -55,7 +55,7 @@ class Get extends Base
->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Usage/XList.php
+1 -1
View File
@@ -52,7 +52,7 @@ class XList extends Base
->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $range, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Variables/Create.php
+1 -1
View File
@@ -62,7 +62,7 @@ class Create extends Base
->inject('response')
->inject('dbForProject')
->inject('project')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, string $key, string $value, bool $secret, Response $response, Database $dbForProject, Document $project)
src/Appwrite/Platform/Modules/Sites/Http/Variables/Delete.php
+1 -1
View File
@@ -54,7 +54,7 @@ class Delete extends Base
->param('variableId', '', new UID(), 'Variable unique ID.', false)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, string $variableId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Variables/Get.php
+1 -1
View File
@@ -53,7 +53,7 @@ class Get extends Base
->param('variableId', '', new UID(), 'Variable unique ID.', false)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $siteId, string $variableId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Sites/Http/Variables/Update.php
+1 -1
View File
@@ -58,7 +58,7 @@ class Update extends Base
->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only sites can read them during build and runtime.', true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Sites/Http/Variables/XList.php
+1 -1
View File
@@ -53,7 +53,7 @@ class XList extends Base
->param('siteId', '', new UID(), 'Site unique ID.', false)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/Create.php
+1 -1
View File
@@ -65,7 +65,7 @@ class Create extends Action
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $bucketId, string $fileId, ?string $expire, Response $response, Database $dbForProject, Event $queueForEvents): void
src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Buckets/Files/XList.php
+1 -1
View File
@@ -55,7 +55,7 @@ class XList extends Action
->param('queries', [], new FileTokens(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', FileTokens::ALLOWED_ATTRIBUTES), true)
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $bucketId, string $fileId, array $queries, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Delete.php
+1 -1
View File
@@ -58,7 +58,7 @@ class Delete extends Action
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $tokenId, Response $response, Database $dbForProject, Event $queueForEvents)
src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Get.php
+1 -1
View File
@@ -50,7 +50,7 @@ class Get extends Action
->param('tokenId', '', new UID(), 'Token ID.')
->inject('response')
->inject('dbForProject')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $tokenId, Response $response, Database $dbForProject)
src/Appwrite/Platform/Modules/Tokens/Http/Tokens/Update.php
+1 -1
View File
@@ -61,7 +61,7 @@ class Update extends Action
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $tokenId, ?string $expire, Response $response, Database $dbForProject, Event $queueForEvents)
src/Appwrite/Platform/Tasks/Doctor.php
+1 -1
View File
@@ -34,7 +34,7 @@ class Doctor extends Action
$this
->desc('Validate server health')
->inject('register')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Registry $register): void
src/Appwrite/Platform/Tasks/Install.php
+1 -1
View File
@@ -31,7 +31,7 @@ class Install extends Action
->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive, bool $noStart): void
src/Appwrite/Platform/Tasks/Maintenance.php
+1 -1
View File
@@ -29,7 +29,7 @@ class Maintenance extends Action
->inject('console')
->inject('queueForCertificates')
->inject('queueForDeletes')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Database $dbForPlatform, Document $console, Certificate $queueForCertificates, Delete $queueForDeletes): void
src/Appwrite/Platform/Tasks/QueueRetry.php
+1 -1
View File
@@ -24,7 +24,7 @@ class QueueRetry extends Action
->param('name', '', new Text(100), 'Queue name')
->param('limit', 0, new Wildcard(), 'jobs limit', true)
->inject('publisher')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
src/Appwrite/Platform/Tasks/SDKs.php
+1 -1
View File
@@ -46,7 +46,7 @@ class SDKs extends Action
->param('git', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we use git push?', optional: true)
->param('production', null, new Nullable(new WhiteList(['yes', 'no'])), 'Should we push to production?', optional: true)
->param('message', null, new Nullable(new Text(256)), 'Commit Message', optional: true)
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(?string $selectedPlatform, ?string $selectedSDK, ?string $version, ?string $git, ?string $production, ?string $message): void
src/Appwrite/Platform/Tasks/SSL.php
+1 -1
View File
@@ -24,7 +24,7 @@ class SSL extends Action
->param('domain', System::getEnv('_APP_DOMAIN', ''), new Hostname(), 'Domain to generate certificate for. If empty, main domain will be used.', true)
->param('skip-check', true, new Boolean(true), 'If DNS and renew check should be skipped. Defaults to true, and when true, all jobs will result in certificate generation attempt.', true)
->inject('queueForCertificates')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $domain, bool|string $skipCheck, Certificate $queueForCertificates): void
src/Appwrite/Platform/Tasks/Screenshot.php
+1 -1
View File
@@ -21,7 +21,7 @@ class Screenshot extends Action
$this
->desc('Create Site template screenshot')
->param('templateId', '', new Text(128), 'Template ID.')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $templateId): void
src/Appwrite/Platform/Tasks/StatsResources.php
+4 -1
View File
@@ -45,7 +45,7 @@ class StatsResources extends Action
->inject('dbForPlatform')
->inject('logError')
->inject('queueForStatsResources')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(Database $dbForPlatform, callable $logError, EventStatsResources $queue): void
@@ -53,11 +53,14 @@ class StatsResources extends Action
$this->logError = $logError;
$this->dbForPlatform = $dbForPlatform;
$this->disableSubqueries();
Console::title("Stats resources V1");
Console::success('Stats resources: started');
$interval = (int) System::getEnv('_APP_STATS_RESOURCES_INTERVAL', '3600');
Console::loop(function () use ($queue) {
Authorization::disable();
Authorization::setDefaultStatus(false);
src/Appwrite/Platform/Tasks/Upgrade.php
+1 -1
View File
@@ -23,7 +23,7 @@ class Upgrade extends Install
->param('image', 'appwrite', new Text(0), 'Main appwrite docker image', true)
->param('interactive', 'Y', new Text(1), 'Run an interactive session', true)
->param('no-start', false, new Boolean(true), 'Run an interactive session', true)
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(string $httpPort, string $httpsPort, string $organization, string $image, string $interactive, bool $noStart): void
src/Appwrite/Platform/Tasks/Vars.php
+1 -1
View File
@@ -18,7 +18,7 @@ class Vars extends Action
{
$this
->desc('List all the server environment variables')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(): void
src/Appwrite/Platform/Workers/Audits.php
+1 -1
View File
@@ -45,7 +45,7 @@ class Audits extends Action
->inject('message')
->inject('getProjectDB')
->inject('project')
->callback([$this, 'action']);
->callback($this->action(...));
$this->lastTriggeredTime = time();
}
src/Appwrite/Platform/Workers/Deletes.php
+1 -1
View File
@@ -495,7 +495,7 @@ class Deletes extends Action
* @throws Authorization
* @throws DatabaseException
*/
private function deleteProject(Database $dbForPlatform, callable $getProjectDB, Device $deviceForFiles, Device $deviceForSites, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
protected function deleteProject(Database $dbForPlatform, callable $getProjectDB, Device $deviceForFiles, Device $deviceForSites, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
{
$projectInternalId = $document->getSequence();
$projectId = $document->getId();
src/Appwrite/Platform/Workers/Functions.php
+1 -1
View File
@@ -53,7 +53,7 @@ class Functions extends Action
->inject('log')
->inject('executor')
->inject('isResourceBlocked')
->callback([$this, 'action']);
->callback($this->action(...));
}
public function action(
src/Appwrite/Platform/Workers/Mails.php
+1 -1
View File
@@ -29,7 +29,7 @@ class Mails extends Action
->inject('message')
->inject('register')
->inject('log')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
src/Appwrite/Platform/Workers/Messaging.php
+2 -2
View File
@@ -72,7 +72,7 @@ class Messaging extends Action
->inject('dbForProject')
->inject('deviceForFiles')
->inject('queueForStatsUsage')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
@@ -426,7 +426,7 @@ class Messaging extends Action
$credentials = $provider->getAttribute('credentials');
return match ($provider->getAttribute('provider')) {
'mock' => new Mock('username', 'password'),
'mock' => (new Mock('username', 'password'))->setEndpoint('http://request-catcher-sms:5000/'),
'twilio' => new Twilio(
$credentials['accountSid'] ?? '',
$credentials['authToken'] ?? '',
src/Appwrite/Platform/Workers/Migrations.php
+1 -1
View File
@@ -69,7 +69,7 @@ class Migrations extends Action
->inject('logError')
->inject('queueForRealtime')
->inject('deviceForImports')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
src/Appwrite/Platform/Workers/StatsResources.php
+1 -1
View File
@@ -49,7 +49,7 @@ class StatsResources extends Action
->inject('getLogsDB')
->inject('dbForPlatform')
->inject('logError')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
src/Appwrite/Platform/Workers/StatsUsage.php
+1 -1
View File
@@ -119,7 +119,7 @@ class StatsUsage extends Action
->inject('getProjectDB')
->inject('getLogsDB')
->inject('register')
->callback([$this, 'action']);
->callback($this->action(...));
$this->lastTriggeredTime = time();
}
src/Appwrite/Platform/Workers/Webhooks.php
+1 -1
View File
@@ -38,7 +38,7 @@ class Webhooks extends Action
->inject('queueForStatsUsage')
->inject('log')
->inject('plan')
->callback([$this, 'action']);
->callback($this->action(...));
}
/**
src/Appwrite/SDK/Specification/Format/Swagger2.php
+1
View File
@@ -141,6 +141,7 @@ class Swagger2 extends Format
$sdkPlatforms[] = APP_PLATFORM_CLIENT;
}
$sdkPlatforms = array_values(array_unique($sdkPlatforms));
$namespace = $sdk->getNamespace() ?? 'default';
$desc ??= '';

Some files were not shown because too many files have changed in this diff Show More