[fix] handle webhook exceptions

defstudio · Jan 26, 2024 · 7397e1d · 7397e1d
1 parent adfb15d
commit 7397e1d
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 29 deletions.
diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
@@ -18,4 +18,5 @@
     'failed_to_get_log_from_telegram' => 'Failed to get log from Telegram server',
     'failed_to_register_webhook' => 'Failed to register webhook',
     'failed_to_unregister_webhook' => 'Failed to unregister webhook',
+    'webhook_error_occurred' => 'Sorry, an error occurred',
 ];
diff --git a/src/Handlers/WebhookHandler.php b/src/Handlers/WebhookHandler.php
@@ -25,6 +25,7 @@
 use Illuminate\Support\Stringable;
 use ReflectionMethod;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;
 
 abstract class WebhookHandler
 {
@@ -65,7 +66,7 @@ private function handleCallbackQuery(): void
             return;
         }
 
-        /** @phpstan-ignore-next-line  */
+        /** @phpstan-ignore-next-line */
         App::call([$this, $action], $this->data->toArray());
     }
 
@@ -220,44 +221,48 @@ public function chatid(): void
 
     public function handle(Request $request, TelegraphBot $bot): void
     {
-        $this->bot = $bot;
+        try {
+            $this->bot = $bot;
 
-        $this->request = $request;
+            $this->request = $request;
 
-        if ($this->request->has('message')) {
-            /* @phpstan-ignore-next-line */
-            $this->message = Message::fromArray($this->request->input('message'));
-            $this->handleMessage();
+            if ($this->request->has('message')) {
+                /* @phpstan-ignore-next-line */
+                $this->message = Message::fromArray($this->request->input('message'));
+                $this->handleMessage();
 
-            return;
-        }
+                return;
+            }
 
-        if ($this->request->has('edited_message')) {
-            /* @phpstan-ignore-next-line */
-            $this->message = Message::fromArray($this->request->input('edited_message'));
-            $this->handleMessage();
+            if ($this->request->has('edited_message')) {
+                /* @phpstan-ignore-next-line */
+                $this->message = Message::fromArray($this->request->input('edited_message'));
+                $this->handleMessage();
 
-            return;
-        }
+                return;
+            }
 
-        if ($this->request->has('channel_post')) {
-            /* @phpstan-ignore-next-line */
-            $this->message = Message::fromArray($this->request->input('channel_post'));
-            $this->handleMessage();
+            if ($this->request->has('channel_post')) {
+                /* @phpstan-ignore-next-line */
+                $this->message = Message::fromArray($this->request->input('channel_post'));
+                $this->handleMessage();
 
-            return;
-        }
+                return;
+            }
 
 
-        if ($this->request->has('callback_query')) {
-            /* @phpstan-ignore-next-line */
-            $this->callbackQuery = CallbackQuery::fromArray($this->request->input('callback_query'));
-            $this->handleCallbackQuery();
-        }
+            if ($this->request->has('callback_query')) {
+                /* @phpstan-ignore-next-line */
+                $this->callbackQuery = CallbackQuery::fromArray($this->request->input('callback_query'));
+                $this->handleCallbackQuery();
+            }
 
-        if ($this->request->has('inline_query')) {
-            /* @phpstan-ignore-next-line */
-            $this->handleInlineQuery(InlineQuery::fromArray($this->request->input('inline_query')));
+            if ($this->request->has('inline_query')) {
+                /* @phpstan-ignore-next-line */
+                $this->handleInlineQuery(InlineQuery::fromArray($this->request->input('inline_query')));
+            }
+        } catch (Throwable $throwable) {
+            $this->onFailure($throwable);
         }
     }
 
@@ -300,4 +305,15 @@ protected function allowUnknownChat(): bool
             default => false,
         };
     }
+
+    protected function onFailure(Throwable $throwable): void
+    {
+        if ($throwable instanceof NotFoundHttpException) {
+            throw $throwable;
+        }
+
+        report($throwable);
+
+        $this->reply(__('telegraph::errors.webhook_error_occurred'));
+    }
 }
diff --git a/tests/Support/TestWebhookHandler.php b/tests/Support/TestWebhookHandler.php
@@ -12,6 +12,7 @@
 use DefStudio\Telegraph\Handlers\WebhookHandler;
 use DefStudio\Telegraph\Keyboard\Button;
 use DefStudio\Telegraph\Keyboard\Keyboard;
+use Exception;
 use Illuminate\Support\Stringable;
 
 class TestWebhookHandler extends WebhookHandler
@@ -32,6 +33,11 @@ public function test(): void
         self::$calls_count++;
     }
 
+    public function trigger_failure()
+    {
+        throw new Exception('foo');
+    }
+
     public function send_reply(): void
     {
         $this->reply('foo');

diff --git a/tests/Unit/Handlers/WebhookHandlerTest.php b/tests/Unit/Handlers/WebhookHandlerTest.php
@@ -354,3 +354,16 @@
 
     Facade::assertSent("Bob just left");
 });
+
+it('does not crash on errors', function () {
+
+    $chat = chat();
+
+    Facade::fake();
+
+    app(TestWebhookHandler::class)
+        ->handle(webhook_request('trigger_failure'), $chat->bot)
+    ;
+
+    Facade::assertRepliedWebhook('Sorry, an error occurred');
+});