feat: log status code

Author: whleucka

app/Providers/EventServiceProvider.php

@@ -14,7 +14,7 @@
 use Echo\Framework\Event\Model\ModelCreated;
 use Echo\Framework\Event\Model\ModelUpdated;
 use Echo\Framework\Event\Model\ModelDeleted;
-use Echo\Framework\Event\Http\RequestReceived;
+use Echo\Framework\Event\Http\ResponseSending;
 use Echo\Framework\Http\Listeners\ActivityListener;
 
 /**
@@ -38,8 +38,8 @@ class EventServiceProvider extends BaseEventServiceProvider
             AuditListener::class,
         ],
 
-        // HTTP activity logging
-        RequestReceived::class => [
+        // HTTP activity logging (on ResponseSending to capture status code)
+        ResponseSending::class => [
             ActivityListener::class,
         ],
 

src/Framework/Http/Kernel.php

@@ -28,7 +28,12 @@ public function handle(RequestInterface $request): ResponseInterface
 
         // If there is no route, then 404
         if (is_null($route)) {
-            return $this->renderer->renderNotFound($request);
+            $response = $this->renderer->renderNotFound($request);
+            try {
+                event(new ResponseSending($request, $response));
+            } catch (\Throwable) {
+            }
+            return $response;
         }
 
         // Set the current route in the request
@@ -50,7 +55,12 @@ public function handle(RequestInterface $request): ResponseInterface
 
             return $response;
         } catch (\Throwable $e) {
-            return $this->renderer->renderException($e, $request);
+            $response = $this->renderer->renderException($e, $request);
+            try {
+                event(new ResponseSending($request, $response));
+            } catch (\Throwable) {
+            }
+            return $response;
         }
     }
 

src/Framework/Http/Listeners/ActivityListener.php

@@ -5,25 +5,33 @@
 use App\Models\Activity;
 use App\Services\GeoIpService;
 use Echo\Framework\Event\EventInterface;
-use Echo\Framework\Event\Http\RequestReceived;
+use Echo\Framework\Event\Http\ResponseSending;
 use Echo\Framework\Event\ListenerInterface;
 
 /**
  * Activity Listener
  *
- * Logs HTTP request activity to the database.
- * Previously this logic was coupled directly in the LogActivity middleware.
+ * Logs HTTP request activity to the database after the response is built.
+ * Listens on ResponseSending so the HTTP status code is available.
  */
 class ActivityListener implements ListenerInterface
 {
     public function handle(EventInterface $event): void
     {
-        if (!$event instanceof RequestReceived) {
+        if (!$event instanceof ResponseSending) {
             return;
         }
 
         try {
             $request = $event->request;
+
+            // Skip logging for benchmark and debug routes
+            $route = $request->getAttribute('route');
+            $middleware = $route['middleware'] ?? [];
+            if (is_array($middleware) && (in_array('benchmark', $middleware, true) || in_array('debug', $middleware, true))) {
+                return;
+            }
+
             $user = user();
             $clientIp = $request->getClientIp();
 
@@ -41,6 +49,7 @@ public function handle(EventInterface $event): void
                 "uri" => $request->getUri(),
                 "ip" => ip2long($clientIp),
                 "country_code" => $countryCode,
+                "status_code" => $event->response->getStatusCode(),
             ]]);
         } catch (\Exception|\Error|\PDOException $e) {
             error_log("-- Skipping activity insert --");

src/Framework/Http/Middleware/LogActivity.php

@@ -3,36 +3,21 @@
 namespace Echo\Framework\Http\Middleware;
 
 use Closure;
-use Echo\Framework\Event\Http\RequestReceived;
 use Echo\Framework\Http\RequestInterface;
 use Echo\Framework\Http\ResponseInterface;
 use Echo\Framework\Http\MiddlewareInterface;
 
 /**
  * LogActivity Middleware
  *
- * Dispatches a RequestReceived event for activity logging.
- * The actual logging is handled by the ActivityListener.
+ * Activity logging is now handled by the ActivityListener on the
+ * ResponseSending event, which has access to the HTTP status code.
+ * This middleware remains as a passthrough for backward compatibility.
  */
 class LogActivity implements MiddlewareInterface
 {
     public function handle(RequestInterface $request, Closure $next): ResponseInterface
     {
-        $route = $request->getAttribute("route");
-        $middleware = $route["middleware"] ?? [];
-
-        // Skip logging for benchmark and debug routes
-        if (is_array($middleware) && (in_array('benchmark', $middleware, true) || in_array('debug', $middleware, true))) {
-            return $next($request);
-        }
-
-        // Dispatch RequestReceived event — listeners handle the logging
-        try {
-            event(new RequestReceived($request));
-        } catch (\Throwable) {
-            // Event dispatching should never break the request pipeline
-        }
-
         return $next($request);
     }
 }

tests/Http/Middleware/LogActivityIntegrationTest.php

@@ -14,6 +14,10 @@
 /**
  * Integration tests for LogActivity middleware
  *
+ * Activity logging has moved to the ActivityListener on the ResponseSending
+ * event. This middleware is now a passthrough — these tests verify it still
+ * passes the request through the pipeline without interference.
+ *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  */
@@ -40,10 +44,10 @@ private function createRequest(array $route = []): Request
         return $request;
     }
 
-    private function createNextHandler(): Closure
+    private function createNextHandler(int $statusCode = 200): Closure
     {
-        return function ($request): ResponseInterface {
-            return new Response('OK', 200);
+        return function ($request) use ($statusCode): ResponseInterface {
+            return new Response('OK', $statusCode);
         };
     }
 
@@ -61,7 +65,7 @@ public function testNextHandlerIsCalledForWebRoutes(): void
         $this->assertTrue($called);
     }
 
-    public function testSkipsBenchmarkRoutes(): void
+    public function testPassesThroughBenchmarkRoutes(): void
     {
         $called = false;
         $next = function ($request) use (&$called): ResponseInterface {
@@ -76,7 +80,7 @@ public function testSkipsBenchmarkRoutes(): void
         $this->assertEquals(200, $response->getStatusCode());
     }
 
-    public function testSkipsDebugRoutes(): void
+    public function testPassesThroughDebugRoutes(): void
     {
         $called = false;
         $next = function ($request) use (&$called): ResponseInterface {
@@ -99,12 +103,11 @@ public function testResponsePassesThrough(): void
         $this->assertEquals(200, $response->getStatusCode());
     }
 
-    public function testHandlesEventDispatcherFailureGracefully(): void
+    public function testPreservesResponseStatusCode(): void
     {
-        // Even if event() throws, middleware should not break
         $request = $this->createRequest();
-        $response = $this->middleware->handle($request, $this->createNextHandler());
+        $response = $this->middleware->handle($request, $this->createNextHandler(404));
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals(404, $response->getStatusCode());
     }
 }