Use the new API to support running longer commands

Author: mnapoli

src/BrefCloudClient.php

@@ -197,20 +197,31 @@ public function removeEnvironment(int $environmentId): void
     }
 
     /**
-     * @return array{success: bool, output: string}
-     *
      * @throws HttpExceptionInterface
      * @throws ExceptionInterface
      */
-    public function startCommand(string $appName, string $environment, string $command): array
+    public function startCommand(int $environmentId, string $command): int
     {
-        return $this->client->request('POST', '/api/v1/commands', [
+        return $this->client->request('POST', '/api/v1/commands/start', [
             'json' => [
-                'appName' => $appName,
-                'environmentName' => $environment,
-                'consoleCommand' => $command,
+                'environmentId' => $environmentId,
+                'command' => $command,
             ],
-        ])->toArray();
+        ])->toArray()['id'];
+    }
+
+    /**
+     * @return array{
+     *     status: 'not_started'|'started'|'success'|'failed',
+     *     output: string,
+     * }
+     *
+     * @throws HttpExceptionInterface
+     * @throws ExceptionInterface
+     */
+    public function getCommand(int $id): array
+    {
+        return $this->client->request('GET', "/api/v1/commands/$id")->toArray();
     }
 
     /**

src/Commands/Command.php

@@ -5,68 +5,101 @@
 use Bref\Cli\BrefCloudClient;
 use Bref\Cli\Cli\IO;
 use Bref\Cli\Cli\Styles;
-use Bref\Cli\Config;
 use JsonException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use function Amp\delay;
 
-class Command extends \Symfony\Component\Console\Command\Command
+class Command extends ApplicationCommand
 {
     protected function configure(): void
     {
         $this
             ->setName('command')
             ->setDescription('Run a CLI command in the deployed application')
-            ->addOption('config', 'c', InputOption::VALUE_REQUIRED, 'The location of the configuration file to use')
-            ->addArgument('args', InputArgument::OPTIONAL, 'The command to run', '')
-            ->addOption('app', null, InputOption::VALUE_REQUIRED, 'The app name (if outside of a project directory)')
-            ->addOption('env', 'e', InputOption::VALUE_REQUIRED, 'The environment to deploy to', 'dev');
+            ->addArgument('args', InputArgument::OPTIONAL, 'The command to run', '');
+        parent::configure();
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        /** @var string|null $configFileName */
-        $configFileName = $input->getOption('config');
+        [
+            'appName' => $appName,
+            'environmentName' => $environmentName,
+            'team' => $team,
+        ] = $this->parseStandardOptions($input);
+
         /** @var string $command */
         $command = $input->getArgument('args');
-        /** @var string $environment */
-        $environment = $input->getOption('env');
-        /** @var string|null $appName */
-        $appName = $input->getOption('app');
-        if (! $appName) {
-            $appName = Config::loadConfig($configFileName, $environment, null)['name'];
-        }
+
+        IO::spin('starting command');
 
         $brefCloud = new BrefCloudClient;
-        $result = $brefCloud->startCommand($appName, $environment, $command);
-
-        if ($result['success']) {
-            IO::writeln($result['output']);
-        } else {
-            try {
-                $errorDetails = json_decode($result['output'], true, 512, JSON_THROW_ON_ERROR);
-                if (is_array($errorDetails) && isset($errorDetails['errorType'], $errorDetails['errorMessage'])) {
-                    $message = nl2br($errorDetails['errorMessage']);
-                    IO::writeln([
-                        '',
-                        Styles::red('ERROR'),
-                        Styles::gray($errorDetails['errorType']),
-                        '',
-                        $message,
-                    ]);
-                    if (isset($errorDetails['stackTrace']) && is_array($errorDetails['stackTrace'])) {
-                        IO::verbose($errorDetails['stackTrace']);
-                    }
-                } else {
-                    IO::writeln(Styles::red($result['output']));
-                }
-            } catch (JsonException) {
-                IO::writeln(Styles::red($result['output']));
+        $environment = $brefCloud->findEnvironment($team, $appName, $environmentName);
+        $id = $brefCloud->startCommand($environment['id'], $command);
+
+        IO::spin('running');
+
+        // Timeout after 2 minutes and 10 seconds
+        $timeout = 130;
+        $startTime = time();
+
+        while (true) {
+            $invocation = $brefCloud->getCommand($id);
+
+            if ($invocation['status'] === 'success') {
+                IO::spinClear();
+                IO::writeln($invocation['output']);
+                return 0;
+            }
+
+            if ($invocation['status'] === 'failed') {
+                IO::spinClear();
+                $this->writeErrorDetails($invocation['output']);
+                return 1;
+            }
+
+            if ((time() - $startTime) > $timeout) {
+                IO::spinClear();
+                IO::writeln(Styles::red('Timed out'));
+                IO::writeln(Styles::gray('The execution timed out after 2 minutes, the command might still be running'));
+                return 1;
             }
+
+            delay(1);
         }
+    }
+
+    private function writeErrorDetails(string $output): void
+    {
+        try {
+            $errorDetails = json_decode($output, true, 512, JSON_THROW_ON_ERROR);
+            if (! is_array($errorDetails)
+                || ! isset($errorDetails['errorType'], $errorDetails['errorMessage'])
+                || ! is_string($errorDetails['errorType'])
+                || ! is_string($errorDetails['errorMessage'])) {
+                IO::writeln(Styles::red($output));
+                return;
+            }
+
+            $errorType = $errorDetails['errorType'];
+            if ($errorType === 'Bref\ConsoleRuntime\CommandFailed') {
+                // No need to show this class, it's noise
+                $errorType = '';
+            }
 
-        return $result['success'] ? 0 : 1;
+            IO::writeln([
+                '',
+                Styles::bold(Styles::red('ERROR')) . '   ' . Styles::gray($errorType),
+                '',
+                $errorDetails['errorMessage'],
+            ]);
+            if (isset($errorDetails['stackTrace']) && is_array($errorDetails['stackTrace'])) {
+                IO::verbose($errorDetails['stackTrace']);
+            }
+        } catch (JsonException) {
+            IO::writeln(Styles::red($output));
+        }
     }
 }