refactor: update error and alert templates, change default logger type, and enhance exception handling

Author: C0deM1ner

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "c0dem1ner/laravel-telegram-logger",
-    "description": "description",
+    "description": "Telegram Log integration for Laravel",
     "minimum-stability": "stable",
     "license": "MIT",
     "authors": [

src/Logger/TelegramLoggerHandler.php

@@ -9,6 +9,7 @@ class TelegramLoggerHandler extends AbstractProcessingHandler
 {
     public string $token;
     public string $chatId;
+    public string $type;
 
     public function __construct(array $config)
     {
@@ -18,15 +19,16 @@ public function __construct(array $config)
 
         $this->token = $config['token'];
         $this->chatId = $config['chat_id'];
+        $this->type = $config['type'];
     }
 
     protected function write($record): void
     {
-        $type = config('telegram-logger.default_logger_type', 'error');
+        $this->type = $this->type ?? config('telegram-logger.default_logger_type', 'error');
 
         telegramLog()
             ->setToken($this->token)
             ->setChatId($this->chatId)
-            ->$type($record['formatted']);
+            ->$this->type($record['formatted']);
     }
 }

src/Providers/TelegramLoggerServiceProvider.php

@@ -3,6 +3,7 @@
 namespace C0deM1ner\LaravelTelegramLogger\Providers;
 
 use C0deM1ner\LaravelTelegramLogger\Console\Commands\SendTestMessageCommand;
+use C0deM1ner\LaravelTelegramLogger\Types\FormatExceptionForTelegramType;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 use Illuminate\Support\ServiceProvider;
 use Throwable;
@@ -53,13 +54,20 @@ public function boot(): void
             app(ExceptionHandler::class)->reportable(function (Throwable $e) use ($errorCodes) {
                 if (method_exists($e, 'getStatusCode')) {
                     $code = $e->getStatusCode();
-
                 } else {
                     $code = 500;
                 }
 
                 if (in_array($code, $errorCodes)) {
-                    telegramLog()->error($e->getMessage());
+                    $additionalData = [
+                        'Request Method' => request()->method(),
+                        'Request URL' => request()->url()
+                    ];
+
+                    telegramLog()->error(
+                        (new FormatExceptionForTelegramType())
+                            ->execute($e, $additionalData)
+                    );
                 }
             });
         }

src/Telegram/TelegramBotApi.php

@@ -4,7 +4,6 @@
 
 use C0deM1ner\LaravelTelegramLogger\Telegram\Exceptions\TelegramBotApiException;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\RateLimiter;
 use Throwable;
 
 class TelegramBotApi
@@ -19,15 +18,6 @@ class TelegramBotApi
      */
     public static function sendMessage(string $token, string $chatId, string $text = ''): bool
     {
-        $key = 'telegram_logger';
-
-        if (RateLimiter::tooManyAttempts($key, 5)) {
-            info('Telegram rate limit exceeded');
-            return false;
-        }
-
-        RateLimiter::hit($key);
-
         try {
             $url = self::HOST . $token . '/sendMessage';
 

src/Telegram/TelegramLog.php

@@ -2,6 +2,7 @@
 
 namespace C0deM1ner\LaravelTelegramLogger\Telegram;
 
+use Illuminate\Support\Facades\RateLimiter;
 use Throwable;
 
 class TelegramLog
@@ -42,6 +43,20 @@ public function setChatId(string $chatId): self
         return $this;
     }
 
+    protected function rateLimiter($message): bool
+    {
+        $key = md5('telegram_logger' . $message);
+
+        if (RateLimiter::tooManyAttempts($key, 5)) {
+            info('Telegram rate limit exceeded');
+            return false;
+        }
+
+        RateLimiter::hit($key);
+
+        return true;
+    }
+
     /**
      * @param string $message
      * @return void
@@ -80,6 +95,10 @@ public function error(string $message): void
      */
     private function send($type, $message): void
     {
+        if (!$this->rateLimiter($message)) {
+            return;
+        }
+
         $chunks = $this->chunkMessage(
             $this->formatText($type, $message)
         );

src/Types/FormatExceptionForTelegramType.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace C0deM1ner\LaravelTelegramLogger\Types;
+
+use Throwable;
+
+class FormatExceptionForTelegramType
+{
+    /**
+     * @throws Throwable
+     */
+    public function execute(Throwable $exception, $additionalData = []): string
+    {
+        return view('telegram-logger::types.exception', [
+            'exception' => $exception,
+            'additionalData' => $additionalData,
+            'trace' => $this->formatTrace($exception),
+        ])->render();
+    }
+
+    protected function formatTrace($exception): string
+    {
+        return collect($exception->getTrace())
+            ->map(function ($trace, $index) {
+                $file = $trace['file'] ?? '[internal function]';
+                $line = $trace['line'] ?? '';
+                $function = $trace['function'] ?? '';
+                return ($index + 1) . ". `{$file}:{$line}` - {$function}";
+            })
+            ->take(5)
+            ->implode("\n");
+    }
+}

src/resources/views/messages/alert.blade.php

@@ -1,7 +1,7 @@
 <b>🟨 Alert 🟨</b>
-<b>App Name </b>{{ $appName }}
+<b>App Name: </b>{{ $appName }}
 
-{{ $message }}
+{!! $message !!}
 
 # ##########################################################################
 {{ $time ?? now() }}

src/resources/views/messages/error.blade.php

@@ -1,7 +1,7 @@
 <b>🟥 Error 🟥</b>
-<b>App Name </b>{{ $appName }}
+<b>App Name: </b>{{ $appName }}
 
-{{ $message }}
+{!! $message !!}
 
 # ##########################################################################
 {{ $time ?? now() }}

src/resources/views/messages/info.blade.php

@@ -1,7 +1,7 @@
 <b>🟦 Information 🟦</b>
-<b>App Name </b>{{ $appName }}
+<b>App Name: </b>{{ $appName }}
 
-{{ $message }}
+{!! $message !!}
 
 # ##########################################################################
 {{ $time ?? now() }}

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

@@ -0,0 +1,15 @@
+<b>Type:</b> <code>{{ get_class($exception) }}</code>
+<b>Message:</b> <i>{{ $exception->getMessage() }}</i>
+<b>File:</b> <code>{{ $exception->getFile() }}</code>
+<b>Line:</b> <code>{{ $exception->getLine() }}</code>
+
+@if (!empty($additionalData))
+<b>Additional Data:</b>
+    @foreach ($additionalData as $key => $value)
+    <b>{{ $key }}:</b> <code>{{ $value }}</code>
+    @endforeach
+@endif
+
+
+<b>Trace:</b>
+<pre>{{ $trace }}</pre>