fix(router): handle HEAD requests

Author: innocenzi

packages/router/src/GenericResponseSender.php

@@ -7,6 +7,8 @@
 use Generator;
 use Tempest\Http\ContentType;
 use Tempest\Http\Header;
+use Tempest\Http\Method;
+use Tempest\Http\Request;
 use Tempest\Http\Response;
 use Tempest\Http\Responses\Download;
 use Tempest\Http\Responses\EventStream;
@@ -19,6 +21,7 @@
 final readonly class GenericResponseSender implements ResponseSender
 {
     public function __construct(
+        private Request $request,
         private ViewRenderer $viewRenderer,
     ) {}
 
@@ -27,7 +30,11 @@ public function send(Response $response): Response
         ob_start();
         $this->sendHeaders($response);
         ob_flush();
-        $this->sendContent($response);
+
+        if (! $this->shouldSendContent()) {
+            $this->sendContent($response);
+        }
+
         ob_end_flush();
 
         if (function_exists('fastcgi_finish_request')) {
@@ -37,6 +44,15 @@ public function send(Response $response): Response
         return $response;
     }
 
+    private function shouldSendContent(): bool
+    {
+        if ($this->request->method === Method::HEAD) {
+            return false;
+        }
+
+        return true;
+    }
+
     private function sendHeaders(Response $response): void
     {
         // TODO: Handle SAPI/FastCGI

packages/router/src/GenericRouter.php

@@ -39,6 +39,8 @@ public function dispatch(Request|PsrRequest $request): Response
             $request = map($request)->with(PsrRequestToGenericRequestMapper::class)->do();
         }
 
+        $this->container->singleton(Request::class, $request);
+
         $callable = $this->getCallable();
 
         return $this->processResponse($callable($request));

packages/router/src/HttpApplication.php

@@ -52,12 +52,10 @@ public function run(): void
         $router = $this->container->get(Router::class);
 
         $psrRequest = $this->container->get(RequestFactory::class)->make();
+        $response = $router->dispatch($psrRequest);
 
         $responseSender = $this->container->get(ResponseSender::class);
-
-        $responseSender->send(
-            $router->dispatch($psrRequest),
-        );
+        $responseSender->send($response);
 
         $this->container->get(Session::class)->cleanup();
 

packages/router/src/ResponseSenderInitializer.php

@@ -4,17 +4,20 @@
 
 namespace Tempest\Router;
 
-use Tempest\Clock\Clock;
 use Tempest\Container\Container;
 use Tempest\Container\Initializer;
 use Tempest\Container\Singleton;
+use Tempest\Http\Request;
 use Tempest\View\ViewRenderer;
 
 final class ResponseSenderInitializer implements Initializer
 {
     #[Singleton]
     public function initialize(Container $container): ResponseSender
     {
-        return new GenericResponseSender($container->get(ViewRenderer::class));
+        return new GenericResponseSender(
+            request: $container->get(Request::class),
+            viewRenderer: $container->get(ViewRenderer::class),
+        );
     }
 }

packages/router/src/Routing/Construction/RouteConfigurator.php

@@ -5,6 +5,7 @@
 namespace Tempest\Router\Routing\Construction;
 
 use Tempest\Container\Singleton;
+use Tempest\Http\Method;
 use Tempest\Router\RouteConfig;
 
 /**
@@ -46,16 +47,19 @@ private function addDynamicRoute(DiscoveredRoute $route): void
     {
         $markedRoute = $this->markRoute($route);
         $this->dynamicRoutes[$route->method->value][$markedRoute->mark] = $route;
+        $this->dynamicRoutes[Method::HEAD->value][$markedRoute->mark] = $route;
 
         $this->routingTree->add($markedRoute);
     }
 
     private function addStaticRoute(DiscoveredRoute $route): void
     {
-        $uriWithTrailingSlash = rtrim($route->uri, '/');
+        $uriWithoutTrailingSlash = rtrim($route->uri, '/');
 
-        $this->staticRoutes[$route->method->value][$uriWithTrailingSlash] = $route;
-        $this->staticRoutes[$route->method->value][$uriWithTrailingSlash . '/'] = $route;
+        $this->staticRoutes[$route->method->value][$uriWithoutTrailingSlash] = $route;
+        $this->staticRoutes[$route->method->value][$uriWithoutTrailingSlash . '/'] = $route;
+        $this->staticRoutes[Method::HEAD->value][$uriWithoutTrailingSlash] = $route;
+        $this->staticRoutes[Method::HEAD->value][$uriWithoutTrailingSlash . '/'] = $route;
     }
 
     private function markRoute(DiscoveredRoute $route): MarkedRoute