gramio 0.0.49 → 0.0.51

package/dist/bot.d.ts

@@ -138,10 +138,10 @@ export declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends D
      * })
      * ```
      */
-    derive<Handler extends Hooks.Derive<Context<typeof this>>>(handler: Handler): Bot<Errors, Derives & {
+    derive<Handler extends Hooks.Derive<Context<typeof this> & Derives["global"]>>(handler: Handler): Bot<Errors, Derives & {
         global: Awaited<ReturnType<Handler>>;
     }>;
-    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<typeof this, Update>>>(updateName: MaybeArray<Update>, handler: Handler): Bot<Errors, Derives & {
+    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<typeof this, Update> & Derives["global"] & Derives[Update]>>(updateName: MaybeArray<Update>, handler: Handler): Bot<Errors, Derives & {
         [K in Update]: Awaited<ReturnType<Handler>>;
     }>;
     decorate<Value extends Record<string, any>>(value: Value): Bot<Errors, Derives & {

package/dist/bot.js

@@ -38,8 +38,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bot = void 0;
-const node_buffer_1 = require("node:buffer");
 const promises_1 = __importDefault(require("node:fs/promises"));
+const node_stream_1 = require("node:stream");
 const callback_data_1 = require("@gramio/callback-data");
 const contexts_1 = require("@gramio/contexts");
 const files_1 = require("@gramio/files");
@@ -119,7 +119,7 @@ let Bot = (() => {
         };
         errorHandler(context, error) {
             if (!this.hooks.onError.length)
-                throw error;
+                return console.error("[Default Error Handler]", context, error);
             return this.runImmutableHooks("onError", {
                 context,
                 //@ts-expect-error ErrorKind exists if user register error-class with .error("kind", SomeError);
@@ -253,11 +253,14 @@ let Bot = (() => {
             const file = await this.api.getFile({ file_id: fileId });
             const url = `${this.options.api.baseURL.replace("/bot", "/file/bot")}${this.options.token}/${file.file_path}`;
             const res = await fetch(url);
-            const buffer = await res.arrayBuffer();
             if (path) {
-                await promises_1.default.writeFile(path, node_buffer_1.Buffer.from(buffer));
+                if (!res.body)
+                    throw new Error("Response without body (should be never throw)");
+                // @ts-ignore denoo
+                await promises_1.default.writeFile(path, node_stream_1.Readable.fromWeb(res.body));
                 return path;
             }
+            const buffer = await res.arrayBuffer();
             return buffer;
         }
         /**
@@ -619,9 +622,7 @@ let Bot = (() => {
                 if ((typeof trigger === "string" && context.query === trigger) ||
                     // @ts-expect-error
                     (typeof trigger === "function" && trigger(context)) ||
-                    (trigger instanceof RegExp &&
-                        context.query &&
-                        trigger.test(context.query))) {
+                    (trigger instanceof RegExp && trigger.test(context.query))) {
                     //@ts-expect-error
                     context.args =
                         trigger instanceof RegExp ? context.query?.match(trigger) : null;
@@ -675,9 +676,7 @@ let Bot = (() => {
                 if ((typeof trigger === "string" && context.query === trigger) ||
                     // @ts-expect-error
                     (typeof trigger === "function" && trigger(context)) ||
-                    (trigger instanceof RegExp &&
-                        context.query &&
-                        trigger.test(context.query))) {
+                    (trigger instanceof RegExp && trigger.test(context.query))) {
                     //@ts-expect-error
                     context.args =
                         trigger instanceof RegExp ? context.query?.match(trigger) : null;
@@ -697,15 +696,13 @@ let Bot = (() => {
          */
         hears(trigger, handler) {
             return this.on("message", (context, next) => {
-                if ((typeof trigger === "string" && context.text === trigger) ||
+                const text = context.text ?? context.caption;
+                if ((typeof trigger === "string" && text === trigger) ||
                     // @ts-expect-error
                     (typeof trigger === "function" && trigger(context)) ||
-                    (trigger instanceof RegExp &&
-                        context.text &&
-                        trigger.test(context.text))) {
+                    (trigger instanceof RegExp && text && trigger.test(text))) {
                     //@ts-expect-error
-                    context.args =
-                        trigger instanceof RegExp ? context.text?.match(trigger) : null;
+                    context.args = trigger instanceof RegExp ? text?.match(trigger) : null;
                     // TODO: remove
                     //@ts-expect-error
                     return handler(context);

package/dist/plugin.d.ts

@@ -106,10 +106,10 @@ export declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extend
      * })
      * ```
      */
