Fixes #27

Author: aarondfrancis

src/Prompt/Dashboard.php

@@ -10,6 +10,7 @@
 use AaronFrancis\Solo\Commands\Command;
 use AaronFrancis\Solo\Facades\Solo;
 use AaronFrancis\Solo\Support\Frames;
+use Carbon\CarbonImmutable;
 use Chewie\Concerns\CreatesAnAltScreen;
 use Chewie\Concerns\Loops;
 use Chewie\Concerns\RegistersRenderers;
@@ -154,13 +155,7 @@ protected function showDashboard(): void
 
         $this->currentCommand()->focus();
 
-        $this->loop(function () use ($listener) {
-            $this->currentCommand()->catchUpScroll();
-            $this->render();
-
-            $listener->once();
-            $this->frames->next();
-        }, 25_000);
+        $this->loop(fn() => $this->loopCallback($listener), 25_000);
 
         // @TODO reconsider using?
         // $this->loopWithListener($listener, function () {
@@ -169,8 +164,19 @@ protected function showDashboard(): void
         // });
     }
 
+    public function loopCallback(?KeyPressListener $listener = null)
+    {
+        $this->currentCommand()->catchUpScroll();
+        $this->render();
+
+        $listener?->once();
+        $this->frames->next();
+    }
+
     public function quit(): void
     {
+        $initiated = CarbonImmutable::now();
+
         foreach ($this->commands as $command) {
             /** @var Command $command */
 
@@ -179,17 +185,20 @@ public function quit(): void
             $command->stop();
         }
 
-        while (true) {
-            $any = array_reduce($this->commands, function ($carry, $command) {
-                return $carry || $command->processRunning();
-            }, false);
+        // We do need to continue looping though, because the `marshalRogueProcess` runs
+        // in the loop. We'll break the loop after all processes are dead or after
+        // 3 seconds. If all the processes aren't dead after three seconds then
+        // the monitoring process should clean it up in the background.
+        $this->loop(function () use ($initiated) {
+            // Run the renderer so it doesn't look like Solo is frozen.
+            $this->loopCallback();
 
-            if ($any) {
-                Sleep::for(100)->milliseconds();
-            } else {
-                break;
-            }
-        }
+            $allDead = array_reduce($this->commands, function ($carry, Command $command) {
+                return $carry && $command->processStopped();
+            }, true);
+
+            return !($allDead || $initiated->addSeconds(3)->isPast());
+        }, 25_000);
 
         $this->terminal()->exit();
     }