Merge branch '1.7.x' into feat-ref-param-to-vcs-list-contents

app/config/platforms.php

@@ -59,7 +59,7 @@ return [
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '16.1.0',
+                'version' => '17.0.1',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -77,7 +77,7 @@ return [
             [
                 'key' => 'apple',
                 'name' => 'Apple',
-                'version' => '10.1.0',
+                'version' => '10.1.1',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
@@ -217,7 +217,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '7.0.0',
+                'version' => '8.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,
@@ -231,6 +231,11 @@ return [
                 'gitRepoName' => 'sdk-for-cli',
                 'gitUserName' => 'appwrite',
                 'gitBranch' => 'dev',
+                'exclude' => [
+                    'services' => [
+                        ['name' => 'assistant'],
+                    ],
+                ],
             ],
         ],
     ],
@@ -411,7 +416,7 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '10.0.0',
+                'version' => '10.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,

app/controllers/api/health.php

@@ -845,15 +845,18 @@ App::get('/v1/health/storage')
         $checkStart = \microtime(true);
 
         foreach ($devices as $device) {
-            if (!$device->write($device->getPath('health.txt'), 'test', 'text/plain')) {
+            $uniqueFileName = \uniqid('health', true);
+            $filePath = $device->getPath($uniqueFileName);
+
+            if (!$device->write($filePath, 'test', 'text/plain')) {
                 throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed writing test file to ' . $device->getRoot());
             }
 
-            if ($device->read($device->getPath('health.txt')) !== 'test') {
+            if ($device->read($filePath) !== 'test') {
                 throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed reading test file from ' . $device->getRoot());
             }
 
-            if (!$device->delete($device->getPath('health.txt'))) {
+            if (!$device->delete($filePath)) {
                 throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed deleting test file from ' . $device->getRoot());
             }
         }

src/Appwrite/Platform/Tasks/Maintenance.php

@@ -4,9 +4,11 @@ namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
+use DateInterval;
+use DateTime;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
+use Utopia\Database\DateTime as DatabaseDateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Platform\Action;
@@ -58,29 +60,35 @@ class Maintenance extends Action
         Console::info('Setting loop start time to ' . $next->format("Y-m-d H:i:s.v") . '. Delaying for ' . $delay . ' seconds.');
 
         Console::loop(function () use ($interval, $cacheRetention, $schedulesDeletionRetention, $usageStatsRetentionHourly, $dbForPlatform, $console, $queueForDeletes, $queueForCertificates) {
-            $time = DateTime::now();
+            $time = DatabaseDateTime::now();
 
             Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
 
+            // Iterate through project only if it was accessed in last 24 hours
+            $dateInterval  = DateInterval::createFromDateString('24 hours');
+            $before24h = (new DateTime())->sub($dateInterval);
+
             $dbForPlatform->foreach(
                 'projects',
                 function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
                     $queueForDeletes
                         ->setType(DELETE_TYPE_MAINTENANCE)
                         ->setProject($project)
-                        ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
+                        ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                         ->trigger();
                 },
                 [
                     Query::equal('region', [System::getEnv('_APP_REGION', 'default')]),
                     Query::limit(100),
+                    Query::greaterThanEqual('accessedAt', DatabaseDateTime::format($before24h)),
+                    Query::orderAsc('teamInternalId'),
                 ]
             );
 
             $queueForDeletes
                 ->setType(DELETE_TYPE_MAINTENANCE)
                 ->setProject($console)
-                ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
+                ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                 ->trigger();
 
             $this->notifyDeleteConnections($queueForDeletes);
@@ -94,13 +102,13 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_REALTIME)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -60))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -60))
             ->trigger();
     }
 
     private function renewCertificates(Database $dbForPlatform, Certificate $queueForCertificate): void
     {
-        $time = DateTime::now();
+        $time = DatabaseDateTime::now();
 
         $certificates = $dbForPlatform->find('certificates', [
             Query::lessThan('attempts', 5), // Maximum 5 attempts
@@ -129,7 +137,7 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_CACHE_BY_TIMESTAMP)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * $interval))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
             ->trigger();
     }
 
@@ -137,7 +145,7 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_SCHEDULES)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * $interval))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
             ->trigger();
     }
 }

src/Appwrite/Platform/Tasks/SDKs.php

@@ -251,7 +251,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     ->setDiscord(APP_SOCIAL_DISCORD_CHANNEL, APP_SOCIAL_DISCORD)
                     ->setDefaultHeaders([
                         'X-Appwrite-Response-Format' => '1.7.0',
-                    ]);
+                    ])
+                    ->setExclude($language['exclude'] ?? []);
 
                 // Make sure we have a clean slate.
                 // Otherwise, all files in this dir will be pushed,