改名

Abstracts/BaseProcess.php

@@ -80,64 +80,4 @@ abstract class BaseProcess implements OnProcessInterface
 	}
 
 
-	/**
-	 * @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);
-		}
-	}
-
 }

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;

Contract/OnDownloadInterface.php

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

Contract/OnProcessInterface.php

@@ -17,27 +17,9 @@ interface OnProcessInterface
 
 	/**
 	 * @param Process $process
-	 * @return string
 	 */
-	public function getProcessName(Process $process): string;
+	public function process(Process $process): void;
 
 
-	/**
-	 * @param Process $process
-	 */
-	public function signListen(Process $process): void;
-
-
-	/**
-	 * @param Process $process
-	 */
-	public function onHandler(Process $process): void;
-
-
-	/**
-	 *
-	 */
-	public function onProcessStop(): void;
-
 
 }

Events/OnServerBeforeStart.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Server\Events;
+
+class OnServerBeforeStart
+{
+
+}

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,13 +2,12 @@
 
 namespace Server\Handler;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Help;
 use Kiri\Events\EventDispatch;
 use Kiri\Kiri;
-use Kiri\Runtime;
 use Server\Events\OnAfterWorkerStart;
 use Server\Events\OnBeforeWorkerStart;
 use Server\Events\OnTaskerStart as OnTaskStart;
@@ -16,7 +15,6 @@ use Server\Events\OnWorkerError;
 use Server\Events\OnWorkerExit;
 use Server\Events\OnWorkerStart;
 use Server\Events\OnWorkerStop;
-use Server\ServerManager;
 use Swoole\Server;
 use Swoole\Timer;
 

Server.php

@@ -3,12 +3,11 @@
 
 namespace Server;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Http\Handler\Abstracts\HttpService;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
-use Kiri\Error\LoggerProcess;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Server\Events\OnShutdown;

ServerCommand.php

@@ -4,12 +4,13 @@ declare(strict_types=1);
 namespace Server;
 
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
-use Kiri\Events\EventProvider;
+use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Server\Events\OnServerBeforeStart;
 use Swoole\Coroutine;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -29,10 +30,10 @@ class ServerCommand extends Command
 
 
 	/**
-	 * @var EventProvider
+	 * @var EventDispatch
 	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
+	#[Inject(EventDispatch::class)]
+	public EventDispatch $eventProvider;
 
 
 	/**
@@ -68,7 +69,7 @@ class ServerCommand extends Command
 		}
 		$manager->shutdown();
 		if ($input->getArgument('action') == 'stop') {
-			throw new Exception('shutdown success');
+			return 0;
 		}
 		return $this->generate_runtime_builder($manager);
 	}
@@ -105,6 +106,8 @@ class ServerCommand extends Command
 
 		Kiri::app()->getRouter()->read_files();
 
+		$this->eventProvider->dispatch(new OnServerBeforeStart());
+
 		$manager->start();
 
 		return 1;

ServerManager.php

@@ -2,22 +2,18 @@
 
 namespace Server;
 
-use Annotation\Inject;
-use Closure;
+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\Handler\OnPipeMessage;
-use Server\Handler\OnServer;
-use Server\Handler\OnServerManager;
-use Server\Handler\OnServerReload;
-use Server\Handler\OnServerTask;
-use Server\Handler\OnServerWorker;
 use Server\Contract\OnCloseInterface;
 use Server\Contract\OnConnectInterface;
 use Server\Contract\OnDisconnectInterface;
@@ -27,6 +23,12 @@ use Server\Contract\OnPacketInterface;
 use Server\Contract\OnProcessInterface;
 use Server\Contract\OnReceiveInterface;
 use Server\Contract\OnTaskInterface;
+use Server\Handler\OnPipeMessage;
+use Server\Handler\OnServer;
+use Server\Handler\OnServerManager;
+use Server\Handler\OnServerReload;
+use Server\Tasker\OnServerTask;
+use Server\Handler\OnServerWorker;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
 use Swoole\Server;
@@ -64,7 +66,7 @@ class ServerManager
 
 
 	/**
-	 * @var ContainerInterface
+	 * @var Container
 	 */
 	#[Inject(ContainerInterface::class)]
 	public ContainerInterface $container;
@@ -168,19 +170,14 @@ class ServerManager
 		if (is_string($customProcess)) {
 			$customProcess = Kiri::getDi()->get($customProcess);
 		}
-		$process = new Process(function (Process $soloProcess) use ($customProcess) {
-			$system = sprintf('[%s].process', Config::get('id', 'system-service'));
+		$system = sprintf('[%s].process', Config::get('id', 'system-service'));
+		$process = new Process(function (Process $process) use ($customProcess, $system) {
 			if (Kiri::getPlatform()->isLinux()) {
-				$soloProcess->name($system . '(' . $customProcess->getName() . ')');
+				$process->name($system . '(' . $customProcess->getName() . ')');
 			}
-			$this->logger->debug($system . $customProcess->getName() . ' start.');
-			$customProcess->signListen($soloProcess);
-			$customProcess->onHandler($soloProcess);
-		},
-			$customProcess->getRedirectStdinAndStdout(),
-			$customProcess->getPipeType(),
-			$customProcess->isEnableCoroutine()
-		);
+			$customProcess->process($process);
+		}, $customProcess->getRedirectStdinAndStdout(), $customProcess->getPipeType(), $customProcess->isEnableCoroutine());
+		$this->logger->debug($system . ' ' . $customProcess->getName() . ' start.');
 		$this->container->setBindings($customProcess->getName(), $process);
 		$this->server->addProcess($process);
 	}
@@ -238,6 +235,7 @@ class ServerManager
 			$config['settings']['log_file'] = storage('system.log');
 		}
 		$config['settings']['pid_file'] = storage('.swoole.pid');
+		$config['settings'][Constant::OPTION_ENABLE_REUSE_PORT] = true;
 		$config['events'] = $config['events'] ?? [];
 		return $config;
 	}
@@ -249,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 = [])
@@ -282,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 = [])
@@ -323,8 +326,9 @@ class ServerManager
 
 	/**
 	 * @param array $settings
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 * @throws ReflectionException
-	 * @throws Exception
 	 */
 	private function addDefaultListener(array $settings): void
 	{
@@ -342,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)
 	{
@@ -427,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);
-
-		$reflect = Kiri::getDi()->getReflect($class);
-
-		if (!$reflect->isInstantiable()) {
-			return null;
+		$execute = unserialize($data);
+		if ($execute instanceof OnTaskInterface) {
+			return $execute->execute();
 		}
-		$class = $reflect->newInstanceArgs($params);
-		return $class->execute();
+		return null;
 	}