modify mysql result

Handler/OnServerWorker.php

@@ -16,6 +16,9 @@ use Kiri\Server\Events\OnWorkerError;
 use Kiri\Server\Events\OnWorkerExit;
 use Kiri\Server\Events\OnWorkerStart;
 use Kiri\Server\Events\OnWorkerStop;
+use Kiri\Message\Waite;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Server;
 use Swoole\Timer;
 
@@ -28,7 +31,7 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
 {
 
 
-	public Router $collector;
+    public Router $router;
 
 
     /**
@@ -36,13 +39,17 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
      */
     public function init()
     {
-//		$this->collector = Kiri::getDi()->get(Router::class);
+		$this->router = Kiri::getDi()->get(Router::class);
     }
 
 
     /**
      * @param Server $server
      * @param int $workerId
+     * @return void
+     * @throws Kiri\Exception\ConfigException
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function onWorkerStart(Server $server, int $workerId)
@@ -54,6 +61,8 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
             set_env('environmental', Kiri::WORKER);
             $this->setProcessName(sprintf('Worker Process[%d].%d', $server->worker_pid, $workerId));
             $dispatch->dispatch(new OnWorkerStart($server, $workerId));
+
+            $this->router->scan_build_route();
         } else {
             set_env('environmental', Kiri::TASK);
             $this->setProcessName(sprintf('Tasker Process[%d].%d', $server->worker_pid, $workerId));
@@ -66,7 +75,8 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
     /**
      * @param Server $server
      * @param int $workerId
-	 * @throws Exception
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function onWorkerStop(Server $server, int $workerId)
     {
@@ -78,7 +88,8 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
     /**
      * @param Server $server
      * @param int $workerId
-	 * @throws Exception
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function onWorkerExit(Server $server, int $workerId)
     {
@@ -92,6 +103,8 @@ class OnServerWorker extends \Kiri\Server\Abstracts\Server
      * @param int $worker_pid
      * @param int $exit_code
      * @param int $signal
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function onWorkerError(Server $server, int $worker_id, int $worker_pid, int $exit_code, int $signal)

Inotify.php

@@ -0,0 +1,188 @@
+<?php
+
+namespace Kiri\Server;
+
+use Exception;
+use Kiri\Annotation\Inject;
+use Kiri\Error\StdoutLoggerInterface;
+use Kiri\Server\Abstracts\BaseProcess;
+use Swoole\Event;
+use Swoole\Process;
+use Swoole\Timer;
+
+class Inotify extends BaseProcess
+{
+
+    private mixed $inotify;
+    private mixed $events;
+
+    private array $watchFiles = [];
+
+
+    public bool $isReloading = FALSE;
+
+
+    public array $dirs = [];
+
+
+    protected int $cid;
+
+    const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
+
+
+    #[Inject(StdoutLoggerInterface::class)]
+    public StdoutLoggerInterface $logger;
+
+
+    /**
+     * @param Process $process
+     * @return void
+     * @throws Exception
+     */
+    public function process(Process $process): void
+    {
+        // TODO: Implement process() method.
+        set_error_handler([$this, 'error']);
+        set_exception_handler([$this, 'error']);
+
+        $this->dirs = [CONTROLLER_PATH, MODEL_PATH, APP_PATH . 'routes', APP_PATH . 'vendor/game-worker'];
+
+        $this->start();
+    }
+
+
+    /**
+     * @return void
+     */
+    public function error(): void
+    {
+
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    public function start()
+    {
+        $this->inotify = inotify_init();
+        $this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
+        foreach ($this->dirs as $dir) {
+            if (!is_dir($dir)) continue;
+            $this->watch($dir);
+        }
+        Event::add($this->inotify, [$this, 'check']);
+        Event::wait();
+    }
+
+
+    public function clear()
+    {
+        Event::del($this->inotify);
+        Event::exit();
+    }
+
+
+    /**
+     * 开始监听
+     * @throws Exception
+     */
+    public function check()
+    {
+        if (!($events = inotify_read($this->inotify))) {
+            return;
+        }
+        if ($this->isReloading) {
+            return;
+        }
+
+        $LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
+        foreach ($events as $ev) {
+            if (!in_array($ev['mask'], $LISTEN_TYPE)) {
+                continue;
+            }
+
+            //非重启类型
+            if (str_ends_with($ev['name'], '.php')) {
+                if ($this->isReloading) {
+                    break;
+                }
+                $this->isReloading = TRUE;
+                Timer::after(3000, fn() => $this->reload());
+            }
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function reload()
+    {
+        $swollen = \Kiri::getDi()->get(SwooleServerInterface::class);
+
+        $swollen->reload();
+
+        $this->clearWatch();
+        foreach ($this->dirs as $root) {
+            $this->watch($root);
+        }
+        $this->isReloading = FALSE;
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    public function clearWatch()
+    {
+        foreach ($this->watchFiles as $wd) {
+            @inotify_rm_watch($this->inotify, $wd);
+        }
+        $this->watchFiles = [];
+    }
+
+
+    /**
+     * @param $dir
+     * @return bool
+     * @throws Exception
+     */
+    public function watch($dir): bool
+    {
+        //目录不存在
+        if (!is_dir($dir)) {
+            return $this->logger->addError("[$dir] is not a directory.");
+        }
+        //避免重复监听
+        if (isset($this->watchFiles[$dir])) {
+            return FALSE;
+        }
+
+        if (in_array($dir, self::IG_DIR)) {
+            return FALSE;
+        }
+
+        $wd = @inotify_add_watch($this->inotify, $dir, $this->events);
+        $this->watchFiles[$dir] = $wd;
+
+        $files = scandir($dir);
+        foreach ($files as $f) {
+            if ($f == '.' || $f == '..') {
+                continue;
+            }
+            $path = $dir . '/' . $f;
+            //递归目录
+            if (is_dir($path)) {
+                $this->watch($path);
+            } else if (!str_ends_with($f, '.php')) {
+                continue;
+            }
+            //检测文件类型
+            if (strstr($f, '.') == '.php') {
+                $wd = @inotify_add_watch($this->inotify, $path, $this->events);
+                $this->watchFiles[$path] = $wd;
+            }
+        }
+        return TRUE;
+    }
+}

Server.php

@@ -43,6 +43,9 @@ class Server extends HttpService
      * @param State $state
      * @param ServerManager $manager
      * @param ContainerInterface $container
+     * @param ProcessManager $processManager
+     * @param EventDispatch $eventDispatch
+     * @param Router $router
      * @param array $config
      * @throws Exception
      */
@@ -97,7 +100,6 @@ class Server extends HttpService
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
      * @throws Exception
 	 */
 	public function start(): void
@@ -109,14 +111,14 @@ class Server extends HttpService
 			$this->manager->addListener($rpcService['type'], $rpcService['host'], $rpcService['port'], $rpcService['mode'], $rpcService);
 		}
 
+        $this->process[] = Inotify::class;
+
 		$processes = array_merge($this->process, Config::get('processes', []));
 
 		$this->processManager->batch($processes);
 
 		$this->eventDispatch->dispatch(new OnServerBeforeStart());
 
-		$this->router->scan_build_route();
-
 		$this->manager->start();
 	}
 
@@ -126,7 +128,6 @@ class Server extends HttpService
 	 * @throws ConfigException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
-	 * @throws ReflectionException
      * @throws Exception
 	 */
 	public function shutdown()