From f46a63ceb6357fa434328505517312d78640450b Mon Sep 17 00:00:00 2001
From: Andrey Helldar <helldar@dragon-code.pro>
Date: Wed, 8 Apr 2026 15:01:17 +0300
Subject: [PATCH] Fixed middleware initialization

---
 src/LaravelRequestTrackerServiceProvider.php | 34 ++++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/LaravelRequestTrackerServiceProvider.php b/src/LaravelRequestTrackerServiceProvider.php
index 9130714..46576e6 100644
--- a/src/LaravelRequestTrackerServiceProvider.php
+++ b/src/LaravelRequestTrackerServiceProvider.php
@@ -9,27 +9,35 @@
 use DragonCode\LaravelRequestTracker\Helpers\TrackerConfig;
 use DragonCode\LaravelRequestTracker\Http\Middleware\RequestTrackerMiddleware;
 use DragonCode\RequestTracker\TrackerUuid;
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\ServiceProvider;
 use Psr\Http\Message\RequestInterface;
 
-use function array_keys;
-
 class LaravelRequestTrackerServiceProvider extends ServiceProvider
 {
-    public function boot(): void
+    public function boot(Kernel $http): void
     {
-        $this->publishes([
-            __DIR__ . '/../config/request-tracker.php' => $this->app->configPath('request-tracker.php'),
-        ], ['config', 'tracker']);
+        $this->bootConfig();
+        $this->registerMiddleware($http);
     }
 
     public function register(): void
     {
         $this->registerConfig();
         $this->registerTrackingData();
-        $this->registerMiddleware();
-        $this->registerHttpMiddleware();
+        $this->registerHttpClient();
+    }
+
+    protected function bootConfig(): void
+    {
+        if (! $this->app->runningInConsole()) {
+            return;
+        }
+
+        $this->publishes([
+            __DIR__ . '/../config/request-tracker.php' => $this->app->configPath('request-tracker.php'),
+        ], ['config', 'tracker']);
     }
 
     protected function registerConfig(): void
@@ -49,16 +57,14 @@ protected function registerTrackingData(): void
         $this->app->make(ContextHelper::class)->store($data);
     }
 
-    protected function registerMiddleware(): void
+    protected function registerMiddleware(Kernel $http): void
     {
-        $router = $this->app['router'];
-
-        foreach (array_keys($router->getMiddlewareGroups()) as $name) {
-            $router->prependMiddlewareToGroup($name, RequestTrackerMiddleware::class);
+        if (! $http->hasMiddleware(RequestTrackerMiddleware::class)) {
+            $http->prependMiddleware(RequestTrackerMiddleware::class);
         }
     }
 
-    protected function registerHttpMiddleware(): void
+    protected function registerHttpClient(): void
     {
         Http::globalRequestMiddleware(function (RequestInterface $request) {
             $context = $this->app->make(ContextHelper::class);