From 4a4bf7b5cb278a18c1b29fbeb38b224bb3d1fcbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=9E=97?= <as2252258@163.com>
Date: Mon, 12 Dec 2022 17:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kiri-engine/Abstracts/BaseContext.php |  13 --
 kiri-engine/Context.php               | 225 --------------------------
 kiri-engine/Pool/Connection.php       |   4 +-
 kiri-engine/Pool/Pool.php             |   3 -
 kiri-engine/Pool/PoolQueue.php        |   3 +-
 kiri-websocket-server/Server.php      |   4 +-
 6 files changed, 5 insertions(+), 247 deletions(-)
 delete mode 100644 kiri-engine/Abstracts/BaseContext.php
 delete mode 100644 kiri-engine/Context.php

diff --git a/kiri-engine/Abstracts/BaseContext.php b/kiri-engine/Abstracts/BaseContext.php
deleted file mode 100644
index b4b98c39..00000000
--- a/kiri-engine/Abstracts/BaseContext.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Kiri\Abstracts;
-
-
-
-use Swoole\Coroutine;
-
-abstract class BaseContext
-{
-	protected static array $pool = [];
-}
diff --git a/kiri-engine/Context.php b/kiri-engine/Context.php
deleted file mode 100644
index c9b5b647..00000000
--- a/kiri-engine/Context.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-
-namespace Kiri;
-
-use Kiri\Abstracts\BaseContext;
-use Swoole\Coroutine;
-
-/**
- * Class Context
- * @package Yoc\http
- */
-class Context extends BaseContext
-{
-	
-	protected static array $_contents = [];
-	
-	
-	/**
-	 * @param $id
-	 * @param $context
-	 * @param null $coroutineId
-	 * @return mixed
-	 */
-	public static function setContext($id, $context, $coroutineId = null): mixed
-	{
-		if (is_null($coroutineId)) {
-			$coroutineId = Coroutine::getCid();
-		}
-		if (Coroutine::getCid() !== -1) {
-			return Coroutine::getContext($coroutineId)[$id] = $context;
-		}
-		return static::$_contents[$id] = $context;
-	}
-	
-	/**
-	 * @param $id
-	 * @param int $value
-	 * @param null $coroutineId
-	 * @return bool|int
-	 */
-	public static function increment($id, int $value = 1, $coroutineId = null): bool|int
-	{
-		if (is_null($coroutineId)) {
-			$coroutineId = Coroutine::getCid();
-		}
-		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
-			Coroutine::getContext($coroutineId)[$id] = 0;
-		}
-		return Coroutine::getContext($coroutineId)[$id] += $value;
-	}
-	
-	/**
-	 * @param $id
-	 * @param int $value
-	 * @param null $coroutineId
-	 * @return bool|int
-	 */
-	public static function decrement($id, int $value = 1, $coroutineId = null): bool|int
-	{
-		if (is_null($coroutineId)) {
-			$coroutineId = Coroutine::getCid();
-		}
-		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
-			Coroutine::getContext($coroutineId)[$id] = 0;
-		}
-		return Coroutine::getContext($coroutineId)[$id] -= $value;
-	}
-	
-	/**
-	 * @param $id
-	 * @param null $default
-	 * @param null $coroutineId
-	 * @return mixed
-	 */
-	public static function getContext($id, $default = null, $coroutineId = null): mixed
-	{
-		if (Coroutine::getCid() === -1) {
-			return static::loadByStatic($id, $default);
-		}
-		return static::loadByContext($id, $default, $coroutineId);
-	}
-	
-	
-	/**
-	 * @param $id
-	 * @param null $default
-	 * @param null $coroutineId
-	 * @return mixed
-	 */
-	private static function loadByContext($id, $default = null, $coroutineId = null): mixed
-	{
-		if (is_null($coroutineId)) {
-			$coroutineId = Coroutine::getCid();
-		}
-		return Coroutine::getContext($coroutineId)[$id] ?? $default;
-	}
-	
-	
-	/**
-	 * @param $id
-	 * @param null $default
-	 * @return mixed
-	 */
-	private static function loadByStatic($id, $default = null): mixed
-	{
-		return static::$_contents[$id] ?? $default;
-	}
-	
-	
-	/**
-	 * @param null $coroutineId
-	 * @return Coroutine\Context|array
-	 */
-	public static function getAllContext($coroutineId = null): Coroutine\Context|array
-	{
-		if (Coroutine::getCid() === -1) {
-			return Coroutine::getContext((int)$coroutineId) ?? [];
-		} else {
-			return static::$_contents ?? [];
-		}
-	}
-	
-	
-	/**
-	 * @return void
-	 */
-	public static function clearAll(): void
-	{
-		if (Coroutine::getCid() === -1) {
-			static::$_contents = [];
-		}
-	}
-	
-	/**
-	 * @param string $id
-	 * @param null $coroutineId
-	 */
-	public static function remove(string $id, $coroutineId = null)
-	{
-		if (is_null($coroutineId)) {
-			$coroutineId = Coroutine::getCid();
-		}
-		if (!static::hasContext($id, $coroutineId)) {
-			return;
-		}
-		if (Coroutine::getCid() === -1) {
-			static::$_contents[$id] = null;
-			
-			unset(static::$_contents[$id]);
-			
-		} else {
-			Coroutine::getContext($coroutineId)[$id] = null;
-			
-			unset(Coroutine::getContext($coroutineId)[$id]);
-		}
-	}
-	
-	/**
-	 * @param $id
-	 * @param null $key
-	 * @param null $coroutineId
-	 * @return bool
-	 */
-	public static function hasContext($id, $key = null, $coroutineId = null): bool
-	{
-		if (Coroutine::getCid() === -1) {
-			return static::searchByStatic($id, $key);
-		}
-		return static::searchByCoroutine($id, $key, $coroutineId);
-	}
-	
-	
-	/**
-	 * @param $id
-	 * @param null $key
-	 * @return bool
-	 */
-	private static function searchByStatic($id, $key = null): bool
-	{
-		if (!isset(static::$_contents[$id])) {
-			return false;
-		}
-		$value = static::$_contents[$id];
-		if (!empty($key) && is_array($value)) {
-			return ($value[$key] ?? null) !== null;
-		}
-		return true;
-	}
-	
-	
-	/**
-	 * @param $id
-	 * @param null $key
-	 * @param null $coroutineId
-	 * @return bool
-	 */
-	private static function searchByCoroutine($id, $key = null, $coroutineId = null): bool
-	{
-		if (is_null($coroutineId)) {
-			$coroutineId = Coroutine::getCid();
-		}
-		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
-			return false;
-		}
-		$value = Coroutine::getContext($coroutineId)[$id];
-		if ($key !== null && is_array($value)) {
-			return ($value[$key] ?? null) !== null;
-		}
-		return true;
-	}
-	
-	
-	/**
-	 * @return bool
-	 */
-	public static function inCoroutine(): bool
-	{
-		return Coroutine::getCid() !== -1;
-	}
-	
-}
-
-
-
diff --git a/kiri-engine/Pool/Connection.php b/kiri-engine/Pool/Connection.php
index 279cce85..ace15a9b 100644
--- a/kiri-engine/Pool/Connection.php
+++ b/kiri-engine/Pool/Connection.php
@@ -5,12 +5,12 @@ namespace Kiri\Pool;
 
 use Closure;
 use Database\Db;
