改名

Server/ServerManager.php

@@ -98,7 +98,7 @@ class ServerManager
 	 */
 	public function initBaseServer($configs, int $daemon = 0): void
 	{
-		$context = ServerManager::getContext();
+		$context = di(ServerManager::class);
 		foreach ($this->sortService($configs['ports']) as $config) {
 			$this->startListenerHandler($context, $config, $daemon);
 		}

System/Abstracts/BaseApplication.php

@@ -213,11 +213,11 @@ abstract class BaseApplication extends Component
 
 	/**
 	 * @param TaskExecute $execute
-	 * @throws ReflectionException
+	 * @throws ReflectionException|NotFindClassException
 	 */
 	public function task(TaskExecute $execute): void
 	{
-		ServerManager::getContext()->task($execute);
+		di(ServerManager::class)->task($execute);
 	}
 
 
@@ -400,10 +400,11 @@ abstract class BaseApplication extends Component
 
 	/**
 	 * @return \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
+	 * @throws
 	 */
 	public function getSwoole(): \Swoole\Http\Server|\Swoole\Server|\Swoole\WebSocket\Server|null
 	{
-		return ServerManager::getContext()->getServer();
+		return di(ServerManager::class)->getServer();
 	}
 
 

System/Async.php

@@ -39,7 +39,7 @@ class Async extends Component
      */
     public function dispatch(string $name, array $params = [])
     {
-    	$context  = ServerManager::getContext();
+    	$context  = di(ServerManager::class);
     	$context->task(static::$_absences[$name], $params);
     }
 

System/Crontab/Zookeeper.php

@@ -77,7 +77,7 @@ class Zookeeper implements CustomProcess
 			if (empty($handler = $redis->get('crontab:' . $value))) {
 				return;
 			}
-			$server = ServerManager::getContext()->getServer();
+			$server = di(ServerManager::class)->getServer();
 			$server->sendMessage(swoole_unserialize($handler), $this->getWorker());
 		} catch (Throwable $exception) {
 			logger()->addError($exception);
@@ -92,7 +92,7 @@ class Zookeeper implements CustomProcess
 	private function getWorker(): int
 	{
 		if ($this->workerNum == 0) {
-			$server = ServerManager::getContext()->getServer();
+			$server = di(ServerManager::class)->getServer();
 
 			$this->workerNum = $server->setting['worker_num'] + ($server->setting['task_worker_num'] ?? 0);
 		}

System/Kiri.php

@@ -446,7 +446,7 @@ class Kiri
 	 */
 	public static function async(string $class, array $params = [])
 	{
-		$manager = ServerManager::getContext();
+		$manager = di(ServerManager::class);
 		$manager->task(new $class(...$params));
 	}
 

http-helper/Context/Request.php

@@ -92,7 +92,7 @@ class Request extends HttpService implements RequestInterface
 	 */
 	public function getConnectInfo(): array|null
 	{
-		$server = ServerManager::getContext()->getServer();
+		$server = di(ServerManager::class)->getServer();
 
 		return $server->getClientInfo($this->getClientId());
 	}

http-helper/Context/Response.php

@@ -82,13 +82,14 @@ class Response extends HttpService implements ResponseInterface
 
 	/**
 	 * @return mixed
+	 * @throws
 	 */
 	public function getClientInfo(): mixed
 	{
 		if (!empty($this->_clientInfo)) {
 			return $this->_clientInfo;
 		}
-		$server = ServerManager::getContext()->getServer();
+		$server = di(ServerManager::class)->getServer();
 		return $server->getClientInfo($this->clientId, $this->reactorId);
 	}
 

http-helper/Server.php

@@ -36,7 +36,13 @@ class Server extends HttpService
 	];
 
 
-	private ServerManager $manager;
+	/**
+	 * @Inject ServerManager
+	 * @var null|ServerManager
+	 */
+	#[Inject(ServerManager::class)]
+	private ?ServerManager $manager = null;
+
 	private mixed $daemon = 0;
 
 
@@ -50,7 +56,6 @@ class Server extends HttpService
 	 */
 	public function init()
 	{
-		$this->manager = ServerManager::getContext();
 	}
 
 

http-helper/Shutdown.php

@@ -49,7 +49,7 @@ class Shutdown extends Component
 			return;
 		}
 
-		$server = ServerManager::getContext()->getServer();
+		$server = di(ServerManager::class)->getServer();
 		$master_pid = $server->setting['pid_file'] ?? PID_PATH;
 		if (file_exists($master_pid)) {
 			$this->close(file_get_contents($master_pid));
@@ -77,7 +77,7 @@ class Shutdown extends Component
 	 */
 	public function isRunning(): bool
 	{
-		$server = ServerManager::getContext()->getServer();
+		$server = di(ServerManager::class)->getServer();
 		$master_pid = $server->setting['pid_file'] ?? PID_PATH;
 
 		if (!file_exists($master_pid)) {