Updated CrashPad class and Changed a few things

Author: shahradelahi

src/CrashPad.php

@@ -3,7 +3,9 @@
 
 namespace TelegramBot;
 
+use Exception;
 use Symfony\Component\Dotenv\Dotenv;
+use Throwable;
 
 /**
  * CrashPad class
@@ -16,16 +18,28 @@ class CrashPad
 {
 
     /**
-     * Clear crash files.
+     * Enable the crash handler
      *
      * @return void
      */
-    public static function clearCrashFiles(): void
+    public static function enableCrashHandler(): void
     {
-        $files = glob(getcwd() . '.telegram-bot/*.log');
-        foreach ($files as $file) {
-            unlink($file);
-        }
+        $handler = function (Throwable $throwable) {
+            if (Telegram::getAdminId() !== -1) {
+                $input = getenv('TG_CURRENT_UPDATE') ?? Telegram::getInput();
+                CrashPad::sendCrash(Telegram::getAdminId(), $throwable, $input);
+            }
+
+            if (!defined('DEBUG_MODE')) {
+                throw new \RuntimeException(
+                    'Something went wrong, Unfortunately, we can not handle this error.', 0, $throwable
+                );
+            }
+
+            CrashPad::print($throwable);
+        };
+
+        set_exception_handler($handler);
     }
 
     /**
@@ -44,35 +58,19 @@ public static function setDebugMode(int $admin_id = -1): void
             Telegram::setAdminId($admin_id);
         }
 
-        set_exception_handler(function (\Throwable $throwable) {
-            if (!defined('DEBUG_MODE') && !DEBUG_MODE) {
-                throw new \RuntimeException(
-                    $throwable->getMessage(),
-                    $throwable->getCode(),
-                    $throwable->getPrevious()
-                );
-            } else {
-                if (Telegram::getAdminId() !== -1) {
-                    $input = getenv('TG_CURRENT_UPDATE') ?? Telegram::getInput();
-                    $update = Telegram::processUpdate($input, Telegram::getApiToken());
-                    $exception = new \Exception($throwable->getMessage(), $throwable->getCode(), $throwable->getPrevious());
-                    CrashPad::sendCrash(Telegram::getAdminId(), $exception, json_encode($update));
-                    CrashPad::report($exception);
-                }
-            }
-        });
+        self::enableCrashHandler();
     }
 
     /**
      * Send crash message and log
      *
      * @param int $chat_id The chat id of the group to send the message to.
-     * @param \Exception|\Throwable $exception The exception to report.
+     * @param Exception|Throwable $exception The exception to report.
      * @param string|null $update (Optional) The update that caused the exception.
      *
      * @retrun bool
      */
