Revert "改名"

This reverts commit fdf58326

composer.json

@@ -27,6 +27,7 @@
     "psr/container": "^2.0",
     "psr/http-server-middleware": "1.0.1",
     "game-worker/kiri-event": "~v2.0",
+    "game-worker/kiri-di": "~v1.0",
     "ext-inotify": "*"
   },
   "autoload": {

kiri-engine/Abstracts/BaseApplication.php

@@ -12,19 +12,19 @@ namespace Kiri\Abstracts;
 
 use Database\Connection;
 use Exception;
-use Kiri\Message\Handler\Router;
 use Kafka\KafkaProvider;
-use Kiri\Async;
 use Kiri;
 use Kiri\Annotation\Annotation as SAnnotation;
+use Kiri\Async;
 use Kiri\Cache\Redis;
 use Kiri\Di\LocalService;
 use Kiri\Error\{ErrorHandler, Logger};
 use Kiri\Exception\{InitException, NotFindClassException};
-use ReflectionException;
+use Kiri\Message\Handler\Router;
 use Kiri\Server\{Server, ServerManager};
 use Kiri\Task\AsyncTaskExecute;
 use Kiri\Task\OnTaskInterface;
+use ReflectionException;
 use Swoole\Table;
 
 /**
@@ -219,20 +219,20 @@ abstract class BaseApplication extends Component
 	private function addEvent($key, $value): void
 	{
 		if ($value instanceof \Closure || is_object($value)) {
-			$this->eventProvider->on($key, $value, 0);
+			$this->getEventProvider()->on($key, $value, 0);
 			return;
 		}
 
 
 		if (is_array($value)) {
 			if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
-				$this->eventProvider->on($key, $value, 0);
+				$this->getEventProvider()->on($key, $value, 0);
 				return;
 			}
 
 			if (is_string($value[0])) {
 				$value[0] = Kiri::createObject($value[0]);
-				$this->eventProvider->on($key, $value, 0);
+				$this->getEventProvider()->on($key, $value, 0);
 				return;
 			}
 
@@ -241,7 +241,7 @@ abstract class BaseApplication extends Component
 				if (!is_callable($item, true)) {
 					throw new InitException("Class does not hav callback.");
 				}
-				$this->eventProvider->on($key, $item, 0);
+				$this->getEventProvider()->on($key, $item, 0);
 			}
 		}
 

kiri-engine/Abstracts/Component.php

@@ -23,9 +23,6 @@ use Psr\Container\NotFoundExceptionInterface;
 /**
  * Class Component
  * @package Kiri\Base
- * @property ContainerInterface|Container $container
- * @property EventProvider $eventProvider
- * @property EventDispatch $eventDispatch
  */
 class Component implements Configure
 {
@@ -67,6 +64,8 @@ class Component implements Configure
 
 	/**
 	 * @return EventDispatch
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	protected function getEventDispatch(): EventDispatch
 	{
@@ -89,38 +88,6 @@ class Component implements Configure
 		return static::class;
 	}
 
-	/**
-	 * @param $name
-	 * @param $value
-	 *
-	 * @throws Exception
-	 */
-	public function __set($name, $value)
-	{
-		$method = 'set' . ucfirst($name);
-		if (method_exists($this, $method)) {
-			$this->{$method}($value);
-		} else {
-			throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
-		}
-	}
-
-	/**
-	 * @param $name
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function __get($name): mixed
-	{
-		$method = 'get' . ucfirst($name);
-		if (method_exists($this, $method)) {
-			return $this->$method();
-		} else {
-			throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
-		}
-	}
-
 
 	/**
 	 * @param $message

kiri-engine/Application.php

@@ -239,7 +239,7 @@ class Application extends BaseApplication
 			scan_directory(MODEL_PATH, 'app\Model');
 		}
 
-		$this->container->setBindings(OutputInterface::class, $output);
+		$this->getContainer()->setBindings(OutputInterface::class, $output);
 
 		$class->run($input, $output);
 		fire(new OnAfterCommandExecute());

kiri-engine/Cache/Base/Redis.php

@@ -45,8 +45,6 @@ class Redis implements StopHeartbeatCheck
 	private int $_last = 0;
 
 
-	private EventProvider $eventProvider;
-
 
 	/**
 	 * @param array $config
@@ -67,9 +65,6 @@ class Redis implements StopHeartbeatCheck
 	public function init()
 	{
 		$this->heartbeat_check();
-
-		$this->eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
 	}
 
 
@@ -110,8 +105,6 @@ class Redis implements StopHeartbeatCheck
 			if (time() - $this->_last > intval($this->pool['tick'] ?? 60)) {
 				$this->stopHeartbeatCheck();
 
-				$this->eventProvider->off(OnWorkerExit::class, [$this, 'stopHeartbeatCheck']);
-
 				$this->pdo = null;
 			}
 		} catch (\Throwable $throwable) {

kiri-engine/Cache/Redis.php

@@ -19,6 +19,8 @@ use Kiri;
 use Kiri\Pool\Redis as PoolRedis;
 use Kiri\Annotation\Inject;
 use Kiri\Server\Events\OnWorkerExit;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Timer;
 
 /**
@@ -43,7 +45,10 @@ class Redis extends Component
 
 
 	/**
+	 * @return void
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws Exception
 	 */
 	public function init()
@@ -54,7 +59,7 @@ class Redis extends Component
 
 		$length = Config::get('cache.redis.pool.max', 10);
 
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'destroy'], 0);
+		$this->getEventProvider()->on(OnWorkerExit::class, [$this, 'destroy'], 0);
 
 		$connections->initConnections('Redis:' . $config['host'], true, $length);
 	}

