swoole running and watch ok

bin/file-watcher.js

@@ -0,0 +1,16 @@
+const chokidar = require('chokidar');
+
+const paths = JSON.parse(process.argv[2]);
+const options = JSON.parse(process.argv[3] || {});
+
+const watcher = chokidar.watch(paths, {
+  ignoreInitial: true,
+  ...options
+});
+
+watcher
+  .on('add', path => console.log(`fileCreated - ${path}`))
+  .on('change', path => console.log(`fileUpdated - ${path}`))
+  .on('unlink', path => console.log(`fileDeleted - ${path}`))
+  .on('addDir', path => console.log(`directoryCreated - ${path}`))
+  .on('unlinkDir', path => console.log(`directoryDeleted - ${path}`));

src/Core/CliServer/CliServerClient.php

@@ -39,6 +39,7 @@ public function logRequestInfo(RequestInterface $request, int $statusCode, float
 
         $method = $request->getMethod();
         $uri = $request->getUri()->getPath();
+        $pid = (string) getmypid();
         $memory = number_format(memory_get_usage() / 1024 / 1024, 2) . 'MB';
         $durationText = number_format($duration) . 'ms';
 
@@ -50,20 +51,22 @@ public function logRequestInfo(RequestInterface $request, int $statusCode, float
             default => 'white',
         };
 
-        $spaces = 25;
-        $length = $spaces + strlen($method . $statusCode . $uri . $memory . $durationText);
+        $spaces = 33;
+        $length = $spaces + strlen($method . $statusCode . $uri . $pid . $memory . $durationText);
 
-        $dots = str_repeat('.', $terminalWidth - $length);
+        $dots = str_repeat('.', max($terminalWidth - $length, 0));
 
         $log = sprintf(
-            '  [<fg=%s;options=bold>%s</>][%s] %s <fg=gray>%s</> [<fg=%s;options=bold>%s</>] %s - %s',
+            '  [<fg=%s;options=bold>%s</>][%s] %s <fg=gray>%s</> [<fg=%s;options=bold>%s</>] ' .
+            'pid: <fg=yellow>%s</> - %s - %s',
             $color,
             $method,
             $name,
             $uri,
             $dots,
             $color,
             $statusCode,
+            $pid,
             $memory,
             $durationText,
         );

src/Core/CliServer/CliServerEngineFactory.php

@@ -37,8 +37,8 @@ public function create(string $name, ?ConsoleOutputInterface $output = null): Cl
         ];
 
         return match ($name) {
-            'php' => $this->container->newInstance(PhpCliServerEngine::class, $args),
-            'swoole' => $this->container->newInstance(SwooleCliServerEngine::class, $args),
+            'php' => $this->container->newInstance(PhpNativeEngine::class, $args),
+            'swoole' => $this->container->newInstance(SwooleEngine::class, $args),
             default => $this->container->resolve($this->serverTypes[$name], $args),
         };
     }

src/Core/CliServer/CliServerRuntime.php

