Merge branch 'feat-db-pools-sync' of https://github.com/appwrite/appwrite into feat-db-pools-fix-scheduler
This commit is contained in:
commit
a3019f3d8c
13 changed files with 596 additions and 357 deletions
3
.env
3
.env
|
@ -41,8 +41,9 @@ _APP_SMTP_PORT=1025
|
||||||
_APP_SMTP_SECURE=
|
_APP_SMTP_SECURE=
|
||||||
_APP_SMTP_USERNAME=
|
_APP_SMTP_USERNAME=
|
||||||
_APP_SMTP_PASSWORD=
|
_APP_SMTP_PASSWORD=
|
||||||
_APP_HAMSTER_RECIPIENTS=
|
|
||||||
_APP_HAMSTER_INTERVAL=86400
|
_APP_HAMSTER_INTERVAL=86400
|
||||||
|
_APP_HAMSTER_TIME=21:00
|
||||||
|
_APP_MIXPANEL_TOKEN=
|
||||||
_APP_SMS_PROVIDER=sms://username:password@mock
|
_APP_SMS_PROVIDER=sms://username:password@mock
|
||||||
_APP_SMS_FROM=+123456789
|
_APP_SMS_FROM=+123456789
|
||||||
_APP_STORAGE_LIMIT=30000000
|
_APP_STORAGE_LIMIT=30000000
|
||||||
|
|
|
@ -111,7 +111,7 @@ RUN mkdir -p /storage/uploads && \
|
||||||
|
|
||||||
# Executables
|
# Executables
|
||||||
RUN chmod +x /usr/local/bin/doctor && \
|
RUN chmod +x /usr/local/bin/doctor && \
|
||||||
chmod +x /usr/local/bin/patch-create-missing-schedules && \
|
chmod +x /usr/local/bin/patch-delete-schedule-updated-at-attribute && \
|
||||||
chmod +x /usr/local/bin/maintenance && \
|
chmod +x /usr/local/bin/maintenance && \
|
||||||
chmod +x /usr/local/bin/volume-sync && \
|
chmod +x /usr/local/bin/volume-sync && \
|
||||||
chmod +x /usr/local/bin/install && \
|
chmod +x /usr/local/bin/install && \
|
||||||
|
|
|
@ -237,8 +237,8 @@ App::get('/v1/functions/:functionId/usage')
|
||||||
$stats = $usage = [];
|
$stats = $usage = [];
|
||||||
$days = $periods[$range];
|
$days = $periods[$range];
|
||||||
$metrics = [
|
$metrics = [
|
||||||
str_replace(['{resourceType}', '{resourceInternalId}'], ['function', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS),
|
str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS),
|
||||||
str_replace(['{resourceType}', '{resourceInternalId}'], ['function', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE),
|
str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE),
|
||||||
str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS),
|
str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS),
|
||||||
str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE),
|
str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE),
|
||||||
str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE),
|
str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE),
|
||||||
|
@ -1342,6 +1342,13 @@ App::post('/v1/functions/:functionId/variables')
|
||||||
throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
|
throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
||||||
|
$schedule
|
||||||
|
->setAttribute('resourceUpdatedAt', DateTime::now())
|
||||||
|
->setAttribute('schedule', $function->getAttribute('schedule'))
|
||||||
|
->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
|
||||||
|
Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
|
||||||
|
|
||||||
$dbForProject->deleteCachedDocument('functions', $function->getId());
|
$dbForProject->deleteCachedDocument('functions', $function->getId());
|
||||||
|
|
||||||
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
||||||
|
@ -1466,6 +1473,13 @@ App::put('/v1/functions/:functionId/variables/:variableId')
|
||||||
throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
|
throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
||||||
|
$schedule
|
||||||
|
->setAttribute('resourceUpdatedAt', DateTime::now())
|
||||||
|
->setAttribute('schedule', $function->getAttribute('schedule'))
|
||||||
|
->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
|
||||||
|
Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
|
||||||
|
|
||||||
$dbForProject->deleteCachedDocument('functions', $function->getId());
|
$dbForProject->deleteCachedDocument('functions', $function->getId());
|
||||||
|
|
||||||
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
||||||
|
@ -1512,6 +1526,14 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
|
||||||
}
|
}
|
||||||
|
|
||||||
$dbForProject->deleteDocument('variables', $variable->getId());
|
$dbForProject->deleteDocument('variables', $variable->getId());
|
||||||
|
|
||||||
|
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
||||||
|
$schedule
|
||||||
|
->setAttribute('resourceUpdatedAt', DateTime::now())
|
||||||
|
->setAttribute('schedule', $function->getAttribute('schedule'))
|
||||||
|
->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
|
||||||
|
Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
|
||||||
|
|
||||||
$dbForProject->deleteCachedDocument('functions', $function->getId());
|
$dbForProject->deleteCachedDocument('functions', $function->getId());
|
||||||
|
|
||||||
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
$schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
|
||||||
|
|
|
@ -42,10 +42,12 @@ Server::setResource('execute', function () {
|
||||||
|
|
||||||
$user ??= new Document();
|
$user ??= new Document();
|
||||||
$functionId = $function->getId();
|
$functionId = $function->getId();
|
||||||
|
$functionInternalId = $function->getInternalId();
|
||||||
$deploymentId = $function->getAttribute('deployment', '');
|
$deploymentId = $function->getAttribute('deployment', '');
|
||||||
|
|
||||||
/** Check if deployment exists */
|
/** Check if deployment exists */
|
||||||
$deployment = $dbForProject->getDocument('deployments', $deploymentId);
|
$deployment = $dbForProject->getDocument('deployments', $deploymentId);
|
||||||
|
$deploymentInternalId = $deployment->getInternalId();
|
||||||
|
|
||||||
if ($deployment->getAttribute('resourceId') !== $functionId) {
|
if ($deployment->getAttribute('resourceId') !== $functionId) {
|
||||||
throw new Exception('Deployment not found. Create deployment before trying to execute a function');
|
throw new Exception('Deployment not found. Create deployment before trying to execute a function');
|
||||||
|
@ -81,10 +83,10 @@ Server::setResource('execute', function () {
|
||||||
$execution = $dbForProject->createDocument('executions', new Document([
|
$execution = $dbForProject->createDocument('executions', new Document([
|
||||||
'$id' => $executionId,
|
'$id' => $executionId,
|
||||||
'$permissions' => $user->isEmpty() ? [] : [Permission::read(Role::user($user->getId()))],
|
'$permissions' => $user->isEmpty() ? [] : [Permission::read(Role::user($user->getId()))],
|
||||||
'functionId' => $function->getId(),
|
'functionId' => $functionId,
|
||||||
'deploymentId' => $deployment->getId(),
|
'functionInternalId' => $functionInternalId,
|
||||||
'functionInternalId' => $function->getInternalId(),
|
'deploymentInternalId' => $deploymentInternalId,
|
||||||
'deploymentInternalId' => $deployment->getInternalId(),
|
'deploymentId' => $deploymentId,
|
||||||
'trigger' => $trigger,
|
'trigger' => $trigger,
|
||||||
'status' => 'waiting',
|
'status' => 'waiting',
|
||||||
'statusCode' => 0,
|
'statusCode' => 0,
|
||||||
|
@ -106,7 +108,7 @@ Server::setResource('execute', function () {
|
||||||
|
|
||||||
$queueForUsage
|
$queueForUsage
|
||||||
->addMetric(METRIC_EXECUTIONS, 1) // per project
|
->addMetric(METRIC_EXECUTIONS, 1) // per project
|
||||||
->addMetric(str_replace('{functionInternalId}', $function->getId(), METRIC_FUNCTION_ID_EXECUTIONS), 1); // per function
|
->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1); // per function
|
||||||
}
|
}
|
||||||
|
|
||||||
$execution->setAttribute('status', 'processing');
|
$execution->setAttribute('status', 'processing');
|
||||||
|
|
|
@ -108,8 +108,8 @@ Server::setResource('reduce', function (Cache $cache, Registry $register, $pools
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case $document->getCollection() === 'functions':
|
case $document->getCollection() === 'functions':
|
||||||
$deployments = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], ['function', $document->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS)));
|
$deployments = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $document->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS)));
|
||||||
$deploymentsStorage = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], ['function', $document->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE)));
|
$deploymentsStorage = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $document->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE)));
|
||||||
$builds = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS)));
|
$builds = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS)));
|
||||||
$buildsStorage = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE)));
|
$buildsStorage = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE)));
|
||||||
$buildsCompute = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE)));
|
$buildsCompute = $dbForProject->getDocument('stats', md5(INFINITI_PERIOD . str_replace('{functionInternalId}', $document->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE)));
|
||||||
|
@ -154,7 +154,7 @@ Server::setResource('reduce', function (Cache $cache, Registry $register, $pools
|
||||||
if (!empty($executions['value'])) {
|
if (!empty($executions['value'])) {
|
||||||
$metrics[] = [
|
$metrics[] = [
|
||||||
'key' => METRIC_EXECUTIONS,
|
'key' => METRIC_EXECUTIONS,
|
||||||
'value' => ($executionsCompute['value'] * -1),
|
'value' => ($executions['value'] * -1),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -186,7 +186,6 @@ $server->job()
|
||||||
$payload = $message->getPayload() ?? [];
|
$payload = $message->getPayload() ?? [];
|
||||||
$project = new Document($payload['project'] ?? []);
|
$project = new Document($payload['project'] ?? []);
|
||||||
$projectId = $project->getInternalId();
|
$projectId = $project->getInternalId();
|
||||||
|
|
||||||
foreach ($payload['reduce'] ?? [] as $document) {
|
foreach ($payload['reduce'] ?? [] as $document) {
|
||||||
if (empty($document)) {
|
if (empty($document)) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -201,7 +200,6 @@ $server->job()
|
||||||
}
|
}
|
||||||
|
|
||||||
$stats[$projectId]['database'] = $project->getAttribute('database');
|
$stats[$projectId]['database'] = $project->getAttribute('database');
|
||||||
|
|
||||||
foreach ($payload['metrics'] ?? [] as $metric) {
|
foreach ($payload['metrics'] ?? [] as $metric) {
|
||||||
if (!isset($stats[$projectId]['keys'][$metric['key']])) {
|
if (!isset($stats[$projectId]['keys'][$metric['key']])) {
|
||||||
$stats[$projectId]['keys'][$metric['key']] = $metric['value'];
|
$stats[$projectId]['keys'][$metric['key']] = $metric['value'];
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
php /usr/src/code/app/cli.php patch-create-missing-schedules $@
|
|
3
bin/patch-delete-schedule-updated-at-attribute
Normal file
3
bin/patch-delete-schedule-updated-at-attribute
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
php /usr/src/code/app/cli.php patch-delete-schedule-updated-at-attribute $@
|
|
@ -44,10 +44,10 @@
|
||||||
"appwrite/php-clamav": "1.1.*",
|
"appwrite/php-clamav": "1.1.*",
|
||||||
"appwrite/php-runtimes": "0.11.*",
|
"appwrite/php-runtimes": "0.11.*",
|
||||||
"utopia-php/abuse": "0.18.*",
|
"utopia-php/abuse": "0.18.*",
|
||||||
"utopia-php/analytics": "0.2.*",
|
|
||||||
"utopia-php/audit": "0.20.*",
|
"utopia-php/audit": "0.20.*",
|
||||||
|
"utopia-php/analytics": "0.10.2",
|
||||||
"utopia-php/cache": "0.8.*",
|
"utopia-php/cache": "0.8.*",
|
||||||
"utopia-php/cli": "0.14.*",
|
"utopia-php/cli": "0.15.*",
|
||||||
"utopia-php/config": "0.2.*",
|
"utopia-php/config": "0.2.*",
|
||||||
"utopia-php/database": "0.30.*",
|
"utopia-php/database": "0.30.*",
|
||||||
"utopia-php/queue": "0.5.*",
|
"utopia-php/queue": "0.5.*",
|
||||||
|
@ -73,8 +73,7 @@
|
||||||
"chillerlan/php-qrcode": "4.3.3",
|
"chillerlan/php-qrcode": "4.3.3",
|
||||||
"adhocore/jwt": "1.1.2",
|
"adhocore/jwt": "1.1.2",
|
||||||
"webonyx/graphql-php": "14.11.*",
|
"webonyx/graphql-php": "14.11.*",
|
||||||
"slickdeals/statsd": "3.1.0",
|
"slickdeals/statsd": "3.1.0"
|
||||||
"league/csv": "^9.0.0"
|
|
||||||
},
|
},
|
||||||
"repositories": [
|
"repositories": [
|
||||||
{
|
{
|
||||||
|
|
292
composer.lock
generated
292
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "d751d0dc8418f9789bfd99ade50cb9ca",
|
"content-hash": "1614e987617e0a710448662d1d9cc7ef",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "adhocore/jwt",
|
"name": "adhocore/jwt",
|
||||||
|
@ -600,93 +600,6 @@
|
||||||
},
|
},
|
||||||
"time": "2022-11-29T16:25:20+00:00"
|
"time": "2022-11-29T16:25:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "league/csv",
|
|
||||||
"version": "9.9.0",
|
|
||||||
"source": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://github.com/thephpleague/csv.git",
|
|
||||||
"reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b"
|
|
||||||
},
|
|
||||||
"dist": {
|
|
||||||
"type": "zip",
|
|
||||||
"url": "https://api.github.com/repos/thephpleague/csv/zipball/b4418ede47fbd88facc34e40a16c8ce9153b961b",
|
|
||||||
"reference": "b4418ede47fbd88facc34e40a16c8ce9153b961b",
|
|
||||||
"shasum": ""
|
|
||||||
},
|
|
||||||
"require": {
|
|
||||||
"ext-json": "*",
|
|
||||||
"ext-mbstring": "*",
|
|
||||||
"php": "^8.1.2"
|
|
||||||
},
|
|
||||||
"require-dev": {
|
|
||||||
"doctrine/collections": "^2.1.2",
|
|
||||||
"ext-dom": "*",
|
|
||||||
"ext-xdebug": "*",
|
|
||||||
"friendsofphp/php-cs-fixer": "^v3.14.3",
|
|
||||||
"phpbench/phpbench": "^1.2.8",
|
|
||||||
"phpstan/phpstan": "^1.10.4",
|
|
||||||
"phpstan/phpstan-deprecation-rules": "^1.1.2",
|
|
||||||
"phpstan/phpstan-phpunit": "^1.3.10",
|
|
||||||
"phpstan/phpstan-strict-rules": "^1.5.0",
|
|
||||||
"phpunit/phpunit": "^10.0.14"
|
|
||||||
},
|
|
||||||
"suggest": {
|
|
||||||
"ext-dom": "Required to use the XMLConverter and the HTMLConverter classes",
|
|
||||||
"ext-iconv": "Needed to ease transcoding CSV using iconv stream filters"
|
|
||||||
},
|
|
||||||
"type": "library",
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "9.x-dev"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"files": [
|
|
||||||
"src/functions_include.php"
|
|
||||||
],
|
|
||||||
"psr-4": {
|
|
||||||
"League\\Csv\\": "src"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"notification-url": "https://packagist.org/downloads/",
|
|
||||||
"license": [
|
|
||||||
"MIT"
|
|
||||||
],
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Ignace Nyamagana Butera",
|
|
||||||
"email": "nyamsprod@gmail.com",
|
|
||||||
"homepage": "https://github.com/nyamsprod/",
|
|
||||||
"role": "Developer"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "CSV data manipulation made easy in PHP",
|
|
||||||
"homepage": "https://csv.thephpleague.com",
|
|
||||||
"keywords": [
|
|
||||||
"convert",
|
|
||||||
"csv",
|
|
||||||
"export",
|
|
||||||
"filter",
|
|
||||||
"import",
|
|
||||||
"read",
|
|
||||||
"transform",
|
|
||||||
"write"
|
|
||||||
],
|
|
||||||
"support": {
|
|
||||||
"docs": "https://csv.thephpleague.com",
|
|
||||||
"issues": "https://github.com/thephpleague/csv/issues",
|
|
||||||
"rss": "https://github.com/thephpleague/csv/releases.atom",
|
|
||||||
"source": "https://github.com/thephpleague/csv"
|
|
||||||
},
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"url": "https://github.com/sponsors/nyamsprod",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"time": "2023-03-11T15:57:12+00:00"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "matomo/device-detector",
|
"name": "matomo/device-detector",
|
||||||
"version": "6.0.0",
|
"version": "6.0.0",
|
||||||
|
@ -1276,24 +1189,25 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/analytics",
|
"name": "utopia-php/analytics",
|
||||||
"version": "0.2.0",
|
"version": "0.10.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/analytics.git",
|
"url": "https://github.com/utopia-php/analytics.git",
|
||||||
"reference": "adfc2d057a7f6ab618a77c8a20ed3e35485ff416"
|
"reference": "14c805114736f44c26d6d24b176a2f8b93d86a1f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/analytics/zipball/adfc2d057a7f6ab618a77c8a20ed3e35485ff416",
|
"url": "https://api.github.com/repos/utopia-php/analytics/zipball/14c805114736f44c26d6d24b176a2f8b93d86a1f",
|
||||||
"reference": "adfc2d057a7f6ab618a77c8a20ed3e35485ff416",
|
"reference": "14c805114736f44c26d6d24b176a2f8b93d86a1f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.4"
|
"php": ">=8.0",
|
||||||
|
"utopia-php/cli": "^0.15.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^9.3",
|
"laravel/pint": "dev-main",
|
||||||
"vimeo/psalm": "4.0.1"
|
"phpunit/phpunit": "^9.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -1305,16 +1219,6 @@
|
||||||
"license": [
|
"license": [
|
||||||
"MIT"
|
"MIT"
|
||||||
],
|
],
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Eldad Fux",
|
|
||||||
"email": "eldad@appwrite.io"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Torsten Dittmann",
|
|
||||||
"email": "torsten@appwrite.io"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A simple library to track events & users.",
|
"description": "A simple library to track events & users.",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"analytics",
|
"analytics",
|
||||||
|
@ -1325,9 +1229,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/analytics/issues",
|
"issues": "https://github.com/utopia-php/analytics/issues",
|
||||||
"source": "https://github.com/utopia-php/analytics/tree/0.2.0"
|
"source": "https://github.com/utopia-php/analytics/tree/0.10.2"
|
||||||
},
|
},
|
||||||
"time": "2021-03-23T21:33:07+00:00"
|
"time": "2023-03-22T12:01:09+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/audit",
|
"name": "utopia-php/audit",
|
||||||
|
@ -1429,16 +1333,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/cli",
|
"name": "utopia-php/cli",
|
||||||
"version": "0.14.0",
|
"version": "0.15.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/cli.git",
|
"url": "https://github.com/utopia-php/cli.git",
|
||||||
"reference": "c30ef985a4e739758a0d95eb0706b357b6d8c086"
|
"reference": "ccb7c8125ffe0254fef8f25744bfa376eb7bd0ea"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/cli/zipball/c30ef985a4e739758a0d95eb0706b357b6d8c086",
|
"url": "https://api.github.com/repos/utopia-php/cli/zipball/ccb7c8125ffe0254fef8f25744bfa376eb7bd0ea",
|
||||||
"reference": "c30ef985a4e739758a0d95eb0706b357b6d8c086",
|
"reference": "ccb7c8125ffe0254fef8f25744bfa376eb7bd0ea",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1446,8 +1350,10 @@
|
||||||
"utopia-php/framework": "0.*.*"
|
"utopia-php/framework": "0.*.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"laravel/pint": "1.2.*",
|
||||||
"phpunit/phpunit": "^9.3",
|
"phpunit/phpunit": "^9.3",
|
||||||
"squizlabs/php_codesniffer": "^3.6"
|
"squizlabs/php_codesniffer": "^3.6",
|
||||||
|
"vimeo/psalm": "4.0.1"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -1459,12 +1365,6 @@
|
||||||
"license": [
|
"license": [
|
||||||
"MIT"
|
"MIT"
|
||||||
],
|
],
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Eldad Fux",
|
|
||||||
"email": "eldad@appwrite.io"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"description": "A simple CLI library to manage command line applications",
|
"description": "A simple CLI library to manage command line applications",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"cli",
|
"cli",
|
||||||
|
@ -1476,9 +1376,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/cli/issues",
|
"issues": "https://github.com/utopia-php/cli/issues",
|
||||||
"source": "https://github.com/utopia-php/cli/tree/0.14.0"
|
"source": "https://github.com/utopia-php/cli/tree/0.15.0"
|
||||||
},
|
},
|
||||||
"time": "2022-10-09T10:19:07+00:00"
|
"time": "2023-03-01T05:55:14+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/config",
|
"name": "utopia-php/config",
|
||||||
|
@ -1996,23 +1896,24 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/orchestration",
|
"name": "utopia-php/orchestration",
|
||||||
"version": "0.9.0",
|
"version": "0.9.1",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/orchestration.git",
|
"url": "https://github.com/utopia-php/orchestration.git",
|
||||||
"reference": "1d4f66684b8c4927f31b695817eae6d84aafd172"
|
"reference": "55f43513b3f940a3f4f9c2cde7682d0c2581beb0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/orchestration/zipball/1d4f66684b8c4927f31b695817eae6d84aafd172",
|
"url": "https://api.github.com/repos/utopia-php/orchestration/zipball/55f43513b3f940a3f4f9c2cde7682d0c2581beb0",
|
||||||
"reference": "1d4f66684b8c4927f31b695817eae6d84aafd172",
|
"reference": "55f43513b3f940a3f4f9c2cde7682d0c2581beb0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.0",
|
"php": ">=8.0",
|
||||||
"utopia-php/cli": "0.14.*"
|
"utopia-php/cli": "0.15.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"laravel/pint": "^1.2",
|
||||||
"phpunit/phpunit": "^9.3",
|
"phpunit/phpunit": "^9.3",
|
||||||
"vimeo/psalm": "4.0.1"
|
"vimeo/psalm": "4.0.1"
|
||||||
},
|
},
|
||||||
|
@ -2039,34 +1940,34 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/orchestration/issues",
|
"issues": "https://github.com/utopia-php/orchestration/issues",
|
||||||
"source": "https://github.com/utopia-php/orchestration/tree/0.9.0"
|
"source": "https://github.com/utopia-php/orchestration/tree/0.9.1"
|
||||||
},
|
},
|
||||||
"time": "2022-11-09T17:38:00+00:00"
|
"time": "2023-03-17T15:05:06+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/platform",
|
"name": "utopia-php/platform",
|
||||||
"version": "0.3.2",
|
"version": "0.3.3",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/platform.git",
|
"url": "https://github.com/utopia-php/platform.git",
|
||||||
"reference": "a53997f1882dc16ff67968aa5f436364c8c8043e"
|
"reference": "a9e7a501f33e0da59779782359a747cb8d34cf6f"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/platform/zipball/a53997f1882dc16ff67968aa5f436364c8c8043e",
|
"url": "https://api.github.com/repos/utopia-php/platform/zipball/a9e7a501f33e0da59779782359a747cb8d34cf6f",
|
||||||
"reference": "a53997f1882dc16ff67968aa5f436364c8c8043e",
|
"reference": "a9e7a501f33e0da59779782359a747cb8d34cf6f",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-redis": "*",
|
"ext-redis": "*",
|
||||||
"php": ">=8.0",
|
"php": ">=8.0",
|
||||||
"utopia-php/cli": "0.14.*",
|
"utopia-php/cli": "0.15.*",
|
||||||
"utopia-php/framework": "0.26.*"
|
"utopia-php/framework": "0.26.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^9.3",
|
"laravel/pint": "1.2.*",
|
||||||
"squizlabs/php_codesniffer": "^3.6"
|
"phpunit/phpunit": "^9.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -2088,9 +1989,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/platform/issues",
|
"issues": "https://github.com/utopia-php/platform/issues",
|
||||||
"source": "https://github.com/utopia-php/platform/tree/0.3.2"
|
"source": "https://github.com/utopia-php/platform/tree/0.3.3"
|
||||||
},
|
},
|
||||||
"time": "2023-02-14T04:51:46+00:00"
|
"time": "2023-03-07T08:52:22+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/pools",
|
"name": "utopia-php/pools",
|
||||||
|
@ -2198,21 +2099,21 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/queue",
|
"name": "utopia-php/queue",
|
||||||
"version": "0.5.1",
|
"version": "0.5.2",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/queue.git",
|
"url": "https://github.com/utopia-php/queue.git",
|
||||||
"reference": "4b39e1f232b2e619b0d7fb4004f2356df334ddc1"
|
"reference": "310271c5cd477541208d7fa74a4dea64df8e04a0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/queue/zipball/4b39e1f232b2e619b0d7fb4004f2356df334ddc1",
|
"url": "https://api.github.com/repos/utopia-php/queue/zipball/310271c5cd477541208d7fa74a4dea64df8e04a0",
|
||||||
"reference": "4b39e1f232b2e619b0d7fb4004f2356df334ddc1",
|
"reference": "310271c5cd477541208d7fa74a4dea64df8e04a0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.0",
|
"php": ">=8.0",
|
||||||
"utopia-php/cli": "0.14.*",
|
"utopia-php/cli": "0.15.*",
|
||||||
"utopia-php/framework": "0.*.*"
|
"utopia-php/framework": "0.*.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
@ -2253,9 +2154,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/queue/issues",
|
"issues": "https://github.com/utopia-php/queue/issues",
|
||||||
"source": "https://github.com/utopia-php/queue/tree/0.5.1"
|
"source": "https://github.com/utopia-php/queue/tree/0.5.2"
|
||||||
},
|
},
|
||||||
"time": "2022-11-16T19:47:26+00:00"
|
"time": "2023-03-07T08:54:10+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/registry",
|
"name": "utopia-php/registry",
|
||||||
|
@ -2707,6 +2608,49 @@
|
||||||
},
|
},
|
||||||
"time": "2023-02-03T05:44:59+00:00"
|
"time": "2023-02-03T05:44:59+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "doctrine/deprecations",
|
||||||
|
"version": "v1.0.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/doctrine/deprecations.git",
|
||||||
|
"reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
|
||||||
|
"reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": "^7.1|^8.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"doctrine/coding-standard": "^9",
|
||||||
|
"phpunit/phpunit": "^7.5|^8.5|^9.5",
|
||||||
|
"psr/log": "^1|^2|^3"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
|
||||||
|
"homepage": "https://www.doctrine-project.org/",
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/doctrine/deprecations/issues",
|
||||||
|
"source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
|
||||||
|
},
|
||||||
|
"time": "2022-05-02T15:47:09+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "doctrine/instantiator",
|
"name": "doctrine/instantiator",
|
||||||
"version": "1.5.0",
|
"version": "1.5.0",
|
||||||
|
@ -3239,24 +3183,27 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpdocumentor/type-resolver",
|
"name": "phpdocumentor/type-resolver",
|
||||||
"version": "1.6.2",
|
"version": "1.7.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/phpDocumentor/TypeResolver.git",
|
"url": "https://github.com/phpDocumentor/TypeResolver.git",
|
||||||
"reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d"
|
"reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
|
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
|
||||||
"reference": "48f445a408c131e38cab1c235aa6d2bb7a0bb20d",
|
"reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
"doctrine/deprecations": "^1.0",
|
||||||
"php": "^7.4 || ^8.0",
|
"php": "^7.4 || ^8.0",
|
||||||
"phpdocumentor/reflection-common": "^2.0"
|
"phpdocumentor/reflection-common": "^2.0",
|
||||||
|
"phpstan/phpdoc-parser": "^1.13"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"ext-tokenizer": "*",
|
"ext-tokenizer": "*",
|
||||||
|
"phpbench/phpbench": "^1.2",
|
||||||
"phpstan/extension-installer": "^1.1",
|
"phpstan/extension-installer": "^1.1",
|
||||||
"phpstan/phpstan": "^1.8",
|
"phpstan/phpstan": "^1.8",
|
||||||
"phpstan/phpstan-phpunit": "^1.1",
|
"phpstan/phpstan-phpunit": "^1.1",
|
||||||
|
@ -3288,9 +3235,9 @@
|
||||||
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
|
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
|
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
|
||||||
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.2"
|
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.0"
|
||||||
},
|
},
|
||||||
"time": "2022-10-14T12:47:21+00:00"
|
"time": "2023-03-12T10:13:29+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpspec/prophecy",
|
"name": "phpspec/prophecy",
|
||||||
|
@ -3360,6 +3307,51 @@
|
||||||
},
|
},
|
||||||
"time": "2023-02-02T15:41:36+00:00"
|
"time": "2023-02-02T15:41:36+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "phpstan/phpdoc-parser",
|
||||||
|
"version": "1.16.1",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/phpstan/phpdoc-parser.git",
|
||||||
|
"reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571",
|
||||||
|
"reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"php": "^7.2 || ^8.0"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"php-parallel-lint/php-parallel-lint": "^1.2",
|
||||||
|
"phpstan/extension-installer": "^1.0",
|
||||||
|
"phpstan/phpstan": "^1.5",
|
||||||
|
"phpstan/phpstan-phpunit": "^1.1",
|
||||||
|
"phpstan/phpstan-strict-rules": "^1.0",
|
||||||
|
"phpunit/phpunit": "^9.5",
|
||||||
|
"symfony/process": "^5.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"PHPStan\\PhpDocParser\\": [
|
||||||
|
"src/"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"description": "PHPDoc parser with support for nullable, intersection and generic types",
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
|
||||||
|
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1"
|
||||||
|
},
|
||||||
|
"time": "2023-02-07T18:11:17+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/php-code-coverage",
|
"name": "phpunit/php-code-coverage",
|
||||||
"version": "9.2.26",
|
"version": "9.2.26",
|
||||||
|
|
|
@ -134,7 +134,6 @@ services:
|
||||||
- _APP_SMTP_SECURE
|
- _APP_SMTP_SECURE
|
||||||
- _APP_SMTP_USERNAME
|
- _APP_SMTP_USERNAME
|
||||||
- _APP_SMTP_PASSWORD
|
- _APP_SMTP_PASSWORD
|
||||||
- _APP_HAMSTER_RECIPIENTS
|
|
||||||
- _APP_USAGE_STATS
|
- _APP_USAGE_STATS
|
||||||
- _APP_STORAGE_LIMIT
|
- _APP_STORAGE_LIMIT
|
||||||
- _APP_STORAGE_PREVIEW_LIMIT
|
- _APP_STORAGE_PREVIEW_LIMIT
|
||||||
|
@ -573,8 +572,9 @@ services:
|
||||||
- _APP_CONNECTIONS_DB_CONSOLE
|
- _APP_CONNECTIONS_DB_CONSOLE
|
||||||
- _APP_CONNECTIONS_DB_PROJECT
|
- _APP_CONNECTIONS_DB_PROJECT
|
||||||
- _APP_CONNECTIONS_CACHE
|
- _APP_CONNECTIONS_CACHE
|
||||||
- _APP_HAMSTER_RECIPIENTS
|
|
||||||
- _APP_HAMSTER_INTERVAL
|
- _APP_HAMSTER_INTERVAL
|
||||||
|
- _APP_HAMSTER_TIME
|
||||||
|
- _APP_MIXPANEL_TOKEN
|
||||||
|
|
||||||
appwrite-maintenance:
|
appwrite-maintenance:
|
||||||
entrypoint: maintenance
|
entrypoint: maintenance
|
||||||
|
|
|
@ -13,6 +13,7 @@ use Appwrite\Platform\Tasks\SDKs;
|
||||||
use Appwrite\Platform\Tasks\Specs;
|
use Appwrite\Platform\Tasks\Specs;
|
||||||
use Appwrite\Platform\Tasks\SSL;
|
use Appwrite\Platform\Tasks\SSL;
|
||||||
use Appwrite\Platform\Tasks\Hamster;
|
use Appwrite\Platform\Tasks\Hamster;
|
||||||
|
use Appwrite\Platform\Tasks\PatchDeleteScheduleUpdatedAtAttribute;
|
||||||
use Appwrite\Platform\Tasks\Usage;
|
use Appwrite\Platform\Tasks\Usage;
|
||||||
use Appwrite\Platform\Tasks\Vars;
|
use Appwrite\Platform\Tasks\Vars;
|
||||||
use Appwrite\Platform\Tasks\Version;
|
use Appwrite\Platform\Tasks\Version;
|
||||||
|
@ -32,6 +33,7 @@ class Tasks extends Service
|
||||||
->addAction(Install::getName(), new Install())
|
->addAction(Install::getName(), new Install())
|
||||||
->addAction(Maintenance::getName(), new Maintenance())
|
->addAction(Maintenance::getName(), new Maintenance())
|
||||||
->addAction(PatchCreateMissingSchedules::getName(), new PatchCreateMissingSchedules())
|
->addAction(PatchCreateMissingSchedules::getName(), new PatchCreateMissingSchedules())
|
||||||
|
->addAction(PatchDeleteScheduleUpdatedAtAttribute::getName(), new PatchDeleteScheduleUpdatedAtAttribute())
|
||||||
->addAction(Schedule::getName(), new Schedule())
|
->addAction(Schedule::getName(), new Schedule())
|
||||||
->addAction(Migrate::getName(), new Migrate())
|
->addAction(Migrate::getName(), new Migrate())
|
||||||
->addAction(SDKs::getName(), new SDKs())
|
->addAction(SDKs::getName(), new SDKs())
|
||||||
|
|
|
@ -10,53 +10,35 @@ use Utopia\CLI\Console;
|
||||||
use Utopia\Database\Database;
|
use Utopia\Database\Database;
|
||||||
use Utopia\Database\Query;
|
use Utopia\Database\Query;
|
||||||
use Utopia\Database\Validator\Authorization;
|
use Utopia\Database\Validator\Authorization;
|
||||||
use League\Csv\Writer;
|
use Utopia\Analytics\Adapter\Mixpanel;
|
||||||
use PHPMailer\PHPMailer\PHPMailer;
|
use Utopia\Analytics\Event;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Pools\Group;
|
use Utopia\Pools\Group;
|
||||||
use Utopia\Registry\Registry;
|
|
||||||
|
|
||||||
class Hamster extends Action
|
class Hamster extends Action
|
||||||
{
|
{
|
||||||
private array $columns = [
|
private array $metrics = [
|
||||||
'Project ID',
|
'usage_files' => 'files.$all.count.total',
|
||||||
'Project Name',
|
'usage_buckets' => 'buckets.$all.count.total',
|
||||||
'Functions',
|
'usage_databases' => 'databases.$all.count.total',
|
||||||
'Deployments',
|
'usage_documents' => 'documents.$all.count.total',
|
||||||
'Members',
|
'usage_collections' => 'collections.$all.count.total',
|
||||||
'Domains',
|
'usage_storage' => 'project.$all.storage.size',
|
||||||
'Files',
|
'usage_requests' => 'project.$all.network.requests',
|
||||||
'Buckets',
|
'usage_bandwidth' => 'project.$all.network.bandwidth',
|
||||||
'Databases',
|
'usage_users' => 'users.$all.count.total',
|
||||||
'Documents',
|
'usage_sessions' => 'sessions.email.requests.create',
|
||||||
'Collections',
|
'usage_executions' => 'executions.$all.compute.total',
|
||||||
'Storage',
|
|
||||||
'Requests',
|
|
||||||
'Bandwidth',
|
|
||||||
'Users',
|
|
||||||
'Sessions',
|
|
||||||
'Executions'
|
|
||||||
];
|
|
||||||
|
|
||||||
private array $usageStats = [
|
|
||||||
'Files' => 'files.$all.count.total',
|
|
||||||
'Buckets' => 'buckets.$all.count.total',
|
|
||||||
'Databases' => 'databases.$all.count.total',
|
|
||||||
'Documents' => 'documents.$all.count.total',
|
|
||||||
'Collections' => 'collections.$all.count.total',
|
|
||||||
'Storage' => 'project.$all.storage.size',
|
|
||||||
'Requests' => 'project.$all.network.requests',
|
|
||||||
'Bandwidth' => 'project.$all.network.bandwidth',
|
|
||||||
'Users' => 'users.$all.count.total',
|
|
||||||
'Sessions' => 'sessions.$all.requests.create',
|
|
||||||
'Executions' => 'executions.$all.compute.total',
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected string $directory = '/usr/local';
|
protected string $directory = '/usr/local';
|
||||||
|
|
||||||
protected string $path;
|
protected string $path;
|
||||||
|
|
||||||
protected string $date;
|
protected string $date;
|
||||||
|
|
||||||
|
protected Mixpanel $mixpanel;
|
||||||
|
|
||||||
public static function getName(): string
|
public static function getName(): string
|
||||||
{
|
{
|
||||||
return 'hamster';
|
return 'hamster';
|
||||||
|
@ -64,166 +46,235 @@ class Hamster extends Action
|
||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
$this->mixpanel = new Mixpanel(App::getEnv('_APP_MIXPANEL_TOKEN', ''));
|
||||||
|
|
||||||
$this
|
$this
|
||||||
->desc('Get stats for projects')
|
->desc('Get stats for projects')
|
||||||
->inject('register')
|
|
||||||
->inject('pools')
|
->inject('pools')
|
||||||
->inject('cache')
|
->inject('cache')
|
||||||
->inject('dbForConsole')
|
->inject('dbForConsole')
|
||||||
->callback(function (Registry $register, Group $pools, Cache $cache, Database $dbForConsole) {
|
->callback(function (Group $pools, Cache $cache, Database $dbForConsole) {
|
||||||
$this->action($register, $pools, $cache, $dbForConsole);
|
$this->action($pools, $cache, $dbForConsole);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private function getStats(Database $dbForConsole, Database $dbForProject, Document $project): array
|
private function getStatsPerProject(Group $pools, Cache $cache, Database $dbForConsole)
|
||||||
{
|
{
|
||||||
$stats = [];
|
$this->calculateByGroup('projects', $dbForConsole, function (Database $dbForConsole, Document $project) use ($pools, $cache) {
|
||||||
|
/**
|
||||||
|
* Skip user projects with id 'console'
|
||||||
|
*/
|
||||||
|
if ($project->getId() === 'console') {
|
||||||
|
Console::info("Skipping project console");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/** Get Project ID */
|
Console::log("Getting stats for {$project->getId()}");
|
||||||
$stats['Project ID'] = $project->getId();
|
|
||||||
|
|
||||||
/** Get Project Name */
|
try {
|
||||||
$stats['Project Name'] = $project->getAttribute('name');
|
$db = $project->getAttribute('database');
|
||||||
|
$adapter = $pools
|
||||||
|
->get($db)
|
||||||
|
->pop()
|
||||||
|
->getResource();
|
||||||
|
|
||||||
/** Get Total Functions */
|
$dbForProject = new Database($adapter, $cache);
|
||||||
$stats['Functions'] = $dbForProject->count('functions', [], APP_LIMIT_COUNT);
|
$dbForProject->setDefaultDatabase('appwrite');
|
||||||
|
$dbForProject->setNamespace('_' . $project->getInternalId());
|
||||||
|
|
||||||
/** Get Total Deployments */
|
$statsPerProject = [];
|
||||||
$stats['Deployments'] = $dbForProject->count('deployments', [], APP_LIMIT_COUNT);
|
|
||||||
|
|
||||||
/** Get Total Members */
|
$statsPerProject['time'] = microtime(true);
|
||||||
$teamInternalId = $project->getAttribute('teamInternalId', null);
|
|
||||||
if ($teamInternalId) {
|
|
||||||
$stats['Members'] = $dbForConsole->count('memberships', [
|
|
||||||
Query::equal('teamInternalId', [$teamInternalId])
|
|
||||||
], APP_LIMIT_COUNT);
|
|
||||||
} else {
|
|
||||||
$stats['Members'] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Get Domains */
|
/** Get Project ID */
|
||||||
$stats['Domains'] = $dbForProject->count('domains', [], APP_LIMIT_COUNT);
|
$statsPerProject['project_id'] = $project->getId();
|
||||||
|
|
||||||
/** Get Usage stats */
|
/** Get project created time */
|
||||||
$range = '90d';
|
$statsPerProject['project_created'] = $project->getAttribute('$createdAt');
|
||||||
$periods = [
|
|
||||||
'90d' => [
|
|
||||||
'period' => '1d',
|
|
||||||
'limit' => 90,
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
$metrics = array_values($this->usageStats);
|
/** Get Project Name */
|
||||||
Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
|
$statsPerProject['project_name'] = $project->getAttribute('name');
|
||||||
foreach ($metrics as $metric) {
|
|
||||||
$limit = $periods[$range]['limit'];
|
|
||||||
$period = $periods[$range]['period'];
|
|
||||||
|
|
||||||
$requestDocs = $dbForProject->find('stats', [
|
/** Get Total Functions */
|
||||||
Query::equal('period', [$period]),
|
$statsPerProject['custom_functions'] = $dbForProject->count('functions', [], APP_LIMIT_COUNT);
|
||||||
Query::equal('metric', [$metric]),
|
|
||||||
Query::limit($limit),
|
|
||||||
Query::orderDesc('time'),
|
|
||||||
]);
|
|
||||||
|
|
||||||
$stats[$metric] = [];
|
/** Get Total Deployments */
|
||||||
foreach ($requestDocs as $requestDoc) {
|
$statsPerProject['custom_deployments'] = $dbForProject->count('deployments', [], APP_LIMIT_COUNT);
|
||||||
$stats[$metric][] = [
|
|
||||||
'value' => $requestDoc->getAttribute('value'),
|
/** Get Total Teams */
|
||||||
'date' => $requestDoc->getAttribute('time'),
|
$statsPerProject['custom_teams'] = $dbForProject->count('teams', [], APP_LIMIT_COUNT);
|
||||||
];
|
|
||||||
|
/** Get Total Members */
|
||||||
|
$teamInternalId = $project->getAttribute('teamInternalId', null);
|
||||||
|
if ($teamInternalId) {
|
||||||
|
$statsPerProject['custom_organization_members'] = $dbForConsole->count('memberships', [
|
||||||
|
Query::equal('teamInternalId', [$teamInternalId])
|
||||||
|
], APP_LIMIT_COUNT);
|
||||||
|
} else {
|
||||||
|
$statsPerProject['custom_organization_members'] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
$stats[$metric] = array_reverse($stats[$metric]);
|
/** Get Email and Name of the project owner */
|
||||||
// Calculate aggregate of each metric
|
if ($teamInternalId) {
|
||||||
$stats[$metric] = array_sum(array_column($stats[$metric], 'value'));
|
$membership = $dbForConsole->findOne('memberships', [
|
||||||
|
Query::equal('teamInternalId', [$teamInternalId]),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!$membership || $membership->isEmpty()) {
|
||||||
|
throw new Exception('Membership not found. Skipping project : ' . $project->getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
$userInternalId = $membership->getAttribute('userInternalId', null);
|
||||||
|
if ($userInternalId) {
|
||||||
|
$user = $dbForConsole->findOne('users', [
|
||||||
|
Query::equal('_id', [$userInternalId]),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$statsPerProject['email'] = $user->getAttribute('email', null);
|
||||||
|
$statsPerProject['name'] = $user->getAttribute('name', null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get Domains */
|
||||||
|
$statsPerProject['custom_domains'] = $dbForProject->count('domains', [], APP_LIMIT_COUNT);
|
||||||
|
|
||||||
|
/** Get Platforms */
|
||||||
|
$platforms = $dbForConsole->find('platforms', [
|
||||||
|
Query::equal('projectInternalId', [$project->getInternalId()]),
|
||||||
|
Query::limit(APP_LIMIT_COUNT)
|
||||||
|
]);
|
||||||
|
|
||||||
|
$statsPerProject['custom_platforms_web'] = sizeof(array_filter($platforms, function ($platform) {
|
||||||
|
return $platform['type'] === 'web';
|
||||||
|
}));
|
||||||
|
|
||||||
|
$statsPerProject['custom_platforms_android'] = sizeof(array_filter($platforms, function ($platform) {
|
||||||
|
return $platform['type'] === 'android';
|
||||||
|
}));
|
||||||
|
|
||||||
|
$statsPerProject['custom_platforms_iOS'] = sizeof(array_filter($platforms, function ($platform) {
|
||||||
|
return str_contains($platform['type'], 'apple');
|
||||||
|
}));
|
||||||
|
|
||||||
|
$statsPerProject['custom_platforms_flutter'] = sizeof(array_filter($platforms, function ($platform) {
|
||||||
|
return str_contains($platform['type'], 'flutter');
|
||||||
|
}));
|
||||||
|
|
||||||
|
/** Get Usage $statsPerProject */
|
||||||
|
$periods = [
|
||||||
|
'infinity' => [
|
||||||
|
'period' => '1d',
|
||||||
|
'limit' => 90,
|
||||||
|
],
|
||||||
|
'24h' => [
|
||||||
|
'period' => '1h',
|
||||||
|
'limit' => 24,
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
Authorization::skip(function () use ($dbForProject, $periods, &$statsPerProject) {
|
||||||
|
foreach ($this->metrics as $key => $metric) {
|
||||||
|
foreach ($periods as $periodKey => $periodValue) {
|
||||||
|
$limit = $periodValue['limit'];
|
||||||
|
$period = $periodValue['period'];
|
||||||
|
|
||||||
|
$requestDocs = $dbForProject->find('stats', [
|
||||||
|
Query::equal('period', [$period]),
|
||||||
|
Query::equal('metric', [$metric]),
|
||||||
|
Query::limit($limit),
|
||||||
|
Query::orderDesc('time'),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$statsPerProject[$key . '_' . $periodKey] = [];
|
||||||
|
foreach ($requestDocs as $requestDoc) {
|
||||||
|
$statsPerProject[$key . '_' . $periodKey][] = [
|
||||||
|
'value' => $requestDoc->getAttribute('value'),
|
||||||
|
'date' => $requestDoc->getAttribute('time'),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
$statsPerProject[$key . '_' . $periodKey] = array_reverse($statsPerProject[$key . '_' . $periodKey]);
|
||||||
|
// Calculate aggregate of each metric
|
||||||
|
$statsPerProject[$key . '_' . $periodKey] = array_sum(array_column($statsPerProject[$key . '_' . $periodKey], 'value'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (isset($statsPerProject['email'])) {
|
||||||
|
/** Send data to mixpanel */
|
||||||
|
$res = $this->mixpanel->createProfile($statsPerProject['email'], '', [
|
||||||
|
'name' => $statsPerProject['name'],
|
||||||
|
'email' => $statsPerProject['email']
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!$res) {
|
||||||
|
Console::error('Failed to create user profile for project: ' . $project->getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
$event = new Event();
|
||||||
|
$event
|
||||||
|
->setName('Project Daily Usage')
|
||||||
|
->setProps($statsPerProject);
|
||||||
|
$res = $this->mixpanel->createEvent($event);
|
||||||
|
if (!$res) {
|
||||||
|
Console::error('Failed to create event for project: ' . $project->getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
Console::error('Failed to send stats for project: ' . $project->getId());
|
||||||
|
Console::error($e->getMessage());
|
||||||
|
} finally {
|
||||||
|
$pools
|
||||||
|
->get($db)
|
||||||
|
->reclaim();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return $stats;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function action(Registry $register, Group $pools, Cache $cache, Database $dbForConsole): void
|
public function action(Group $pools, Cache $cache, Database $dbForConsole): void
|
||||||
{
|
{
|
||||||
|
|
||||||
Console::title('Cloud Hamster V1');
|
Console::title('Cloud Hamster V1');
|
||||||
Console::success(APP_NAME . ' cloud hamster process v1 has started');
|
Console::success(APP_NAME . ' cloud hamster process has started');
|
||||||
|
|
||||||
$interval = (int) App::getEnv('_APP_HAMSTER_INTERVAL', '30'); // 30 seconds (by default)
|
$sleep = (int) App::getEnv('_APP_HAMSTER_INTERVAL', '30'); // 30 seconds (by default)
|
||||||
|
|
||||||
Console::loop(function () use ($register, $pools, $cache, $dbForConsole, $interval) {
|
$jobInitTime = App::getEnv('_APP_HAMSTER_TIME', '22:00'); // (hour:minutes)
|
||||||
|
$now = new \DateTime();
|
||||||
|
$now->setTimezone(new \DateTimeZone(date_default_timezone_get()));
|
||||||
|
$next = new \DateTime($now->format("Y-m-d $jobInitTime"));
|
||||||
|
$next->setTimezone(new \DateTimeZone(date_default_timezone_get()));
|
||||||
|
$delay = $next->getTimestamp() - $now->getTimestamp();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If time passed for the target day.
|
||||||
|
*/
|
||||||
|
if ($delay <= 0) {
|
||||||
|
$next->add(\DateInterval::createFromDateString('1 days'));
|
||||||
|
$delay = $next->getTimestamp() - $now->getTimestamp();
|
||||||
|
}
|
||||||
|
|
||||||
|
Console::log('[' . $now->format("Y-m-d H:i:s.v") . '] Delaying for ' . $delay . ' setting loop to [' . $next->format("Y-m-d H:i:s.v") . ']');
|
||||||
|
|
||||||
|
Console::loop(function () use ($pools, $cache, $dbForConsole, $sleep) {
|
||||||
$now = date('d-m-Y H:i:s', time());
|
$now = date('d-m-Y H:i:s', time());
|
||||||
Console::info("[{$now}] Getting Cloud Usage Stats every {$interval} seconds");
|
Console::info("[{$now}] Getting Cloud Usage Stats every {$sleep} seconds");
|
||||||
$loopStart = microtime(true);
|
$loopStart = microtime(true);
|
||||||
|
|
||||||
/* Initialise new Utopia app */
|
/* Initialise new Utopia app */
|
||||||
$app = new App('UTC');
|
$app = new App('UTC');
|
||||||
$console = $app->getResource('console');
|
|
||||||
|
|
||||||
/** CSV stuff */
|
Console::info('Getting stats for all projects');
|
||||||
$this->date = date('Y-m-d');
|
$this->getStatsPerProject($pools, $cache, $dbForConsole);
|
||||||
$this->path = "{$this->directory}/stats_{$this->date}.csv";
|
Console::success('Completed getting stats for all projects');
|
||||||
$csv = Writer::createFromPath($this->path, 'w');
|
|
||||||
$csv->insertOne($this->columns);
|
|
||||||
|
|
||||||
/** Database connections */
|
Console::info('Getting stats for all organizations');
|
||||||
$totalProjects = $dbForConsole->count('projects') + 1;
|
$this->getStatsPerOrganization($dbForConsole);
|
||||||
Console::success("Found a total of: {$totalProjects} projects");
|
Console::success('Completed getting stats for all organizations');
|
||||||
|
|
||||||
$projects = [$console];
|
Console::info('Getting stats for all users');
|
||||||
$count = 0;
|
$this->getStatsPerUser($dbForConsole);
|
||||||
$limit = 30;
|
Console::success('Completed getting stats for all users');
|
||||||
$sum = 30;
|
|
||||||
$offset = 0;
|
|
||||||
while (!empty($projects)) {
|
|
||||||
foreach ($projects as $project) {
|
|
||||||
/**
|
|
||||||
* Skip user projects with id 'console'
|
|
||||||
*/
|
|
||||||
if ($project->getId() === 'console') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Console::info("Getting stats for {$project->getId()}");
|
|
||||||
|
|
||||||
try {
|
|
||||||
$db = $project->getAttribute('database');
|
|
||||||
$adapter = $pools
|
|
||||||
->get($db)
|
|
||||||
->pop()
|
|
||||||
->getResource();
|
|
||||||
|
|
||||||
$dbForProject = new Database($adapter, $cache);
|
|
||||||
$dbForProject->setDefaultDatabase('appwrite');
|
|
||||||
$dbForProject->setNamespace('_' . $project->getInternalId());
|
|
||||||
|
|
||||||
$statsPerProject = $this->getStats($dbForConsole, $dbForProject, $project);
|
|
||||||
$csv->insertOne(array_values($statsPerProject));
|
|
||||||
} catch (\Throwable $th) {
|
|
||||||
throw $th;
|
|
||||||
Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
|
|
||||||
} finally {
|
|
||||||
$pools
|
|
||||||
->get($db)
|
|
||||||
->reclaim();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$sum = \count($projects);
|
|
||||||
|
|
||||||
$projects = $dbForConsole->find('projects', [
|
|
||||||
Query::limit($limit),
|
|
||||||
Query::offset($offset),
|
|
||||||
]);
|
|
||||||
|
|
||||||
$offset = $offset + $limit;
|
|
||||||
$count = $count + $sum;
|
|
||||||
|
|
||||||
Console::log('Iterated through ' . $count . '/' . $totalProjects . ' projects...');
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->sendEmail($register);
|
|
||||||
|
|
||||||
$pools
|
$pools
|
||||||
->get('console')
|
->get('console')
|
||||||
|
@ -232,40 +283,138 @@ class Hamster extends Action
|
||||||
$loopTook = microtime(true) - $loopStart;
|
$loopTook = microtime(true) - $loopStart;
|
||||||
$now = date('d-m-Y H:i:s', time());
|
$now = date('d-m-Y H:i:s', time());
|
||||||
Console::info("[{$now}] Cloud Stats took {$loopTook} seconds");
|
Console::info("[{$now}] Cloud Stats took {$loopTook} seconds");
|
||||||
}, $interval);
|
}, $sleep, $delay);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function sendEmail(Registry $register)
|
protected function calculateByGroup(string $collection, Database $dbForConsole, callable $callback)
|
||||||
{
|
{
|
||||||
/** @var \PHPMailer\PHPMailer\PHPMailer $mail */
|
$count = 0;
|
||||||
$mail = $register->get('smtp');
|
$chunk = 0;
|
||||||
|
$limit = 50;
|
||||||
|
$results = [];
|
||||||
|
$sum = $limit;
|
||||||
|
|
||||||
$mail->clearAddresses();
|
$executionStart = \microtime(true);
|
||||||
$mail->clearAllRecipients();
|
|
||||||
$mail->clearReplyTos();
|
|
||||||
$mail->clearAttachments();
|
|
||||||
$mail->clearBCCs();
|
|
||||||
$mail->clearCCs();
|
|
||||||
|
|
||||||
try {
|
while ($sum === $limit) {
|
||||||
/** Addresses */
|
$chunk++;
|
||||||
$mail->setFrom(App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM), 'Appwrite Cloud Hamster');
|
|
||||||
$recipients = explode(',', App::getEnv('_APP_HAMSTER_RECIPIENTS', ''));
|
$results = $dbForConsole->find($collection, \array_merge([
|
||||||
foreach ($recipients as $recipient) {
|
Query::limit($limit),
|
||||||
$mail->addAddress($recipient);
|
Query::offset($count)
|
||||||
|
]));
|
||||||
|
|
||||||
|
$sum = count($results);
|
||||||
|
|
||||||
|
Console::log('Processing chunk #' . $chunk . '. Found ' . $sum . ' documents');
|
||||||
|
|
||||||
|
foreach ($results as $document) {
|
||||||
|
call_user_func($callback, $dbForConsole, $document);
|
||||||
|
$count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Attachments */
|
|
||||||
$mail->addAttachment($this->path);
|
|
||||||
|
|
||||||
/** Content */
|
|
||||||
$mail->Subject = "Cloud Report for {$this->date}";
|
|
||||||
$mail->Body = "Please find the daily cloud report atttached";
|
|
||||||
|
|
||||||
$mail->send();
|
|
||||||
Console::success('Email has been sent!');
|
|
||||||
} catch (Exception $e) {
|
|
||||||
Console::error("Message could not be sent. Mailer Error: {$mail->ErrorInfo}");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$executionEnd = \microtime(true);
|
||||||
|
|
||||||
|
Console::log("Processed {$count} document by group in " . ($executionEnd - $executionStart) . " seconds");
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getStatsPerOrganization(Database $dbForConsole)
|
||||||
|
{
|
||||||
|
|
||||||
|
$this->calculateByGroup('teams', $dbForConsole, function (Database $dbForConsole, Document $document) {
|
||||||
|
try {
|
||||||
|
$statsPerOrganization = [];
|
||||||
|
|
||||||
|
/** Organization name */
|
||||||
|
$statsPerOrganization['name'] = $document->getAttribute('name');
|
||||||
|
|
||||||
|
/** Get Email and of the organization owner */
|
||||||
|
$membership = $dbForConsole->findOne('memberships', [
|
||||||
|
Query::equal('teamInternalId', [$document->getInternalId()]),
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!$membership || $membership->isEmpty()) {
|
||||||
|
throw new Exception('Membership not found. Skipping organization : ' . $document->getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
$userInternalId = $membership->getAttribute('userInternalId', null);
|
||||||
|
if ($userInternalId) {
|
||||||
|
$user = $dbForConsole->findOne('users', [
|
||||||
|
Query::equal('_id', [$userInternalId]),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$statsPerOrganization['email'] = $user->getAttribute('email', null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Organization Creation Date */
|
||||||
|
$statsPerOrganization['created'] = $document->getAttribute('$createdAt');
|
||||||
|
|
||||||
|
/** Number of team members */
|
||||||
|
$statsPerOrganization['members'] = $document->getAttribute('total');
|
||||||
|
|
||||||
|
/** Number of projects in this organization */
|
||||||
|
$statsPerOrganization['projects'] = $dbForConsole->count('projects', [
|
||||||
|
Query::equal('teamId', [$document->getId()]),
|
||||||
|
Query::limit(APP_LIMIT_COUNT)
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!isset($statsPerOrganization['email'])) {
|
||||||
|
throw new Exception('Email not found. Skipping organization : ' . $document->getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
$event = new Event();
|
||||||
|
$event
|
||||||
|
->setName('Organization Daily Usage')
|
||||||
|
->setProps($statsPerOrganization);
|
||||||
|
$res = $this->mixpanel->createEvent($event);
|
||||||
|
if (!$res) {
|
||||||
|
throw new Exception('Failed to create event for organization : ' . $document->getId());
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
Console::error($e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getStatsPerUser(Database $dbForConsole)
|
||||||
|
{
|
||||||
|
$this->calculateByGroup('users', $dbForConsole, function (Database $dbForConsole, Document $document) {
|
||||||
|
try {
|
||||||
|
$statsPerUser = [];
|
||||||
|
|
||||||
|
/** Organization name */
|
||||||
|
$statsPerUser['name'] = $document->getAttribute('name');
|
||||||
|
|
||||||
|
/** Organization ID (needs to be stored as an email since mixpanel uses the email attribute as a distinctID) */
|
||||||
|
$statsPerUser['email'] = $document->getAttribute('email');
|
||||||
|
|
||||||
|
/** Organization Creation Date */
|
||||||
|
$statsPerUser['created'] = $document->getAttribute('$createdAt');
|
||||||
|
|
||||||
|
/** Number of teams this user is a part of */
|
||||||
|
$statsPerUser['memberships'] = $dbForConsole->count('memberships', [
|
||||||
|
Query::equal('userInternalId', [$document->getInternalId()]),
|
||||||
|
Query::limit(APP_LIMIT_COUNT)
|
||||||
|
]);
|
||||||
|
|
||||||
|
if (!isset($statsPerUser['email'])) {
|
||||||
|
throw new Exception('User has no email: ' . $document->getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Send data to mixpanel */
|
||||||
|
$event = new Event();
|
||||||
|
$event
|
||||||
|
->setName('User Daily Usage')
|
||||||
|
->setProps($statsPerUser);
|
||||||
|
$res = $this->mixpanel->createEvent($event);
|
||||||
|
|
||||||
|
if (!$res) {
|
||||||
|
throw new Exception('Failed to create user profile for user: ' . $document->getId());
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
Console::error($e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,74 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Appwrite\Platform\Tasks;
|
||||||
|
|
||||||
|
use Utopia\Platform\Action;
|
||||||
|
use Utopia\CLI\Console;
|
||||||
|
use Utopia\Database\Query;
|
||||||
|
use Utopia\Database\Database;
|
||||||
|
use Utopia\Database\Validator\Authorization;
|
||||||
|
use Utopia\Pools\Group;
|
||||||
|
|
||||||
|
class PatchDeleteScheduleUpdatedAtAttribute extends Action
|
||||||
|
{
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'patch-delete-schedule-updated-at-attribute';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
$this
|
||||||
|
->desc('Ensure function collections do not have scheduleUpdatedAt attribute')
|
||||||
|
->inject('pools')
|
||||||
|
->inject('dbForConsole')
|
||||||
|
->inject('getProjectDB')
|
||||||
|
->callback(fn (Group $pools, Database $dbForConsole, callable $getProjectDB) => $this->action($pools, $dbForConsole, $getProjectDB));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Iterate over every function on every project to make sure there is a schedule. If not, recreate the schedule.
|
||||||
|
*/
|
||||||
|
public function action(Group $pools, Database $dbForConsole, callable $getProjectDB): void
|
||||||
|
{
|
||||||
|
Authorization::disable();
|
||||||
|
Authorization::setDefaultStatus(false);
|
||||||
|
|
||||||
|
Console::title('PatchDeleteScheduleUpdatedAtAttribute V1');
|
||||||
|
Console::success(APP_NAME . ' PatchDeleteScheduleUpdatedAtAttribute v1 has started');
|
||||||
|
|
||||||
|
$limit = 100;
|
||||||
|
$projectCursor = null;
|
||||||
|
while (true) {
|
||||||
|
$projectsQueries = [Query::limit($limit)];
|
||||||
|
if ($projectCursor !== null) {
|
||||||
|
$projectsQueries[] = Query::cursorAfter($projectCursor);
|
||||||
|
}
|
||||||
|
$projects = $dbForConsole->find('projects', $projectsQueries);
|
||||||
|
|
||||||
|
if (count($projects) === 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($projects as $project) {
|
||||||
|
Console::log("Checking Project " . $project->getAttribute('name') . " (" . $project->getId() . ")");
|
||||||
|
$dbForProject = $getProjectDB($project);
|
||||||
|
|
||||||
|
try {
|
||||||
|
/**
|
||||||
|
* Delete 'scheduleUpdatedAt' attribute
|
||||||
|
*/
|
||||||
|
$dbForProject->deleteAttribute('functions', 'scheduleUpdatedAt');
|
||||||
|
$dbForProject->deleteCachedCollection('functions');
|
||||||
|
Console::success("'scheduleUpdatedAt' deleted.");
|
||||||
|
} catch (\Throwable $th) {
|
||||||
|
Console::warning("'scheduleUpdatedAt' errored: {$th->getMessage()}");
|
||||||
|
}
|
||||||
|
|
||||||
|
$pools->reclaim();
|
||||||
|
}
|
||||||
|
|
||||||
|
$projectCursor = $projects[array_key_last($projects)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue