改名

HttpServer/Abstracts/Callback.php

@@ -6,14 +6,17 @@ namespace HttpServer\Abstracts;
 
 use Database\Connection;
 use Exception;
+use HttpServer\Http\Request;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
+use ReflectionException;
 use Snowflake\Abstracts\Config;
 use Snowflake\Core\Json;
 use Snowflake\Error\LoggerProcess;
 use Snowflake\Event;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Exception\ConfigException;
+use Snowflake\Exception\NotFindClassException;
 use Snowflake\Snowflake;
 use Swoole\Process;
 use Swoole\Server;
@@ -64,6 +67,19 @@ abstract class Callback extends HttpService
     }
 
 
+	/**
+	 * @param $fd
+	 * @param $data
+	 * @param $reID
+	 * @return Request
+	 * @throws ReflectionException
+	 * @throws NotFindClassException
+	 */
+	protected function _request($fd, $data, $reID): Request
+	{
+		return Request::createListenRequest($fd, $data, $reID);
+	}
+
     /**
      * @param $message
      * @throws

HttpServer/Events/OnPacket.php

@@ -4,13 +4,12 @@ declare(strict_types=1);
 namespace HttpServer\Events;
 
 
+use Exception;
 use HttpServer\Abstracts\Callback;
-use HttpServer\Http\Request;
 use Snowflake\Core\Json;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
-use Exception;
 
 /**
  * Class OnPacket
@@ -35,10 +34,13 @@ class OnPacket extends Callback
 	 */
 	public function onHandler(Server $server, string $data, array $clientInfo): mixed
 	{
+		[$host, $port] = [$clientInfo['address'], $clientInfo['port']];
 		try {
-			$request = Request::createListenRequest($clientInfo, $server, $data);
-
-			[$host, $port] = [$clientInfo['address'], $clientInfo['port']];
+			\Swoole\Coroutine\defer(function () {
+				fire(Event::SYSTEM_RESOURCE_RELEASES);
+				\logger_insert();
+			});
+			$request = $this->_request($clientInfo, $server, $data);
 
 			$router = Snowflake::app()->getRouter();
 			if (($node = $router->find_path($request)) === null) {
@@ -56,10 +58,7 @@ class OnPacket extends Callback
 
 			$response = Json::encode(['state' => 500, 'message' => $exception->getMessage()]);
 
-			return $server->sendto($clientInfo['address'], $clientInfo['port'], $response);
-		} finally {
-			fire(Event::SYSTEM_RESOURCE_RELEASES);
-			logger()->insert();
+			return $server->sendto($host, $port, $response);
 		}
 	}
 

HttpServer/Events/OnReceive.php

@@ -49,9 +49,8 @@ class OnReceive extends Callback
 	{
 		try {
 			\Swoole\Coroutine\defer(function (){
-				$event = Snowflake::app()->getEvent();
-				$event->trigger(Event::SYSTEM_RESOURCE_RELEASES);
-				\logger()->insert();
+				fire(Event::SYSTEM_RESOURCE_RELEASES);
+				\logger_insert();
 			});
 			$request = $this->_request($fd, $data, $reID);
 			if (($node = $this->router->find_path($request)) === null) {
@@ -71,18 +70,4 @@ class OnReceive extends Callback
 	}
 
 
-	/**
-	 * @param $fd
-	 * @param $data
-	 * @param $reID
-	 * @return Request
-	 * @throws ReflectionException
-	 * @throws NotFindClassException
-	 */
-	private function _request($fd, $data, $reID): Request
-	{
-		return Request::createListenRequest($fd, $data, $reID);
-	}
-
-
 }