改名

Abstracts/Server.php

@@ -4,7 +4,7 @@
 namespace Server\Abstracts;
 
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;

Handler/OnPipeMessage.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Note\Inject;
 use Server\Abstracts\Server;
 use Exception;
 use Server\Contract\OnPipeMessageInterface;

Handler/OnServer.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Note\Inject;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Server\Abstracts\Server;

Handler/OnServerManager.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Note\Inject;
 use Kiri\Events\EventDispatch;
 use Server\Abstracts\Server;
 use Kiri\Exception\ConfigException;

Handler/OnServerReload.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Note\Inject;
 use Kiri\Events\EventDispatch;
 use Server\Events\OnAfterReload;
 use Server\Events\OnBeforeReload;

Handler/OnServerWorker.php

@@ -2,7 +2,7 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Help;

Server.php

@@ -3,7 +3,7 @@
 
 namespace Server;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Http\Handler\Abstracts\HttpService;
 use JetBrains\PhpStorm\Pure;

ServerCommand.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 namespace Server;
 
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Events\EventDispatch;

ServerManager.php

@@ -2,13 +2,16 @@
 
 namespace Server;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
-use Kiri\Di\ContainerInterface;
+use Kiri\Di\Container;
+use Psr\Container\ContainerInterface;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
 use Server\Abstracts\BaseProcess;
 use Server\Contract\OnCloseInterface;
@@ -24,7 +27,7 @@ use Server\Handler\OnPipeMessage;
 use Server\Handler\OnServer;
 use Server\Handler\OnServerManager;
 use Server\Handler\OnServerReload;
-use Server\Handler\OnServerTask;
+use Server\Tasker\OnServerTask;
 use Server\Handler\OnServerWorker;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
@@ -63,7 +66,7 @@ class ServerManager
 
 
 	/**
-	 * @var ContainerInterface
+	 * @var Container
 	 */
 	#[Inject(ContainerInterface::class)]
 	public ContainerInterface $container;
@@ -244,6 +247,9 @@ class ServerManager
 	 * @param int $port
 	 * @param int $mode
 	 * @param array $settings
+	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws Exception
 	 */
 	private function addNewListener(string $type, string $host, int $port, int $mode, array $settings = [])
@@ -277,8 +283,10 @@ class ServerManager
 	 * @param int $port
 	 * @param int $mode
 	 * @param array $settings
-	 * @throws ReflectionException
 	 * @throws ConfigException
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
 	 * @throws Exception
 	 */
 	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
@@ -318,8 +326,9 @@ class ServerManager
 
 	/**
 	 * @param array $settings
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws ReflectionException
-	 * @throws Exception
 	 */
 	private function addDefaultListener(array $settings): void
 	{
@@ -337,6 +346,9 @@ class ServerManager
 	/**
 	 * @param array $events
 	 * @param Server|Port $server
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
 	 */
 	private function addServiceEvents(array $events, Server|Port $server)
 	{
@@ -422,10 +434,12 @@ class ServerManager
 
 	/**
 	 * @param array|null $settings
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
 	 */
 	public function bindCallback(?array $settings = [])
 	{
-		// TODO: Implement bindCallback() method.
 		if (count($settings) < 1) {
 			return;
 		}

Tasker/AsyncTaskExecute.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Server\Tasker;
+
+use Kiri\Kiri;
+use Note\Inject;
+use Exception;
+use Kiri\Abstracts\BaseObject;
+use Kiri\Core\HashMap;
+use Kiri\Di\Container;
+use Psr\Container\ContainerInterface;
+use ReflectionException;
+use Server\Contract\OnTaskInterface;
+use Server\SwooleServerInterface;
+
+
+/**
+ *
+ */
+class AsyncTaskExecute extends BaseObject
+{
+
+
+	/**
+	 * @var SwooleServerInterface|null
+	 */
+	public ?SwooleServerInterface $server = null;
+
+
+	/**
+	 * @var Container
+	 */
+	#[Inject(ContainerInterface::class)]
+	public ContainerInterface $container;
+
+
+	private HashMap $hashMap;
+
+
+	/**
+	 *
+	 */
+	public function init()
+	{
+		$this->hashMap = new HashMap();
+	}
+
+
+	/**
+	 * @param string $key
+	 * @param $handler
+	 */
+	public function reg(string $key, $handler)
+	{
+		$this->hashMap->put($key, $handler);
+	}
+
+
+	/**
+	 * @param OnTaskInterface|string $handler
+	 * @param array $params
+	 * @param int|null $workerId
+	 * @throws Exception
+	 */
+	public function execute(OnTaskInterface|string $handler, array $params = [], int $workerId = null)
+	{
+		if (!$this->server) {
+			$this->server = Kiri::getDi()->get(SwooleServerInterface::class);
+		}
+		if ($workerId === null || $workerId <= $this->server->setting['worker_num']) {
+			$workerId = random_int($this->server->setting['worker_num'] + 1, $this->server->setting['task_worker_num']);
+		}
+		if (is_string($handler)) {
+			$handler = $this->handle($handler, $params);
+		}
+		$this->server->task(serialize($handler), $workerId);
+	}
+
+
+	/**
+	 * @param $handler
+	 * @param $params
+	 * @return object
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	private function handle($handler, $params): object
+	{
+		if (!class_exists($handler) && $this->hashMap->has($handler)) {
+			$handler = $this->hashMap->get($handler);
+		}
+		$implements = $this->container->getReflect($handler);
+		if (!in_array(OnTaskInterface::class, $implements->getInterfaceNames())) {
+			throw new Exception('Task must instance ' . OnTaskInterface::class);
+		}
+		return $implements->newInstanceArgs($params);
+	}
+
+
+}

Tasker/OnServerTask.php

@@ -1,13 +1,12 @@
 <?php
 
 
-namespace Server\Handler;
+namespace Server\Tasker;
 
 
-use Annotation\Inject;
+use Note\Inject;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
 use ReflectionException;
 use Server\Contract\OnTaskInterface;
 use Swoole\Server;
@@ -68,19 +67,14 @@ class OnServerTask
 	/**
 	 * @param $data
 	 * @return null
-	 * @throws ReflectionException
 	 */
 	private function resolve($data)
 	{
-		[$class, $params] = json_encode($data, true);
+		$execute = unserialize($data);
-
+		if ($execute instanceof OnTaskInterface) {
-		$reflect = Kiri::getDi()->getReflect($class);
+			return $execute->execute();
-
-		if (!$reflect->isInstantiable()) {
-			return null;
 		}
-		$class = $reflect->newInstanceArgs($params);
+		return null;
-		return $class->execute();
 	}