fix(daemon): correct functionality and syntax

Author: isaaclee12

lib/Command/Daemon/ListDaemons.php

@@ -19,8 +19,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class ListDaemons extends Command
-{
+class ListDaemons extends Command {
 
 	public function __construct(
 		private readonly DaemonConfigService $daemonConfigService,
@@ -29,15 +28,13 @@ public function __construct(
 		parent::__construct();
 	}
 
-	protected function configure(): void
-	{
+	protected function configure(): void {
 		$this->setName('app_api:daemon:list');
 		$this->setDescription('List registered daemons');
 		$this->addOption('show-deploy-config', null, InputOption::VALUE_NONE, 'Show full deploy configuration');
 	}
 
-	protected function execute(InputInterface $input, OutputInterface $output): int
-	{
+	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$daemonConfigs = $this->daemonConfigService->getRegisteredDaemonConfigs();
 		if (count($daemonConfigs) === 0) {
 			$output->writeln('No registered daemon configs.');
@@ -47,53 +44,56 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 		$defaultDaemonName = $this->appConfig->getValueString(Application::APP_ID, 'default_daemon_config', lazy: true);
 
 		$output->writeln('Registered ExApp daemon configs:');
-		$table = new Table($output);
 
-		$showDeployConfig = $input->getOption('show-deploy-config');
+		if ($input->getOption('show-deploy-config')) {
 
-		$headers = ['Def', 'Name', 'Display name', 'Deploy ID', 'Protocol', 'Host', 'NC Url', 'Is HaRP', 'HaRP FRP Address', 'HaRP Docker Socket Port'];
-		if ($showDeployConfig) {
-			$headers[] = 'Deploy Config JSON';
-		}
-		$table->setHeaders($headers);
-
-		$rows = [];
-		foreach ($daemonConfigs as $daemon) {
-			$deployConfig = $daemon->getDeployConfig();
-			$newRow = [
-				$daemon->getName() === $defaultDaemonName ? '*' : '',
-				$daemon->getName(),
-				$daemon->getDisplayName(),
-				$daemon->getAcceptsDeployId(),
-				$daemon->getProtocol(),
-				$daemon->getHost(),
-				$deployConfig['nextcloud_url'],
-				isset($deployConfig['harp']) ? 'yes' : 'no',
-				$deployConfig['harp']['frp_address'] ?? '(none)',
-				$deployConfig['harp']['docker_socket_port'] ?? '(none)',
-			];
-
-			if ($showDeployConfig) {
-				$deployConfigOutput = [
-					'net' => $deployConfig['net'],
-					'nextcloud_url' => $deployConfig['nextcloud_url'],
-					'computeDevice' => $deployConfig['computeDevice'],
-				];
+			foreach ($daemonConfigs as $daemon) {
+				$deployConfig = $daemon->getDeployConfig();
 
-				if (isset($deployConfig['harp'])) {
-					$deployConfigOutput['harp'] = $deployConfig['harp'];
+				if (isset($deployConfig['haproxy_password'])) {
+					$deployConfig['haproxy_password'] = '***'; 
 				}
 
-				array_push(
-					$newRow,
-					json_encode($deployConfigOutput, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
-				);
+				$daemonInfo = [
+					$daemon->getName() === $defaultDaemonName ? '*' : '',
+					$daemon->getName(),
+					$daemon->getDisplayName(),
+					$daemon->getAcceptsDeployId(),
+					$daemon->getProtocol(),
+					$daemon->getHost(),
+					$deployConfig,
+				];
+
+				echo json_encode($daemonInfo, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+				$output->writeln('');
 			}
-			array_push($rows, $newRow);
-		}
 
-		$table->setRows($rows);
-		$table->render();
+		} else {
+
+			$table = new Table($output);
+			$headers = ['Def', 'Name', 'Display name', 'Deploy ID', 'Protocol', 'Host', 'NC Url', 'Is HaRP', 'HaRP FRP Address', 'HaRP Docker Socket Port'];
+			$table->setHeaders($headers);
+
+			$rows = [];
+			foreach ($daemonConfigs as $daemon) {
+				$deployConfig = $daemon->getDeployConfig();
+				$rows[] = [
+					$daemon->getName() === $defaultDaemonName ? '*' : '',
+					$daemon->getName(),
+					$daemon->getDisplayName(),
+					$daemon->getAcceptsDeployId(),
+					$daemon->getProtocol(),
+					$daemon->getHost(),
+					$deployConfig['nextcloud_url'],
+					isset($deployConfig['harp']) ? 'yes' : 'no',
+					$deployConfig['harp']['frp_address'] ?? '(none)',
+					$deployConfig['harp']['docker_socket_port'] ?? '(none)',
+				];
+			}
+
+			$table->setRows($rows);
+			$table->render();
+		}
 
 		return 0;
 	}