app init status logic adjustments

Signed-off-by: Andrey Borysenko <[email protected]>
nextcloud · Oct 19, 2023 · 7d3c9ed · 7d3c9ed
1 parent b7830ae
commit 7d3c9ed
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/lib/Command/ExApp/Register.php b/lib/Command/ExApp/Register.php
@@ -193,6 +193,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 			$this->service->dispatchExAppInit($exApp);
 
+			if ($daemonConfig->getAcceptsDeployId() === $this->manualActions->getAcceptsDeployId()) {
+				// Wait until ExApp initialized in case of manual-install type
+				do {
+					$exApp = $this->service->getExApp($appId);
+					$status = json_decode($exApp->getStatus(), true);
+					if (isset($status['error'])) {
+						$output->writeln(sprintf('ExApp %s initialization step failed. Error: %s', $appId, $status['error']));
+						return 1;
+					}
+				} while (isset($status['progress']));
+			}
+
 			$output->writeln(sprintf('ExApp %s successfully registered.', $appId));
 			return 0;
 		}

diff --git a/lib/Command/ExApp/Update.php b/lib/Command/ExApp/Update.php
@@ -223,6 +223,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			return 1;
 		}
 
+		$this->service->setAppInitProgress($appId, 0, '', true);
 		$this->service->dispatchExAppInit($exApp);
 
 		$output->writeln(sprintf('ExApp %s successfully updated.', $appId));

diff --git a/lib/Controller/ExAppsPageController.php b/lib/Controller/ExAppsPageController.php
@@ -10,7 +10,6 @@
 use OC\App\Platform;
 use OC_App;
 use OCA\AppAPI\AppInfo\Application;
-use OCA\AppAPI\Attribute\AppAPIAuth;
 use OCA\AppAPI\Db\DaemonConfig;
 use OCA\AppAPI\Db\ExApp;
 use OCA\AppAPI\Db\ExAppScope;
@@ -26,7 +25,6 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\PasswordConfirmationRequired;
-use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
@@ -663,7 +661,7 @@ public function updateApp(string $appId): JSONResponse {
 			'port' => (int) $exAppInfo['port'],
 		])) {
 			// 6. Set initialization progress to start
-			$this->service->setAppInitProgress($appId, 0);
+			$this->service->setAppInitProgress($appId, 0, '', true);
 			// 7. Dispatch init step on ExApp side
 			$this->service->dispatchExAppInit($exApp);
 		}

diff --git a/lib/Controller/OCSApiController.php b/lib/Controller/OCSApiController.php
@@ -97,12 +97,8 @@ public function getNCUsersList(): DataResponse {
 	#[AppAPIAuth]
 	#[PublicPage]
 	#[NoCSRFRequired]
-	public function setAppProgress(string $appId, int $progress): DataResponse {
-		$this->service->setAppInitProgress($appId, $progress);
-		if ($progress === 100) {
-			$exApp = $this->service->getExApp($appId);
-			$this->service->enableExApp($exApp);
-		}
+	public function setAppProgress(string $appId, int $progress, string $error): DataResponse {
+		$this->service->setAppInitProgress($appId, $progress, $error);
 		return new DataResponse();
 	}
 }
diff --git a/lib/Service/AppAPIService.php b/lib/Service/AppAPIService.php
@@ -313,15 +313,28 @@ public function updateExAppInfo(ExApp $exApp, array $exAppInfo): bool {
 	 *
 	 * @return void
 	 */
-	public function setAppInitProgress(string $appId, int $progress): void {
+	public function setAppInitProgress(string $appId, int $progress, string $error = '', bool $update = false): void {
 		$exApp = $this->getExApp($appId);
 		$cacheKey = '/exApp_' . $exApp->getAppid();
 
 		$status = json_decode($exApp->getStatus(), true);
+
+		if ($update) {
+			// Set active=false during update action, for register it already false
+			$status['active'] = false;
+		}
+
+		if ($status['active']) {
+			return;
+		}
+
 		if ($progress === -1) {
-			$this->logger->error(sprintf('ExApp %s initialization failed', $appId));
+			$this->logger->error(sprintf('ExApp %s initialization failed. Error: %s', $appId, $error));
+			if ($error !== '') {
+				$status['error'] = $error;
+			}
 		}
-		if ($progress < 100 && $progress >= 0) {
+		if ($progress >= 0 && $progress < 100) {
 			$status['progress'] = $progress;
 		} else {
 			unset($status['progress']);
@@ -330,9 +343,12 @@ public function setAppInitProgress(string $appId, int $progress): void {
 		$exApp->setStatus(json_encode($status));
 
 		try {
-			$this->exAppMapper->update($exApp);
+			$exApp = $this->exAppMapper->update($exApp);
 			$this->updateExAppLastCheckTime($exApp);
 			$this->cache->set($cacheKey, $exApp, self::CACHE_TTL);
+			if ($progress === 100) {
+				$this->enableExApp($exApp);
+			}
 		} catch (Exception) {
 		}
 	}

diff --git a/src/store/apps.js b/src/store/apps.js
@@ -397,6 +397,12 @@ const actions = {
 						context.commit('setIntervalUpdater', null)
 					}
 				}
+				if (Object.hasOwn(state, 'error') && state?.error !== '') {
+					context.commit('setError', {
+						appId: [appId],
+						error: response.data?.error,
+					})
+				}
 			})
 			.catch((error) => context.commit('API_FAILURE', error))
 	},