kiri-engine/Core/HashMap.php

@@ -4,8 +4,9 @@ namespace Kiri\Core;
 
 use JetBrains\PhpStorm\Pure;
 use ReturnTypeWillChange;
+use Traversable;
 
-class HashMap implements \ArrayAccess
+class HashMap implements \ArrayAccess, \IteratorAggregate
 {
 
 	/**
@@ -14,7 +15,16 @@ class HashMap implements \ArrayAccess
 	private array $lists = [];
 
 
-	/**
+    /**
+     * @return Traversable
+     */
+    public function getIterator(): Traversable
+    {
+        return new \ArrayIterator($this->lists);
+    }
+
+
+    /**
 	 * @param string $key
 	 * @param $value
 	 */

kiri-engine/Di/Container.php

@@ -1,454 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/4/24 0024
- * Time: 17:27
- */
-declare(strict_types=1);
-
-namespace Kiri\Di;
-
-use Closure;
-use Exception;
-use Kiri;
-use Kiri\Abstracts\Logger;
-use Kiri\Annotation\Inject;
-use Psr\Container\ContainerInterface;
-use Psr\Log\LoggerInterface;
-use ReflectionClass;
-use ReflectionException;
-use ReflectionFunction;
-use ReflectionMethod;
-use ReflectionProperty;
-
-/**
- * Class Container
- * @package Kiri\Di
- */
-class Container implements ContainerInterface
-{
-
-	/**
-	 * @var array
-	 *
-	 * instance class by className
-	 */
-	private array $_singletons = [];
-
-	/**
-	 * @var ReflectionMethod[]
-	 *
-	 * class new instance construct parameter
-	 */
-	private array $_constructs = [];
-
-	/**
-	 * @var array
-	 *
-	 * implements \ReflectClass
-	 */
-	private array $_reflection = [];
-
-
-	/** @var array */
-	private array $_parameters = [];
-
-
-	/** @var array|string[] */
-	private array $_interfaces = [
-		LoggerInterface::class => Logger::class
-	];
-
-
-	/**
-	 * @param string $id
-	 * @return mixed
-	 * @throws
-	 */
-	public function get(string $id): mixed
-	{
-		if ($id == ContainerInterface::class) {
-			return $this;
-		}
-		return $this->make($id, [], []);
-	}
-
-
-	/**
-	 * @param $class
-	 * @param array $constrict
-	 * @param array $config
-	 * @return mixed
-	 * @throws
-	 */
-	public function make($class, array $constrict = [], array $config = []): mixed
-	{
-		if ($class == ContainerInterface::class) {
-			return $this;
-		}
-		if ($this->isInterface($class)) {
-			$class = $this->_interfaces[$class];
-		}
-		if (!isset($this->_singletons[$class])) {
-			$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
-		}
-		return $this->_singletons[$class];
-	}
-
-
-	/**
-	 * @param string $interface
-	 * @param string $class
-	 */
-	public function mapping(string $interface, string $class)
-	{
-		$this->_interfaces[$interface] = $class;
-	}
-
-
-	/**
-	 * @param $class
-	 * @return bool
-	 */
-	public function isInterface($class): bool
-	{
-		$reflect = $this->getReflect($class);
-		if ($reflect->isInterface()) {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * @param string $interface
-	 * @param $object
-	 */
-	public function setBindings(string $interface, $object)
-	{
-		if (is_string($object)) {
-			$this->_interfaces[$interface] = $object;
-		} else {
-			$className = get_class($object);
-			$this->_interfaces[$interface] = $className;
-			$this->_singletons[$className] = $object;
-		}
-	}
-
-
-	/**
-	 * @param $class
-	 * @param array $constrict
-	 * @param array $config
-	 * @return object
-	 * @throws
-	 */
-	public function create($class, array $constrict = [], array $config = []): object
-	{
-		return $this->resolve($class, $constrict, $config);
-	}
-
-
-	/**
-	 * @param $class
-	 * @param $constrict
-	 * @param $config
-	 *
-	 * @return object
-	 * @throws Exception
-	 */
-	private function resolve($class, $constrict, $config): object
-	{
-		$reflect = $this->resolveDependencies($class);
-		if (!$reflect->isInstantiable()) {
-			throw new ReflectionException('Class ' . $class . ' cannot be instantiated');
-		}
-
-		$object = $this->newInstance($reflect, $constrict);
-
-		$this->propertyInject($reflect, $object);
-
-		return $this->onAfterInit($object, $config);
-	}
-
-
-	/**
-	 * @param ReflectionClass $reflect
-	 * @param $dependencies
-	 * @return object
-	 * @throws ReflectionException
-	 */
-	private function newInstance(ReflectionClass $reflect, $dependencies): object
-	{
-		if (!isset($this->_constructs[$reflect->getName()])) {
-			return $reflect->newInstance();
-		}
-		$construct = $this->_constructs[$reflect->getName()];
-		if ($construct->getNumberOfParameters() < 1) {
-			return $reflect->newInstance();
-		}
-		$parameters = $this->mergeParam($this->resolveMethodParameters($construct), $dependencies);
-		return $reflect->newInstanceArgs($parameters);
-	}
-
-
-	/**
-	 * @param ReflectionClass $reflect
-	 * @param $object
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function propertyInject(ReflectionClass $reflect, $object): mixed
-	{
-		foreach (NoteManager::getPropertyAnnotation($reflect) as $property => $inject) {
-			/** @var Inject $inject */
-			$inject->execute($object, $property);
-		}
-		return $object;
-	}
-
-
-	/**
-	 * @param $className
-	 * @param $method
-	 * @return array
-	 */
-	public function getMethodAttribute($className, $method = null): array
-	{
-		$methods = NoteManager::getMethodAnnotation($this->getReflect($className));
-		if (!empty($method)) {
-			return $methods[$method] ?? [];
-		}
-		return $methods;
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param string|null $property
-	 * @return ReflectionProperty|ReflectionProperty[]|null
-	 */
-	public function getClassReflectionProperty(string $class, string $property = null): ReflectionProperty|null|array
-	{
-		$lists = NoteManager::getProperty($this->getReflect($class));
-		if (empty($lists)) {
-			return null;
-		}
-		if (!empty($property)) {
-			return $lists[$property] ?? null;
-		}
-		return $lists;
-	}
-
-
-	/**
-	 * @param $object
-	 * @param $config
-	 * @return mixed
-	 */
-	private function onAfterInit($object, $config): mixed
-	{
-		Kiri::configure($object, $config);
-		if (method_exists($object, 'init') && is_callable([$object, 'init'])) {
-			call_user_func([$object, 'init']);
-		}
-		return $object;
-	}
-
-
-	/**
-	 * @param $class
-	 * @return ReflectionClass
-	 */
-	private function resolveDependencies($class): ReflectionClass
-	{
-		if (isset($this->_reflection[$class])) {
-			return $this->_reflection[$class];
-		}
-		$reflect = new ReflectionClass($class);
-		if ($reflect->isAbstract() || $reflect->isTrait() || $reflect->isInterface()) {
-			return $this->_reflection[$class] = $reflect;
-		}
-		$construct = NoteManager::resolveTarget($reflect);
-		if (!empty($construct) && $construct->getNumberOfParameters() > 0) {
-			$this->_constructs[$class] = $construct;
-		}
-		return $this->_reflection[$class] = $reflect;
-	}
-
-
-	/**
-	 * @param ReflectionClass|string $class
-	 * @return ReflectionMethod[]
-	 * @throws ReflectionException
-	 */
-	public function getReflectMethods(ReflectionClass|string $class): array
-	{
-		if (is_string($class)) {
-			$class = $this->getReflect($class);
-		}
-		return NoteManager::getMethods($class);
-	}
-
-
-	/**
-	 * @param ReflectionClass|string $class
-	 * @param string $method
-	 * @return ReflectionMethod|null
-	 * @throws ReflectionException
-	 */
-	public function getReflectMethod(ReflectionClass|string $class, string $method): ?ReflectionMethod
-	{
-		return $this->getReflectMethods($class)[$method] ?? null;
-	}
-
-
-	/**
-	 * @param string $className
-	 * @param string $method
-	 * @return array|null
-	 * @throws ReflectionException
-	 */
-	public function getMethodParameters(string $className, string $method): ?array
-	{
-		if (isset($this->_parameters[$className]) && isset($this->_parameters[$className][$method])) {
-			return $this->_parameters[$className][$method];
-		}
-		$reflectMethod = $this->getReflectMethod($this->getReflect($className), $method);
-		if (!($reflectMethod instanceof ReflectionMethod)) {
-			throw new ReflectionException("Class does not have a function $className::$method");
-		}
-		$className = $reflectMethod->getDeclaringClass()->getName();
-		if (isset($this->_parameters[$className]) && isset($this->_parameters[$className][$reflectMethod->getName()])) {
-			return $this->_parameters[$className][$reflectMethod->getName()];
-		}
-		return $this->setParameters($className, $reflectMethod->getName(), $this->resolveMethodParameters($reflectMethod));
-	}
-
-
-	/**
-	 * @param $class
-	 * @param $method
-	 * @param $parameters
-	 * @return mixed
-	 */
-	private function setParameters($class, $method, $parameters): mixed
-	{
-		if (!isset($this->_parameters[$class])) {
-			$this->_parameters[$class] = [];
-		}
-		return $this->_parameters[$class][$method] = $parameters;
-	}
-
-
-	/**
-	 * @param Closure $reflectionMethod
-	 * @return array
-	 * @throws ReflectionException
-	 */
-	public function getFunctionParameters(Closure $reflectionMethod): array
-	{
-		return $this->resolveMethodParameters(new ReflectionFunction($reflectionMethod));
-	}
-
-
-	/**
-	 * @param ReflectionMethod|ReflectionFunction $reflectionMethod
-	 * @return array
-	 */
-	private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
-	{
-		if ($reflectionMethod->getNumberOfParameters() < 1) {
-			return [];
-		}
-		$params = [];
-		foreach ($reflectionMethod->getParameters() as $key => $parameter) {
-			if ($parameter->isDefaultValueAvailable()) {
-				$params[$key] = $parameter->getDefaultValue();
-			} else if ($parameter->getType() === null) {
-				$params[$key] = $parameter->getType();
-			} else {
-				$type = $parameter->getType()->getName();
-				if (is_string($type) && class_exists($type) || isset($this->_interfaces[$type])) {
-					$type = Kiri::getDi()->get($type);
-				}
-				$params[$key] = match ($parameter->getType()) {
-					'string' => '',
-					'int', 'float' => 0,
-					'', null, 'object', 'mixed' => NULL,
-					'bool' => false,
-					default => $type
-				};
-			}
-		}
-		return $params;
-	}
-
-
-	/**
-	 * @param $class
-	 * @return ReflectionClass|null
-	 */
-	public function getReflect($class): ?ReflectionClass
-	{
-		if (!isset($this->_reflection[$class])) {
-			return $this->resolveDependencies($class);
-		}
-		return $this->_reflection[$class];
-	}
-
-	/**
-	 * @param $class
-	 */
-	public function unset($class)
-	{
-		if (is_array($class) && isset($class['class'])) {
-			$class = $class['class'];
-		} else if (is_object($class)) {
-			$class = $class::class;
-		}
-		unset(
-			$this->_reflection[$class], $this->_singletons[$class], $this->_constructs[$class]
-		);
-	}
-
-	/**
-	 * @return $this
-	 */
-	public function flush(): static
-	{
-		$this->_reflection = [];
-		$this->_singletons = [];
-		$this->_constructs = [];
-		return $this;
-	}
-
-	/**
-	 * @param $old
-	 * @param $newParam
-	 *
-	 * @return mixed
-	 */
-	private function mergeParam($old, $newParam): array
-	{
-		if (empty($old)) {
-			return $newParam;
-		} else if (empty($newParam)) {
-			return $old;
-		}
-		foreach ($newParam as $key => $val) {
-			$old[$key] = $val;
-		}
-		return $old;
-	}
-
-	/**
-	 * @param string $id
-	 * @return bool
-	 */
-	public function has(string $id): bool
-	{
-		return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
-	}
-}

kiri-engine/Di/LocalService.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace Kiri\Di;
-
-use Kiri\Abstracts\Component;
-use Kiri;
-
-
-/**
- * 服务定位器
- */
-class LocalService extends Component
-{
-
-
-	private array $_components = [];
-
-
-	private array $_definition = [];
-
-
-	/**
-	 * @param $name
-	 * @param $define
-	 */
-	public function set($name, $define)
-	{
-		unset($this->_components[$name]);
-
-		$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;
-	}
-
-
-	/**
-	 * @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
-	 */
-	public function remove($id): void
-	{
-		unset($this->_components[$id], $this->_definition[$id]);
-	}
-
-
-}

kiri-engine/Di/NoteManager.php

@@ -1,303 +0,0 @@
-<?php
-
-namespace Kiri\Di;
-
-use JetBrains\PhpStorm\Pure;
-use ReflectionAttribute;
-use ReflectionClass;
-use ReflectionProperty;
-
-class NoteManager
-{
-
-
-	private static array $_classTarget = [];
-	private static array $_classMethodAnnotation = [];
-	private static array $_classMethod = [];
-	private static array $_classPropertyAnnotation = [];
-	private static array $_classProperty = [];
-	private static array $_mapping = [];
-
-
-	/**
-	 * @return void
-	 */
-	public static function clear()
-	{
-		static::$_classTarget = [];
-		static::$_classMethodAnnotation = [];
-		static::$_classMethod = [];
-		static::$_classPropertyAnnotation = [];
-		static::$_classProperty = [];
-		static::$_mapping = [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 */
-	public static function setTargetAnnotation(ReflectionClass $class)
-	{
-		$className = $class->getName();
-		if (!isset(static::$_classTarget[$className])) {
-			static::$_classTarget[$className] = [];
-		}
-		foreach ($class->getAttributes() as $attribute) {
-			if (!class_exists($attribute->getName())) {
-				continue;
-			}
-
-			$instance = $attribute->newInstance();
-
-			static::$_classTarget[$className][] = $instance;
-
-			self::setMappingClass($attribute, $className);
-		}
-	}
-
-
-	/**
-	 * @param ReflectionAttribute $attribute
-	 * @param string $class
-	 */
-	public static function setMappingClass(ReflectionAttribute $attribute, string $class)
-	{
-		if (!isset(static::$_mapping[$attribute->getName()])) {
-			static::$_mapping[$attribute->getName()] = [];
-		}
-		if (!isset(static::$_mapping[$attribute->getName()][$class])) {
-			static::$_mapping[$attribute->getName()][$class] = [];
-		}
-	}
-
-
-	/**
-	 * @param ReflectionAttribute $attribute
-	 * @param string $class
-	 * @param string $method
-	 * @param mixed $instance
-	 */
-	public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
-	{
-		self::setMappingClass($attribute, $class);
-
-		if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
-			static::$_mapping[$attribute->getName()][$class]['method'] = [];
-		}
-		static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
-	}
-
-
-	/**
-	 * @param ReflectionAttribute $attribute
-	 * @param string $class
-	 * @param string $property
-	 * @param $instance
-	 */
-	public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
-	{
-		self::setMappingClass($attribute, $class);
-
-		$mapping = static::$_mapping[$attribute->getName()][$class];
-		if (!isset($mapping['property'])) {
-			$mapping['property'] = [];
-		}
-		$mapping['property'][] = [$property => $instance];
-		static::$_mapping[$attribute->getName()][$class] = $mapping;
-	}
-
-
-	/**
-	 * @param mixed $class
-	 * @return array
-	 */
-	public static function getTargetAnnotation(mixed $class): array
-	{
-		if (!is_string($class)) {
-			$class = $class::class;
-		}
-		return static::$_classTarget[$class] ?? [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 */
-	public static function setMethodAnnotation(ReflectionClass $class)
-	{
-		$className = $class->getName();
-		static::$_classMethodAnnotation[$className] = static::$_classMethod[$className] = [];
-		foreach ($class->getMethods() as $ReflectionMethod) {
-			static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-			static::$_classMethodAnnotation[$className][$ReflectionMethod->getName()] = [];
-			foreach ($ReflectionMethod->getAttributes() as $attribute) {
-				if (!class_exists($attribute->getName())) {
-					continue;
-				}
-				$instance = $attribute->newInstance();
-
-				static::$_classMethodAnnotation[$className][$ReflectionMethod->getName()][] = $instance;
-
-				self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
-			}
-		}
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param string $method
-	 * @return bool
-	 */
-	public static function hasMethod(string $class, string $method): bool
-	{
-		return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @return array
-	 */
-	#[Pure] public static function getMethodAnnotation(ReflectionClass $class): array
-	{
-		return static::$_classMethodAnnotation[$class->getName()] ?? [];
-	}
-
-
-	/**
-	 * @param \ReflectionClass $reflect
-	 * @return \ReflectionMethod|null
-	 */
-	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
-	{
-		NoteManager::setPropertyAnnotation($reflect);
-		NoteManager::setTargetAnnotation($reflect);
-		NoteManager::setMethodAnnotation($reflect);
-
-		return $reflect->getConstructor();
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 */
-	public static function setPropertyAnnotation(ReflectionClass $class)
-	{
-		$className = $class->getName();
-		static::$_classProperty[$className] = static::$_classPropertyAnnotation[$className] = [];
-		foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
-			ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
-			static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-			foreach ($ReflectionMethod->getAttributes() as $attribute) {
-				if (!class_exists($attribute->getName())) {
-					continue;
-				}
-
-				$instance = $attribute->newInstance();
-
-				static::$_classPropertyAnnotation[$className][$ReflectionMethod->getName()] = $instance;
-
-				self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
-			}
-		}
-	}
-
-
-	/**
-	 * @param string $attribute
-	 * @param string|null $class
-	 * @return array[]
-	 */
-	public static function getAttributeTrees(string $attribute, string $class = null): array
-	{
-		$mapping = static::$_mapping[$attribute] ?? [];
-		if (empty($mapping) || empty($class)) {
-			return $mapping;
-		}
-		return $mapping[$class] ?? [];
-	}
-
-
-	/**
-	 * @param string $attribute
-	 * @param string $class
-	 * @param string|null $method
-	 * @return array
-	 */
-	public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
-	{
-		$class = self::getAttributeTrees($attribute, $class);
-		if (empty($class) || !isset($class['method'])) {
-			return null;
-		}
-		if (empty($method)) {
-			return $class['method'];
-		}
-		foreach ($class['method'] as $value) {
-			$key = key($value);
-			if ($method == $key) {
-				return $value[$key];
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param string $attribute
-	 * @param string $class
-	 * @param string $method
-	 * @return mixed
-	 */
-	public static function getPropertyByAnnotation(string $attribute, string $class, string $method): mixed
-	{
-		$class = self::getAttributeTrees($attribute, $class);
-		if (empty($class) || !isset($class['property'])) {
-			return [];
-		}
-		foreach ($class['property'] as $value) {
-			$key = key($value);
-			if ($method == $key) {
-				return $value[$key];
-			}
-		}
-		return null;
-	}
-
-
-	/**
-	 * @param ReflectionClass|string $class
-	 * @return array
-	 * @throws \ReflectionException
-	 */
-	public static function getMethods(ReflectionClass|string $class): array
-	{
-		if (is_string($class)) {
-			$class = self::getReflect($class);
-		}
-		return static::$_classMethod[$class->getName()] ?? [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @return ReflectionProperty[]
-	 */
-	#[Pure] public static function getProperty(ReflectionClass $class): array
-	{
-		return static::$_classProperty[$class->getName()] ?? [];
-	}
-
-
-	/**
-	 * @param ReflectionClass $class
-	 * @return array
-	 */
-	#[Pure] public static function getPropertyAnnotation(ReflectionClass $class): array
-	{
-		return static::$_classPropertyAnnotation[$class->getName()] ?? [];
-	}
-
-
-}

kiri-engine/Error/ErrorHandler.php

@@ -36,13 +36,8 @@ class ErrorHandler extends Component implements ErrorInterface
 	 */
 	public function register()
 	{
-//		ini_set('display_errors', '1');
 		set_exception_handler([$this, 'exceptionHandler']);
-		if (defined('HHVM_VERSION')) {
-			set_error_handler([$this, 'errorHandler']);
-		} else {
-			set_error_handler([$this, 'errorHandler']);
-		}
+		set_error_handler([$this, 'errorHandler']);
 		register_shutdown_function([$this, 'shutdown']);
 	}
 
@@ -118,8 +113,6 @@ 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/HotReload.php

@@ -204,7 +204,6 @@ class HotReload extends Command
 	public function trigger_reload(string $path = '')
 	{
 		$this->logger->warning('change reload');
-		var_dump($path);
 		if (!empty($path) && str_starts_with($path, CONTROLLER_PATH)) {
 			$pid = file_get_contents(storage('.swoole.pid'));
 			if (!empty($pid) && Process::kill($pid, 0)) {

kiri-engine/Pool/Pool.php

@@ -41,11 +41,10 @@ class Pool extends Component
 
 
 	/**
-	 * @param Channel $channel
+	 * @param Channel|SplQueue $channel
 	 * @param $retain_number
-	 * @throws Exception
 	 */
-	protected function pop(Channel $channel, $retain_number): void
+	protected function pop(Channel|SplQueue $channel, $retain_number): void
 	{
 		while ($channel->length() > $retain_number) {
 			if (Context::inCoroutine()) {

kiri-server/CoroutineTasker.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Kiri\Server;
+
+use Kiri\Abstracts\Component;
+use Kiri\Abstracts\Config;
+use Kiri\Exception\ConfigException;
+use Kiri\Task\OnServerTask;
+use Swoole\Coroutine;
+use Swoole\Coroutine\Channel;
+use Swoole\Server\Task;
+
+class CoroutineTasker extends Component
+{
+
+
+	public Channel $channel;
+
+
+	/**
+	 * @return void
+	 * @throws ConfigException
+	 */
+	public function initCore()
+	{
+		$taskWorker = Config::get('server.settings.task_worker_num', 0);
+
+		if ($taskWorker > 1) {
+			$this->channel = new Channel($taskWorker);
+			for ($i = 0; $i < $taskWorker; $i++) {
+
+				Coroutine::create(function () {
+					while ($this->channel->capacity) {
+						$data = $this->channel->pop(-1);
+
+						$execute = $this->getContainer()->get(OnServerTask::class);
+
+						$task = new Task();
+						$task->data = $data;
+						$execute->onCoroutineTask(null, $task);
+					}
+				});
+			}
+		}
+	}
+
+
+	public function dispatch($data)
+	{
+		$this->channel->push($data);
+	}
+
+
+}

kiri-task/CoroutineTaskExecute.php

@@ -56,14 +56,15 @@ class CoroutineTaskExecute extends Component
 	 */
 	protected function handler()
 	{
+		Coroutine\defer(function () {
+			$this->handler();
+		});
 		$data = $this->channel->pop(-1);
 
 		$task = new Task();
 		$task->data = $data;
 
 		$this->taskServer->onCoroutineTask(null, $task);
-
-		$this->handler();
 	}
 
 

kiri-task/TaskManager.php

@@ -37,7 +37,7 @@ class TaskManager extends Component
 		}
 
 		$task_use_object = $swollen->setting['task_object'] ?? $swollen->setting['task_use_object'] ?? false;
-		$reflect = $this->container->get(OnServerTask::class);
+		$reflect = $this->getContainer()->get(OnServerTask::class);
 
 		$swollen->on('finish', [$reflect, 'onFinish']);
 		if ($task_use_object || $swollen->setting['task_enable_coroutine']) {

kiri-task/TaskResolve.php

@@ -21,7 +21,7 @@ trait TaskResolve
 		if (!class_exists($handler) && $this->hashMap->has($handler)) {
 			$handler = $this->hashMap->get($handler);
 		}
-		$implements = $this->container->getReflect($handler);
+		$implements = $this->getContainer()->getReflect($handler);
 		if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
 			throw new Exception('Task must instance ' . OnTaskInterface::class);
 		}

kiri-websocket-server/Server.php

@@ -41,14 +41,14 @@ class Server extends AbstractServer
 	 */
 	public function init()
 	{
-		$this->router = $this->container->get(DataGrip::class)->get('ws');
+		$this->router = $this->getContainer()->get(DataGrip::class)->get('ws');
 		$handler = $this->router->find('/', 'GET');
 		if (is_int($handler) || is_null($handler)) {
 			return;
 		}
 		$this->callback = $handler->callback[0];
 
-		$this->sender = $this->container->get(Sender::class);
+		$this->sender = $this->getContainer()->get(Sender::class);
 		$this->sender->setServer($this->server);
 	}