改名

Database/Db.php

@@ -22,12 +22,15 @@ class Db
 {
     use QueryTrait;
 
+
+    private static bool $_inTransaction = false;
+
     /**
      * @return bool
      */
     public static function transactionsActive(): bool
     {
-        return Context::getContext('begin:transaction') === true;
+        return static::$_inTransaction === true;
     }
 
     /**
@@ -35,7 +38,8 @@ class Db
      */
     public static function beginTransaction()
     {
-        Context::setContext('begin:transaction', true);
+    	static::$_inTransaction = true;
+//        Context::setContext('begin:transaction', true);
     }
 
     /**
@@ -49,7 +53,7 @@ class Db
         $event = Snowflake::app()->getEvent();
         $event->trigger(Connection::TRANSACTION_COMMIT);
         $event->offName(Connection::TRANSACTION_COMMIT);
-        Context::deleteContext('begin:transaction');
+	    static::$_inTransaction = false;
     }
 
     /**
@@ -63,7 +67,7 @@ class Db
         $event = Snowflake::app()->getEvent();
         $event->trigger(Connection::TRANSACTION_ROLLBACK);
         $event->offName(Connection::TRANSACTION_ROLLBACK);
-        Context::deleteContext('begin:transaction');
+	    static::$_inTransaction = false;
     }
 
     /**

HttpServer/Http/Context.php

@@ -41,16 +41,14 @@ class Context extends BaseContext
 	 */
 	private static function setStatic($id, $context, $key = null): mixed
 	{
-        if (!empty($key)) {
+		if (empty($key)) {
+			return static::$_requests[$id] = $context;
+		}
 		if (!is_array(static::$_requests[$id])) {
-                static::$_requests[$id] = [$key => $context];
+			return static::$_requests[$id] = [$key => $context];
 		} else {
-                static::$_requests[$id][$key] = $context;
+			return static::$_requests[$id][$key] = $context;
 		}
-        } else {
-            static::$_requests[$id] = $context;
-        }
-        return $context;
 	}
 
 	/**
@@ -61,27 +59,24 @@ class Context extends BaseContext
 	 */
 	private static function setCoroutine($id, $context, $key = null): mixed
 	{
-        if (!static::hasContext($id)) {
+		if (empty($key)) {
-            Coroutine::getContext()[$id] = [];
+			return Coroutine::getContext()[$id] = $context;
 		}
-        if (!empty($key)) {
 		if (!is_array(Coroutine::getContext()[$id])) {
 			Coroutine::getContext()[$id] = [$key => $context];
 		} else {
 			Coroutine::getContext()[$id][$key] = $context;
 		}
-        } else {
-            Coroutine::getContext()[$id] = $context;
-        }
 		return $context;
 	}
 
 	/**
 	 * @param $id
 	 * @param null $key
-     * @return mixed
+	 * @param int $value
+	 * @return bool|int
 	 */
-    public static function autoIncr($id, $key = null): mixed
+	public static function increment($id, $key = null, $value = 1): bool|int
 	{
 		if (!static::inCoroutine()) {
 			return false;
@@ -89,15 +84,16 @@ class Context extends BaseContext
 		if (!isset(Coroutine::getContext()[$id][$key])) {
 			return false;
 		}
-        return Coroutine::getContext()[$id][$key] += 1;
+		return Coroutine::getContext()[$id][$key] += $value;
 	}
 
 	/**
 	 * @param $id
 	 * @param null $key
-     * @return mixed
+	 * @param int $value
+	 * @return bool|int
 	 */
-    public static function autoDecr($id, $key = null): mixed
+	public static function decrement($id, $key = null, $value = 1): bool|int
 	{
 		if (!static::inCoroutine() || !static::hasContext($id)) {
 			return false;
@@ -105,7 +101,7 @@ class Context extends BaseContext
 		if (!isset(Coroutine::getContext()[$id][$key])) {
 			return false;
 		}
-        return Coroutine::getContext()[$id][$key] -= 1;
+		return Coroutine::getContext()[$id][$key] -= $value;
 	}
 
 	/**
@@ -119,19 +115,48 @@ class Context extends BaseContext
 			return null;
 		}
 		if (static::inCoroutine()) {
-            if ($key === null) {
+			return static::loadByContext($id, $key);
-                return Coroutine::getContext()[$id];
 		} else {
-                return Coroutine::getContext()[$id][$key] ?? null;
+			return static::loadByStatic($id, $key);
-            }
-        } else {
-            if ($key === null) {
-                return static::$_requests[$id];
-            } else {
-                return static::$_requests[$id][$key] ?? null;
 		}
 	}
+
+
+	/**
+	 * @param $id
+	 * @param null $key
+	 * @return mixed
+	 */
+	private static function loadByContext($id, $key = null): mixed
+	{
+		$data = Coroutine::getContext()[$id] ?? null;
+		if ($data === null) {
+			return null;
 		}
+		if ($key !== null) {
+			return $data[$key] ?? null;
+		}
+		return $data;
+	}
+
+
+	/**
+	 * @param $id
+	 * @param null $key
+	 * @return mixed
+	 */
+	private static function loadByStatic($id, $key = null): mixed
+	{
+		$data = static::$_requests[$id] ?? null;
+		if ($data === null) {
+			return null;
+		}
+		if ($key !== null) {
+			return $data[$key] ?? null;
+		}
+		return $data;
+	}
+
 
 	/**
 	 * @return mixed
@@ -149,20 +174,20 @@ class Context extends BaseContext
 	 * @param string $id
 	 * @param string|null $key
 	 */
-    public static function deleteContext(string $id, string $key = null)
+	public static function remove(string $id, string $key = null)
 	{
 		if (!static::hasContext($id, $key)) {
 			return;
 		}
 		if (static::inCoroutine()) {
+			unset(static::$_requests[$id]);
+			return;
+		}
 		if (!empty($key)) {
 			unset(Coroutine::getContext()[$id][$key]);
 		} else {
 			unset(Coroutine::getContext()[$id]);
 		}
-        } else {
-            unset(static::$_requests[$id]);
-        }
 	}
 
 	/**
@@ -173,7 +198,21 @@ class Context extends BaseContext
 	public static function hasContext($id, $key = null): bool
 	{
 		if (!static::inCoroutine()) {
-            if (!isset(static::$_requests[$id]) || empty(static::$_requests[$id])) {
+			return static::searchByStatic($id, $key);
+		} else {
+			return static::searchByCoroutine($id, $key);
+		}
+	}
+
+
+	/**
+	 * @param $id
+	 * @param null $key
+	 * @return bool
+	 */
+	private static function searchByStatic($id, $key = null): bool
+	{
+		if (!isset(static::$_requests[$id])) {
 			return false;
 		}
 		if (!empty($key) && !isset(static::$_requests[$id][$key])) {
@@ -181,17 +220,23 @@ class Context extends BaseContext
 		}
 		return true;
 	}
+
+
+	/**
+	 * @param $id
+	 * @param null $key
+	 * @return bool
+	 */
+	private static function searchByCoroutine($id, $key = null): bool
+	{
 		if (!isset(Coroutine::getContext()[$id])) {
 			return false;
 		}
-        if (Coroutine::getContext()[$id] !== null) {
+		if ($key !== null) {
-            if ($key === null) {
+			return isset((Coroutine::getContext()[$id] ?? [])[$key]);
+		}
 		return true;
 	}
-            return isset(Coroutine::getContext()[$id][$key]);
-        }
-        return false;
-    }
 
 
 	/**

System/Abstracts/Pool.php

@@ -154,7 +154,7 @@ abstract class Pool extends Component
 		}
 		if (!Context::hasContext('create::client::ing::' . $name)) {
 			$this->push($name, $this->createClient($name, $callback));
-			Context::deleteContext('create::client::ing::' . $name);
+			Context::remove('create::client::ing::' . $name);
 		}
 	}
 

System/Pool/Connection.php

@@ -65,7 +65,7 @@ class Connection extends Pool
         if (!Context::hasContext('begin_' . $coroutineName)) {
             Context::setContext('begin_' . $coroutineName, 0);
         }
-        Context::autoIncr('begin_' . $coroutineName);
+        Context::increment('begin_' . $coroutineName);
         if (!Context::getContext('begin_' . $coroutineName) !== 0) {
             return;
         }
@@ -84,7 +84,7 @@ class Connection extends Pool
         if (!Context::hasContext('begin_' . $coroutineName)) {
             return;
         }
-        if (Context::autoDecr('begin_' . $coroutineName) > 0) {
+        if (Context::decrement('begin_' . $coroutineName) > 0) {
             return;
         }
         $connection = Context::getContext($coroutineName);
@@ -117,7 +117,7 @@ class Connection extends Pool
         if (!Context::hasContext('begin_' . $coroutineName)) {
             return;
         }
-        if (Context::autoDecr('begin_' . $coroutineName) > 0) {
+        if (Context::decrement('begin_' . $coroutineName) > 0) {
             return;
         }
         if (($connection = Context::getContext($coroutineName)) instanceof PDO) {
@@ -250,7 +250,7 @@ class Connection extends Pool
      */
     public function remove($coroutineName)
     {
-        Context::deleteContext($coroutineName);
+        Context::remove($coroutineName);
     }
 
     /**

System/Pool/Redis.php

@@ -119,7 +119,7 @@ class Redis extends Pool
      */
     public function remove(string $coroutineName)
     {
-        Context::deleteContext($coroutineName);
+        Context::remove($coroutineName);
     }
 
     /**