改名

kiri-engine/Abstracts/BaseApplication.php

@@ -14,6 +14,7 @@ use Annotation\Annotation as SAnnotation;
 use Database\Connection;
 use Exception;
 use Http\Handler\Router;
+use Kiri\Events\OnBeforeCommandExecute;
 use Server\Server;
 use Kafka\KafkaProvider;
 use Kiri\Async;
@@ -227,6 +228,8 @@ abstract class BaseApplication extends Component
 			$eventProvider->on($key, $value, 0);
 			return;
 		}
+
+
 		if (is_array($value)) {
 			if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
 				$eventProvider->on($key, $value, 0);
@@ -239,6 +242,7 @@ abstract class BaseApplication extends Component
 				return;
 			}
 
+
 			foreach ($value as $item) {
 				if (!is_callable($item, true)) {
 					throw new InitException("Class does not hav callback.");

kiri-engine/Application.php

@@ -22,7 +22,6 @@ use Kiri\Events\OnBeforeCommandExecute;
 use Kiri\Exception\NotFindClassException;
 use Kiri\FileListen\FileChangeCustomProcess;
 use ReflectionException;
-use Server\ServerCommand;
 use Server\ServerProviders;
 use stdClass;
 use Swoole\Process;
@@ -30,6 +29,7 @@ use Swoole\Timer;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\ConsoleOutput;
 
 /**
@@ -192,12 +192,13 @@ class Application extends BaseApplication
 	 */
 	public function execute(array $argv): void
 	{
+		/** @var InputInterface $input */
 		[$input, $output] = $this->argument($argv);
 		try {
 			$console = di(ConsoleApplication::class);
 			$command = $input->getFirstArgument();
 			if (empty($command)) {
-				$command = 'list';
+				$command = 'sw:server';
 			}
 			$command = $console->find($command);
 			if ($command instanceof Command) {
@@ -211,6 +212,7 @@ class Application extends BaseApplication
 	}
 
 
+
 	/**
 	 * @param $argv
 	 * @return array

kiri-engine/Di/LocalService.php

@@ -13,73 +13,76 @@ class LocalService extends Component
 {
 
 
-    private array $_components = [];
+	private array $_components = [];
 
 
-    private array $_definition = [];
+	private array $_definition = [];
 
 
-    /**
-     * @param $name
-     * @param $define
-     */
-    public function set($name, $define)
-    {
-        unset($this->_components[$name]);
+	/**
+	 * @param $name
+	 * @param $define
+	 */
+	public function set($name, $define)
+	{
+		unset($this->_components[$name]);
 
-        $this->_definition[$name] = $define;
-    }
+		$this->_definition[$name] = $define;
+		if (is_object($define) || $define instanceof \Closure) {
+			$this->_components[$name] = $define;
+		}
+	}
 
 
-    /**
-     * @throws \Exception
-     */
-    public function get(string $name, $throwException = true)
-    {
-        if (isset($this->_components[$name])) {
-            return $this->_components[$name];
-        }
-        if (isset($this->_definition[$name])) {
-            $definition = $this->_definition[$name];
-            if (is_object($definition) && !$definition instanceof \Closure) {
-                return $this->_components[$name] = $definition;
-            }
-            return $this->_components[$name] = Kiri::createObject($definition);
-        } else if ($throwException) {
-            throw new \Exception("Unknown component ID: $name");
-        }
-        return null;
-    }
+	/**
+	 * @throws \Exception
+	 */
+	public function get(string $name, $throwException = true)
+	{
+		if (isset($this->_components[$name])) {
+			return $this->_components[$name];
+		}
+		if (isset($this->_definition[$name])) {
+			$definition = $this->_definition[$name];
+			if (is_object($definition) && !$definition instanceof \Closure) {
+				return $this->_components[$name] = $definition;
+			}
+			return $this->_components[$name] = Kiri::createObject($definition);
+		} else if ($throwException) {
+			throw new \Exception("Unknown component ID: $name");
+		}
+		return null;
+	}
 
 
-    /**
-     * @param array $components
-     */
-    public function setComponents(array $components)
-    {
-        foreach ($components as $name => $component) {
-            $this->set($name, $component);
-        }
-    }
+	/**
+	 * @param array $components
+	 */
+	public function setComponents(array $components)
+	{
+		foreach ($components as $name => $component) {
+			$this->set($name, $component);
+		}
+	}
 
 
-    /**
-     * @param $id
-     * @return bool
-     */
-    public function has($id): bool
-    {
-        return isset($this->_components[$id]) || isset($this->_definition[$id]);
-    }
+	/**
+	 * @param $id
+	 * @return bool
+	 */
+	public function has($id): bool
+	{
+		return isset($this->_components[$id]) || isset($this->_definition[$id]);
+	}
 
 
-    /**
-     * @param $id
-     */
-    public function remove($id): void
-    {
-        unset($this->_components[$id], $this->_definition[$id]);
-    }
+	/**
+	 * @param $id
+	 */
+	public function remove($id): void
+	{
+		unset($this->_components[$id], $this->_definition[$id]);
+	}
 
 
 }

kiri-engine/Error/ErrorHandler.php

@@ -118,6 +118,8 @@ class ErrorHandler extends Component implements ErrorInterface
 	{
 		$path = ['file' => $file, 'line' => $line];
 
+        var_dump(func_get_args());
+
 		$data = Json::to($code, $this->category . ': ' . $message, $path);
 
 		write($data, $this->category);

kiri-engine/FileListen/FileChangeCustomProcess.php

@@ -8,9 +8,8 @@ use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Swoole\Coroutine;
-use Swoole\Coroutine\Barrier;
+use Swoole\Process;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -30,14 +29,19 @@ class FileChangeCustomProcess extends Command
 	public int $int = -1;
 
 
+	protected mixed $source = null;
+	protected mixed $pipes = [];
+
+	protected ?Coroutine\Channel $channel = null;
+
+
 	/**
 	 *
 	 */
 	protected function configure()
 	{
 		$this->setName('sw:wather')
-			->setDescription('server start')
-			->addArgument('action', InputArgument::REQUIRED);
+			->setDescription('server start');
 	}
 
 
@@ -46,37 +50,46 @@ class FileChangeCustomProcess extends Command
 	 * @param OutputInterface $output
 	 * @return int
 	 * @throws ConfigException
-	 * @throws \Swoole\Exception
 	 * @throws Exception
 	 */
 	public function execute(InputInterface $input, OutputInterface $output): int
 	{
 		// TODO: Implement onHandler() method.
 		set_error_handler([$this, 'onErrorHandler']);
+
 		$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
 		if (!extension_loaded('inotify')) {
 			$driver = Kiri::getDi()->get(Scaner::class, [$this->dirs, $this]);
 		} else {
 			$driver = Kiri::getDi()->get(Inotify::class, [$this->dirs, $this]);
 		}
-		$make = Barrier::make();
-		go(function () {
-			$this->trigger_reload();
-		});
-		go(function () {
-			$sign = Coroutine::waitSignal(SIGTERM, -1);
-			if ($sign) {
-				proc_open("php " . APP_PATH . "kiri.php sw:server stop", [], $pipes);
-			}
-		});
-		go(function () use ($driver) {
+
+		if (Kiri::getPlatform()->isLinux()) {
+			swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
+		}
+		$this->trigger_reload();
+		Coroutine::create(function () use ($driver) {
 			$driver->start();
 		});
-		Barrier::wait($make);
 		return 0;
 	}
 
 
+	/**
+	 * @throws Exception
+	 */
+	private function stop(): void
+	{
+		if (is_resource($this->source)) {
+			proc_terminate($this->source);
+			while (proc_get_status($this->source)['running']) {
+				Coroutine::sleep(1);
+			}
+			proc_close($this->source);
+			$this->source = null;
+		}
+	}
+
 	/**
 	 * @param $code
 	 * @param $message
@@ -95,12 +108,18 @@ class FileChangeCustomProcess extends Command
 
 	/**
 	 * 重启
+	 *
 	 * @throws Exception
 	 */
 	public function trigger_reload()
 	{
 		Kiri::getDi()->get(Logger::class)->warning('change reload');
 
-		proc_open("php " . APP_PATH . "kiri.php sw:server restart", [], $pipes);
+		$this->stop();
+		Coroutine::create(function () {
+			$this->source = proc_open("php " . APP_PATH . "kiri.php", [], $pipes);
+		});
 	}
+
+
 }

kiri-engine/FileListen/Inotify.php

@@ -13,6 +13,9 @@ class Inotify
 
 	private array $watchFiles = [];
 
+
+	protected int $cid;
+
 	const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
 
 
@@ -41,6 +44,11 @@ class Inotify
 	}
 
 
+	public function clear()
+	{
+		Event::del($this->inotify);
+		Event::exit();
+	}
 
 
 	/**

kiri-engine/FileListen/Scaner.php

@@ -117,12 +117,20 @@ class Scaner
 	}
 
 
+	private bool $isStop = false;
+
+	public function clear()
+	{
+		$this->isStop = true;
+	}
+
+
 	/**
 	 * @throws Exception
 	 */
 	public function tick()
 	{
-		if ($this->process->isReloading) {
+		if ($this->process->isReloading || $this->isStop) {
 			return;
 		}