@@ -20,15 +20,13 @@
  */
 class CliServerRuntime
 {
-    protected static string $stateFilePath = '';
-
     protected static CliServerStateManager $cliServerStateManager;
 
     public static ConsoleOutput $output;
 
     public static function parseArgv(array $argv): CliServerState
     {
-        self::$stateFilePath = $stateFilePath = $argv[1] ?? '';
+        $stateFilePath = $argv[1] ?? '';
 
         $cliServerStateManager = new CliServerStateManager($stateFilePath);
 

src/Core/CliServer/CliServerState.php

@@ -19,7 +19,7 @@
 class CliServerState extends ValueObject
 {
     public string $name = '';
-    public int $pid = 0;
+    public int $masterPid = 0;
     public string $host = '';
     public int $port = 0;
     public int $managerPid = 0;
@@ -56,9 +56,9 @@ public function setName(string $name): static
         return $this;
     }
 
-    public function setPid(int $pid): static
+    public function setMasterPid(int $masterPid): static
     {
-        $this->pid = $pid;
+        $this->masterPid = $masterPid;
 
         return $this;
     }
@@ -82,9 +82,9 @@ public function getManagerPid(): int
         return $this->managerPid;
     }
 
-    public function getPid(): int
+    public function getMasterPid(): int
     {
-        return $this->pid;
+        return $this->masterPid;
     }
 
     public function getName(): string

src/Core/CliServer/CliServerTrait.php

@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * Part of cati project.
+ *
+ * @copyright  Copyright (C) 2023 __ORGANIZATION__.
+ * @license    __LICENSE__
+ */
+
+declare(strict_types=1);
+
+namespace Windwalker\Core\CliServer;
+
+use Symfony\Component\Process\PhpExecutableFinder;
+use Windwalker\Core\Filesystem\FileWatcher;
+
+/**
+ * Trait CliServerTrait
+ */
+trait CliServerTrait
+{
+    protected function getPhpBinary(): false|string
+    {
+        return (new PhpExecutableFinder())->find();
+    }
+
+    public function createFileWatcher(string $mainFile): FileWatcher
+    {
+        $paths = (array) $this->app->config('reactor.watch');
+
+        $paths[] = $mainFile;
+
+        return FileWatcher::paths(...$paths)
+                ->usePolling(false)
+                ->awaitWriteFinish();
+    }
+}

src/Core/CliServer/Contracts/ServerProcessManageInterface.php

@@ -15,7 +15,7 @@ interface ServerProcessManageInterface
 {
     public function isRunning(): bool;
 
-    public function reloadServer(): bool;
+    public function reloadServer(): void;
 
     public function stopServer(): bool;
 }

src/Core/CliServer/PhpCliServerEngine.php → src/Core/CliServer/PhpNativeEngine.php

@@ -28,7 +28,7 @@
  *     docroot: string,
  * }
  */
