Revert "改名"

This reverts commit fdf58326

kiri-engine/Abstracts/BaseApplication.php

@@ -223,22 +223,21 @@ abstract class BaseApplication extends Component
 	 */
 	private function addEvent($key, $value): void
 	{
-		$eventProvider = di(EventProvider::class);
 		if ($value instanceof \Closure || is_object($value)) {
-			$eventProvider->on($key, $value, 0);
+			$this->eventProvider->on($key, $value, 0);
 			return;
 		}
 
 
 		if (is_array($value)) {
 			if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
-				$eventProvider->on($key, $value, 0);
+				$this->eventProvider->on($key, $value, 0);
 				return;
 			}
 
 			if (is_string($value[0])) {
 				$value[0] = Kiri::createObject($value[0]);
-				$eventProvider->on($key, $value, 0);
+				$this->eventProvider->on($key, $value, 0);
 				return;
 			}
 
@@ -247,7 +246,7 @@ abstract class BaseApplication extends Component
 				if (!is_callable($item, true)) {
 					throw new InitException("Class does not hav callback.");
 				}
-				$eventProvider->on($key, $item, 0);
+				$this->eventProvider->on($key, $item, 0);
 			}
 		}
 

kiri-engine/Abstracts/Component.php

@@ -15,7 +15,10 @@ use JetBrains\PhpStorm\Pure;
 use Kiri\Di\Container;
 use Kiri\Events\EventProvider;
 use Kiri\Kiri;
+use Note\Inject;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Component
@@ -26,6 +29,8 @@ use Psr\Container\ContainerInterface;
 class Component implements Configure
 {
 
+
+
 	/**
 	 * BaseAbstract constructor.
 	 *
@@ -40,6 +45,26 @@ class Component implements Configure
 	}
 
 
+	/**
+	 * @return Container|ContainerInterface
+	 */
+	#[Pure] public function getContainer(): ContainerInterface|Container
+	{
+		return Kiri::getDi();
+	}
+
+
+	/**
+	 * @return EventProvider
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function getEventProvider(): EventProvider
+	{
+		return $this->getContainer()->get(EventProvider::class);
+	}
+
+
 	/**
 	 * @throws Exception
 	 */
@@ -48,24 +73,6 @@ class Component implements Configure
 	}
 
 
-	/**
-	 * @return EventProvider
-	 * @throws \ReflectionException
-	 */
-	public function getEventProvider(): EventProvider
-	{
-		return Kiri::getDi()->get(EventProvider::class);
-	}
-
-
-	/**
-	 * @return Container
-	 */
-	#[Pure] public function getContainer(): ContainerInterface
-	{
-		return Kiri::getDi();
-	}
-
 
 	/**
 	 * @return string

kiri-engine/Abstracts/Config.php

@@ -23,15 +23,15 @@ class Config extends Component
 
 	const ERROR_MESSAGE = 'The not find %s in app configs.';
 
-	protected mixed $data = [];
+	protected static mixed $data = [];
 
 
 	/**
 	 * @return mixed
 	 */
-	public function getData(): mixed
+	public static function getData(): mixed
 	{
-		return $this->data;
+		return static::$data;
 	}
 
 
@@ -40,23 +40,21 @@ class Config extends Component
 	 * @param $value
 	 * @return mixed
 	 */
