Always send request after response

Author: zepfietje

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.3.1] - 2022-07-02
+
+### Changed
+
+- Always send request after response.
+
 ## [0.3.0] - 2022-07-02
 
 ### Added
@@ -50,6 +56,7 @@
 
 - TrackPageview middleware.
 
+[0.3.1]: https://github.com/pirsch-analytics/laravel-pirsch/releases/tag/0.3.1
 [0.3.0]: https://github.com/pirsch-analytics/laravel-pirsch/releases/tag/0.3.0
 [0.2.2]: https://github.com/pirsch-analytics/laravel-pirsch/releases/tag/0.2.2
 [0.2.1]: https://github.com/pirsch-analytics/laravel-pirsch/releases/tag/0.2.1

src/Http/Middleware/TrackPageview.php

@@ -9,12 +9,9 @@
 class TrackPageview
 {
     public function handle(Request $request, Closure $next): mixed
-    {
-        return $next($request);
-    }
-
-    public function terminate(Request $request, mixed $response): void
     {
         Pirsch::track();
+
+        return $next($request);
     }
 }

src/Pirsch.php

@@ -10,30 +10,32 @@ public static function track(
         ?string $name = null,
         ?array $meta = null,
     ): void {
-        if (! config('pirsch.token')) {
-            return;
-        }
+        app()->terminating(function () use ($name, $meta) {
+            if (! config('pirsch.token')) {
+                return;
+            }
 
-        Http::withToken(config('pirsch.token'))
-            ->retry(
-                times: 3,
-                sleepMilliseconds: 100,
-            )
-            ->post(
-                url: 'https://api.pirsch.io/api/v1/'.($name === null ? 'hit' : 'event'),
-                data: [
-                    'url' => request()->fullUrl(),
-                    'ip' => request()->ip(),
-                    'user_agent' => request()->userAgent(),
-                    'accept_language' => request()->headers->get('Accept-Language'),
-                    'referrer' => request()->headers->get('Referer'),
-                    ...$name === null
-                        ? []
-                        : [
-                            'event_name' => $name,
-                            'event_meta' => $meta,
-                        ],
-                ],
-            );
+            Http::withToken(config('pirsch.token'))
+                ->retry(
+                    times: 3,
+                    sleepMilliseconds: 100,
+                )
+                ->post(
+                    url: 'https://api.pirsch.io/api/v1/'.($name === null ? 'hit' : 'event'),
+                    data: [
+                        'url' => request()->fullUrl(),
+                        'ip' => request()->ip(),
+                        'user_agent' => request()->userAgent(),
+                        'accept_language' => request()->headers->get('Accept-Language'),
+                        'referrer' => request()->headers->get('Referer'),
+                        ...$name === null
+                            ? []
+                            : [
+                                'event_name' => $name,
+                                'event_meta' => $meta,
+                            ],
+                    ],
+                );
+        });
     }
 }