-use PDO;
 use Exception;
 use Kiri;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Context;
+use Kiri\Di\Context;
+use PDO;
 use Swoole\Error;
 use Throwable;
 
diff --git a/kiri-engine/Pool/Pool.php b/kiri-engine/Pool/Pool.php
index 2009b969..c34f76d9 100644
--- a/kiri-engine/Pool/Pool.php
+++ b/kiri-engine/Pool/Pool.php
@@ -8,13 +8,10 @@ use Database\Mysql\PDO;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Abstracts\CoordinatorManager;
 use Kiri\Annotation\Inject;
-use Kiri\Context;
 use Kiri\Exception\ConfigException;
 use Kiri\Server\Abstracts\StatusEnum;
 use Kiri\Server\WorkerStatus;
-use Swoole\Coroutine\Channel;
 
 
 /**
diff --git a/kiri-engine/Pool/PoolQueue.php b/kiri-engine/Pool/PoolQueue.php
index d7e086ae..6e67ef24 100644
--- a/kiri-engine/Pool/PoolQueue.php
+++ b/kiri-engine/Pool/PoolQueue.php
@@ -2,8 +2,7 @@
 
 namespace Kiri\Pool;
 
-use Kiri\Context;
-
+use Kiri\Di\Context;
 use Swoole\Coroutine\Channel;
 
 class PoolQueue implements QueueInterface
diff --git a/kiri-websocket-server/Server.php b/kiri-websocket-server/Server.php
index 4596df77..539fc85c 100644
--- a/kiri-websocket-server/Server.php
+++ b/kiri-websocket-server/Server.php
@@ -7,18 +7,18 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Annotation\Inject;
-use Kiri\Context;
 use Kiri\Di\ContainerInterface;
+use Kiri\Di\Context;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\ConfigException;
 use Kiri\Message\Abstracts\ExceptionHandlerInterface;
+use Kiri\Message\Constrict\Response as CResponse;
 use Kiri\Message\Constrict\ResponseInterface;
 use Kiri\Message\ExceptionHandlerDispatcher;
 use Kiri\Message\Handler\DataGrip;
 use Kiri\Message\Handler\Dispatcher;
 use Kiri\Message\Handler\RouterCollector;
 use Kiri\Message\ResponseEmitter;
-use Kiri\Message\Constrict\Response as CResponse;
 use Kiri\Websocket\Contract\OnCloseInterface;
 use Kiri\Websocket\Contract\OnDisconnectInterface;
 use Kiri\Websocket\Contract\OnHandshakeInterface;