-    derive<Handler extends Hooks.Derive<Context<AnyBot>>>(handler: Handler): Plugin<Errors, Derives & {
+    derive<Handler extends Hooks.Derive<Context<AnyBot> & Derives["global"]>>(handler: Handler): Plugin<Errors, Derives & {
         global: Awaited<ReturnType<Handler>>;
     }>;
-    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<AnyBot, Update>>>(updateName: MaybeArray<Update>, handler: Handler): Plugin<Errors, Derives & {
+    derive<Update extends UpdateName, Handler extends Hooks.Derive<ContextType<AnyBot, Update> & Derives["global"] & Derives[Update]>>(updateName: MaybeArray<Update>, handler: Handler): Plugin<Errors, Derives & {
         [K in Update]: Awaited<ReturnType<Handler>>;
     }>;
     decorate<Value extends Record<string, any>>(value: Value): Plugin<Errors, Derives & {

package/dist/updates.js

@@ -4,7 +4,6 @@ exports.Updates = void 0;
 const promises_1 = require("node:timers/promises");
 const contexts_1 = require("@gramio/contexts");
 const composer_1 = require("./composer");
-const errors_1 = require("./errors");
 class Updates {
     bot;
     isStarted = false;
@@ -65,20 +64,20 @@ class Updates {
     }
     async startFetchLoop(params = {}) {
         while (this.isStarted) {
-            const updates = await this.bot.api.getUpdates({
-                ...params,
-                offset: this.offset,
-                suppress: true,
-            });
-            if (updates instanceof errors_1.TelegramError || typeof updates === "undefined") {
-                await promises_1.scheduler.wait(this.bot.options.api.retryGetUpdatesWait);
-            }
-            else {
+            try {
+                const updates = await this.bot.api.getUpdates({
+                    ...params,
+                    offset: this.offset,
+                });
                 for await (const update of updates) {
                     //TODO: update errors
                     await this.handleUpdate(update).catch(console.error);
                 }
             }
+            catch (error) {
+                console.error("Error received when fetching updates", error);
+                await promises_1.scheduler.wait(this.bot.options.api.retryGetUpdatesWait);
+            }
         }
     }
     stopPolling() {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "commonjs",
-	"version": "0.0.49",
+	"version": "0.0.51",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -27,11 +27,11 @@
 	"author": "kravets",
 	"license": "MIT",
 	"devDependencies": {
-		"@biomejs/biome": "1.8.3",
-		"@types/bun": "^1.1.8",
+		"@biomejs/biome": "1.9.1",
+		"@types/bun": "^1.1.9",
 		"@types/debug": "^4.1.12",
-		"pkgroll": "^2.4.2",
-		"typescript": "^5.5.4"
+		"pkgroll": "^2.5.0",
+		"typescript": "^5.6.2"
 	},
 	"dependencies": {
 		"@gramio/callback-data": "^0.0.3",
@@ -39,7 +39,7 @@
 		"@gramio/files": "^0.0.12",
 		"@gramio/format": "^0.1.3",
 		"@gramio/keyboards": "^0.3.3",
-		"@gramio/types": "^7.10.0",
+		"@gramio/types": "^7.10.1",
 		"debug": "^4.3.7",
 		"inspectable": "^3.0.2",
 		"middleware-io": "^2.8.1"