feat: add possibility to catch errors with bot.catch on webhook

src/bot.ts

@@ -316,17 +316,7 @@ export class Bot<
         // handle updates sequentially (!)
         for (const update of updates) {
             this.lastTriedUpdateId = update.update_id;
-            try {
-                await this.handleUpdate(update);
-            } catch (err) {
-                // should always be true
-                if (err instanceof BotError) {
-                    await this.errorHandler(err);
-                } else {
-                    console.error("FATAL: grammY unable to handle:", err);
-                    throw err;
-                }
-            }
+            await this.handleUpdate(update);
         }
     }
 
@@ -367,7 +357,7 @@ a known bot info object.",
             await run(this.middleware(), ctx);
         } catch (err) {
             debugErr(`Error in middleware for update ${update.update_id}`);
-            throw new BotError<C>(err, ctx);
+            await this.errorHandler(new BotError<C>(err, ctx));
         }
     }
 

test/convenience/webhook.test.ts

@@ -11,9 +11,9 @@ import type bodyParser from "npm:@types/koa-bodyparser";
 import type Koa from "npm:@types/koa";
 import type { FastifyInstance } from "npm:fastify";
 import type { NextApiRequest, NextApiResponse } from "npm:next";
-import { Bot, webhookCallback } from "../../src/mod.ts";
+import { Bot, BotError, webhookCallback } from "../../src/mod.ts";
 import type { UserFromGetMe } from "../../src/types.ts";
-import { describe, it } from "../deps.test.ts";
+import { assertEquals, assertIsError, describe, it } from "../deps.test.ts";
 
 describe("webhook", () => {
     const bot = new Bot("dummy", { me: {} as unknown as UserFromGetMe });
@@ -138,4 +138,29 @@ describe("webhook", () => {
             return handler(req);
         });
     });
+
+    it("bot should catch errors in webhoook handler", async () => {
+        let called = false;
+
+        bot.catch((err) => {
+            assertIsError(err, BotError, "Test Error");
+            called = true;
+        });
+        bot.on("message", () => {
+            throw new Error("Test Error");
+        });
+
+        const handler = webhookCallback(bot, "std/http");
+        const fakeReq = new Request("https://fake-api.com", {
+            method: "POST",
+            body: JSON.stringify({
+                update_id: 9696,
+                message: {},
+            }),
+        });
+
+        await handler(fakeReq);
+
+        assertEquals(called, true);
+    });
 });

test/deps.test.ts

@@ -3,6 +3,7 @@ export {
     assertEquals,
     assertFalse,
     assertInstanceOf,
+    assertIsError,
     assertNotStrictEquals,
     assertObjectMatch,
     assertRejects,