Foundational refactor to allow for HTTP/3

composer.json

@@ -36,6 +36,7 @@
         "amphp/hpack": "^3",
         "amphp/http": "^2",
         "amphp/pipeline": "^1",
+        "amphp/quic": "dev-master",
         "amphp/socket": "^2.1",
         "amphp/sync": "^2",
         "league/uri": "^6.8 | ^7.1",

src/Driver/Client.php

@@ -27,4 +27,9 @@ public function getLocalAddress(): SocketAddress;
      * If the client is encrypted a TlsInfo object is returned, otherwise null.
      */
     public function getTlsInfo(): ?TlsInfo;
+
+    /**
+     * @return bool Whether the client uses QUIC.
+     */
+    public function isQuicClient(): bool;
 }

src/Driver/ClientFactory.php

@@ -3,6 +3,7 @@
 namespace Amp\Http\Server\Driver;
 
 use Amp\Http\Client\SocketException;
+use Amp\Quic\QuicConnection;
 use Amp\Socket\Socket;
 
 interface ClientFactory
@@ -12,5 +13,5 @@ interface ClientFactory
      *
      * @throws SocketException
      */
-    public function createClient(Socket $socket): ?Client;
+    public function createClient(Socket|QuicConnection $socket): ?Client;
 }

src/Driver/ConnectionLimitingClientFactory.php

@@ -2,6 +2,7 @@
 
 namespace Amp\Http\Server\Driver;
 
+use Amp\Quic\QuicConnection;
 use Amp\Socket\InternetAddress;
 use Amp\Socket\InternetAddressVersion;
 use Amp\Socket\Socket;
@@ -19,7 +20,7 @@ public function __construct(
     ) {
     }
 
