refactor

Author: Lukasss93

config/nutgram.php

@@ -23,17 +23,8 @@
     // Set log channel
     'log_channel' => env('TELEGRAM_LOG_CHANNEL', 'null'),
 
-    // Watch configs used by the "nutgram:run --watch" command
-    'watch' => [
-        // PHP binary to use
-        'bin' => PHP_BINARY,
-
-        // Interval in microseconds to check for changes
-        'interval' => 250 * 1000,
-
-        // Paths to watch
-        'paths' => [
-            app_path('Telegram'),
-        ]
+    // Watch paths used by the "nutgram:run --watch" command
+    'watch_paths' => [
+        app_path('Telegram'),
     ],
 ];

src/Console/RunCommand.php

@@ -3,58 +3,94 @@
 namespace Nutgram\Laravel\Console;
 
 use Illuminate\Console\Command;
-use Illuminate\Process\InvokedProcess;
-use Illuminate\Support\Facades\Process;
+use Symfony\Component\Process\PhpSubprocess;
+use Symfony\Component\Process\Process;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use SergiX44\Nutgram\Nutgram;
 use Spatie\Watcher\Watch;
 
 class RunCommand extends Command
 {
-    protected $signature = 'nutgram:run {--watch : Watch for changes and restart the bot}';
+    protected $signature = 'nutgram:run {--watch : Watch for changes and restart the bot}
+                                        {--without-tty : Disable output to TTY}';
 
     protected $description = 'Start the bot in long polling mode';
 
-    protected ?InvokedProcess $watchProcess = null;
+    protected ?Process $runProcess = null;
 
     /**
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function handle(Nutgram $bot): void
+    public function handle(Nutgram $bot): int
     {
-        if ($this->option('watch')) {
-            $this->watch();
+        if (!$this->option('watch')) {
+            $bot->run();
 
-            return;
+            return Command::SUCCESS;
         }
 
-        $bot->run();
+        $this->info('Watching for changes...');
+
+        if(!$this->startAsyncRun()){
+            return Command::FAILURE;
+        }
+
+        $this->listenForChanges();
+
+        return Command::SUCCESS;
     }
 
-    protected function watch(): void
+    protected function startAsyncRun(): bool
     {
-        $this->info('Watching for changes...');
-        $this->startWatchProcess();
-
-        Watch::paths(...config('nutgram.watch.paths', []))
-            ->setIntervalTime(config('nutgram.watch.interval', 250 * 1000))
-            ->onAnyChange(function () {
-                $this->warn('Restarting the bot...');
-                $this->watchProcess?->stop();
-                $this->startWatchProcess();
+        $this->runProcess = (new PhpSubprocess(['artisan', 'nutgram:run', '--ansi']))
+            ->setTty(Process::isTtySupported() && !$this->option('without-tty'))
+            ->setTimeout(null);
+
+        $this->runProcess->start(function (string $type, string $output) {
+            if(Process::isTtySupported() && !$this->option('without-tty')) {
+                $this->output->write($output);
+            }
+        });
+
+        sleep(1);
+
+        return ! $this->runProcess->isTerminated();
+    }
+
+    protected function listenForChanges(): self
+    {
+        Watch::paths(...config('nutgram.watch_paths', []))
+            ->setIntervalTime(200 * 1000)
+            ->onAnyChange(function (string $event, string $path) {
+                if ($this->isPhpFile($path)) {
+                    $this->restartAsyncRun();
+                }
             })
             ->start();
+
+        return $this;
+    }
+
+    protected function isPhpFile(string $path): bool
+    {
+        return str_ends_with(strtolower($path), '.php');
     }
 
-    protected function startWatchProcess(): void
+    protected function restartAsyncRun(): self
     {
-        $this->watchProcess = Process::tty(Process::supportsTty())->start(
-            command: config('nutgram.watch.bin', PHP_BINARY).' artisan nutgram:run',
-            output: function (string $type, string $output) {
+        $this->components->info('Change detected! Restarting bot...');
+
+        $this->runProcess->stop();
+        $this->runProcess->wait(function (string $type, string $output) {
+            if(Process::isTtySupported() && !$this->option('without-tty')) {
                 $this->output->write($output);
             }
-        );
+        });
+
+        $this->startAsyncRun();
+
+        return $this;
     }
 }