Support swow psr7-plus interface for all components. (#5839)

Author: limingxinleo

composer.json

@@ -19,7 +19,8 @@
         "hyperf/server": "~3.1.0",
         "hyperf/support": "~3.1.0",
         "hyperf/utils": "~3.1.0",
-        "multiplex/socket": "^1.0"
+        "multiplex/socket": "^1.0",
+        "swow/psr7-plus": "^1.0"
     },
     "autoload": {
         "psr-4": {

src/Contract/HttpMessageBuilderInterface.php

@@ -11,14 +11,15 @@
  */
 namespace Hyperf\RpcMultiplex\Contract;
 
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Swow\Psr7\Message\ResponsePlusInterface;
+use Swow\Psr7\Message\ServerRequestPlusInterface;
 
 interface HttpMessageBuilderInterface
 {
-    public function buildRequest(array $data): ServerRequestInterface;
+    public function buildRequest(array $data): ServerRequestPlusInterface;
 
-    public function buildResponse(ServerRequestInterface $request, array $data): ResponseInterface;
+    public function buildResponse(ServerRequestInterface $request, array $data): ResponsePlusInterface;
 
-    public function persistToContext(ResponseInterface $response): ResponseInterface;
+    public function persistToContext(ResponsePlusInterface $response): ResponsePlusInterface;
 }

src/CoreMiddleware.php

@@ -21,8 +21,8 @@
 use Hyperf\RpcMultiplex\Contract\HttpMessageBuilderInterface;
 use InvalidArgumentException;
 use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Swow\Psr7\Message\ResponsePlusInterface;
 use Throwable;
 
 class CoreMiddleware extends \Hyperf\RpcServer\CoreMiddleware
@@ -85,7 +85,7 @@ protected function handleMethodNotAllowed(array $methods, ServerRequestInterface
         return $this->handleNotFound($request);
     }
 
-    protected function transferToResponse($response, ServerRequestInterface $request): ResponseInterface
+    protected function transferToResponse($response, ServerRequestInterface $request): ResponsePlusInterface
     {
         return $this->responseBuilder->buildResponse($request, $response);
     }

src/HttpMessageBuilder.php

@@ -13,23 +13,25 @@
 
 use Hyperf\Codec\Json;
 use Hyperf\Context\Context;
+use Hyperf\Context\ResponseContext;
 use Hyperf\Contract\PackerInterface;
 use Hyperf\HttpMessage\Server\Request;
 use Hyperf\HttpMessage\Stream\SwooleStream;
 use Hyperf\HttpMessage\Uri\Uri;
 use Hyperf\Rpc\Context as RpcContext;
 use Hyperf\RpcMultiplex\Contract\HttpMessageBuilderInterface;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\UriInterface;
+use Swow\Psr7\Message\ResponsePlusInterface;
+use Swow\Psr7\Message\ServerRequestPlusInterface;
 
 class HttpMessageBuilder implements HttpMessageBuilderInterface
 {
     public function __construct(protected PackerInterface $packer, protected RpcContext $context)
     {
     }
 
-    public function buildRequest(array $data): ServerRequestInterface
+    public function buildRequest(array $data): ServerRequestPlusInterface
     {
         $uri = $this->buildUri(
             $data[Constant::PATH] ?? '/',
@@ -43,19 +45,19 @@ public function buildRequest(array $data): ServerRequestInterface
 
         $request = new Request('POST', $uri, ['Content-Type' => 'application/json'], new SwooleStream(Json::encode($parsedData)));
 
-        return $request->withParsedBody($parsedData);
+        return $request->setParsedBody($parsedData);
     }
 
-    public function buildResponse(ServerRequestInterface $request, array $data): ResponseInterface
+    public function buildResponse(ServerRequestInterface $request, array $data): ResponsePlusInterface
     {
         $packed = $this->packer->pack($data);
 
-        return $this->response()->withBody(new SwooleStream($packed));
+        return $this->response()->setBody(new SwooleStream($packed));
     }
 
-    public function persistToContext(ResponseInterface $response): ResponseInterface
+    public function persistToContext(ResponsePlusInterface $response): ResponsePlusInterface
     {
-        return Context::set(ResponseInterface::class, $response);
+        return ResponseContext::set($response);
     }
 
     protected function buildUri($path, $host, $port, $scheme = 'http'): UriInterface
@@ -68,8 +70,8 @@ protected function buildUri($path, $host, $port, $scheme = 'http'): UriInterface
     /**
      * Get response instance from context.
      */
-    protected function response(): ResponseInterface
+    protected function response(): ResponsePlusInterface
     {
-        return Context::get(ResponseInterface::class);
+        return ResponseContext::get();
     }
 }

src/TcpServer.php

@@ -19,6 +19,7 @@
 use Hyperf\Coroutine\Coroutine;
 use Hyperf\ExceptionHandler\ExceptionHandlerDispatcher;
 use Hyperf\HttpMessage\Server\Response;
+use Hyperf\HttpMessage\Stream\SwooleStream;
 use Hyperf\HttpServer\Contract\CoreMiddlewareInterface;
 use Hyperf\Rpc\Protocol;
 use Hyperf\Rpc\ProtocolManager;
@@ -33,9 +34,10 @@
 use Multiplex\Packet;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Swoole\Coroutine\Server\Connection;
 use Swoole\Server as SwooleServer;
+use Swow\Psr7\Message\ResponsePlusInterface;
+use Swow\Psr7\Message\ServerRequestPlusInterface;
 
 use function Hyperf\Support\make;
 
@@ -82,8 +84,7 @@ public function onReceive($server, int $fd, int $reactorId, string $data): void
         Coroutine::create(function () use ($server, $fd, $reactorId, $data) {
             $packet = $this->packetPacker->unpack($data);
             if ($packet->isHeartbeat()) {
-                $response = new Response();
-                $this->send($server, $fd, $response->withContent(Heartbeat::PONG));
+                $this->send($server, $fd, (new Response())->setBody(new SwooleStream(Heartbeat::PONG)));
                 return;
             }
 
@@ -114,7 +115,7 @@ protected function createCoreMiddleware(): CoreMiddlewareInterface
         return new CoreMiddleware($this->container, $this->protocol, $this->messageBuilder, $this->serverName);
     }
 
-    protected function buildRequest(int $fd, int $reactorId, string $data): ServerRequestInterface
+    protected function buildRequest(int $fd, int $reactorId, string $data): ServerRequestPlusInterface
     {
         $parsed = $this->packer->unpack($data);
 
@@ -123,9 +124,9 @@ protected function buildRequest(int $fd, int $reactorId, string $data): ServerRe
         return $request->withAttribute('fd', $fd)->withAttribute('request_id', $parsed['id'] ?? null);
     }
 
-    protected function buildResponse(int $fd, $server): ResponseInterface
+    protected function buildResponse(int $fd, $server): ResponsePlusInterface
     {
-        return (new Response())->withAttribute('fd', $fd)->withAttribute('server', $server);
+        return (new Response())->setAttribute('fd', $fd)->setAttribute('server', $server);
     }
 
     protected function initProtocol()