-	public function setData($key, $value): mixed
+	public static function setData($key, $value): mixed
 	{
-		return $this->data[$key] = $value;
+		return static::$data[$key] = $value;
 	}
 
 
 	/**
 	 * @param array $configs
-	 * @throws Exception
 	 */
 	public static function sets(array $configs)
 	{
-		$config = Kiri::app()->getConfig();
 		if (empty($configs)) {
 			return;
 		}
-        $config->data = $configs;
+		static::$data = $configs;
 	}
 
 	/**
@@ -64,11 +62,11 @@ class Config extends Component
 	 * @param bool $try
 	 * @param mixed|null $default
 	 * @return mixed
-	 * @throws
+	 * @throws ConfigException
 	 */
 	public static function get($key, mixed $default = null, bool $try = FALSE): mixed
 	{
-		$instance = Kiri::app()->getConfig()->getData();
+		$instance = static::$data;
 		if (!str_contains($key, '.')) {
 			return $instance[$key] ?? $default;
 		}
@@ -94,27 +92,23 @@ class Config extends Component
 	 * @param $key
 	 * @param $value
 	 * @return mixed
-	 * @throws Exception
 	 */
 	public static function set($key, $value): mixed
 	{
-		$config = Kiri::app()->getConfig();
-		return $config->setData($key, $value);
+		return static::setData($key, $value);
 	}
 
 	/**
 	 * @param $key
 	 * @param bool $must_not_null
 	 * @return bool
-	 * @throws Exception
 	 */
 	public static function has($key, bool $must_not_null = false): bool
 	{
-		$config = Kiri::app()->getConfig();
-		if (!isset($config->data[$key])) {
+		if (!isset(static::$data[$key])) {
 			return false;
 		}
-		$config = $config->data[$key];
+		$config = static::$data[$key];
 		if ($must_not_null === false) {
 			return true;
 		}

kiri-engine/Abstracts/Logger.php

@@ -2,11 +2,11 @@
 
 namespace Kiri\Abstracts;
 
-use Kiri\Kiri;
-use Note\Inject;
+use DirectoryIterator;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
+use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
 use ReflectionException;
 use Server\Events\OnWorkerStop;
@@ -155,7 +155,7 @@ class Logger implements LoggerInterface
 	{
 		// TODO: Implement log() method.
 		$levels = Config::get('log.level', Logger::LOGGER_LEVELS);
-		if (!in_array($level, $levels)) {
+		if (!in_array($level, $levels) || str_contains($message, 'Event::rshutdown')) {
 			return;
 		}
 
@@ -176,13 +176,44 @@ class Logger implements LoggerInterface
 		$loggers = implode(PHP_EOL, $this->_loggers);
 		$this->_loggers = [];
 		if (!empty($loggers)) {
-			$filename = storage('log-' . date('Y-m-d') . '.log', 'logs/');
+			$filename = storage('log-' . date('Y-m-d') . '.log', 'log/');
 
 			file_put_contents($filename, $loggers);
 		}
 	}
 
 
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function flush()
+	{
+		$this->removeFile(storage());
+	}
+
+
+	/**
+	 * @param string $dirname
+	 * @return void
+	 */
+	private function removeFile(string $dirname)
+	{
+		$paths = new DirectoryIterator($dirname);
+		/** @var DirectoryIterator $path */
+		foreach ($paths as $path) {
+			if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
+				continue;
+			}
+			if ($path->isDir()) {
+				$directory = rtrim($path->getRealPath(), '/');
+				$this->removeFile($directory);
+			}
+			@unlink($path->getRealPath());
+		}
+	}
+
+
 	/**
 	 * @param $message
 	 * @param $context
@@ -191,7 +222,7 @@ class Logger implements LoggerInterface
 	private function _string($message, $context): string
 	{
 		if (!empty($context)) {
-			return $message . ' ' . PHP_EOL . print_r($context, true) . PHP_EOL;
+			return $message . ' ' . PHP_EOL . print_r($context, TRUE) . PHP_EOL;
 		}
 		return $message . PHP_EOL;
 	}

kiri-engine/Cache/Redis.php

@@ -19,6 +19,7 @@ use Kiri\Kiri;
 use Kiri\Pool\Redis as PoolRedis;
 use Note\Inject;
 use Server\Events\OnWorkerExit;
+use Swoole\Timer;
 
 /**
  * Class Redis
@@ -80,6 +81,25 @@ class Redis extends Component
 	}
 
 
+    /**
+     * @param $key
+     * @param int $timeout
+     * @return bool
+     */
+    public function waite($key, int $timeout = 5): bool
+    {
+        $time = time();
+        while (!$this->setNx($key, 1)) {
+            if (time()- $time >= $timeout) {
+                return FALSE;
+            }
+            usleep(1000);
+        }
+        $this->expire($key, $timeout);
+        return TRUE;
+    }
+
+
 	/**
 	 * @param $key
 	 * @param int $timeout

kiri-engine/Context.php

@@ -165,8 +165,9 @@ class Context extends BaseContext
 		if (!isset(static::$_contents[$id])) {
 			return false;
 		}
-		if (!empty($key) && !isset(static::$_contents[$id][$key])) {
-			return false;
+        $value = static::$_contents[$id];
+        if (!empty($key) && is_array($value)) {
+			return isset($value[$key]);
 		}
 		return true;
 	}

kiri-engine/Core/DateFormat.php

@@ -27,7 +27,7 @@ class DateFormat
 		if ($time === null) {
 			$time = time();
 		} else if (is_numeric($time)) {
-			$length = strlen(floatval($time));
+			$length = strlen((string)$time);
 			if ($length != 10 && $length != 13) {
 				return false;
 			}
@@ -86,9 +86,7 @@ class DateFormat
 			return false;
 		}
 
-		$time = date('t', $time);
-
-		return $time;
+		return date('t', $time);
 	}
 
 	/**

kiri-engine/Core/Dtl.php

@@ -21,6 +21,7 @@ class Dtl extends Component
 	/**
 	 * Dtl constructor.
 	 * @param $params
+	 * @throws Exception
 	 */
 	public function __construct($params)
 	{
@@ -35,9 +36,6 @@ class Dtl extends Component
 	 */
 	public function toArray(): array
 	{
-		if (!is_array($this->params)) {
-			return ArrayAccess::toArray($this->params);
-		}
 		return $this->params;
 	}
 

kiri-engine/Core/HashMap.php

@@ -3,6 +3,7 @@
 namespace Kiri\Core;
 
 use JetBrains\PhpStorm\Pure;
+use ReturnTypeWillChange;
 
 class HashMap implements \ArrayAccess
 {
@@ -62,7 +63,7 @@ class HashMap implements \ArrayAccess
 	 * @param mixed $offset
 	 * @return bool
 	 */
-	public function offsetExists($offset): bool
+	public function offsetExists(mixed $offset): bool
 	{
 		return isset($this->lists[$offset]);
 	}
@@ -72,7 +73,7 @@ class HashMap implements \ArrayAccess
 	 * @param mixed $offset
 	 * @return mixed
 	 */
-	#[Pure] public function offsetGet($offset): mixed
+	#[Pure] public function offsetGet(mixed $offset): mixed
 	{
 		return $this->get($offset);
 	}
@@ -82,7 +83,8 @@ class HashMap implements \ArrayAccess
 	 * @param mixed $offset
 	 * @param mixed $value
 	 */
-	public function offsetSet($offset, $value)
+	#[ReturnTypeWillChange]
+	public function offsetSet(mixed $offset, mixed $value)
 	{
 		$this->put($offset, $value);
 	}
@@ -91,7 +93,8 @@ class HashMap implements \ArrayAccess
 	/**
 	 * @param mixed $offset
 	 */
-	public function offsetUnset($offset)
+	#[ReturnTypeWillChange]
+	public function offsetUnset(mixed $offset)
 	{
 		unset($this->lists[$offset]);
 	}

kiri-engine/Core/Help.php

@@ -59,6 +59,7 @@ class Help
 	/**
 	 * @param $xml
 	 * @return mixed
+	 * @throws Exception
 	 */
 	public static function toArray($xml): mixed
 	{
@@ -200,6 +201,9 @@ class Help
 	 */
 	public static function sendEmail($email, string $Subject, $messageContent)
 	{
+		if (!class_exists('\Swift_Mailer')) {
+			return;
+		}
 		$mailer = new \Swift_Mailer((new \Swift_SmtpTransport($email['host'], $email['port']))
 			->setUsername($email['username'])->setPassword($email['password']));
 		$message = (new \Swift_Message($Subject))

kiri-engine/Core/Json.php

@@ -43,7 +43,7 @@ class Json
 	 * @param bool $asArray
 	 * @return mixed
 	 */
-	public static function decode($data, $asArray = true): mixed
+	public static function decode($data, bool $asArray = true): mixed
 	{
 		if (is_array($data) || is_numeric($data)) {
 			return $data;
@@ -55,14 +55,13 @@ class Json
 
 	/**
 	 * @param $code
-	 * @param string $message
-	 * @param array $data
+	 * @param string|array $message
+	 * @param array|int $data
 	 * @param int $count
 	 * @param array $exPageInfo
-	 * @return mixed
-	 * @throws
+	 * @return string|bool
 	 */
-	public static function to($code, $message = '', $data = [], $count = 0, $exPageInfo = []): mixed
+	public static function to($code, string|array $message = '', array|int $data = [], int $count = 0, array $exPageInfo = []): string|bool
 	{
 		$params['code'] = $code;
 		if (!is_string($message)) {

kiri-engine/Di/Container.php

@@ -27,7 +27,7 @@ use Psr\Container\ContainerInterface;
  * Class Container
  * @package Kiri\Di
  */
-class Container extends Component implements ContainerInterface
+class Container implements ContainerInterface
 {
 
 	/**
@@ -65,7 +65,7 @@ class Container extends Component implements ContainerInterface
     /**
      * @param string $id
      * @return mixed
-     * @throws ReflectionException
+     * @throws
      */
 	public function get(string $id): mixed
 	{
@@ -108,7 +108,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return bool
-	 * @throws ReflectionException
 	 */
 	public function isInterface($class): bool
 	{
@@ -212,7 +211,6 @@ class Container extends Component implements ContainerInterface
 	 * @param $className
 	 * @param $method
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	public function getMethodAttribute($className, $method = null): array
 	{
@@ -228,7 +226,6 @@ class Container extends Component implements ContainerInterface
 	 * @param string $class
 	 * @param string|null $property
 	 * @return ReflectionProperty|ReflectionProperty[]|null
-	 * @throws ReflectionException
 	 */
 	public function getClassReflectionProperty(string $class, string $property = null): ReflectionProperty|null|array
 	{
@@ -339,9 +336,6 @@ class Container extends Component implements ContainerInterface
 		if (!isset($this->_parameters[$class])) {
 			$this->_parameters[$class] = [];
 		}
-		if (!isset($this->_parameters[$class][$method])) {
-			$this->_parameters[$class][$method] = [];
-		}
 		return $this->_parameters[$class][$method] = $parameters;
 	}
 
@@ -360,7 +354,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param ReflectionMethod|ReflectionFunction $reflectionMethod
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
 	{
@@ -394,7 +387,6 @@ class Container extends Component implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return ReflectionClass|null
-	 * @throws ReflectionException
 	 */
 	public function getReflect($class): ?ReflectionClass
 	{

kiri-engine/Error/Logger.php

@@ -13,7 +13,6 @@ use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
-use Kiri\Events\EventProvider;
 use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
 use Throwable;

kiri-engine/Kiri.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Kiri;
 
+error_reporting(0);
+
 
 use Note\Note;
 use Database\Collection;

kiri-engine/Runtime.php

@@ -5,6 +5,7 @@ namespace Kiri;
 
 
 use Exception;
+use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Input;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -62,8 +63,7 @@ class Runtime extends Command
 	public function configEach(): string
 	{
 		$array = [];
-		$configs = Kiri::app()->getConfig();
-		foreach ($configs->getData() as $key => $datum) {
+		foreach (Config::getData() as $key => $datum) {
 			if ($datum instanceof \Closure) {
 				continue;
 			}

kiri-gii/Gii.php

@@ -119,10 +119,8 @@ class Gii
 	 */
 	private function makeByDatabases($make, InputInterface $input): array
 	{
-		$redis = Kiri::getDi()->get(Redis::class);
 		if ($input->hasOption('name')) {
 			$this->tableName = $input->getOption('name');
-			$redis->del('column:' . $this->tableName);
 		}
 		return match ($make) {
 			'controller' => $this->getTable(1, 0),

kiri-server/Abstracts/BaseProcess.php

@@ -1,143 +0,0 @@
-<?php
-
-namespace Kiri\Server\Abstracts;
-
-
-use JetBrains\PhpStorm\Pure;
-use Kiri\Server\Contract\OnProcessInterface;
-use Swoole\Coroutine;
-use Swoole\Process;
-
-/**
- *
- */
-abstract class BaseProcess implements OnProcessInterface
-{
-
-	protected bool $isStop = false;
-
-
-	protected mixed $redirect_stdin_and_stdout = null;
-
-
-	protected int $pipe_type = SOCK_DGRAM;
-
-
-	protected bool $enable_coroutine = true;
-
-
-	public string $name = 'swoole process.';
-
-
-	/**
-	 * @return string
-	 */
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function isStop(): bool
-	{
-		return $this->isStop;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getRedirectStdinAndStdout(): mixed
-	{
-		return $this->redirect_stdin_and_stdout;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPipeType(): int
-	{
-		return $this->pipe_type;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isEnableCoroutine(): bool
-	{
-		return $this->enable_coroutine;
-	}
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void
-	{
-		$this->isStop = true;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public function checkProcessIsStop(): bool
-	{
-		return $this->isStop === true;
-	}
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function signListen(Process $process): void
-	{
-	}
-
-
-	/**
-	 *
-	 */
-	protected function exit(): void
-	{
-		putenv('process.status=idle');
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public function isWorking(): bool
-	{
-		return env('process.status', 'working') == 'working';
-	}
-
-
-	/**
-	 *
-	 */
-	private function waiteExit(Process $process): void
-	{
-		$this->onProcessStop();
-		while ($this->isWorking()) {
-			$this->sleep();
-		}
-		$process->exit(0);
-	}
-
-
-	/**
-	 *
-	 */
-	private function sleep(): void
-	{
-		if ($this->enable_coroutine) {
-			Coroutine::sleep(0.1);
-		} else {
-			usleep(100);
-		}
-	}
-
-}

kiri-server/Constant.php

@@ -1,133 +0,0 @@
-<?php
-
-
-namespace Kiri\Server;
-
-
-/**
- * Class Constant
- * @package Server
- */
-class Constant
-{
-
-	const START = 'Start';
-	const SHUTDOWN = 'Shutdown';
-	const BEFORE_SHUTDOWN = 'beforeShutdown';
-	const WORKER_START = 'WorkerStart';
-	const WORKER_STOP = 'WorkerStop';
-	const WORKER_EXIT = 'WorkerExit';
-	const CONNECT = 'Connect';
-	const HANDSHAKE = 'handshake';
-	const OPEN = 'open';
-	const DISCONNECT = 'disconnect';
-	const MESSAGE = 'message';
-	const RECEIVE = 'Receive';
-	const PACKET = 'Packet';
-	const REQUEST = 'request';
-	const CLOSE = 'Close';
-	const TASK = 'Task';
-	const FINISH = 'Finish';
-	const PIPE_MESSAGE = 'PipeMessage';
-	const WORKER_ERROR = 'WorkerError';
-	const MANAGER_START = 'ManagerStart';
-	const MANAGER_STOP = 'ManagerStop';
-	const BEFORE_RELOAD = 'BeforeReload';
-	const AFTER_RELOAD = 'AfterReload';
-
-
-	const SERVER_TYPE_HTTP = 'http';
-	const SERVER_TYPE_WEBSOCKET = 'ws';
-	const SERVER_TYPE_TCP = 'tcp';
-	const SERVER_TYPE_UDP = 'udp';
-	const SERVER_TYPE_BASE = 'base';
-
-
-	const STATUS_404_MESSAGE = '<h2>HTTP 404 Not Found</h2><hr><i>Powered by Swoole</i>';
-	const STATUS_405_MESSAGE = '<h2>HTTP 405 Method allow</h2><hr><i>Powered by Swoole</i>';
-
-
-    const OPTION_REACTOR_NUM = 'reactor_num';
-    const OPTION_WORKER_NUM = 'worker_num';
-    const OPTION_MAX_REQUEST = 'max_request';
-    const OPTION_MAX_CONN = 'max_connection';
-    const OPTION_TASK_WORKER_NUM = 'task_worker_num';
-    const OPTION_TASK_IPC_MODE = 'task_ipc_mode';
-    const OPTION_TASK_MAX_REQUEST = 'task_max_request';
-    const OPTION_TASK_TMPDIR = 'task_tmpdir';
-    const OPTION_TASK_ENABLE_COROUTINE = 'task_enable_coroutine';
-    const OPTION_TASK_USE_OBJECT = 'task_use_object';
-    const OPTION_DISPATCH_MODE = 'dispatch_mode';
-    const OPTION_DISPATCH_FUNC = 'dispatch_func';
-    const OPTION_MESSAGE_QUEUE_KEY = 'message_queue_key';
-    const OPTION_DAEMONIZE = 'daemonize';
-    const OPTION_BACKLOG = 'backlog';
-    const OPTION_LOG_FILE = 'log_file';
-    const OPTION_LOG_LEVEL = 'log_level';
-    const OPTION_LOG_DATE_WITH_MICROSECONDS = 'log_date_with_microseconds';
-    const OPTION_LOG_ROTATION = 'log_rotation';
-    const OPTION_LOG_DATE_FORMAT = 'log_date_format';
-    const OPTION_OPEN_TCP_KEEPALIVE = 'open_tcp_keepalive';
-    const OPTION_HEARTBEAT_CHECK_INTERVAL = 'heartbeat_check_interval';
-    const OPTION_HEARTBEAT_IDLE_TIME = 'heartbeat_idle_time';
-    const OPTION_OPEN_EOF_CHECK = 'open_eof_check';
-    const OPTION_OPEN_EOF_SPLIT = 'open_eof_split';
-    const OPTION_PACKAGE_EOF = 'package_eof';
-    const OPTION_OPEN_LENGTH_CHECK = 'open_length_check';
-    const OPTION_PACKAGE_LENGTH_TYPE = 'package_length_type';
-    const OPTION_PACKAGE_LENGTH_FUNC = 'package_length_func';
-    const OPTION_PACKAGE_MAX_LENGTH = 'package_max_length';
-    const OPTION_OPEN_HTTP_PROTOCOL = 'open_http_protocol';
-    const OPTION_OPEN_MQTT_PROTOCOL = 'open_mqtt_protocol';
-    const OPTION_OPEN_REDIS_PROTOCOL = 'open_redis_protocol';
-    const OPTION_OPEN_WEBSOCKET_PROTOCOL = 'open_websocket_protocol';
-    const OPTION_OPEN_WEBSOCKET_CLOSE_FRAME = 'open_websocket_close_frame';
-    const OPTION_OPEN_TCP_NODELAY = 'open_tcp_nodelay';
-    const OPTION_OPEN_CPU_AFFINITY = 'open_cpu_affinity';
-    const OPTION_CPU_AFFINITY_IGNORE = 'cpu_affinity_ignore';
-    const OPTION_TCP_DEFER_ACCEPT = 'tcp_defer_accept';
-    const OPTION_SSL_CERT_FILE = 'ssl_cert_file';
-    const OPTION_SSL_KEY_FILE = 'ssl_key_file';
-    const OPTION_SSL_METHOD = 'ssl_method';
-    const OPTION_SSL_PROTOCOLS = 'ssl_protocols';
-    const OPTION_SSL_SNI_CERTS = 'ssl_sni_certs';
-    const OPTION_SSL_CIPHERS = 'ssl_ciphers';
-    const OPTION_SSL_VERIFY_PEER = 'ssl_verify_peer';
-    const OPTION_SSL_ALLOW_SELF_SIGNED = 'ssl_allow_self_signed';
-    const OPTION_SSL_CLIENT_CERT_FILE = 'ssl_client_cert_file';
-    const OPTION_SSL_COMPRESS = 'ssl_compress';
-    const OPTION_SSL_VERIFY_DEPTH = 'ssl_verify_depth';
-    const OPTION_SSL_PREFER_SERVER_CIPHERS = 'ssl_prefer_server_ciphers';
-    const OPTION_SSL_DHPARAM = 'ssl_dhparam';
-    const OPTION_SSL_ECDH_CURVE = 'ssl_ecdh_curve';
-    const OPTION_USER = 'user';
-    const OPTION_GROUP = 'group';
-    const OPTION_CHROOT = 'chroot';
-    const OPTION_PID_FILE = 'pid_file';
-    const OPTION_BUFFER_INPUT_SIZE = 'buffer_input_size';
-    const OPTION_BUFFER_OUTPUT_SIZE = 'buffer_output_size';
-    const OPTION_SOCKET_BUFFER_SIZE = 'socket_buffer_size';
-    const OPTION_ENABLE_UNSAFE_EVENT = 'enable_unsafe_event';
-    const OPTION_DISCARD_TIMEOUT_REQUEST = 'discard_timeout_request';
-    const OPTION_ENABLE_REUSE_PORT = 'enable_reuse_port';
-    const OPTION_ENABLE_DELAY_RECEIVE = 'enable_delay_receive';
-    const OPTION_RELOAD_ASYNC = 'reload_async';
-    const OPTION_MAX_WAIT_TIME = 'max_wait_time';
-    const OPTION_TCP_FASTOPEN = 'tcp_fastopen';
-    const OPTION_REQUEST_SLOWLOG_FILE = 'request_slowlog_file';
-    const OPTION_ENABLE_COROUTINE = 'enable_coroutine';
-    const OPTION_MAX_COROUTINE = 'max_coroutine';
-    const OPTION_SEND_YIELD = 'send_yield';
-    const OPTION_SEND_TIMEOUT = 'send_timeout';
-    const OPTION_HOOK_FLAGS = 'hook_flags';
-    const OPTION_BUFFER_HIGH_WATERMARK = 'buffer_high_watermark';
-    const OPTION_BUFFER_LOW_WATERMARK = 'buffer_low_watermark';
-    const OPTION_TCP_USER_TIMEOUT = 'tcp_user_timeout';
-    const OPTION_STATS_FILE = 'stats_file';
-    const OPTION_EVENT_OBJECT = 'event_object';
-    const OPTION_START_SESSION_ID = 'start_session_id';
-    const OPTION_SINGLE_THREAD = 'single_thread';
-    const OPTION_MAX_QUEUED_BYTES = 'max_queued_bytes';
-
-
-}

kiri-server/Contract/OnBeforeShutdown.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Server\Contract;
-
-interface OnBeforeShutdown
-{
-
-}

kiri-server/Contract/OnCloseInterface.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-
-/**
- *
- */
-interface OnCloseInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 */
-	public function onClose(Server $server, int $fd): void;
-
-
-}

kiri-server/Contract/OnConnectInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-interface OnConnectInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 * @return void
-	 */
-	public function onConnect(Server $server, int $fd): void;
-
-}

kiri-server/Contract/OnDisconnectInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-interface OnDisconnectInterface
-{
-
-
-
-    /**
-     * @param Server $server
-     * @param int $fd
-     */
-    public function onDisconnect(Server $server, int $fd): void;
-
-
-}

kiri-server/Contract/OnDownloadInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Http\Response;
-
-interface OnDownloadInterface
-{
-
-	public function dispatch(Response $response);
-
-}

kiri-server/Contract/OnHandshakeInterface.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Http\Request;
-use Swoole\Http\Response;
-
-
-/**
- *
- */
-interface OnHandshakeInterface
-{
-
-
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 */
-	public function onHandshake(Request $request, Response $response): void;
-
-}

kiri-server/Contract/OnMessageInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-use Swoole\WebSocket\Frame;
-
-interface OnMessageInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param Frame $frame
-	 * @return void
-	 */
-	public function onMessage(Server $server, Frame $frame): void;
-
-}

kiri-server/Contract/OnOpenInterface.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Http\Request;
-use Swoole\WebSocket\Server;
-
-interface OnOpenInterface
-{
-
-
-    /**
-     * @param Server $server
-     * @param Request $request
-     */
-    public function onOpen(Server $server, Request $request): void;
-
-}

kiri-server/Contract/OnPacketInterface.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Server\Abstracts\Server;
-
-interface OnPacketInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param string $data
-	 * @param array $clientInfo
-	 * @return mixed
-	 */
-	public function onPacket(Server $server, string $data, array $clientInfo): void;
-
-}

kiri-server/Contract/OnPipeMessageInterface.php

@@ -1,21 +0,0 @@
-<?php
-
-
-namespace Kiri\Server\Contract;
-
-
-/**
- * Interface OnPipeMessageInterface
- * @package Server\Contract
- */
-interface OnPipeMessageInterface
-{
-
-	/**
-	 *
-	 */
-	public function process(): void;
-
-
-
-}

kiri-server/Contract/OnProcessInterface.php

@@ -1,29 +0,0 @@
-<?php
-
-
-namespace Kiri\Server\Contract;
-
-
-use Swoole\Process;
-
-
-/**
- * Interface BaseProcess
- * @package Contract
- */
-interface OnProcessInterface
-{
-
-	/**
-	 * @param Process $process
-	 */
-	public function onHandler(Process $process): void;
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void;
-
-
-}

kiri-server/Contract/OnReceiveInterface.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Kiri\Server\Contract;
-
-use Swoole\Server;
-
-
-/**
- *
- */
-interface OnReceiveInterface
-{
-
-
-	/**
-	 * @param Server $server
-	 * @param int $fd
-	 * @param int $reactor_id
-	 * @param string $data
-	 * @return void
-	 */
-	public function onReceive(Server $server, int $fd, int $reactor_id, string $data): void;
-
-
-}

kiri-server/Contract/OnTaskInterface.php

@@ -1,17 +0,0 @@
-<?php
-
-
-namespace Kiri\Server\Contract;
-
-
-use Swoole\Server;
-
-interface OnTaskInterface
-{
-
-	public function execute();
-
-
-	public function finish(Server $server, int $task_id);
-
-}

kiri-server/CoroutineServer.php

@@ -1,207 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-use Note\Inject;
-use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Error\Logger;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Kiri\Server\Abstracts\BaseProcess;
-use ReflectionException;
-use Swoole\Coroutine;
-use Swoole\Coroutine\Http\Server as HServer;
-use Swoole\Coroutine\Server;
-use Swoole\Coroutine\Server\Connection;
-use Swoole\Http\Request;
-use Swoole\Http\Response;
-use Swoole\Process;
-use function Swoole\Coroutine\run;
-
-
-/**
- *
- */
-class CoroutineServer implements SwooleServerInterface
-{
-
-	use TraitServer;
-
-
-	/**
-	 * @var HServer[]|Server[]
-	 */
-	private array $servers = [];
-
-
-	#[Inject(Logger::class)]
-	public Logger $logger;
-
-
-	const SERVER_CLASS = [
-		Constant::SERVER_TYPE_BASE      => Server::class,
-		Constant::SERVER_TYPE_TCP       => Server::class,
-		Constant::SERVER_TYPE_UDP       => Server::class,
-		Constant::SERVER_TYPE_HTTP      => HServer::class,
-		Constant::SERVER_TYPE_WEBSOCKET => HServer::class,
-	];
-
-
-	/**
-	 * @param array $configs
-	 * @param bool $daemon
-	 * @throws Exception
-	 */
-	public function initBaseServer(array $configs, bool $daemon)
-	{
-		$configs['ports'] = $this->sortService($configs['ports']);
-		foreach ($configs['ports'] as $n => $config) {
-			$this->servers[$config['name'] ?? $n] = $this->addListener($config);
-		}
-	}
-
-
-	/**
-	 * @param array $config
-	 * @return mixed
-	 * @throws ReflectionException
-	 */
-	private function addListener(array $config): mixed
-	{
-		/** @var HServer|Server $port */
-		$class = self::SERVER_CLASS[$config['type']];
-		$port = new $class($config['host'], $config['port'], $config['isSsl'] ?? false, $config['reuse_port'] ?? true);
-		$port->set($config['settings'] ?? []);
-		if ($config['type'] == Constant::SERVER_TYPE_HTTP) {
-			$port->handle('/', fn($request, $response) => $this->onRequestHandle($request, $response, $config));
-		} else if ($config['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-			$port->handle('/', fn($request, $response) => $this->onWebsocketHandle($request, $response, $config));
-		} else {
-			$port->handle(fn(Connection $connection) => $this->onConnectionHandle($connection, $config));
-		}
-		return $this->eventListener($port, $config);
-	}
-
-
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 * @param $config
-	 */
-	protected function onRequestHandle(Request $request, Response $response, $config)
-	{
-		if (isset($config[Constant::REQUEST])) {
-			call_user_func($config[Constant::REQUEST], $request, $response);
-			return;
-		}
-		$response->status(505);
-		$response->end();
-	}
-
-
-	/**
-	 * @param Request $request
-	 * @param Response $response
-	 * @param $config
-	 */
-	protected function onWebsocketHandle(Request $request, Response $response, $config)
-	{
-		$handshake = $config[Constant::HANDSHAKE] ?? null;
-		if (!is_null($handshake)) {
-			call_user_func($handshake, $request, $response);
-		} else {
-			$response->upgrade();
-			$open = $config[Constant::OPEN] ?? null;
-			if (!is_null($open)) {
-				call_user_func($open, $request);
-			}
-		}
-		$close = $config[Constant::CLOSE] ?? null;
-		$message = $config[Constant::MESSAGE] ?? null;
-		while (true) {
-			$data = $response->recv();
-			if ($data === '' || $data === false) {
-				$response->close();
-				call_user_func($close, $response->fd);
-			} else {
-				call_user_func($message, $data);
-			}
-		}
-	}
-
-
-	/**
-	 * @param Connection $connection
-	 * @param $config
-	 */
-	protected function onConnectionHandle(Connection $connection, $config)
-	{
-		call_user_func($config[Constant::RECEIVE] ?? null, $connection);
-	}
-
-
-	/**
-	 * @throws ConfigException
-	 * @throws ReflectionException
-	 */
-	public function start(): void
-	{
-		$this->startProcess();
-		run(function () {
-			$this->startServers();
-		});
-	}
-
-
-	/**
-	 * @return array
-	 * @throws ConfigException|ReflectionException
-	 */
-	private function startProcess(): array
-	{
-		$processes = [];
-		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-		foreach ($this->process as $process) {
-			/** @var BaseProcess $process */
-			if (is_string($process)) {
-				$process = Kiri::getDi()->get($process);
-			}
-			$swowProcess = new Process([$process, 'onHandler'], $process->getRedirectStdinAndStdout(),
-				$process->getPipeType(), $process->isEnableCoroutine());
-			if (Kiri::getPlatform()->isLinux()) {
-				$swowProcess->name($system . '(' . $process->getName() . ')');
-			}
-			$swowProcess->start();
-			array_push($processes, $swowProcess);
-		}
-		return $processes;
-	}
-
-
-	private function startServers()
-	{
-		foreach ($this->servers as $server) {
-			Coroutine::create(fn() => $server->start());
-		}
-	}
-
-
-	/**
-	 * @param mixed $server
-	 * @param array $config
-	 * @return mixed
-	 * @throws ReflectionException
-	 */
-	private function eventListener(mixed $server, array $config): mixed
-	{
-		foreach ($config['events'] as $key => $value) {
-			if (is_array($value) && is_string($value[0])) {
-				$value[0] = Kiri::getDi()->get($value[0]);
-			}
-			$server->on($key, $value);
-		}
-		return $server;
-	}
-
-}

kiri-server/SoloAsyncServer.php

@@ -1,143 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-use Note\Inject;
-use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Error\Logger;
-use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Kiri\Server\Abstracts\BaseProcess;
-use ReflectionException;
-use Swoole\Http\Server as HServer;
-use Swoole\Process;
-use Swoole\Server;
-use Swoole\WebSocket\Server as WServer;
-
-class SoloAsyncServer implements SwooleServerInterface
-{
-
-	use TraitServer;
-
-
-	private HServer|WServer|Server|null $server = null;
-
-
-	#[Inject(Logger::class)]
-	public Logger $logger;
-
-
-	const SERVER_CLASS = [
-		Constant::SERVER_TYPE_BASE, Constant::SERVER_TYPE_TCP,
-		Constant::SERVER_TYPE_UDP       => Server::class,
-		Constant::SERVER_TYPE_HTTP      => HServer::class,
-		Constant::SERVER_TYPE_WEBSOCKET => WServer::class
-	];
-
-
-	/**
-	 * @param array $configs
-	 * @param bool $daemon
-	 * @throws Exception
-	 */
-	public function initBaseServer(array $configs, bool $daemon)
-	{
-		$configs['ports'] = $this->sortService($configs['ports']);
-		foreach ($configs['ports'] as $config) {
-			$service = $this->addListener($config);
-			if (!$this->server) {
-				$this->server = $service;
-			}
-		}
-		$this->startProcess();
-	}
-
-
-	/**
-	 * @throws ConfigException|ReflectionException
-	 */
-	private function startProcess()
-	{
-		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
-		foreach ($this->process as $process) {
-			/** @var BaseProcess $process */
-			if (is_string($process)) {
-				$process = Kiri::getDi()->get($process);
-			}
-			$sowProcess = new Process([$process, 'onHandler'], $process->getRedirectStdinAndStdout(),
-				$process->getPipeType(), $process->isEnableCoroutine());
-			if (Kiri::getPlatform()->isLinux()) {
-				$sowProcess->name($system . '(' . $process->getName() . ')');
-			}
-			$this->server->addProcess($sowProcess);
-		}
-	}
-
-
-	/**
-	 * @param array $config
-	 * @return mixed
-	 * @throws Exception
-	 */
-	private function addListener(array $config): Server\Port
-	{
-		$config = $this->resetConfig($config);
-		if (!$this->server) {
-			$class = self::SERVER_CLASS[$config['type']];
-			$port = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']);
-			$config['settings'] = array_merge(Config::get('server.settings', []), $config['settings']);
-			$config['settings'][Constant::OPTION_DAEMONIZE] = 0;
-		} else {
-			$port = $this->server->addlistener($config['host'], $config['port'], $config['mode']);
-			if ($port === false) {
-				throw new Exception("The port is already in use[{$config['host']}::{$config['port']}]");
-			}
-		}
-		$port->set($config['settings'] ?? []);
-		return $this->eventListener($port, $config);
-	}
-
-
-	/**
-	 * @param Server\Port|Server|HServer|WServer $server
-	 * @throws ReflectionException
-	 */
-	private function eventListener(mixed $server, array $config): Server\Port|HServer|Server|WServer
-	{
-		foreach ($config['events'] as $key => $value) {
-			if (is_array($value) && is_string($value[0])) {
-				$value[0] = Kiri::getDi()->get($value[0]);
-			}
-			$server->on($key, $value);
-		}
-		return $server;
-	}
-
-
-	public function start()
-	{
-		$this->server->start();
-	}
-
-
-	/**
-	 * @param array $config
-	 * @return array
-	 */
-	private function resetConfig(array $config): array
-	{
-		if ($config['type'] == Constant::SERVER_TYPE_HTTP && !isset($config['settings']['open_http_protocol'])) {
-			$config['settings']['open_http_protocol'] = true;
-			if ($this->server && in_array($this->server->setting['dispatch_mode'], [2, 4])) {
-				$config['settings']['open_http2_protocol'] = true;
-			}
-		}
-		if ($config['type'] == Constant::SERVER_TYPE_WEBSOCKET && !isset($config['settings']['open_websocket_protocol'])) {
-			$config['settings']['open_websocket_protocol'] = true;
-		}
-		return $config;
-	}
-
-
-}

kiri-server/SwooleServerInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-interface SwooleServerInterface
-{
-
-
-	public function start();
-
-
-}

kiri-server/TraitServer.php

@@ -1,50 +0,0 @@
-<?php
-
-namespace Kiri\Server;
-
-use Kiri\Server\Contract\OnProcessInterface;
-
-trait TraitServer
-{
-
-
-	protected array $process = [];
-
-
-	/**
-	 * @param OnProcessInterface|string $process
-	 * @throws \Exception
-	 */
-	public function addProcess(OnProcessInterface|string $process)
-	{
-		if (is_string($process) && !in_array(OnProcessInterface::class, class_implements($process))) {
-			throw new \Exception('Other Process must instance ' . OnProcessInterface::class);
-		}
-		$this->process[] = $process;
-	}
-
-
-	/**
-	 * @param array $ports
-	 * @return array
-	 */
-	public function sortService(array $ports): array
-	{
-		$array = [];
-		foreach ($ports as $port) {
-			if ($port['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-				array_unshift($array, $port);
-			} else if ($port['type'] == Constant::SERVER_TYPE_HTTP) {
-				if (!empty($array) && $array[0]['type'] == Constant::SERVER_TYPE_WEBSOCKET) {
-					$array[] = $port;
-				} else {
-					array_unshift($array, $port);
-				}
-			} else {
-				$array[] = $port;
-			}
-		}
-		return $array;
-	}
-
-}

kiri-websocket-server/FdCollector.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Websocket;
+
+class FdCollector
+{
+
+
+	public function set($fd)
+	{
+
+	}
+
+}

kiri-websocket-server/Sender.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Kiri\Websocket;
+
+class Sender
+{
+
+
+	public function push($fd, $data)
+	{
+
+	}
+
+
+	public function close($fd)
+	{
+
+	}
+
+
+}

kiri-websocket-server/Server.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace Kiri\Websocket;
+
+use Http\Handler\DataGrip;
+use Http\Handler\Router;
+use Kiri\Abstracts\Component;
+use Kiri\Server\Contract\OnOpenInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use ReflectionException;
+use Server\Contract\OnCloseInterface;
+use Server\Contract\OnHandshakeInterface;
+use Server\Contract\OnMessageInterface;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\WebSocket\CloseFrame;
+use Swoole\WebSocket\Frame;
+
+
+/**
+ *
+ */
+class Server extends Component implements OnHandshakeInterface, OnMessageInterface, OnCloseInterface
+{
+
+	public Router $router;
+
+
+	public string $serverName = 'ws';
+
+
+	public mixed $callback = null;
+
+
+	public mixed $server;
+
+
+
+	/**
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
+	 */
+	public function init()
+	{
+		$this->router = $this->container->get(DataGrip::class)->get($this->serverName);
+		$handler = $this->router->find('/', 'GET');
+		if (is_int($handler) || is_null($handler)) {
+			return;
+		}
+		$this->callback = $handler->callback[0];
+	}
+
+
+	/**
+	 * @param \Swoole\Server $server
+	 * @param int $fd
+	 */
+	public function onClose(\Swoole\Server $server, int $fd): void
+	{
+		if ($this->callback instanceof OnCloseInterface) {
+			$this->callback->onClose($server, $fd);
+		}
+	}
+
+
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 */
+	public function onHandshake(Request $request, Response $response): void
+	{
+		try {
+			if (!$this->callback instanceof OnHandshakeInterface) {
+				throw new \Exception('Page not found.');
+			}
+			$this->callback->onHandshake($request, $response);
+
+			$this->afterHandshake($request);
+			if ($this->server instanceof \Swoole\Coroutine\Http\Server) {
+				while (true) {
+					$data = $response->recv();
+					if ($data === '' || $data === false || $data instanceof CloseFrame) {
+						$this->onClose($this->server, $response->fd);
+						break;
+					}
+					$this->onMessage($this->server, $data);
+				}
+			}
+		} catch (\Throwable $throwable) {
+			$response->status(500, $throwable->getMessage());
+			$response->end();
+		}
+	}
+
+
+	/**
+	 * @param $request
+	 */
+	public function afterHandshake($request)
+	{
+		if (!($this->callback instanceof OnOpenInterface)) {
+			return;
+		}
+		$this->callback->onOpen($this->server, $request);
+	}
+
+
+	/**
+	 * @param \Swoole\Server $server
+	 * @param Frame $frame
+	 */
+	public function onMessage(\Swoole\Server $server, Frame $frame): void
+	{
+		if ($this->callback instanceof OnMessageInterface) {
+			$this->callback->onMessage($server, $frame);
+		}
+	}
+}