Nyholm HTTP messages, intermediate

composer.json

@@ -27,21 +27,21 @@
     },
     "require": {
         "php": "^8.1",
-        "phrity/http": "^1.0",
+        "nyholm/psr7": "^1.4",
+        "phrity/http": "^1.1",
         "phrity/net-uri": "^2.1",
         "phrity/net-stream": "^2.3",
-        "psr/http-message": "^1.1 | ^2.0",
+        "psr/http-message": "^1.1 || ^2.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
-        "guzzlehttp/psr7": "^2.0",
         "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
         "phrity/logger-console": "^1.0",
         "phrity/net-mock": "^2.3",
         "phrity/util-errorhandler": "^1.1",
         "robiningelbrecht/phpunit-coverage-tools": "^1.9",
-        "squizlabs/php_codesniffer": "^3.5 || ^4.0"
+        "squizlabs/php_codesniffer": "^4.0"
     },
     "suggests": {
         "ext-zlib": "Required for per-message deflate compression"

src/Client.php

@@ -580,7 +580,6 @@ protected function performHandshake(Uri $uri, Connection $connection): ResponseI
             $request = $connection->pushHttp($request);
             /** @var ResponseInterface */
             $response = $connection->pullHttp();
-
             if ($response->getStatusCode() != 101) {
                 throw new HandshakeException("Invalid status code {$response->getStatusCode()}.", $response);
             }
@@ -652,6 +651,7 @@ protected function parseUri(UriInterface|string $uri): Uri
         if (!$uriInstance->getHost()) {
             throw new BadUriException("Invalid URI host.");
         }
+        $uriInstance = $uriInstance->withPath($uriInstance->getPath(), Uri::ABSOLUTE_PATH | Uri::NORMALIZE_PATH);
         return $uriInstance;
     }
 

src/Http/HttpHandler.php

@@ -7,13 +7,17 @@
 
 namespace WebSocket\Http;
 
-use Phrity\Http\HttpFactory;
+use Phrity\Http\{
+    HttpFactory,
+    Serializer,
+};
 use Phrity\Net\{
     SocketStream,
     Uri
 };
 use Psr\Http\Message\{
     MessageInterface,
+    RequestInterface,
     ResponseFactoryInterface,
     ServerRequestFactoryInterface,
     UriFactoryInterface,
@@ -38,6 +42,7 @@ class HttpHandler implements LoggerAwareInterface, Stringable
     private SocketStream $stream;
     private bool $ssl;
     private HttpFactory $httpFactory;
+    private Serializer $serializer;
 
     public function __construct(
         SocketStream $stream,
@@ -47,6 +52,7 @@ public function __construct(
         $this->stream = $stream;
         $this->ssl = $ssl;
         $this->httpFactory = $httpFactory ?? new DefaultHttpFactory();
+        $this->serializer = new Serializer();
     }
 
     /**
@@ -68,9 +74,9 @@ public function pull(): MessageInterface
         // Pulling server request
         preg_match('!^(?P<method>[A-Z]+) (?P<path>[^ ]*) HTTP/(?P<version>[0-9/.]+)!', $status, $matches);
         if (!empty($matches)) {
-            $message = $this->httpFactory->createServerRequest($matches['method'], '');
             $path = $matches['path'];
             $version = $matches['version'];
+            $message = $this->httpFactory->createServerRequest($matches['method'], $path);
         }
 
         // Pulling response
@@ -98,7 +104,7 @@ public function pull(): MessageInterface
                 }
             }
         }
-        if ($message instanceof Request) {
+        if ($message instanceof RequestInterface) {
             $scheme = $this->ssl ? 'wss' : 'ws';
             $uri = $this->httpFactory->createUri("{$scheme}://{$message->getHeaderLine('Host')}{$path}");
             $message = $message->withUri($uri, true);
@@ -114,10 +120,7 @@ public function pull(): MessageInterface
      */
     public function push(MessageInterface $message): MessageInterface
     {
-        if (!$message instanceof Message) {
-            throw new RuntimeException('Generic MessageInterface currently not supported.');
-        }
-        $data = implode("\r\n", $message->getAsArray()) . "\r\n\r\n";
+        $data = $this->serializer->message($message);
         $this->stream->write($data);
         return $message;
     }