-class PhpCliServerEngine implements CliServerEngineInterface
+class PhpNativeEngine implements CliServerEngineInterface
 {
     use OptionsResolverTrait;
 

src/Core/CliServer/SwooleCliServerEngine.php → src/Core/CliServer/SwooleEngine.php

@@ -31,14 +31,13 @@
 use function Windwalker\swoole_installed;
 
 /**
- * The SwooleCliServerEngine class.
+ * The SwooleEngine class.
  */
-class SwooleCliServerEngine implements CliServerEngineInterface, ServerProcessManageInterface
+class SwooleEngine implements CliServerEngineInterface, ServerProcessManageInterface
 {
     use InstanceCacheTrait;
     use OptionsResolverTrait;
-    use MessageOutputTrait;
-    use ProcessRunnerTrait;
+    use CliServerTrait;
 
     public function __construct(
         protected ConsoleApplication $app,
@@ -108,7 +107,7 @@ public function run(string $host, int $port, array $options = []): int
 
         $process = $this->app->createProcess(
             [
-                $this->getPhpBinary(),
+                $this->getPhpBinary() ?: 'php',
                 $options['main'],
                 $this->serverStateManager->getFilePath(),
             ]
@@ -127,6 +126,7 @@ public function run(string $host, int $port, array $options = []): int
 
     protected function runServerProcess(Process $process, CliServerState $state): int
     {
+        $options = $state->getManagerOptions();
         $process->start();
 
         while (!$process->isStarted()) {
@@ -139,9 +139,12 @@ protected function runServerProcess(Process $process, CliServerState $state): in
         $output->writeln('Starting...');
         $output->newLine();
 
-        while (true) {
-            usleep(1000 * 500); // 0.5 seconds
+        if ($options['watch'] ?? null) {
+            $watcher = $this->createFileWatcher($options['main']);
+            $watcher->listen();
+        }
 
+        while ($process->isRunning()) {
             $output = $process->getIncrementalOutput();
             $errOutput = $process->getIncrementalErrorOutput();
 
@@ -155,6 +158,14 @@ protected function runServerProcess(Process $process, CliServerState $state): in
             if ($errOutput) {
                 $this->output->write($errOutput);
             }
+
+            if (isset($watcher) && $watcher->hasChanged()) {
+                $this->output->writeln('File changes detected. Restarting server.');
+
+                $this->reloadServer();
+            }
+
+            usleep(1000 * 500); // 0.5 seconds
         }
 
         return 0;
@@ -163,18 +174,21 @@ protected function runServerProcess(Process $process, CliServerState $state): in
     public function isRunning(): bool
     {
         $state = $this->serverStateManager->getState();
-        $pid = $state->getPid();
+        $masterPid = $state->getMasterPid();
         $managerPid = $state->getManagerPid();
 
         if ($managerPid) {
-            return $pid && $managerPid && $this->isAlive($managerPid);
+            return $masterPid && $managerPid && $this->isAlive($managerPid);
         }
 
-        return $pid && $this->isAlive($pid);
+        return $masterPid && $this->isAlive($masterPid);
     }
 
-    public function reloadServer(): bool
+    public function reloadServer(): void
     {
+        $state = $this->serverStateManager->getState();
+
+        static::signal($state->getMasterPid(), SIGUSR1);
     }
 
     public function stopServer(): bool

src/Core/Filesystem/FileWatcher.php

@@ -0,0 +1,139 @@
+<?php
+
+/**
+ * Part of cati project.
+ *
+ * @copyright  Copyright (C) 2023 __ORGANIZATION__.
+ * @license    __LICENSE__
+ */
+
+declare(strict_types=1);
+
+namespace Windwalker\Core\Filesystem;
+
+use Spatie\Watcher\Watch;
+use Symfony\Component\Process\ExecutableFinder;
+use Symfony\Component\Process\Process;
+use Windwalker\Utilities\Options\OptionAccessTrait;
+
+/**
+ * The FileWatcher class.
+ */
+class FileWatcher extends Watch
+{
+    use OptionAccessTrait;
+
+    protected ?Process $process = null;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->options['usePolling'] = true;
+    }
+
+    public static function path(string $path): self
+    {
+        return (new static())->setPaths($path);
+    }
+
+    public static function paths(...$paths): self
+    {
+        return (new static())->setPaths($paths);
+    }
+
+    public function isRunning(): bool
+    {
+        return $this->process?->isRunning();
+    }
+
+    public function getChangedInfo(): string
+    {
+        return $this->process?->getIncrementalOutput();
+    }
+
+    public function hasChanged(): bool
+    {
+        return (bool) $this->getChangedInfo();
+    }
+
+    public function onFileChanged(callable $handler): self
+    {
+        $this->onFileCreated[] = $handler;
+        $this->onFileUpdated[] = $handler;
+        $this->onFileDeleted[] = $handler;
+
+        return $this;
+    }
+
+    public function doActions(string $output): void
+    {
+        $this->actOnOutput($output);
+    }
+
+    public function listen(): static
+    {
+        $this->process = $this->getWatchProcess();
+
+        return $this;
+    }
+
+    protected function getWatchProcess(): Process
+    {
+        $command = [
+            (new ExecutableFinder())->find('node'),
+            dirname(__DIR__, 3) . '/bin/file-watcher.js',
+            json_encode($this->paths, JSON_THROW_ON_ERROR),
+            json_encode($this->options, JSON_THROW_ON_ERROR),
+        ];
+
+        $process = new Process(
+            command: $command,
+            timeout: null,
+        );
+
+        $process->start();
+
+        return $process;
+    }
+
+    public function stop(int $timeout = 10, int $signal = null): ?int
+    {
+        return $this->getRunningProcess()->stop($timeout, $signal);
+    }
+
+    public function getRunningProcess(): Process
+    {
+        if (!$this->process) {
+            throw new \RuntimeException('Process not exists');
+        }
+
+        if (!$this->process->isRunning()) {
+            throw new \RuntimeException('Process not running.');
+        }
+
+        return $this->process;
+    }
+
+    public function getProcess(): ?Process
+    {
+        return $this->process;
+    }
+
+    public function usePolling(bool $value): static
+    {
+        return $this->setOption('usePolling', $value);
+    }
+
+    public function awaitWriteFinish(int $stabilityThreshold = 2000, int $pollInterval = 100): static
+    {
+        return $this->setOption('awaitWriteFinish', compact('stabilityThreshold', 'pollInterval'));
+    }
+
+    public function disableAwaitWriteFinish(): static
+    {
+        unset($this->options['awaitWriteFinish']);
+
+        return $this;
+    }
+}