Fix: store current route in per-request container

composer.json

@@ -31,7 +31,7 @@
     "require": {
         "php": ">=8.2",
         "ext-swoole": "*",
-        "utopia-php/di": "0.3.*",
+        "utopia-php/di": "^0.3.2",
         "utopia-php/servers": "0.3.*",
         "utopia-php/compression": "0.1.*",
         "utopia-php/telemetry": "0.2.*",

src/Http/Http.php

@@ -110,15 +110,6 @@ class Http
      */
     protected static array $requestHooks = [];
 
-    /**
-     * Route
-     *
-     * Memory cached result for chosen route
-     *
-     * @var Route|null
-     */
-    protected ?Route $route = null;
-
     /**
      * Wildcard route
      * If set, this get's executed if no other route is matched
@@ -530,7 +521,19 @@ public static function getRoutes(): array
      */
     public function getRoute(): ?Route
     {
-        return $this->route ?? null;
+        $container = $this->server->getContainer();
+
+        if (!$container->has('route')) {
+            return null;
+        }
+
+        try {
+            $route = $container->get('route');
+        } catch (\Throwable) {
+            return null;
+        }
+
+        return $route instanceof Route ? $route : null;
     }
 
     /**
@@ -540,7 +543,7 @@ public function getRoute(): ?Route
      */
     public function setRoute(Route $route): self
     {
-        $this->route = $route;
+        $this->setRequestResource('route', fn () => $route, []);
 
         return $this;
     }
@@ -675,18 +678,26 @@ public function start()
      */
     public function match(Request $request, bool $fresh = true): ?Route
     {
-        if (null !== $this->route && !$fresh) {
-            return $this->route;
+        if (!$fresh) {
+            $cached = $this->getRoute();
+
+            if (null !== $cached) {
+                return $cached;
+            }
         }
 
         $url = \parse_url($request->getURI(), PHP_URL_PATH);
         $url = \is_string($url) ? ($url === '' ? '/' : $url) : '/';
         $method = $request->getMethod();
         $method = (self::REQUEST_METHOD_HEAD == $method) ? self::REQUEST_METHOD_GET : $method;
 
-        $this->route = Router::match($method, $url);
+        $route = Router::match($method, $url);
 
-        return $this->route;
+        if (null !== $route) {
+            $this->setRequestResource('route', fn () => $route, []);
+        }
+
+        return $route;
     }
 
     /**
@@ -837,7 +848,7 @@ public function run(Request $request, Response $response): static
         $attributes = [
             'url.scheme' => $request->getProtocol(),
             'http.request.method' => $request->getMethod(),
-            'http.route' => $this->route?->getPath(),
+            'http.route' => $this->getRoute()?->getPath(),
             'http.response.status_code' => $response->getStatusCode(),
         ];
         $this->requestDuration->record($requestDuration, $attributes);
@@ -907,8 +918,6 @@ private function runInternal(Request $request, Response $response): static
         $route = $this->match($request);
         $groups = ($route instanceof Route) ? $route->getGroups() : [];
 
-        $this->setRequestResource('route', fn () => $route, []);
-
         if (self::REQUEST_METHOD_HEAD == $method) {
             $method = self::REQUEST_METHOD_GET;
             $response->disablePayload();
@@ -947,8 +956,7 @@ private function runInternal(Request $request, Response $response): static
         }
 
         if (null === $route && null !== self::$wildcardRoute) {
-            $route = self::$wildcardRoute;
-            $this->route = $route;
+            $route = clone self::$wildcardRoute;
             $path = \parse_url($request->getURI(), PHP_URL_PATH);
             $path = \is_string($path) ? ($path === '' ? '/' : $path) : '/';
             $route->path($path);