改名

HttpServer/Events/OnPacket.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 namespace HttpServer\Events;
 
 
-use Closure;
 use HttpServer\Abstracts\Callback;
+use HttpServer\Http\Request;
+use Snowflake\Core\Json;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
 use Exception;
-use HttpServer\Events\Utility\DataResolve;
 
 /**
  * Class OnPacket
@@ -20,12 +20,10 @@ class OnPacket extends Callback
 {
 
 
-	/** @var ?Closure */
+	public int $port = 0;
-	public ?Closure $unpack = null;
 
 
-	/** @var ?Closure */
+	public string $host = '';
-	public ?Closure $pack = null;
 
 
 	/**
@@ -38,15 +36,18 @@ class OnPacket extends Callback
 	public function onHandler(Server $server, string $data, array $clientInfo): mixed
 	{
 		try {
-			$data = DataResolve::unpack($this->unpack, $clientInfo['address'], $clientInfo['port'], $data);
+			$request = Request::createListenRequest($clientInfo, $server, $data);
-			if (empty($data)) {
+
-				throw new Exception('Format error.');
+			[$host, $port] = [$clientInfo['address'], $clientInfo['port']];
+
+			$router = Snowflake::app()->getRouter();
+			if (($node = $router->find_path($request)) === null) {
+				return $server->sendto($host, $port, Json::encode(['state' => 404]));
 			}
-			return $server->sendto($clientInfo['address'], $clientInfo['port'], DataResolve::pack($this->pack, $data));
+			return $server->sendto($host, $port, $node->dispatch());
 		} catch (\Throwable $exception) {
-			$response['message'] = $exception->getMessage();
+			$response = Json::encode(['state' => 500, 'message' => $exception->getMessage()]);
-			$response['state'] = 500;
+
-			$response = DataResolve::pack($this->pack, $response);
 			return $server->sendto($clientInfo['address'], $clientInfo['port'], $response);
 		} finally {
 			fire(Event::SYSTEM_RESOURCE_RELEASES);

HttpServer/Events/OnReceive.php

@@ -5,12 +5,12 @@ namespace HttpServer\Events;
 
 
 use HttpServer\Abstracts\Callback;
+use HttpServer\Http\Request;
+use Snowflake\Core\Json;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 use Swoole\Server;
 use Exception;
-use Closure;
-use HttpServer\Events\Utility\DataResolve;
 
 /**
  * Class OnReceive
@@ -19,13 +19,10 @@ use HttpServer\Events\Utility\DataResolve;
 class OnReceive extends Callback
 {
 
-
+	public int $port = 0;
-	/** @var ?Closure */
-	public ?Closure $unpack = null;
 
 
-	/** @var ?Closure */
+	public string $host = '';
-	public ?Closure $pack = null;
 
 
 	/**
@@ -39,18 +36,15 @@ class OnReceive extends Callback
 	public function onHandler(Server $server, int $fd, int $reID, string $data): mixed
 	{
 		try {
-			$client = $server->getClientInfo($fd, $reID);
+			$request = Request::createListenRequest($fd, $server, $data, $reID);
 
-			$data = DataResolve::unpack($this->unpack, $client['remote_ip'], $client['remote_port'], $data);
+			$router = Snowflake::app()->getRouter();
-			if (empty($data)) {
+			if (($node = $router->find_path($request)) === null) {
-				throw new Exception('Format error.');
+				return $server->send($fd, Json::encode(['state' => 404]));
 			}
-			return $server->send($fd, DataResolve::pack($this->pack, $data));
+			return $server->send($fd, $node->dispatch());
 		} catch (\Throwable $exception) {
-			$response['message'] = $exception->getMessage();
+			return $server->send($fd, Json::encode(['state' => 500, 'message' => $exception->getMessage()]));
-			$response['state'] = 500;
-			$response = DataResolve::pack($this->pack, $response);
-			return $server->send($fd, $response);
 		} finally {
 			$event = Snowflake::app()->getEvent();
 			$event->trigger(Event::SYSTEM_RESOURCE_RELEASES);
@@ -58,4 +52,5 @@ class OnReceive extends Callback
 		}
 	}
 
+
 }

HttpServer/Http/HttpParams.php

@@ -72,6 +72,16 @@ class HttpParams
 		}
 	}
 
+
+	/**
+	 * @return mixed
+	 */
+	public function getBody(): mixed
+	{
+		return $this->body;
+	}
+
+
 	/**
 	 * @param string $key
 	 * @param string $value

HttpServer/Http/Request.php

@@ -15,6 +15,7 @@ use Snowflake\Core\Json;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Exception\NotFindClassException;
 use Snowflake\Snowflake;
+use Swoole\Server;
 use function router;
 
 defined('REQUEST_OK') or define('REQUEST_OK', 0);
@@ -47,6 +48,7 @@ class Request extends HttpService
 	public bool $isCli = FALSE;
 
 	public float $startTime;
+	public ?array $clientInfo;
 
 	public string $uri = '';
 
@@ -481,7 +483,37 @@ class Request extends HttpService
 		$sRequest->headers->replace('request_uri', $event . '::' . $route);
 		$sRequest->parseUri();
 
-        return $sRequest;
+		return Context::setContext('request', $sRequest);
+	}
+
+
+	/**
+	 * @param $fd
+	 * @param Server $server
+	 * @param $data
+	 * @param int $reID
+	 * @return Request
+	 * @throws NotFindClassException
+	 * @throws ReflectionException
+	 */
+	public static function createListenRequest($fd, Server $server, $data, $reID = 0): Request
+	{
+		/** @var Request $sRequest */
+		$sRequest = Snowflake::createObject(Request::class);
+		if (is_array($fd)) {
+			$sRequest->fd = 0;
+			$sRequest->clientInfo = $fd;
+		} else {
+			$sRequest->fd = $fd;
+			$sRequest->clientInfo = $server->getClientInfo($fd, $reID);
+		}
+		$sRequest->startTime = microtime(true);
+		$sRequest->params = new HttpParams(['body' => $data], [], []);
+		$sRequest->headers = new HttpHeaders([]);
+		$sRequest->headers->replace('request_method', 'listen');
+		$sRequest->headers->replace('request_uri', 'add-port-listen/' . $server->port);
+		$sRequest->parseUri();
+		return Context::setContext('request', $sRequest);
 	}
 
 

HttpServer/Server.php

@@ -431,8 +431,8 @@ class Server extends HttpService
 		} else {
 			$this->onBind($newListener, 'packet', [$class = new OnPacket(), 'onHandler']);
 		}
-		$class->pack = $config['resolve']['pack'] ?? null;
+		$class->host = $config['host'];
-		$class->unpack = $config['resolve']['unpack'] ?? null;
+		$class->port = $config['port'];
 	}