Enhance Telegram logging: add rate limit checks and include session data in exception view

Author: C0deM1ner

src/Providers/TelegramLoggerServiceProvider.php

@@ -65,15 +65,11 @@ public function boot(): void
                         'User Agent' => request()->header('User-Agent'),
                     ];
 
-                    $requestParameters = request()->all();
-
-
                     telegramLog()->error(
                         (new FormatExceptionForTelegramType())
                             ->execute(
                                 $e,
                                 $additionalData,
-                                $requestParameters
                             )
                     );
                 }

src/Telegram/TelegramLog.php

@@ -50,12 +50,19 @@ protected function rateLimiter($message): bool
         $maxAttempts = config('telegram-logger.max_attempts', 1);
 
         if (RateLimiter::tooManyAttempts($key, $maxAttempts)) {
+            info('Telegram rate limit exceeded for message: ' . $message);
+
+            return false;
+        }
+
+        if (RateLimiter::tooManyAttempts('telegram_logger', 5)){
             info('Telegram rate limit exceeded');
 
             return false;
         }
 
         RateLimiter::hit($key, $decaySeconds);
+        RateLimiter::hit('telegram_logger');
 
         return true;
     }

src/Types/FormatExceptionForTelegramType.php

@@ -9,12 +9,11 @@ class FormatExceptionForTelegramType
     /**
      * @throws Throwable
      */
-    public function execute(Throwable $exception, $additionalData = [], $requestParameters = []): string
+    public function execute(Throwable $exception, $additionalData = []): string
     {
         return view('telegram-logger::types.exception', [
             'exception' => $exception,
             'additionalData' => $additionalData,
-            'requestParameters' => $requestParameters,
             'trace' => $this->formatTrace($exception),
         ])->render();
     }

src/resources/views/types/exception.blade.php

@@ -3,21 +3,29 @@
 <b>File:</b> <code>{{ $exception->getFile() }}</code>
 <b>Line:</b> <code>{{ $exception->getLine() }}</code>
 
-<code>_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-</code>
 
 @if (!empty($additionalData))
+<code>_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-</code>
+
 <b>Additional Data:</b>
     @foreach ($additionalData as $key => $value)
     <b>{{ $key }}:</b> <code>{{ $value }}</code>
     @endforeach
 @endif
 
----
+
+@if (!empty(request()->all()))
 <code>_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-</code>
 
-@if (!empty($requestParameters))
 <b>Request Parameters:</b>
-<pre>{{ json_encode($requestParameters, JSON_PRETTY_PRINT) }}</pre>
+<pre>{{ json_encode(request()->all(), JSON_PRETTY_PRINT) }}</pre>
+@endif
+
+@if (!empty(session()->all()))
+<code>_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-</code>
+
+<b>Session Data:</b>
+<pre>{{ json_encode(session()->all(), JSON_PRETTY_PRINT) }}</pre>
 @endif
 
 <code>_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-</code>