gramio 0.2.5 → 0.3.0

package/README.md

@@ -2,7 +2,7 @@
 
 <div align="center">
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-8.2-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
+[![Bot API](https://img.shields.io/badge/Bot%20API-9.0-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
 [![npm](https://img.shields.io/npm/v/gramio?logo=npm&style=flat&labelColor=000&color=3b82f6)](https://www.npmjs.org/package/gramio)
 [![npm downloads](https://img.shields.io/npm/dw/gramio?logo=npm&style=flat&labelColor=000&color=3b82f6)](https://www.npmjs.org/package/gramio)
 [![JSR](https://jsr.io/badges/@gramio/core)](https://jsr.io/@gramio/core)

package/dist/index.cjs

@@ -7,32 +7,10 @@ var contexts = require('@gramio/contexts');
 var files = require('@gramio/files');
 var format = require('@gramio/format');
 var debug = require('debug');
-var inspectable = require('inspectable');
+var utils = require('./utils-BbVj3DtT.cjs');
 var middlewareIo = require('middleware-io');
 var keyboards = require('@gramio/keyboards');
 
-const ErrorKind = Symbol("ErrorKind");
-class TelegramError extends Error {
-  /** Name of the API Method */
-  method;
-  /** Params that were sent */
-  params;
-  /** See  {@link TelegramAPIResponseError.error_code}*/
-  code;
-  /** Describes why a request was unsuccessful. */
-  payload;
-  /** Construct new TelegramError */
-  constructor(error, method, params) {
-    super(error.description);
-    this.name = method;
-    this.method = method;
-    this.params = params;
-    this.code = error.error_code;
-    if (error.parameters) this.payload = error.parameters;
-  }
-}
-TelegramError.constructor[ErrorKind] = "TELEGRAM";
-
 class Composer {
   composer = middlewareIo.Composer.builder();
   length = 0;
@@ -100,44 +78,6 @@ class Composer {
   }
 }
 
-var __create$1 = Object.create;
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
-var __knownSymbol$1 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-var __typeError$1 = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name$1 = (target, value) => __defProp$1(target, "name", { value, configurable: true });
-var __decoratorStart$1 = (base) => [, , , __create$1(null)];
-var __decoratorStrings$1 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
-var __expectFn$1 = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError$1("Function expected") : fn;
-var __decoratorContext$1 = (kind, name, done, metadata, fns) => ({ kind: __decoratorStrings$1[kind], name, metadata, addInitializer: (fn) => done._ ? __typeError$1("Already initialized") : fns.push(__expectFn$1(fn || null)) });
-var __decoratorMetadata$1 = (array, target) => __defNormalProp$1(target, __knownSymbol$1("metadata"), array[3]);
-var __runInitializers$1 = (array, flags, self, value) => {
-  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) fns[i].call(self) ;
-  return value;
-};
-var __decorateElement$1 = (array, flags, name, decorators, target, extra) => {
-  var it, done, ctx, k = flags & 7, p = false;
-  var j = 0;
-  var extraInitializers = array[j] || (array[j] = []);
-  var desc = k && ((target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc$1(target , name));
-  __name$1(target, name);
-  for (var i = decorators.length - 1; i >= 0; i--) {
-    ctx = __decoratorContext$1(k, name, done = {}, array[3], extraInitializers);
-    it = (0, decorators[i])(target, ctx), done._ = 1;
-    __expectFn$1(it) && (target = it);
-  }
-  return __decoratorMetadata$1(array, target), desc && __defProp$1(target, name, desc), p ? k ^ 4 ? extra : desc : target;
-};
-var _Plugin_decorators, _init$1;
-_Plugin_decorators = [inspectable.Inspectable({
-  serialize: (plugin) => ({
-    name: plugin._.name,
-    dependencies: plugin._.dependencies
-  })
-})];
 class Plugin {
   /**
    * 	@internal
@@ -197,7 +137,7 @@ class Plugin {
    * Register custom class-error in plugin
    **/
   error(kind, error) {
-    error[ErrorKind] = kind;
+    error[utils.ErrorKind] = kind;
     this._.errorsDefinitions[kind] = error;
     return this;
   }
@@ -312,28 +252,6 @@ class Plugin {
     return this;
   }
 }
-_init$1 = __decoratorStart$1();
-Plugin = __decorateElement$1(_init$1, 0, "Plugin", _Plugin_decorators, Plugin);
-__runInitializers$1(_init$1, 1, Plugin);
-
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-function convertToString(value) {
-  const typeOfValue = typeof value;
-  if (typeOfValue === "string") return value;
-  if (typeOfValue === "object") return JSON.stringify(value);
-  return String(value);
-}
-function simplifyObject(obj) {
-  const result = {};
-  for (const [key, value] of Object.entries(obj)) {
-    const typeOfValue = typeof value;
-    if (value === void 0 || value === null || typeOfValue === "function")
-      continue;
-    result[key] = convertToString(value);
-  }
-  return result;
-}
-const IS_BUN = typeof Bun !== "undefined";
 
 class UpdateQueue {
   updateQueue = [];
@@ -372,7 +290,7 @@ class UpdateQueue {
     this.onIdlePromise = new Promise((resolve) => {
       this.onIdleResolver = resolve;
     });
-    await Promise.race([this.onIdlePromise, sleep(timeout)]);
+    await Promise.race([this.onIdlePromise, utils.sleep(timeout)]);
     this.isActive = false;
   }
 }
@@ -442,9 +360,9 @@ class Updates {
         }
       } catch (error) {
         console.error("Error received when fetching updates", error);
-        if (error instanceof TelegramError && error.payload?.retry_after) {
-          await sleep(error.payload.retry_after * 1e3);
-        } else await sleep(this.bot.options.api.retryGetUpdatesWait ?? 1e3);
+        if (error instanceof utils.TelegramError && error.payload?.retry_after) {
+          await utils.sleep(error.payload.retry_after * 1e3);
+        } else await utils.sleep(this.bot.options.api.retryGetUpdatesWait ?? 1e3);
       }
     }
   }
@@ -453,43 +371,8 @@ class Updates {
   }
 }
 
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __knownSymbol = (name2, symbol) => (symbol = Symbol[name2]) ? symbol : Symbol.for("Symbol." + name2);
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __decoratorStart = (base) => [, , , __create(null)];
-var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
-var __expectFn = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError("Function expected") : fn;
-var __decoratorContext = (kind, name2, done, metadata, fns) => ({ kind: __decoratorStrings[kind], name: name2, metadata, addInitializer: (fn) => done._ ? __typeError("Already initialized") : fns.push(__expectFn(fn || null)) });
-var __decoratorMetadata = (array, target) => __defNormalProp(target, __knownSymbol("metadata"), array[3]);
-var __runInitializers = (array, flags, self, value) => {
-  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) fns[i].call(self) ;
-  return value;
-};
-var __decorateElement = (array, flags, name2, decorators, target, extra) => {
-  var it, done, ctx, k = flags & 7, p = false;
-  var j = 0;
-  var extraInitializers = array[j] || (array[j] = []);
-  var desc = k && ((target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(target , name2));
-  __name(target, name2);
-  for (var i = decorators.length - 1; i >= 0; i--) {
-    ctx = __decoratorContext(k, name2, done = {}, array[3], extraInitializers);
-    it = (0, decorators[i])(target, ctx), done._ = 1;
-    __expectFn(it) && (target = it);
-  }
-  return __decoratorMetadata(array, target), desc && __defProp(target, name2, desc), p ? k ^ 4 ? extra : desc : target;
-};
-var _Bot_decorators, _init;
 const $debugger = debug("gramio");
 const debug$api = $debugger.extend("api");
-_Bot_decorators = [inspectable.Inspectable({
-  serialize: () => ({})
-})];
 class Bot {
   /** @deprecated use `~` instead*/
   _ = {
@@ -529,7 +412,7 @@ class Bot {
   lazyloadPlugins = [];
   dependencies = [];
   errorsDefinitions = {
-    TELEGRAM: TelegramError
+    TELEGRAM: utils.TelegramError
   };
   errorHandler(context, error) {
     if (!this.hooks.onError.length)
@@ -537,7 +420,7 @@ class Bot {
     return this.runImmutableHooks("onError", {
       context,
       //@ts-expect-error ErrorKind exists if user register error-class with .error("kind", SomeError);
-      kind: error.constructor[ErrorKind] ?? "UNKNOWN",
+      kind: error.constructor[utils.ErrorKind] ?? "UNKNOWN",
       error
     });
   }
@@ -609,7 +492,7 @@ class Bot {
     );
     params = context.params;
     if (params && files.isMediaUpload(method, params)) {
-      if (IS_BUN) {
+      if (utils.IS_BUN) {
         const formData = await files.convertJsonToFormData(method, params);
         reqOptions.body = formData;
       } else {
@@ -618,7 +501,7 @@ class Bot {
           params
         );
         reqOptions.body = formData;
-        const simplifiedParams = simplifyObject(paramsWithoutFiles);
+        const simplifiedParams = utils.simplifyObject(paramsWithoutFiles);
         url += `?${new URLSearchParams(simplifiedParams).toString()}`;
       }
     } else {
@@ -630,7 +513,7 @@ class Bot {
     const data = await response.json();
     debug$api$method("response: %j", data);
     if (!data.ok) {
-      const err = new TelegramError(data, method, params);
+      const err = new utils.TelegramError(data, method, params);
       this.runImmutableHooks("onResponseError", err, this.api);
       if (!params?.suppress) throw err;
       return err;
@@ -701,7 +584,7 @@ class Bot {
    * ```
    */
   error(kind, error) {
-    error[ErrorKind] = kind;
+    error[utils.ErrorKind] = kind;
     this.errorsDefinitions[kind] = error;
     return this;
   }
@@ -1103,7 +986,7 @@ class Bot {
       const info = await this.api.getMe({
         suppress: true
       });
-      if (info instanceof TelegramError) {
+      if (info instanceof utils.TelegramError) {
         if (info.code === 404)
           info.message = "The bot token is incorrect. Check it in BotFather.";
         throw info;
@@ -1132,10 +1015,12 @@ class Bot {
   } = {}) {
     await this.init();
     if (!webhook) {
-      await this.api.deleteWebhook({
-        drop_pending_updates: dropPendingUpdates
-        // suppress: true,
-      });
+      await utils.withRetries(
+        () => this.api.deleteWebhook({
+          drop_pending_updates: dropPendingUpdates
+          // suppress: true,
+        })
+      );
       this.updates.startPolling({
         allowed_updates: allowedUpdates
       });
@@ -1148,12 +1033,14 @@ class Bot {
       return this.info;
     }
     if (this.updates.isStarted) this.updates.stopPolling();
-    await this.api.setWebhook({
-      ...webhook,
-      drop_pending_updates: dropPendingUpdates,
-      allowed_updates: allowedUpdates
-      // suppress: true,
-    });
+    await utils.withRetries(
+      async () => this.api.setWebhook({
+        ...webhook,
+        drop_pending_updates: dropPendingUpdates,
+        allowed_updates: allowedUpdates
+        // suppress: true,
+      })
+    );
     this.runImmutableHooks("onStart", {
       plugins: this.dependencies,
       // biome-ignore lint/style/noNonNullAssertion: bot.init() guarantees this.info
@@ -1178,9 +1065,6 @@ class Bot {
     });
   }
 }
-_init = __decoratorStart();
-Bot = __decorateElement(_init, 0, "Bot", _Bot_decorators, Bot);
-__runInitializers(_init, 1, Bot);
 
 const SECRET_TOKEN_HEADER = "X-Telegram-Bot-Api-Secret-Token";
 const WRONG_TOKEN_ERROR = "secret token is invalid";
@@ -1257,11 +1141,11 @@ function webhookHandler(bot, framework, secretToken) {
 
 Symbol.metadata ??= Symbol("Symbol.metadata");
 
+exports.ErrorKind = utils.ErrorKind;
+exports.TelegramError = utils.TelegramError;
 exports.Bot = Bot;
 exports.Composer = Composer;
-exports.ErrorKind = ErrorKind;
 exports.Plugin = Plugin;
-exports.TelegramError = TelegramError;
 exports.Updates = Updates;
 exports.webhookHandler = webhookHandler;
 Object.keys(callbackData).forEach(function (k) {

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
-import { Context, UpdateName, MaybeArray, ContextType, Attachment } from '@gramio/contexts';
+import { Context, UpdateName, MaybeArray, ContextType, BotLike, Attachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
 import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
 export * from '@gramio/types';
@@ -556,6 +556,9 @@ type FilterDefinitions = Record<string, (...args: any[]) => (context: Context<Bo
 type AnyBot = Bot<any, any>;
 /** Type of Bot that accepts any generics */
 type AnyPlugin = Plugin<any, any>;
+type CallbackQueryShorthandContext<BotType extends BotLike, Trigger extends CallbackData | string | RegExp> = Omit<ContextType<BotType, "callback_query">, "data"> & BotType["__Derives"]["global"] & BotType["__Derives"]["callback_query"] & {
+    queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
+};
 
 declare class UpdateQueue<Data = TelegramUpdate> {
     private updateQueue;
@@ -710,7 +713,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * })
      * ```
      */
-    onError<T extends UpdateName>(updateName: MaybeArray<T>, handler: Hooks.OnError<Errors, ContextType<typeof this, T> & Derives["global"] & Derives[T]>): this;
+    onError<T extends UpdateName>(updateName: MaybeArray<T>, handler: Hooks.OnError<Errors, ContextType<typeof this, T>>): this;
     onError(handler: Hooks.OnError<Errors, Context<typeof this> & Derives["global"]>): this;
     /**
      * Derive some data to handlers
@@ -819,7 +822,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
     onResponseError<Methods extends keyof APIMethods, Handler extends Hooks.OnResponseError<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     onResponseError(handler: Hooks.OnResponseError): this;
     /** Register handler to one or many Updates */
-    on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<typeof this, T> & Derives["global"] & Derives[T]>): this;
+    on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<typeof this, T>>): this;
     /** Register handler to any Updates */
     use(handler: Handler<Context<typeof this> & Derives["global"]>): this;
     /**
@@ -864,7 +867,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * });
      * ```
      * */
-    reaction(trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: ContextType<typeof this, "message_reaction"> & Derives["global"] & Derives["message_reaction"]) => unknown): this;
+    reaction(trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: ContextType<typeof this, "message_reaction">) => unknown): this;
     /**
      * Register handler to `callback_query` event
      *
@@ -888,11 +891,9 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     });
      * ```
      */
-    callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: Omit<ContextType<typeof this, "callback_query">, "data"> & Derives["global"] & Derives["callback_query"] & {
-        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
-    }) => unknown): this;
+    callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: CallbackQueryShorthandContext<typeof this, Trigger>) => unknown): this;
     /** Register handler to `chosen_inline_result` update */
-    chosenInlineResult<Ctx = ContextType<typeof this, "chosen_inline_result"> & Derives["global"] & Derives["chosen_inline_result"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
+    chosenInlineResult<Ctx = ContextType<typeof this, "chosen_inline_result">>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     /**
@@ -930,10 +931,10 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * );
      * ```
      * */
-    inlineQuery<Ctx = ContextType<typeof this, "inline_query"> & Derives["global"] & Derives["inline_query"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
+    inlineQuery<Ctx = ContextType<typeof this, "inline_query">>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown, options?: {
-        onResult?: (context: ContextType<Bot, "chosen_inline_result"> & Derives["global"] & Derives["chosen_inline_result"] & {
+        onResult?: (context: ContextType<Bot, "chosen_inline_result"> & {
             args: RegExpMatchArray | null;
         }) => unknown;
     }): this;
@@ -944,7 +945,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     if (context.args) await context.send(`Params ${context.args[1]}`);
      * });
      */
-    hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"], Trigger extends RegExp | string | ((context: Ctx) => boolean) = RegExp | string | ((context: Ctx) => boolean)>(trigger: Trigger, handler: (context: Ctx & {
+    hears<Ctx = ContextType<typeof this, "message">, Trigger extends RegExp | string | ((context: Ctx) => boolean) = RegExp | string | ((context: Ctx) => boolean)>(trigger: Trigger, handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     /**
@@ -954,7 +955,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     return context.send(`You message is /start ${context.args}`);
      * });
      */
-    command(command: string, handler: (context: ContextType<typeof this, "message"> & Derives["global"] & Derives["message"] & {
+    command(command: string, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
     }) => unknown, options?: Omit<SetMyCommandsParams, "commands"> & Omit<TelegramBotCommand, "command">): this;
     /** Currently not isolated!!! */
@@ -1068,4 +1069,4 @@ declare function webhookHandler<Framework extends keyof typeof frameworks>(bot:
     response: () => any;
 } ? (...args: Parameters<(typeof frameworks)[Framework]>) => ReturnType<ReturnType<(typeof frameworks)[Framework]>["response"]> : (...args: Parameters<(typeof frameworks)[Framework]>) => void;
 
-export { type AnyBot, type AnyPlugin, Bot, type BotOptions, Composer, type DeriveDefinitions, type ErrorDefinitions, ErrorKind, type FilterDefinitions, type Handler, Hooks, type MaybePromise, type MaybeSuppressedParams, type MaybeSuppressedReturn, Plugin, type Suppress, type SuppressedAPIMethodParams, type SuppressedAPIMethodReturn, type SuppressedAPIMethods, TelegramError, Updates, type WebhookHandlers, webhookHandler };
+export { type AnyBot, type AnyPlugin, Bot, type BotOptions, type CallbackQueryShorthandContext, Composer, type DeriveDefinitions, type ErrorDefinitions, ErrorKind, type FilterDefinitions, type Handler, Hooks, type MaybePromise, type MaybeSuppressedParams, type MaybeSuppressedReturn, Plugin, type Suppress, type SuppressedAPIMethodParams, type SuppressedAPIMethodReturn, type SuppressedAPIMethods, TelegramError, Updates, type WebhookHandlers, webhookHandler };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
-import { Context, UpdateName, MaybeArray, ContextType, Attachment } from '@gramio/contexts';
+import { Context, UpdateName, MaybeArray, ContextType, BotLike, Attachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
 import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
 export * from '@gramio/types';
@@ -556,6 +556,9 @@ type FilterDefinitions = Record<string, (...args: any[]) => (context: Context<Bo
 type AnyBot = Bot<any, any>;
 /** Type of Bot that accepts any generics */
 type AnyPlugin = Plugin<any, any>;
+type CallbackQueryShorthandContext<BotType extends BotLike, Trigger extends CallbackData | string | RegExp> = Omit<ContextType<BotType, "callback_query">, "data"> & BotType["__Derives"]["global"] & BotType["__Derives"]["callback_query"] & {
+    queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
+};
 
 declare class UpdateQueue<Data = TelegramUpdate> {
     private updateQueue;
@@ -710,7 +713,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * })
      * ```
      */
-    onError<T extends UpdateName>(updateName: MaybeArray<T>, handler: Hooks.OnError<Errors, ContextType<typeof this, T> & Derives["global"] & Derives[T]>): this;
+    onError<T extends UpdateName>(updateName: MaybeArray<T>, handler: Hooks.OnError<Errors, ContextType<typeof this, T>>): this;
     onError(handler: Hooks.OnError<Errors, Context<typeof this> & Derives["global"]>): this;
     /**
      * Derive some data to handlers
@@ -819,7 +822,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
     onResponseError<Methods extends keyof APIMethods, Handler extends Hooks.OnResponseError<Methods>>(methods: MaybeArray<Methods>, handler: Handler): this;
     onResponseError(handler: Hooks.OnResponseError): this;
     /** Register handler to one or many Updates */
-    on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<typeof this, T> & Derives["global"] & Derives[T]>): this;
+    on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<typeof this, T>>): this;
     /** Register handler to any Updates */
     use(handler: Handler<Context<typeof this> & Derives["global"]>): this;
     /**
@@ -864,7 +867,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * });
      * ```
      * */
-    reaction(trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: ContextType<typeof this, "message_reaction"> & Derives["global"] & Derives["message_reaction"]) => unknown): this;
+    reaction(trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: ContextType<typeof this, "message_reaction">) => unknown): this;
     /**
      * Register handler to `callback_query` event
      *
@@ -888,11 +891,9 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     });
      * ```
      */
-    callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: Omit<ContextType<typeof this, "callback_query">, "data"> & Derives["global"] & Derives["callback_query"] & {
-        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
-    }) => unknown): this;
+    callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: CallbackQueryShorthandContext<typeof this, Trigger>) => unknown): this;
     /** Register handler to `chosen_inline_result` update */
-    chosenInlineResult<Ctx = ContextType<typeof this, "chosen_inline_result"> & Derives["global"] & Derives["chosen_inline_result"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
+    chosenInlineResult<Ctx = ContextType<typeof this, "chosen_inline_result">>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     /**
@@ -930,10 +931,10 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * );
      * ```
      * */
-    inlineQuery<Ctx = ContextType<typeof this, "inline_query"> & Derives["global"] & Derives["inline_query"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
+    inlineQuery<Ctx = ContextType<typeof this, "inline_query">>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown, options?: {
-        onResult?: (context: ContextType<Bot, "chosen_inline_result"> & Derives["global"] & Derives["chosen_inline_result"] & {
+        onResult?: (context: ContextType<Bot, "chosen_inline_result"> & {
             args: RegExpMatchArray | null;
         }) => unknown;
     }): this;
@@ -944,7 +945,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     if (context.args) await context.send(`Params ${context.args[1]}`);
      * });
      */
-    hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"], Trigger extends RegExp | string | ((context: Ctx) => boolean) = RegExp | string | ((context: Ctx) => boolean)>(trigger: Trigger, handler: (context: Ctx & {
+    hears<Ctx = ContextType<typeof this, "message">, Trigger extends RegExp | string | ((context: Ctx) => boolean) = RegExp | string | ((context: Ctx) => boolean)>(trigger: Trigger, handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     /**
@@ -954,7 +955,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     return context.send(`You message is /start ${context.args}`);
      * });
      */
-    command(command: string, handler: (context: ContextType<typeof this, "message"> & Derives["global"] & Derives["message"] & {
+    command(command: string, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
     }) => unknown, options?: Omit<SetMyCommandsParams, "commands"> & Omit<TelegramBotCommand, "command">): this;
     /** Currently not isolated!!! */
@@ -1068,4 +1069,4 @@ declare function webhookHandler<Framework extends keyof typeof frameworks>(bot:
     response: () => any;
 } ? (...args: Parameters<(typeof frameworks)[Framework]>) => ReturnType<ReturnType<(typeof frameworks)[Framework]>["response"]> : (...args: Parameters<(typeof frameworks)[Framework]>) => void;
 
-export { type AnyBot, type AnyPlugin, Bot, type BotOptions, Composer, type DeriveDefinitions, type ErrorDefinitions, ErrorKind, type FilterDefinitions, type Handler, Hooks, type MaybePromise, type MaybeSuppressedParams, type MaybeSuppressedReturn, Plugin, type Suppress, type SuppressedAPIMethodParams, type SuppressedAPIMethodReturn, type SuppressedAPIMethods, TelegramError, Updates, type WebhookHandlers, webhookHandler };
+export { type AnyBot, type AnyPlugin, Bot, type BotOptions, type CallbackQueryShorthandContext, Composer, type DeriveDefinitions, type ErrorDefinitions, ErrorKind, type FilterDefinitions, type Handler, Hooks, type MaybePromise, type MaybeSuppressedParams, type MaybeSuppressedReturn, Plugin, type Suppress, type SuppressedAPIMethodParams, type SuppressedAPIMethodReturn, type SuppressedAPIMethods, TelegramError, Updates, type WebhookHandlers, webhookHandler };

package/dist/index.js

@@ -9,32 +9,10 @@ export * from '@gramio/files';
 import { FormattableMap } from '@gramio/format';
 export * from '@gramio/format';
 import debug from 'debug';
-import { Inspectable } from 'inspectable';
+import { E as ErrorKind, s as sleep, T as TelegramError, I as IS_BUN, a as simplifyObject, w as withRetries } from './utils-DTFsIb2X.js';
 import { Composer as Composer$1, noopNext } from 'middleware-io';
 export * from '@gramio/keyboards';
 
-const ErrorKind = Symbol("ErrorKind");
-class TelegramError extends Error {
-  /** Name of the API Method */
-  method;
-  /** Params that were sent */
-  params;
-  /** See  {@link TelegramAPIResponseError.error_code}*/
-  code;
-  /** Describes why a request was unsuccessful. */
-  payload;
-  /** Construct new TelegramError */
-  constructor(error, method, params) {
-    super(error.description);
-    this.name = method;
-    this.method = method;
-    this.params = params;
-    this.code = error.error_code;
-    if (error.parameters) this.payload = error.parameters;
-  }
-}
-TelegramError.constructor[ErrorKind] = "TELEGRAM";
-
 class Composer {
   composer = Composer$1.builder();
   length = 0;
@@ -102,44 +80,6 @@ class Composer {
   }
 }
 
-var __create$1 = Object.create;
-var __defProp$1 = Object.defineProperty;
-var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
-var __knownSymbol$1 = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
-var __typeError$1 = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp$1 = (obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name$1 = (target, value) => __defProp$1(target, "name", { value, configurable: true });
-var __decoratorStart$1 = (base) => [, , , __create$1(null)];
-var __decoratorStrings$1 = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
-var __expectFn$1 = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError$1("Function expected") : fn;
-var __decoratorContext$1 = (kind, name, done, metadata, fns) => ({ kind: __decoratorStrings$1[kind], name, metadata, addInitializer: (fn) => done._ ? __typeError$1("Already initialized") : fns.push(__expectFn$1(fn || null)) });
-var __decoratorMetadata$1 = (array, target) => __defNormalProp$1(target, __knownSymbol$1("metadata"), array[3]);
-var __runInitializers$1 = (array, flags, self, value) => {
-  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) fns[i].call(self) ;
-  return value;
-};
-var __decorateElement$1 = (array, flags, name, decorators, target, extra) => {
-  var it, done, ctx, k = flags & 7, p = false;
-  var j = 0;
-  var extraInitializers = array[j] || (array[j] = []);
-  var desc = k && ((target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc$1(target , name));
-  __name$1(target, name);
-  for (var i = decorators.length - 1; i >= 0; i--) {
-    ctx = __decoratorContext$1(k, name, done = {}, array[3], extraInitializers);
-    it = (0, decorators[i])(target, ctx), done._ = 1;
-    __expectFn$1(it) && (target = it);
-  }
-  return __decoratorMetadata$1(array, target), desc && __defProp$1(target, name, desc), p ? k ^ 4 ? extra : desc : target;
-};
-var _Plugin_decorators, _init$1;
-_Plugin_decorators = [Inspectable({
-  serialize: (plugin) => ({
-    name: plugin._.name,
-    dependencies: plugin._.dependencies
-  })
-})];
 class Plugin {
   /**
    * 	@internal
@@ -314,28 +254,6 @@ class Plugin {
     return this;
   }
 }
-_init$1 = __decoratorStart$1();
-Plugin = __decorateElement$1(_init$1, 0, "Plugin", _Plugin_decorators, Plugin);
-__runInitializers$1(_init$1, 1, Plugin);
-
-const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-function convertToString(value) {
-  const typeOfValue = typeof value;
-  if (typeOfValue === "string") return value;
-  if (typeOfValue === "object") return JSON.stringify(value);
-  return String(value);
-}
-function simplifyObject(obj) {
-  const result = {};
-  for (const [key, value] of Object.entries(obj)) {
-    const typeOfValue = typeof value;
-    if (value === void 0 || value === null || typeOfValue === "function")
-      continue;
-    result[key] = convertToString(value);
-  }
-  return result;
-}
-const IS_BUN = typeof Bun !== "undefined";
 
 class UpdateQueue {
   updateQueue = [];
@@ -455,43 +373,8 @@ class Updates {
   }
 }
 
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __knownSymbol = (name2, symbol) => (symbol = Symbol[name2]) ? symbol : Symbol.for("Symbol." + name2);
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __decoratorStart = (base) => [, , , __create(null)];
-var __decoratorStrings = ["class", "method", "getter", "setter", "accessor", "field", "value", "get", "set"];
-var __expectFn = (fn) => fn !== void 0 && typeof fn !== "function" ? __typeError("Function expected") : fn;
-var __decoratorContext = (kind, name2, done, metadata, fns) => ({ kind: __decoratorStrings[kind], name: name2, metadata, addInitializer: (fn) => done._ ? __typeError("Already initialized") : fns.push(__expectFn(fn || null)) });
-var __decoratorMetadata = (array, target) => __defNormalProp(target, __knownSymbol("metadata"), array[3]);
-var __runInitializers = (array, flags, self, value) => {
-  for (var i = 0, fns = array[flags >> 1], n = fns && fns.length; i < n; i++) fns[i].call(self) ;
-  return value;
-};
-var __decorateElement = (array, flags, name2, decorators, target, extra) => {
-  var it, done, ctx, k = flags & 7, p = false;
-  var j = 0;
-  var extraInitializers = array[j] || (array[j] = []);
-  var desc = k && ((target = target.prototype), k < 5 && (k > 3 || !p) && __getOwnPropDesc(target , name2));
-  __name(target, name2);
-  for (var i = decorators.length - 1; i >= 0; i--) {
-    ctx = __decoratorContext(k, name2, done = {}, array[3], extraInitializers);
-    it = (0, decorators[i])(target, ctx), done._ = 1;
-    __expectFn(it) && (target = it);
-  }
-  return __decoratorMetadata(array, target), desc && __defProp(target, name2, desc), p ? k ^ 4 ? extra : desc : target;
-};
-var _Bot_decorators, _init;
 const $debugger = debug("gramio");
 const debug$api = $debugger.extend("api");
-_Bot_decorators = [Inspectable({
-  serialize: () => ({})
-})];
 class Bot {
   /** @deprecated use `~` instead*/
   _ = {
@@ -1134,10 +1017,12 @@ class Bot {
   } = {}) {
     await this.init();
     if (!webhook) {
-      await this.api.deleteWebhook({
-        drop_pending_updates: dropPendingUpdates
-        // suppress: true,
-      });
+      await withRetries(
+        () => this.api.deleteWebhook({
+          drop_pending_updates: dropPendingUpdates
+          // suppress: true,
+        })
+      );
       this.updates.startPolling({
         allowed_updates: allowedUpdates
       });
@@ -1150,12 +1035,14 @@ class Bot {
       return this.info;
     }
     if (this.updates.isStarted) this.updates.stopPolling();
-    await this.api.setWebhook({
-      ...webhook,
-      drop_pending_updates: dropPendingUpdates,
-      allowed_updates: allowedUpdates
-      // suppress: true,
-    });
+    await withRetries(
+      async () => this.api.setWebhook({
+        ...webhook,
+        drop_pending_updates: dropPendingUpdates,
+        allowed_updates: allowedUpdates
+        // suppress: true,
+      })
+    );
     this.runImmutableHooks("onStart", {
       plugins: this.dependencies,
       // biome-ignore lint/style/noNonNullAssertion: bot.init() guarantees this.info
@@ -1180,9 +1067,6 @@ class Bot {
     });
   }
 }
-_init = __decoratorStart();
-Bot = __decorateElement(_init, 0, "Bot", _Bot_decorators, Bot);
-__runInitializers(_init, 1, Bot);
 
 const SECRET_TOKEN_HEADER = "X-Telegram-Bot-Api-Secret-Token";
 const WRONG_TOKEN_ERROR = "secret token is invalid";

package/dist/utils-BbVj3DtT.cjs

@@ -0,0 +1,72 @@
+'use strict';
+
+const ErrorKind = Symbol("ErrorKind");
+class TelegramError extends Error {
+  /** Name of the API Method */
+  method;
+  /** Params that were sent */
+  params;
+  /** See  {@link TelegramAPIResponseError.error_code}*/
+  code;
+  /** Describes why a request was unsuccessful. */
+  payload;
+  /** Construct new TelegramError */
+  constructor(error, method, params) {
+    super(error.description);
+    this.name = method;
+    this.method = method;
+    this.params = params;
+    this.code = error.error_code;
+    if (error.parameters) this.payload = error.parameters;
+  }
+}
+TelegramError.constructor[ErrorKind] = "TELEGRAM";
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function convertToString(value) {
+  const typeOfValue = typeof value;
+  if (typeOfValue === "string") return value;
+  if (typeOfValue === "object") return JSON.stringify(value);
+  return String(value);
+}
+function simplifyObject(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const typeOfValue = typeof value;
+    if (value === void 0 || value === null || typeOfValue === "function")
+      continue;
+    result[key] = convertToString(value);
+  }
+  return result;
+}
+const IS_BUN = typeof Bun !== "undefined";
+
+async function suppressError(fn) {
+  try {
+    return [await fn(), false];
+  } catch (error) {
+    return [error, true];
+  }
+}
+async function withRetries(resultPromise) {
+  let [result, isFromCatch] = await suppressError(resultPromise);
+  while (result instanceof TelegramError) {
+    const retryAfter = result.payload?.retry_after;
+    if (retryAfter) {
+      await sleep(retryAfter * 1e3);
+      [result, isFromCatch] = await suppressError(resultPromise);
+    } else {
+      if (isFromCatch) throw result;
+      return result;
+    }
+  }
+  if (result instanceof Error && isFromCatch) throw result;
+  return result;
+}
+
+exports.ErrorKind = ErrorKind;
+exports.IS_BUN = IS_BUN;
+exports.TelegramError = TelegramError;
+exports.simplifyObject = simplifyObject;
+exports.sleep = sleep;
+exports.withRetries = withRetries;

package/dist/utils-DTFsIb2X.js

@@ -0,0 +1,65 @@
+const ErrorKind = Symbol("ErrorKind");
+class TelegramError extends Error {
+  /** Name of the API Method */
+  method;
+  /** Params that were sent */
+  params;
+  /** See  {@link TelegramAPIResponseError.error_code}*/
+  code;
+  /** Describes why a request was unsuccessful. */
+  payload;
+  /** Construct new TelegramError */
+  constructor(error, method, params) {
+    super(error.description);
+    this.name = method;
+    this.method = method;
+    this.params = params;
+    this.code = error.error_code;
+    if (error.parameters) this.payload = error.parameters;
+  }
+}
+TelegramError.constructor[ErrorKind] = "TELEGRAM";
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function convertToString(value) {
+  const typeOfValue = typeof value;
+  if (typeOfValue === "string") return value;
+  if (typeOfValue === "object") return JSON.stringify(value);
+  return String(value);
+}
+function simplifyObject(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const typeOfValue = typeof value;
+    if (value === void 0 || value === null || typeOfValue === "function")
+      continue;
+    result[key] = convertToString(value);
+  }
+  return result;
+}
+const IS_BUN = typeof Bun !== "undefined";
+
+async function suppressError(fn) {
+  try {
+    return [await fn(), false];
+  } catch (error) {
+    return [error, true];
+  }
+}
+async function withRetries(resultPromise) {
+  let [result, isFromCatch] = await suppressError(resultPromise);
+  while (result instanceof TelegramError) {
+    const retryAfter = result.payload?.retry_after;
+    if (retryAfter) {
+      await sleep(retryAfter * 1e3);
+      [result, isFromCatch] = await suppressError(resultPromise);
+    } else {
+      if (isFromCatch) throw result;
+      return result;
+    }
+  }
+  if (result instanceof Error && isFromCatch) throw result;
+  return result;
+}
+
+export { ErrorKind as E, IS_BUN as I, TelegramError as T, simplifyObject as a, sleep as s, withRetries as w };

package/dist/utils.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+var utils = require('./utils-BbVj3DtT.cjs');
+
+
+
+exports.withRetries = utils.withRetries;

package/dist/utils.d.cts

@@ -0,0 +1,8 @@
+/**
+ * @module
+ *
+ * Pack of useful utilities for Telegram Bot API and GramIO
+ */
+declare function withRetries<Result>(resultPromise: () => Promise<Result>): Promise<Result>;
+
+export { withRetries };

package/dist/utils.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @module
+ *
+ * Pack of useful utilities for Telegram Bot API and GramIO
+ */
+declare function withRetries<Result>(resultPromise: () => Promise<Result>): Promise<Result>;
+
+export { withRetries };

package/dist/utils.js

@@ -0,0 +1 @@
+export { w as withRetries } from './utils-DTFsIb2X.js';

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.2.5",
+	"version": "0.3.0",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
@@ -16,6 +16,16 @@
 				"types": "./dist/index.d.cts",
 				"default": "./dist/index.cjs"
 			}
+		},
+		"./utils": {
+			"import": {
+				"types": "./dist/utils.d.ts",
+				"default": "./dist/utils.js"
+			},
+			"require": {
+				"types": "./dist/utils.d.cts",
+				"default": "./dist/utils.cjs"
+			}
 		}
 	},
 	"keywords": [
@@ -27,7 +37,12 @@
 		"types",
 		"client",
 		"webhook",
-		"long-polling"
+		"long-polling",
+		"files",
+		"plugins",
+		"format",
+		"contexts",
+		"files"
 	],
 	"scripts": {
 		"type": "tsc --noEmit",
@@ -41,20 +56,19 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@biomejs/biome": "1.9.4",
-		"@types/bun": "^1.2.5",
+		"@types/bun": "^1.2.9",
 		"@types/debug": "^4.1.12",
-		"pkgroll": "^2.11.2",
-		"typescript": "^5.8.2"
+		"pkgroll": "^2.12.1",
+		"typescript": "^5.8.3"
 	},
 	"dependencies": {
 		"@gramio/callback-data": "^0.0.3",
-		"@gramio/contexts": "^0.1.4",
-		"@gramio/files": "^0.2.0",
-		"@gramio/format": "^0.1.5",
-		"@gramio/keyboards": "^1.1.0",
-		"@gramio/types": "^8.3.3",
+		"@gramio/contexts": "^0.2.0",
+		"@gramio/files": "^0.3.0",
+		"@gramio/format": "^0.2.0",
+		"@gramio/keyboards": "^1.2.1",
+		"@gramio/types": "^9.0.1",
 		"debug": "^4.4.0",
-		"inspectable": "^3.0.2",
 		"middleware-io": "^2.8.1"
 	},
 	"files": ["dist"]