fix: error handling, cookies

Author: mcharytoniuk

src/CookieManager.php

@@ -36,4 +36,14 @@ public function addCookieToResponse(
 
         $this->cookies->offsetGet($request)->add($cookie);
     }
+
+    /**
+     * @return Set<Cookie>
+     */
+    public function getRequestCookies(ServerRequestInterface $request): Set
+    {
+        return $this->cookies->offsetExists($request)
+            ? $this->cookies->offsetGet($request)
+            : new Set();
+    }
 }

src/HttpRecursiveResponder.php

@@ -30,11 +30,11 @@ public function respondRecursive(
             $responder = $this->processMiddlewares($request, $response, $responder);
 
             if ($responder instanceof HttpResponderInterface) {
-                $forwardedResponder = $responder->respond($request, $response);
-
-                if ($forwardedResponder !== $responder) {
-                    return $this->respondRecursive($request, $response, $forwardedResponder);
-                }
+                return $this->respondRecursive(
+                    $request,
+                    $response,
+                    $responder->respond($request, $response),
+                );
             }
 
             if ($responder instanceof HttpInterceptableInterface) {

src/HttpResponderAggregate.php

@@ -18,6 +18,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Psr\Log\LoggerInterface;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
@@ -35,6 +36,7 @@ public function __construct(
         private HttpRecursiveResponder $recursiveResponder,
         private HttpResponderCollection $httpResponderCollection,
         private HttpRouteMatchRegistry $routeMatchRegistry,
+        private LoggerInterface $logger,
         private MethodNotAllowed $methodNotAllowed,
         private PageNotFound $pageNotFound,
         private PsrSwooleResponder $psrSwooleResponder,
@@ -59,36 +61,53 @@ public function respondToPsrRequest(
         ServerRequestInterface $request,
         ResponseInterface $response,
     ): ResponseInterface {
-        $responder = $this->selectResponder($request);
-
         try {
-            return $this->recursiveResponder->respondRecursive($request, $response, $responder);
+            $responder = $this->selectResponder($request);
+
+            try {
+                return $this->recursiveResponder->respondRecursive($request, $response, $responder);
+            } catch (Throwable $throwable) {
+                $this->eventDispatcher->dispatch(new UnhandledException($throwable));
+
+                return $this->recursiveResponder->respondRecursive(
+                    $request,
+                    $response,
+                    $this->serverError->sendThrowable($request, $response, $throwable),
+                );
+            } finally {
+                $this->eventDispatcher->dispatch(new HttpResponseReady($responder, $request));
+            }
         } catch (Throwable $throwable) {
-            $this->eventDispatcher->dispatch(new UnhandledException($throwable));
-
-            return $this->recursiveResponder->respondRecursive(
-                $request,
-                $response,
-                $this->serverError->sendThrowable($request, $response, $throwable),
-            );
-        } finally {
-            $this->eventDispatcher->dispatch(new HttpResponseReady($responder, $request));
+            $this->logger->error(sprintf(
+                'http_psr_responder_failure(%s)',
+                (string) $throwable,
+            ));
         }
     }
 
     public function respondToSwooleRequest(Request $request, Response $response): void
     {
-        $this->psrSwooleResponder->respondWithPsrResponse(
-            $response,
-            $this->respondToPsrRequest(
-                new SwooleServerRequest(
-                    applicationConfiguration: $this->applicationConfiguration,
-                    request: $request,
-                    swooleConfiguration: $this->swooleConfiguration,
+        try {
+            $psrRequest = new SwooleServerRequest(
+                applicationConfiguration: $this->applicationConfiguration,
+                request: $request,
+                swooleConfiguration: $this->swooleConfiguration,
+            );
+
+            $this->psrSwooleResponder->respondWithPsrResponse(
+                $psrRequest,
+                $response,
+                $this->respondToPsrRequest(
+                    $psrRequest,
+                    new SwooleServerResponse($response),
                 ),
-                new SwooleServerResponse($response),
-            ),
-        );
+            );
+        } catch (Throwable $throwable) {
+            $this->logger->error(sprintf(
+                'http_swoole_responder_failure(%s)',
+                (string) $throwable,
+            ));
+        }
     }
 
     /**

src/PsrSwooleResponder.php

@@ -6,12 +6,18 @@
 
 use Distantmagic\Resonance\Attribute\Singleton;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Swoole\Http\Response;
 
 #[Singleton]
 readonly class PsrSwooleResponder
 {
+    public function __construct(
+        private CookieManager $cookieManager,
+    ) {}
+
     public function respondWithPsrResponse(
+        ServerRequestInterface $request,
         Response $response,
         ResponseInterface $psrResponse,
     ): void {
@@ -30,16 +36,31 @@ public function respondWithPsrResponse(
             }
         }
 
+        foreach ($this->cookieManager->getRequestCookies($request) as $cookie) {
+            $response->cookie(
+                name: $cookie->getName(),
+                value: $cookie->getValue(),
+                expires: $cookie->getExpiresTime(),
+                path: $cookie->getPath(),
+                domain: $cookie->getDomain() ?? '',
+                secure: $cookie->isSecure(),
+                httponly: $cookie->isHttpOnly(),
+                samesite: $cookie->getSameSite() ?? '',
+            );
+        }
+
         if (is_string($sendfile)) {
             if (!$response->sendfile($sendfile)) {
                 $response->status(500, 'Unable to send file');
             }
-        } else {
-            $response->status(
-                $psrResponse->getStatusCode(),
-                $psrResponse->getReasonPhrase(),
-            );
-            $response->end($psrResponse->getBody()->getContents());
+
+            return;
         }
+
+        $response->status(
+            $psrResponse->getStatusCode(),
+            $psrResponse->getReasonPhrase(),
+        );
+        $response->end($psrResponse->getBody()->getContents());
     }
 }

src/WebSocketServerController.php

@@ -69,14 +69,14 @@ public function handleServerPipeMessage(ServerPipeMessageInterface $serverPipeMe
 
     public function onClose(int $fd): void
     {
-        $this->logger->debug(sprintf('websocket_close(%s)', $fd));
-
         $this->webSocketServerConnectionTable->unregisterConnection($fd);
 
         if (!$this->protocolControllers->hasKey($fd)) {
             return;
         }
 
+        $this->logger->debug(sprintf('websocket_close(%s)', $fd));
+
         $this->protocolControllers->get($fd)->onClose($fd);
         $this->protocolControllers->remove($fd);
     }