改名

composer.json

@@ -21,16 +21,17 @@
     "ext-xml": "*",
     "ext-curl": "*",
     "ext-openssl": "*",
-    "symfony/console": "^v5.3",
+    "symfony/console": "v5.3.10",
     "psr/log": "1.*",
     "ext-sockets": "*",
     "ext-pcntl": "*",
     "ext-posix": "*",
     "composer-runtime-api": "^2.0",
-    "swiftmailer/swiftmailer": "^6.0",
+    "swiftmailer/swiftmailer": "v6.3.*",
     "psr/container": "^2.0",
-    "psr/http-server-middleware": "^1.0",
-    "game-worker/kiri-event": "v1.0"
+    "psr/http-server-middleware": "1.0.1",
+    "game-worker/kiri-event": "v1.0",
+    "ext-inotify": "*"
   },
   "autoload": {
     "psr-4": {

kiri-engine/FileListen/HotReload.php

@@ -138,17 +138,16 @@ class HotReload extends Command
 	public function trigger_reload()
 	{
 		$this->logger->warning('change reload');
-//		$pid = file_get_contents(storage('.swoole.pid'));
-//		if (!empty($pid) && Process::kill($pid, 0)) {
-//			Process::kill($pid, SIGTERM);
-//		}
-		if ($this->process && Process::kill($this->process->pid, 0)) {
-			Process::kill($this->process->pid) && Process::wait(true);
-		}
-		$this->process = new Process(function (Process $process) {
+		$pid  = $this->process?->pid;
+		$process = new Process(function (Process $process) {
 			$process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
 		});
-		$this->process->start();
+		$process->start();
+		if ($pid && Process::kill($pid, 0)) {
+			Process::kill($pid) && Process::wait(true);
+		}
+		$this->process = null;
+		$this->process = $process;
 	}
 
 

kiri-engine/FileListen/Inotify.php

@@ -4,6 +4,7 @@ namespace Kiri\FileListen;
 
 use Exception;
 use Swoole\Event;
+use Swoole\Timer;
 
 class Inotify
 {
@@ -14,6 +15,9 @@ class Inotify
 	private array $watchFiles = [];
 
 
+    protected bool $isReloading = FALSE;
+
+
 	protected int $cid;
 
 	const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
@@ -51,21 +55,19 @@ class Inotify
 	}
 
 
-    /**
-     * 开始监听
-     * @throws Exception
-     */
+	/**
+	 * 开始监听
+	 * @throws Exception
+	 */
 	public function check()
 	{
 		if (!($events = inotify_read($this->inotify))) {
 			return;
 		}
-		if ($this->process->isReloading) {
-			if (!$this->process->isReloadingOut) {
-				$this->process->isReloadingOut = true;
-			}
+		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)) {
@@ -73,8 +75,8 @@ class Inotify
 			}
 			//非重启类型
 			if (str_ends_with($ev['name'], '.php')) {
-                sleep(2);
-				$this->reload();
+                Timer::after(3000, fn()=>$this->reload());
+                $this->isReloading = TRUE;
 			}
 		}
 	}
@@ -84,15 +86,13 @@ class Inotify
 	 */
 	public function reload()
 	{
-		$this->process->isReloading = true;
 		$this->process->trigger_reload();
 		$this->clearWatch();
 		foreach ($this->dirs as $root) {
 			$this->watch($root);
 		}
 		$this->process->int = -1;
-		$this->process->isReloading = FALSE;
-		$this->process->isReloadingOut = FALSE;
+        $this->isReloading = FALSE;
 	}
 
 

kiri-engine/FileListen/Scaner.php

@@ -103,6 +103,9 @@ class Scaner
 	 */
 	public function timerReload()
 	{
+		if ($this->process->isReloading) {
+			return;
+		}
 		$this->process->isReloading = true;
 		$this->process->trigger_reload();
 

kiri-engine/Proxy/AProxy.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Kiri\Proxy;
-
-abstract class AProxy
-{
-
-}

kiri-engine/Proxy/AspectProxy.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Kiri\Proxy;
-
-use Annotation\Aspect;
-use Http\Handler\Handler;
-use Kiri\Di\NoteManager;
-use Kiri\IAspect;
-use Kiri\Kiri;
-
-
-/**
- *
- */
-class AspectProxy extends AProxy implements ProxyInterface
-{
-
-
-    /**
-     * @param Handler $executor
-     * @return mixed
-     */
-    public function proxy(Handler $executor): mixed
-    {
-        if ($executor->callback instanceof \Closure) {
-            return call_user_func($executor->callback, ...$executor->params);
-        }
-        $controller = Kiri::getDi()->get($executor->callback[0]);
-        $aspect = $this->getAspect($executor->callback);
-        if (!is_null($aspect)) {
-            $aspect->before();
-            $result = $aspect->invoke([$controller, $executor->callback[1]], $executor->params);
-            $aspect->after($result);
-        } else {
-            $result = call_user_func([$controller, $executor->callback[1]]);
-        }
-        return $result;
-    }
-
-
-    /**
-     * @param array $executor
-     * @return ?IAspect
-     */
-    protected function getAspect(array $executor): ?IAspect
-    {
-        $aspect = NoteManager::getSpecify_annotation(Aspect::class, $executor[0], $executor[1]);
-        if (!is_null($aspect)) {
-            $aspect = Kiri::getDi()->get($aspect->aspect);
-        }
-        return $aspect;
-    }
-}

kiri-engine/Proxy/ProxyInterface.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Kiri\Proxy;
-
-use Http\Handler\Handler;
-
-interface ProxyInterface
-{
-
-
-    /**
-     * @param Handler $executor
-     * @return mixed
-     */
-    public function proxy(Handler $executor): mixed;
-
-}