-    public static function sendCrash(int $chat_id, \Exception|\Throwable $exception, string|null $update = null): bool
+    public static function sendCrash(int $chat_id, Exception|Throwable $exception, string|null $update = null): bool
     {
         if ($chat_id === -1) {
             throw new \RuntimeException(sprintf(
@@ -86,29 +84,39 @@ public static function sendCrash(int $chat_id, \Exception|\Throwable $exception,
             Telegram::setToken($_ENV['TELEGRAM_BOT_TOKEN']);
         }
 
+        if (($token = self::loadToken()) === null) {
+            throw new \RuntimeException(
+                'The token is not set. Please set the token using `Telegram::setToken()` method.'
+            );
+        }
+
         $text = Request::sendMessage([
+            'bot_token' => $token,
             'chat_id' => $chat_id,
             'parse_mode' => 'HTML',
-            'text' => ($message = sprintf(
+            'text' => sprintf(
                 "<b>Message</b>: %s\n\n<b>File</b>: %s(%d)\n\n<b>Trace</b>: \n%s",
                 $exception->getMessage(),
                 $exception->getFile(),
                 $exception->getLine(),
                 $exception->getTraceAsString()
-            )),
+            ),
         ]);
 
-        if ($update !== null) {
-            $document = Request::sendDocument([
-                'chat_id' => $chat_id,
-                'document' => self::createCrashFile(
-                    $message . "\n\n" . $update
-                ),
-            ]);
-            return $text->isOk() && $document->isOk();
-        }
+        $document = Request::sendDocument([
+            'bot_token' => $token,
+            'chat_id' => $chat_id,
+            'document' => self::createCrashFile(sprintf(
+                "Message: %s\n\nFile: %s(%d)\n\nTrace: \n%s\n\nUpdate: \n%s",
+                $exception->getMessage(),
+                $exception->getFile(),
+                $exception->getLine(),
+                $exception->getTraceAsString(),
+                $update ?? 'Did not receive update.'
+            )),
+        ]);
 
-        return $text->isOk();
+        return $text->isOk() && $document->isOk();
     }
 
     /**
@@ -131,10 +139,10 @@ private static function createCrashFile(string $content): string
     /**
      * Report the error to the developers from the Telegram Bot API.
      *
-     * @param \Exception|\Throwable $exception The exception to report.
+     * @param Exception|Throwable $exception The exception to report.
      * @retrun void
      */
-    public static function report(\Exception|\Throwable $exception): void
+    public static function print(Exception|Throwable $exception): void
     {
         TelegramLog::error(($message = sprintf(
             "%s(%d): %s\n%s",
@@ -146,4 +154,43 @@ public static function report(\Exception|\Throwable $exception): void
         echo '<b>TelegramError:</b> ' . $message;
     }
 
+    /**
+     * Clear the crash logs.
+     *
+     * @return void
+     */
+    public static function clearCrashLogs(): void
+    {
+        $base_path = $_SERVER['DOCUMENT_ROOT'] . '.telegram-bot/';
+        if (!file_exists($base_path)) {
+            return;
+        }
+
+        $files = glob($base_path . '*');
+        foreach ($files as $file) {
+            if (is_file($file)) {
+                unlink($file);
+            }
+        }
+    }
+
+    /**
+     * Check is there any loaded token or any token in the environment file.
+     *
+     * @return string|null
+     */
+    private static function loadToken(): string|null
+    {
+        if (($token = Telegram::getApiToken()) !== false) {
+            return $token;
+        }
+
+        if (file_exists(Telegram::getEnvFilePath())) {
+            (new Dotenv())->load(Telegram::getEnvFilePath());
+            return $_ENV['TELEGRAM_BOT_TOKEN'] ?? null;
+        }
+
+        return null;
+    }
+
 }

src/Entities/InlineKeyboardButton.php

@@ -23,10 +23,7 @@
  * @method bool         getPay()                            Optional. Specify True, to send a Pay button.
  *
  * @method InlineKeyboardButton setText(string $text)                                                       Label text on the button
- * @method InlineKeyboardButton setUrl(string $url)                                                         Optional. HTTP url to be opened when button is pressed
  * @method InlineKeyboardButton setLoginUrl(LoginUrl $login_url)                                            Optional. HTTP url to be opened when button is pressed
- * @method InlineKeyboardButton setCallbackData(string $callback_data)                                      Optional. Data to be sent in a callback query to the bot when button is pressed, 1-64 bytes
- * @method InlineKeyboardButton setWebApp(WebAppInfo $web_app)                                              Optional. Description of the Web App that will be launched when the user presses the button. The Web App will be able to send an arbitrary message on behalf of the user using the method answerWebAppQuery. Available only in private chats between a user and the bot.
  * @method InlineKeyboardButton setSwitchInlineQuery(string $switch_inline_query)                           Optional. If set, pressing the button will prompt the user to select one of their chats, open that chat and insert the bot's username and the specified inline query in the input field. Can be empty, in which case just the bot’s username will be inserted.
  * @method InlineKeyboardButton setSwitchInlineQueryCurrentChat(string $switch_inline_query_current_chat)   Optional. If set, pressing the button will insert the bot‘s username and the specified inline query in the current chat's input field. Can be empty, in which case only the bot’s username will be inserted.
  * @method InlineKeyboardButton setCallbackGame(CallbackGame $callback_game)                                Optional. Description of the game that will be launched when the user presses the button.
@@ -68,32 +65,40 @@ public static function couldBe(array $data): bool
     }
 
     /**
+     * Optional. Data to be sent in a callback query to the bot when button is pressed, 1-64 bytes
+     *
      * @param string $data
      * @return $this
      */
-    public function CallbackData(string $data): InlineKeyboardButton
+    public function setCallbackData(string $data): InlineKeyboardButton
     {
         $this->raw_data['callback_data'] = $data;
 
         return $this;
     }
 
     /**
+     * Optional. HTTP url to be opened when button is pressed
+     *
      * @param string $data
      * @return $this
      */
-    public function Url(string $data): InlineKeyboardButton
+    public function setUrl(string $data): InlineKeyboardButton
     {
         $this->raw_data['url'] = $data;
 
         return $this;
     }
 
     /**
+     * Optional. Description of the Web App that will be launched when the user presses the button. The Web App will
+     * be able to send an arbitrary message on behalf of the user using the method answerWebAppQuery. Available only
+     * in private chats between a user and the bot.
+     *
      * @param string $url
      * @return $this
      */
-    public function WebApp(string $url): KeyboardButton
+    public function setWebApp(string $url): KeyboardButton
     {
         $this->raw_data['web_app'] = new WebAppInfo(['url' => $url]);
 

src/Entities/KeyboardButton.php

@@ -29,7 +29,6 @@
  * @method $this setRequestContact(bool $request_contact)                Optional. If True, the user's phone number will be sent as a contact when the button is pressed. Available in private chats only
  * @method $this setRequestLocation(bool $request_location)            Optional. If True, the user's current location will be sent when the button is pressed. Available in private chats only
  * @method $this setRequestPoll(KeyboardButtonPollType $request_poll)    Optional. If specified, the user will be asked to create a poll and send it to the bot when the button is pressed. Available in private chats only
- * @method $this setWebApp(WebAppInfo $web_app)                        Optional. If specified, the described Web App will be launched when the button is pressed. The Web App will be able to send a “web_app_data” service message. Available in private chats only.
  */
 class KeyboardButton extends Entity
 {
@@ -70,10 +69,13 @@ public static function couldBe(array $data): bool
     }
 
     /**
+     * Optional. If specified, the described Web App will be launched when the button is pressed.
+     * The Web App will be able to send a “web_app_data” service message. Available in private chats only.
+     *
      * @param string $url
      * @return $this
      */
-    public function WebApp(string $url): KeyboardButton
+    public function setWebApp(string $url): KeyboardButton
     {
         $this->raw_data['web_app'] = new WebAppInfo(['url' => $url]);
 

src/Entities/Update.php

@@ -27,7 +27,7 @@
  * @method ChatMemberUpdated  getMyChatMember()         Optional. The bot's chat member status was updated in a chat. For private chats, this update is received only when the bot is blocked or unblocked by the user.
  * @method ChatMemberUpdated  getChatMember()           Optional. A chat member's status was updated in a chat. The bot must be an administrator in the chat and must explicitly specify “chat_member” in the list of allowed_updates to receive these updates.
  * @method ChatJoinRequest    getChatJoinRequest()      Optional. A request to join the chat has been sent. The bot must have the can_invite_users administrator right in the chat to receive these updates.
- * @method WebAppData         getWebData()              Optional. The data from WebApp
+ * @method WebAppData         getWebAppData()           Optional. The data from WebApp
  */
 class Update extends Entity
 {
@@ -46,7 +46,7 @@ class Update extends Entity
     public const TYPE_MY_CHAT_MEMBER = 'my_chat_member';
     public const TYPE_CHAT_MEMBER = 'chat_member';
     public const TYPE_CHAT_JOIN_REQUEST = 'chat_join_request';
-    public const TYPE_WEB_DATA = 'web_data';
+    public const TYPE_WEB_DATA = 'web_app_data';
 
     /**
      * Get the update type based on the set properties

src/Interfaces/PluginEventsInterface.php

@@ -104,10 +104,9 @@ public function onPoll(int $update_id, Poll $poll): \Generator;
     public function onPollAnswer(int $update_id, PollAnswer $pollAnswer): \Generator;
 
     /**
-     * @param int $update_id
      * @param WebAppData $webAppData
      * @return \Generator
      */
-    public function onWebAppData(int $update_id, WebAppData $webAppData): \Generator;
+    public function onWebAppData(WebAppData $webAppData): \Generator;
 
 }