gramio 0.0.39 → 0.0.41

package/dist/bot.js

@@ -44,11 +44,14 @@ const callback_data_1 = require("@gramio/callback-data");
 const contexts_1 = require("@gramio/contexts");
 const files_1 = require("@gramio/files");
 const format_1 = require("@gramio/format");
+const debug_1 = __importDefault(require("debug"));
 const inspectable_1 = require("inspectable");
 const undici_1 = require("undici");
 const errors_1 = require("./errors");
 const plugin_1 = require("./plugin");
 const updates_1 = require("./updates");
+const $debugger = (0, debug_1.default)("gramio");
+const debug$api = $debugger.extend("api");
 /** Bot instance
  *
  * @example
@@ -134,7 +137,11 @@ let Bot = (() => {
             this.options = {
                 ...(typeof tokenOrOptions === "object" ? tokenOrOptions : options),
                 token,
-                api: { ...options?.api, baseURL: "https://api.telegram.org/bot" },
+                api: {
+                    baseURL: "https://api.telegram.org/bot",
+                    retryGetUpdatesWait: 1000,
+                    ...options?.api,
+                },
             };
             if (!(options?.plugins &&
                 "format" in options.plugins &&
@@ -142,6 +149,7 @@ let Bot = (() => {
                 this.extend(new plugin_1.Plugin("@gramio/format").preRequest((context) => {
                     if (!context.params)
                         return context;
+                    // @ts-ignore
                     const formattable = format_1.FormattableMap[context.method];
                     // @ts-ignore add AnyTelegramMethod to @gramio/format
                     if (formattable)
@@ -164,6 +172,7 @@ let Bot = (() => {
             }
         }
         async _callApi(method, params = {}) {
+            const debug$api$method = debug$api.extend(method);
             const url = `${this.options.api.baseURL}${this.options.token}/${method}`;
             const reqOptions = {
                 method: "POST",
@@ -177,7 +186,9 @@ let Bot = (() => {
             });
             // biome-ignore lint/style/noParameterAssign: mutate params
             params = context.params;
+            // @ts-ignore
             if (params && (0, files_1.isMediaUpload)(method, params)) {
+                // @ts-ignore
                 const formData = await (0, files_1.convertJsonToFormData)(method, params);
                 reqOptions.body = formData;
             }
@@ -187,8 +198,10 @@ let Bot = (() => {
                 };
                 reqOptions.body = JSON.stringify(params);
             }
+            debug$api$method("options: %j", reqOptions);
             const response = await (0, undici_1.request)(url, reqOptions);
             const data = (await response.body.json());
+            debug$api$method("response: %j", data);
             if (!data.ok) {
                 const err = new errors_1.TelegramError(data, method, params);
                 // @ts-expect-error
@@ -675,7 +688,7 @@ let Bot = (() => {
                         ?.replace(`@${this.info.username}`, "");
                     // @ts-expect-error
                     context.args = context.text?.slice(entity.length).trim() || null;
-                    return cmd?.startsWith(command);
+                    return cmd === command;
                 }))
                     // @ts-expect-error
                     return handler(context);

package/dist/types.d.ts

@@ -25,6 +25,11 @@ export interface BotOptions {
          * 	@default false
          * */
         useTest?: boolean;
+        /**
+         * Time in milliseconds before calling {@link APIMethods.getUpdates | getUpdates} again
+         * @default 1000
+         */
+        retryGetUpdatesWait?: number;
     };
 }
 /**

package/dist/updates.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
@@ -66,10 +68,16 @@ class Updates {
             const updates = await this.bot.api.getUpdates({
                 ...params,
                 offset: this.offset,
+                suppress: true,
             });
-            for await (const update of updates) {
-                //TODO: update errors
-                await this.handleUpdate(update).catch(console.error);
+            if (updates instanceof errors_1.TelegramError || typeof updates === "undefined") {
+                await promises_1.scheduler.wait(this.bot.options.api.retryGetUpdatesWait);
+            }
+            else {
+                for await (const update of updates) {
+                    //TODO: update errors
+                    await this.handleUpdate(update).catch(console.error);
+                }
             }
         }
     }

package/dist/webhook/index.d.ts

@@ -30,49 +30,6 @@ export type WebhookHandlers = keyof typeof frameworks;
  * });
  * ```
  */
-export declare function webhookHandler<Framework extends keyof typeof frameworks>(bot: Bot, framework: Framework, secretToken?: string): ReturnType<{
-    elysia: ({ body, headers }: any) => {
-        update: any;
-        header: any;
-        unauthorized: () => import("undici").Response;
-    };
-    fastify: (request: any, reply: any) => {
-        update: any;
-        header: any;
-        unauthorized: () => any;
-    };
-    hono: (c: any) => {
-        update: any;
-        header: any;
-        unauthorized: () => any;
-    };
-    express: (req: any, res: any) => {
-        update: any;
-        header: any;
-        unauthorized: () => any;
-    };
-    koa: (ctx: any) => {
-        update: any;
-        header: any;
-        unauthorized: () => void;
-    };
-    http: (req: any, res: any) => {
-        update: Promise<import("@gramio/types").TelegramUpdate>;
-        header: any;
-        unauthorized: () => any;
-    };
-    "std/http": (req: any) => {
-        update: any;
-        header: any;
-        response: () => import("undici").Response;
-        unauthorized: () => import("undici").Response;
-    };
-    "Bun.serve": (req: any) => {
-        update: any;
-        header: any;
-        response: () => import("undici").Response;
-        unauthorized: () => import("undici").Response;
-    };
-}[Framework]> extends {
+export declare function webhookHandler<Framework extends keyof typeof frameworks>(bot: Bot, framework: Framework, secretToken?: string): ReturnType<(typeof frameworks)[Framework]> extends {
     response: () => any;
 } ? (...args: Parameters<(typeof frameworks)[Framework]>) => ReturnType<ReturnType<(typeof frameworks)[Framework]>["response"]> : (...args: Parameters<(typeof frameworks)[Framework]>) => void;

package/dist/webhook/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webhookHandler = void 0;
+exports.webhookHandler = webhookHandler;
 const adapters_1 = require("./adapters");
 /**
  * Setup handler with yours web-framework to receive updates via webhook
@@ -44,4 +44,3 @@ function webhookHandler(bot, framework, secretToken) {
             return response();
     });
 }
-exports.webhookHandler = webhookHandler;

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "gramio",
-  "version": "0.0.39",
+  "type": "commonjs",
+  "version": "0.0.41",
   "description": "Powerful Telegram Bot API framework",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -27,8 +28,9 @@
   "license": "ISC",
   "devDependencies": {
     "@biomejs/biome": "1.7.3",
-    "@types/node": "^20.12.12",
-    "typescript": "^5.4.5"
+    "@types/debug": "^4.1.12",
+    "@types/node": "^20.14.9",
+    "typescript": "^5.5.2"
   },
   "dependencies": {
     "@gramio/callback-data": "^0.0.3",
@@ -36,10 +38,11 @@
     "@gramio/files": "^0.0.8",
     "@gramio/format": "^0.1.3",
     "@gramio/keyboards": "^0.3.3",
-    "@gramio/types": "^7.4.1",
-    "inspectable": "^3.0.1",
+    "@gramio/types": "^7.5.0",
+    "debug": "^4.3.5",
+    "inspectable": "^3.0.2",
     "middleware-io": "^2.8.1",
-    "undici": "^6.18.1"
+    "undici": "^6.19.2"
   },
   "files": [
     "dist"