-    public function createClient(Socket $socket): ?Client
+    public function createClient(Socket|QuicConnection $socket): ?Client
     {
         $address = $socket->getRemoteAddress();
 

src/Driver/DefaultHttpDriverFactory.php

@@ -29,6 +29,18 @@ public function createHttpDriver(
         ErrorHandler $errorHandler,
         Client $client,
     ): HttpDriver {
+        if ($client->isQuicClient()) {
+            return new Http3Driver(
+                requestHandler: $requestHandler,
+                errorHandler: $errorHandler,
+                logger: $this->logger,
+                streamTimeout: $this->streamTimeout,
+                headerSizeLimit: $this->headerSizeLimit,
+                bodySizeLimit: $this->bodySizeLimit,
+                pushEnabled: $this->pushEnabled,
+            );
+        }
+
         if ($client->getTlsInfo()?->getApplicationLayerProtocol() === "h2") {
             return new Http2Driver(
                 requestHandler: $requestHandler,

src/Driver/Http1Driver.php

@@ -16,7 +16,7 @@
 use Amp\Http\HttpStatus;
 use Amp\Http\InvalidHeaderException;
 use Amp\Http\Server\ClientException;
-use Amp\Http\Server\Driver\Internal\AbstractHttpDriver;
+use Amp\Http\Server\Driver\Internal\StreamHttpDriver;
 use Amp\Http\Server\ErrorHandler;
 use Amp\Http\Server\Request;
 use Amp\Http\Server\RequestBody;
@@ -32,7 +32,7 @@
 use function Amp\Http\formatDateHeader;
 use function Amp\Http\mapHeaderPairs;
 
-final class Http1Driver extends AbstractHttpDriver
+final class Http1Driver extends StreamHttpDriver
 {
     private static function makeHeaderReduceClosure(string $search): \Closure
     {

src/Driver/Http2Driver.php

@@ -18,8 +18,8 @@
 use Amp\Http\HttpStatus;
 use Amp\Http\InvalidHeaderException;
 use Amp\Http\Server\ClientException;
-use Amp\Http\Server\Driver\Internal\AbstractHttpDriver;
 use Amp\Http\Server\Driver\Internal\Http2Stream;
+use Amp\Http\Server\Driver\Internal\StreamHttpDriver;
 use Amp\Http\Server\ErrorHandler;
 use Amp\Http\Server\Push;
 use Amp\Http\Server\Request;
@@ -35,7 +35,7 @@
 use function Amp\async;
 use function Amp\Http\formatDateHeader;
 
-final class Http2Driver extends AbstractHttpDriver implements Http2Processor
+final class Http2Driver extends StreamHttpDriver implements Http2Processor
 {
     public const DEFAULT_CONCURRENT_STREAM_LIMIT = 100;
 

src/Driver/Http3Driver.php

@@ -0,0 +1,60 @@
+<?php declare(strict_types=1);
+
+namespace Amp\Http\Server\Driver;
+
+use Amp\Http\Server\Driver\Internal\ConnectionHttpDriver;
+use Amp\Http\Server\Driver\Internal\QPack;
+use Amp\Http\Server\ErrorHandler;
+use Amp\Http\Server\Request;
+use Amp\Http\Server\RequestHandler;
+use Amp\Http\Server\Response;
+use Amp\Quic\QuicConnection;
+use Amp\Socket\Socket;
+use Psr\Log\LoggerInterface as PsrLogger;
+
+class Http3Driver extends ConnectionHttpDriver
+{
+    private bool $allowsPush;
+
+    public function __construct(
+        RequestHandler $requestHandler,
+        ErrorHandler $errorHandler,
+        PsrLogger $logger,
+        private readonly int $streamTimeout = Http2Driver::DEFAULT_STREAM_TIMEOUT,
+        private readonly int $headerSizeLimit = Http2Driver::DEFAULT_HEADER_SIZE_LIMIT,
+        private readonly int $bodySizeLimit = Http2Driver::DEFAULT_BODY_SIZE_LIMIT,
+        private readonly bool $pushEnabled = true,
+        private readonly ?string $settings = null,
+    ) {
+        parent::__construct($requestHandler, $errorHandler, $logger);
+
+        $this->allowsPush = $pushEnabled;
+
+        $this->qpack = new QPack;
+    }
+
+    protected function write(Request $request, Response $response): void
+    {
+
+    }
+
+    public function getApplicationLayerProtocols(): array
+    {
+        return ["h3"]; // that's a property of the server itself...? "h3" is the default mandated by RFC 9114, but section 3.1 allows for custom mechanisms too, technically.
+    }
+
+    public function handleConnection(Client $client, QuicConnection|Socket $connection): void
+    {
+
+    }
+
+    public function getPendingRequestCount(): int
+    {
+        return 0;
+    }
+
+    public function stop(): void
+    {
+
+    }
+}

src/Driver/HttpDriver.php

@@ -4,6 +4,8 @@
 
 use Amp\ByteStream\ReadableStream;
 use Amp\ByteStream\WritableStream;
+use Amp\Quic\QuicConnection;
+use Amp\Socket\Socket;
 
 interface HttpDriver
 {
@@ -18,14 +20,22 @@ interface HttpDriver
     public function getApplicationLayerProtocols(): array;
 
     /**
-     * Set up the driver.
+     * Set up the driver in a socket independent way.
      */
     public function handleClient(
         Client $client,
         ReadableStream $readableStream,
         WritableStream $writableStream,
     ): void;
 
+    /**
+     * Set up the driver directly through a connection.
+     */
+    public function handleConnection(
+        Client $client,
+        Socket|QuicConnection $connection
+    ): void;
+
     /**
      * @return int Number of requests that are being read by the parser.
      */

src/Driver/Internal/AbstractHttpDriver.php → src/Driver/Internal/ConnectionHttpDriver.php

@@ -2,9 +2,12 @@
 
 namespace Amp\Http\Server\Driver\Internal;
 
+use Amp\ByteStream\ReadableStream;
+use Amp\ByteStream\WritableStream;
 use Amp\Http\HttpStatus;
 use Amp\Http\Server\ClientException;
 use Amp\Http\Server\DefaultErrorHandler;
+use Amp\Http\Server\Driver\Client;
 use Amp\Http\Server\Driver\HttpDriver;
 use Amp\Http\Server\ErrorHandler;
 use Amp\Http\Server\HttpErrorException;
@@ -14,7 +17,7 @@
 use Psr\Log\LoggerInterface;
 
 /** @internal */
-abstract class AbstractHttpDriver implements HttpDriver
+abstract class ConnectionHttpDriver implements HttpDriver
 {
     private static ?TimeoutQueue $timeoutQueue = null;
     private static ?ErrorHandler $defaultErrorHandler = null;
@@ -143,4 +146,12 @@ private function handleError(int $status, ?string $reason, Request $request): Re
             return self::getDefaultErrorHandler()->handleError($status, null, $request);
         }
     }
+
+    public function handleClient(
+        Client $client,
+        ReadableStream $readableStream,
+        WritableStream $writableStream,
+    ): void {
+        throw new \Error(get_class($this) . " cannot handle Clients in a stream independent way. Use handleConnection() instead.");
+    }
 }

src/Driver/Internal/QPack.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Amp\Http\Server\Driver\Internal;
+
+class QPack
+{
+
+}

src/Driver/Internal/StreamHttpDriver.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Amp\Http\Server\Driver\Internal;
+
+use Amp\Http\Server\Driver\Client;
+use Amp\Quic\QuicConnection;
+use Amp\Socket\Socket;
+
+abstract class StreamHttpDriver extends ConnectionHttpDriver
+{
+    public function handleConnection(Client $client, QuicConnection|Socket $connection): void
+    {
+        $this->handleClient($client, $connection, $connection);
+    }
+}

src/Driver/LoggingSocketClientFactory.php

@@ -2,6 +2,7 @@
 
 namespace Amp\Http\Server\Driver;
 
+use Amp\Quic\QuicConnection;
 use Amp\Socket\Socket;
 use Psr\Log\LoggerInterface as PsrLogger;
 
@@ -13,7 +14,7 @@ public function __construct(
     ) {
     }
 
-    public function createClient(Socket $socket): ?Client
+    public function createClient(Socket|QuicConnection $socket): ?Client
     {
         $local = $socket->getLocalAddress()->toString();
         $remote = $socket->getRemoteAddress()->toString();

src/Driver/SocketClient.php

@@ -2,6 +2,7 @@
 
 namespace Amp\Http\Server\Driver;
 
+use Amp\Quic\QuicConnection;
 use Amp\Socket\Socket;
 use Amp\Socket\SocketAddress;
 use Amp\Socket\TlsInfo;
@@ -11,7 +12,7 @@ final class SocketClient implements Client
     private readonly int $id;
 
     public function __construct(
-        private readonly Socket $socket,
+        private readonly Socket|QuicConnection $socket,
     ) {
         $this->id = createClientId();
     }
@@ -50,4 +51,9 @@ public function isClosed(): bool
     {
         return $this->socket->isClosed();
     }
+
+    public function isQuicClient(): bool
+    {
+        return $this->socket instanceof QuicConnection;
+    }
 }

src/Driver/SocketClientFactory.php

@@ -3,6 +3,7 @@
 namespace Amp\Http\Server\Driver;
 
 use Amp\CancelledException;
+use Amp\Quic\QuicConnection;
 use Amp\Socket\Socket;
 use Amp\Socket\SocketException;
 use Amp\TimeoutCancellation;
@@ -16,7 +17,7 @@ public function __construct(
     ) {
     }
 
-    public function createClient(Socket $socket): ?Client
+    public function createClient(Socket|QuicConnection $socket): ?Client
     {
         $local = $socket->getLocalAddress()->toString();
         $remote = $socket->getRemoteAddress()->toString();