Only retry fetching app store data once every 5 minutes in case it failed

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Author: juliusknorr

lib/private/App/AppStore/Fetcher/AppFetcher.php

@@ -35,6 +35,7 @@
 use OC\Files\AppData\Factory;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Http\Client\IClientService;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\ILogger;
 
@@ -59,13 +60,16 @@ public function __construct(Factory $appDataFactory,
 								ITimeFactory $timeFactory,
 								IConfig $config,
 								CompareVersion $compareVersion,
-								ILogger $logger) {
+								ILogger $logger,
+								ICacheFactory $cacheFactory
+	) {
 		parent::__construct(
 			$appDataFactory,
 			$clientService,
 			$timeFactory,
 			$config,
-			$logger
+			$logger,
+			$cacheFactory
 		);
 
 		$this->fileName = 'apps.json';

lib/private/App/AppStore/Fetcher/CategoryFetcher.php

@@ -30,6 +30,7 @@
 use OC\Files\AppData\Factory;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Http\Client\IClientService;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\ILogger;
 
@@ -45,13 +46,16 @@ public function __construct(Factory $appDataFactory,
 								IClientService $clientService,
 								ITimeFactory $timeFactory,
 								IConfig $config,
-								ILogger $logger) {
+								ILogger $logger,
+								ICacheFactory $cacheFactory
+	) {
 		parent::__construct(
 			$appDataFactory,
 			$clientService,
 			$timeFactory,
 			$config,
-			$logger
+			$logger,
+			$cacheFactory
 		);
 		$this->fileName = 'categories.json';
 		$this->endpointName = 'categories.json';

lib/private/App/AppStore/Fetcher/Fetcher.php

@@ -37,6 +37,8 @@
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Http\Client\IClientService;
+use OCP\ICache;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\ILogger;
 
@@ -61,6 +63,8 @@ abstract class Fetcher {
 	protected $version;
 	/** @var string */
 	protected $channel;
+	/** @var ICache */
+	private $cache;
 
 	/**
 	 * @param Factory $appDataFactory
@@ -73,12 +77,15 @@ public function __construct(Factory $appDataFactory,
 								IClientService $clientService,
 								ITimeFactory $timeFactory,
 								IConfig $config,
-								ILogger $logger) {
+								ILogger $logger,
+								ICacheFactory $cacheFactory
+	) {
 		$this->appData = $appDataFactory->get('appstore');
 		$this->clientService = $clientService;
 		$this->timeFactory = $timeFactory;
 		$this->config = $config;
 		$this->logger = $logger;
+		$this->cache = $cacheFactory->createDistributed('appstore-fetcher');
 	}
 
 	/**
@@ -91,6 +98,9 @@ public function __construct(Factory $appDataFactory,
 	 */
 	protected function fetch($ETag, $content) {
 		$appstoreenabled = $this->config->getSystemValue('appstoreenabled', true);
+		if ((bool)$this->cache->get('lastFetchFailure')) {
+			return [];
+		}
 
 		if (!$appstoreenabled) {
 			return [];
@@ -107,7 +117,13 @@ protected function fetch($ETag, $content) {
 		}
 
 		$client = $this->clientService->newClient();
-		$response = $client->get($this->getEndpoint(), $options);
+		try {
+			$response = $client->get($this->getEndpoint(), $options);
+		} catch (ConnectException $e) {
+			// Only retry app store fetching once every 5 minutes when failing
+			$this->cache->set('lastFetchFailure', true, 300);
+			throw $e;
+		}
 
 		$responseJson = [];
 		if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) {
@@ -175,6 +191,9 @@ public function get($allowUnstable = false) {
 		// Refresh the file content
 		try {
 			$responseJson = $this->fetch($ETag, $content, $allowUnstable);
+			if (empty($responseJson['data'])) {
+				return [];
+			}
 			// Don't store the apps request file
 			if ($allowUnstable) {
 				return $responseJson['data'];

tests/lib/App/AppStore/Fetcher/AppFetcherTest.php

@@ -33,6 +33,7 @@
 use OCP\Http\Client\IClient;
 use OCP\Http\Client\IClientService;
 use OCP\Http\Client\IResponse;
+use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\ILogger;
 use Test\TestCase;
@@ -1849,14 +1850,16 @@ protected function setUp(): void {
 		$this->config = $this->createMock(IConfig::class);
 		$this->compareVersion = new CompareVersion();
 		$this->logger = $this->createMock(ILogger::class);
+		$cacheFactory = $this->createMock(ICacheFactory::class);
 
 		$this->fetcher = new AppFetcher(
 			$factory,
 			$this->clientService,
 			$this->timeFactory,
 			$this->config,
 			$this->compareVersion,
-			$this->logger
+			$this->logger,
+			$cacheFactory
 		);
 	}
 

tests/lib/App/AppStore/Fetcher/CategoryFetcherTest.php

@@ -22,19 +22,23 @@
 namespace Test\App\AppStore\Fetcher;
 
 use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OCP\ICacheFactory;
 
 class CategoryFetcherTest extends FetcherBase {
 	protected function setUp(): void {
 		parent::setUp();
 		$this->fileName = 'categories.json';
 		$this->endpoint = 'https://apps.nextcloud.com/api/v1/categories.json';
 
+		$cacheFactory = $this->createMock(ICacheFactory::class);
+
 		$this->fetcher = new CategoryFetcher(
 			$this->appDataFactory,
 			$this->clientService,
 			$this->timeFactory,
 			$this->config,
-			$this->logger
+			$this->logger,
+			$cacheFactory
 		);
 	}