gramio 0.3.1 → 0.4.1

package/dist/index.cjs

@@ -6,10 +6,10 @@ var callbackData = require('@gramio/callback-data');
 var contexts = require('@gramio/contexts');
 var files = require('@gramio/files');
 var format = require('@gramio/format');
-var debug = require('debug');
-var utils = require('./utils-BbVj3DtT.cjs');
+var utils = require('./utils-BIdmQNPz.cjs');
 var middlewareIo = require('middleware-io');
 var keyboards = require('@gramio/keyboards');
+require('debug');
 
 class Composer {
   composer = middlewareIo.Composer.builder();
@@ -54,14 +54,14 @@ class Composer {
         )) {
           context[key] = value;
         }
-        next();
+        return await next();
       });
     else if (handler)
       this.on(updateNameOrHandler, async (context, next) => {
         for (const [key, value] of Object.entries(await handler(context))) {
           context[key] = value;
         }
-        next();
+        return await next();
       });
     return this;
   }
@@ -298,9 +298,11 @@ class UpdateQueue {
 class Updates {
   bot;
   isStarted = false;
+  isRequestActive = false;
   offset = 0;
   composer;
   queue;
+  stopPollingPromiseResolve;
   constructor(bot, onError) {
     this.bot = bot;
     this.composer = new Composer(onError);
@@ -339,40 +341,83 @@ class Updates {
     }
   }
   /** @deprecated use bot.start instead @internal */
-  startPolling(params = {}) {
+  startPolling(params = {}, options = {}) {
     if (this.isStarted) throw new Error("[UPDATES] Polling already started!");
     this.isStarted = true;
-    this.startFetchLoop(params);
+    this.startFetchLoop(params, options);
     return;
   }
-  async startFetchLoop(params = {}) {
+  async startFetchLoop(params = {}, options = {}) {
+    if (options.dropPendingUpdates)
+      await this.dropPendingUpdates(options.deleteWebhookOnConflict);
     while (this.isStarted) {
       try {
-        const updates = await this.bot.api.getUpdates({
-          ...params,
-          offset: this.offset,
-          timeout: 30
-        });
+        this.isRequestActive = true;
+        const updates = await utils.withRetries(
+          () => this.bot.api.getUpdates({
+            timeout: 30,
+            ...params,
+            offset: this.offset
+          })
+        );
+        this.isRequestActive = false;
         const updateId = updates.at(-1)?.update_id;
         this.offset = updateId ? updateId + 1 : this.offset;
         for await (const update of updates) {
           this.queue.add(update);
         }
       } catch (error) {
+        if (error instanceof utils.TelegramError) {
+          if (error.code === 409 && error.message.includes("deleteWebhook")) {
+            if (options.deleteWebhookOnConflict)
+              await this.bot.api.deleteWebhook();
+            continue;
+          }
+        }
         console.error("Error received when fetching updates", error);
-        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);
+        await utils.sleep(this.bot.options.api.retryGetUpdatesWait ?? 1e3);
       }
     }
+    this.stopPollingPromiseResolve?.();
   }
-  stopPolling() {
+  async dropPendingUpdates(deleteWebhookOnConflict = false) {
+    const result = await this.bot.api.getUpdates({
+      // The negative offset can be specified to retrieve updates starting from *-offset* update from the end of the updates queue.
+      // All previous updates will be forgotten.
+      offset: -1,
+      timeout: 0,
+      suppress: true
+    });
+    if (result instanceof utils.TelegramError) {
+      if (result.code === 409 && result.message.includes("deleteWebhook")) {
+        if (deleteWebhookOnConflict) {
+          await this.bot.api.deleteWebhook({
+            drop_pending_updates: true
+          });
+          return;
+        }
+      }
+      throw result;
+    }
+    const lastUpdateId = result.at(-1)?.update_id;
+    utils.debug$updates(
+      "Dropping pending updates... Set offset to last update id %s + 1",
+      lastUpdateId
+    );
+    this.offset = lastUpdateId ? lastUpdateId + 1 : this.offset;
+  }
+  /**
+   * ! Soon waitPendingRequests param default will changed to true
+   */
+  stopPolling(waitPendingRequests = false) {
     this.isStarted = false;
+    if (!this.isRequestActive || !waitPendingRequests) return Promise.resolve();
+    return new Promise((resolve) => {
+      this.stopPollingPromiseResolve = resolve;
+    });
   }
 }
 
-const $debugger = debug("gramio");
-const debug$api = $debugger.extend("api");
 class Bot {
   /** @deprecated use `~` instead*/
   _ = {
@@ -473,7 +518,7 @@ class Bot {
     }
   }
   async _callApi(method, params = {}) {
-    const debug$api$method = debug$api.extend(method);
+    const debug$api$method = utils.debug$api.extend(method);
     let url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
     const reqOptions = {
       method: "POST",
@@ -1010,20 +1055,30 @@ class Bot {
    */
   async start({
     webhook,
+    longPolling,
     dropPendingUpdates,
-    allowedUpdates
+    allowedUpdates,
+    deleteWebhook: deleteWebhookRaw
   } = {}) {
     await this.init();
+    const deleteWebhook = deleteWebhookRaw ?? "on-conflict-with-polling";
     if (!webhook) {
-      await utils.withRetries(
-        () => this.api.deleteWebhook({
-          drop_pending_updates: dropPendingUpdates
-          // suppress: true,
-        })
+      if (deleteWebhook === true)
+        await utils.withRetries(
+          () => this.api.deleteWebhook({
+            drop_pending_updates: dropPendingUpdates
+          })
+        );
+      this.updates.startPolling(
+        {
+          ...longPolling,
+          allowed_updates: allowedUpdates
+        },
+        {
+          dropPendingUpdates,
+          deleteWebhookOnConflict: deleteWebhook === "on-conflict-with-polling"
+        }
       );
-      this.updates.startPolling({
-        allowed_updates: allowedUpdates
-      });
       this.runImmutableHooks("onStart", {
         plugins: this.dependencies,
         // biome-ignore lint/style/noNonNullAssertion: bot.init() guarantees this.info
@@ -1033,14 +1088,15 @@ class Bot {
       return this.info;
     }
     if (this.updates.isStarted) this.updates.stopPolling();
-    await utils.withRetries(
-      async () => this.api.setWebhook({
-        ...webhook,
-        drop_pending_updates: dropPendingUpdates,
-        allowed_updates: allowedUpdates
-        // suppress: true,
-      })
-    );
+    if (webhook !== true)
+      await utils.withRetries(
+        async () => this.api.setWebhook({
+          ...typeof webhook === "string" ? { url: webhook } : 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
@@ -1051,13 +1107,14 @@ class Bot {
   }
   /**
    * Stops receiving events via long-polling or webhook
-   * Currently does not implement graceful shutdown
    * */
   async stop(timeout = 3e3) {
-    if (this.updates.isStarted) {
-      this.updates.stopPolling();
-    }
-    await this.updates.queue.stop(timeout);
+    await Promise.all(
+      [
+        this.updates.queue.stop(timeout),
+        this.updates.isStarted ? this.updates.stopPolling() : void 0
+      ].filter(Boolean)
+    );
     await this.runImmutableHooks("onStop", {
       plugins: this.dependencies,
       // biome-ignore lint/style/noNonNullAssertion: bot.init() guarantees this.info
@@ -1134,7 +1191,7 @@ function webhookHandler(bot, framework, secretToken) {
       ...args
     );
     if (secretToken && header !== secretToken) return unauthorized();
-    await bot.updates.handleUpdate(await update);
+    bot.updates.queue.add(await update);
     if (response) return response();
   };
 }

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
 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';
+import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
 export * from '@gramio/types';
 import * as middleware_io from 'middleware-io';
 import { Composer as Composer$1, Middleware, CaughtMiddlewareHandler, NextMiddleware } from 'middleware-io';
@@ -559,6 +559,20 @@ 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;
 };
+type BotStartOptionsLongPolling = Omit<NonNullable<APIMethodParams<"getUpdates">>, "allowed_updates" | "offset">;
+type BotStartOptionsWebhook = true | string | Omit<SetWebhookParams, "drop_pending_updates" | "allowed_updates">;
+type AllowedUpdates = Exclude<NonNullable<APIMethodParams<"getUpdates">>["allowed_updates"], "update_id">;
+interface BotStartOptions {
+    webhook?: BotStartOptionsWebhook;
+    longPolling?: BotStartOptionsLongPolling;
+    dropPendingUpdates?: boolean;
+    allowedUpdates?: AllowedUpdates;
+    deleteWebhook?: boolean | "on-conflict-with-polling";
+}
+interface PollingStartOptions {
+    dropPendingUpdates?: boolean;
+    deleteWebhookOnConflict?: boolean;
+}
 
 declare class UpdateQueue<Data = TelegramUpdate> {
     private updateQueue;
@@ -576,15 +590,21 @@ declare class UpdateQueue<Data = TelegramUpdate> {
 declare class Updates {
     private readonly bot;
     isStarted: boolean;
+    isRequestActive: boolean;
     private offset;
     composer: Composer;
     queue: UpdateQueue<TelegramUpdate>;
+    stopPollingPromiseResolve: ((value?: undefined) => void) | undefined;
     constructor(bot: AnyBot, onError: CaughtMiddlewareHandler<Context<any>>);
     handleUpdate(data: TelegramUpdate, mode?: "wait" | "lazy"): Promise<unknown>;
     /** @deprecated use bot.start instead @internal */
-    startPolling(params?: APIMethodParams<"getUpdates">): void;
-    startFetchLoop(params?: APIMethodParams<"getUpdates">): Promise<void>;
-    stopPolling(): void;
+    startPolling(params?: APIMethodParams<"getUpdates">, options?: PollingStartOptions): void;
+    startFetchLoop(params?: APIMethodParams<"getUpdates">, options?: PollingStartOptions): Promise<void>;
+    dropPendingUpdates(deleteWebhookOnConflict?: boolean): Promise<void>;
+    /**
+     * ! Soon waitPendingRequests param default will changed to true
+     */
+    stopPolling(waitPendingRequests?: boolean): Promise<void>;
 }
 
 /** Bot instance
@@ -978,14 +998,9 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * bot.start();
      * ```
      */
-    start({ webhook, dropPendingUpdates, allowedUpdates, }?: {
-        webhook?: Omit<APIMethodParams<"setWebhook">, "drop_pending_updates" | "allowed_updates">;
-        dropPendingUpdates?: boolean;
-        allowedUpdates?: NonNullable<APIMethodParams<"getUpdates">>["allowed_updates"];
-    }): Promise<TelegramUser | undefined>;
+    start({ webhook, longPolling, dropPendingUpdates, allowedUpdates, deleteWebhook: deleteWebhookRaw, }?: BotStartOptions): Promise<TelegramUser>;
     /**
      * Stops receiving events via long-polling or webhook
-     * Currently does not implement graceful shutdown
      * */
     stop(timeout?: number): Promise<void>;
 }
@@ -1069,4 +1084,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, 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 };
+export { type AllowedUpdates, type AnyBot, type AnyPlugin, Bot, type BotOptions, type BotStartOptions, type BotStartOptionsLongPolling, type BotStartOptionsWebhook, type CallbackQueryShorthandContext, Composer, type DeriveDefinitions, type ErrorDefinitions, ErrorKind, type FilterDefinitions, type Handler, Hooks, type MaybePromise, type MaybeSuppressedParams, type MaybeSuppressedReturn, Plugin, type PollingStartOptions, type Suppress, type SuppressedAPIMethodParams, type SuppressedAPIMethodReturn, type SuppressedAPIMethods, TelegramError, Updates, type WebhookHandlers, webhookHandler };

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
 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';
+import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
 export * from '@gramio/types';
 import * as middleware_io from 'middleware-io';
 import { Composer as Composer$1, Middleware, CaughtMiddlewareHandler, NextMiddleware } from 'middleware-io';
@@ -559,6 +559,20 @@ 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;
 };
+type BotStartOptionsLongPolling = Omit<NonNullable<APIMethodParams<"getUpdates">>, "allowed_updates" | "offset">;
+type BotStartOptionsWebhook = true | string | Omit<SetWebhookParams, "drop_pending_updates" | "allowed_updates">;
+type AllowedUpdates = Exclude<NonNullable<APIMethodParams<"getUpdates">>["allowed_updates"], "update_id">;
+interface BotStartOptions {
+    webhook?: BotStartOptionsWebhook;
+    longPolling?: BotStartOptionsLongPolling;
+    dropPendingUpdates?: boolean;
+    allowedUpdates?: AllowedUpdates;
+    deleteWebhook?: boolean | "on-conflict-with-polling";
+}
+interface PollingStartOptions {
+    dropPendingUpdates?: boolean;
+    deleteWebhookOnConflict?: boolean;
+}
 
 declare class UpdateQueue<Data = TelegramUpdate> {
     private updateQueue;
@@ -576,15 +590,21 @@ declare class UpdateQueue<Data = TelegramUpdate> {
 declare class Updates {
     private readonly bot;
     isStarted: boolean;
+    isRequestActive: boolean;
     private offset;
     composer: Composer;
     queue: UpdateQueue<TelegramUpdate>;
+    stopPollingPromiseResolve: ((value?: undefined) => void) | undefined;
     constructor(bot: AnyBot, onError: CaughtMiddlewareHandler<Context<any>>);
     handleUpdate(data: TelegramUpdate, mode?: "wait" | "lazy"): Promise<unknown>;
     /** @deprecated use bot.start instead @internal */
-    startPolling(params?: APIMethodParams<"getUpdates">): void;
-    startFetchLoop(params?: APIMethodParams<"getUpdates">): Promise<void>;
-    stopPolling(): void;
+    startPolling(params?: APIMethodParams<"getUpdates">, options?: PollingStartOptions): void;
+    startFetchLoop(params?: APIMethodParams<"getUpdates">, options?: PollingStartOptions): Promise<void>;
+    dropPendingUpdates(deleteWebhookOnConflict?: boolean): Promise<void>;
+    /**
+     * ! Soon waitPendingRequests param default will changed to true
+     */
+    stopPolling(waitPendingRequests?: boolean): Promise<void>;
 }
 
 /** Bot instance
@@ -978,14 +998,9 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * bot.start();
      * ```
      */
-    start({ webhook, dropPendingUpdates, allowedUpdates, }?: {
-        webhook?: Omit<APIMethodParams<"setWebhook">, "drop_pending_updates" | "allowed_updates">;
-        dropPendingUpdates?: boolean;
-        allowedUpdates?: NonNullable<APIMethodParams<"getUpdates">>["allowed_updates"];
-    }): Promise<TelegramUser | undefined>;
+    start({ webhook, longPolling, dropPendingUpdates, allowedUpdates, deleteWebhook: deleteWebhookRaw, }?: BotStartOptions): Promise<TelegramUser>;
     /**
      * Stops receiving events via long-polling or webhook
-     * Currently does not implement graceful shutdown
      * */
     stop(timeout?: number): Promise<void>;
 }
@@ -1069,4 +1084,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, 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 };
+export { type AllowedUpdates, type AnyBot, type AnyPlugin, Bot, type BotOptions, type BotStartOptions, type BotStartOptionsLongPolling, type BotStartOptionsWebhook, type CallbackQueryShorthandContext, Composer, type DeriveDefinitions, type ErrorDefinitions, ErrorKind, type FilterDefinitions, type Handler, Hooks, type MaybePromise, type MaybeSuppressedParams, type MaybeSuppressedReturn, Plugin, type PollingStartOptions, type Suppress, type SuppressedAPIMethodParams, type SuppressedAPIMethodReturn, type SuppressedAPIMethods, TelegramError, Updates, type WebhookHandlers, webhookHandler };

package/dist/index.js

@@ -8,10 +8,10 @@ import { isMediaUpload, convertJsonToFormData, extractFilesToFormData } from '@g
 export * from '@gramio/files';
 import { FormattableMap } from '@gramio/format';
 export * from '@gramio/format';
-import debug from 'debug';
-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 { E as ErrorKind, s as sleep, w as withRetries, T as TelegramError, d as debug$updates, a as debug$api, I as IS_BUN, b as simplifyObject } from './utils-CV4fnsQV.js';
 import { Composer as Composer$1, noopNext } from 'middleware-io';
 export * from '@gramio/keyboards';
+import 'debug';
 
 class Composer {
   composer = Composer$1.builder();
@@ -56,14 +56,14 @@ class Composer {
         )) {
           context[key] = value;
         }
-        next();
+        return await next();
       });
     else if (handler)
       this.on(updateNameOrHandler, async (context, next) => {
         for (const [key, value] of Object.entries(await handler(context))) {
           context[key] = value;
         }
-        next();
+        return await next();
       });
     return this;
   }
@@ -300,9 +300,11 @@ class UpdateQueue {
 class Updates {
   bot;
   isStarted = false;
+  isRequestActive = false;
   offset = 0;
   composer;
   queue;
+  stopPollingPromiseResolve;
   constructor(bot, onError) {
     this.bot = bot;
     this.composer = new Composer(onError);
@@ -341,40 +343,83 @@ class Updates {
     }
   }
   /** @deprecated use bot.start instead @internal */
-  startPolling(params = {}) {
+  startPolling(params = {}, options = {}) {
     if (this.isStarted) throw new Error("[UPDATES] Polling already started!");
     this.isStarted = true;
-    this.startFetchLoop(params);
+    this.startFetchLoop(params, options);
     return;
   }
-  async startFetchLoop(params = {}) {
+  async startFetchLoop(params = {}, options = {}) {
+    if (options.dropPendingUpdates)
+      await this.dropPendingUpdates(options.deleteWebhookOnConflict);
     while (this.isStarted) {
       try {
-        const updates = await this.bot.api.getUpdates({
-          ...params,
-          offset: this.offset,
-          timeout: 30
-        });
+        this.isRequestActive = true;
+        const updates = await withRetries(
+          () => this.bot.api.getUpdates({
+            timeout: 30,
+            ...params,
+            offset: this.offset
+          })
+        );
+        this.isRequestActive = false;
         const updateId = updates.at(-1)?.update_id;
         this.offset = updateId ? updateId + 1 : this.offset;
         for await (const update of updates) {
           this.queue.add(update);
         }
       } catch (error) {
+        if (error instanceof TelegramError) {
+          if (error.code === 409 && error.message.includes("deleteWebhook")) {
+            if (options.deleteWebhookOnConflict)
+              await this.bot.api.deleteWebhook();
+            continue;
+          }
+        }
         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);
+        await sleep(this.bot.options.api.retryGetUpdatesWait ?? 1e3);
       }
     }
+    this.stopPollingPromiseResolve?.();
   }
-  stopPolling() {
+  async dropPendingUpdates(deleteWebhookOnConflict = false) {
+    const result = await this.bot.api.getUpdates({
+      // The negative offset can be specified to retrieve updates starting from *-offset* update from the end of the updates queue.
+      // All previous updates will be forgotten.
+      offset: -1,
+      timeout: 0,
+      suppress: true
+    });
+    if (result instanceof TelegramError) {
+      if (result.code === 409 && result.message.includes("deleteWebhook")) {
+        if (deleteWebhookOnConflict) {
+          await this.bot.api.deleteWebhook({
+            drop_pending_updates: true
+          });
+          return;
+        }
+      }
+      throw result;
+    }
+    const lastUpdateId = result.at(-1)?.update_id;
+    debug$updates(
+      "Dropping pending updates... Set offset to last update id %s + 1",
+      lastUpdateId
+    );
+    this.offset = lastUpdateId ? lastUpdateId + 1 : this.offset;
+  }
+  /**
+   * ! Soon waitPendingRequests param default will changed to true
+   */
+  stopPolling(waitPendingRequests = false) {
     this.isStarted = false;
+    if (!this.isRequestActive || !waitPendingRequests) return Promise.resolve();
+    return new Promise((resolve) => {
+      this.stopPollingPromiseResolve = resolve;
+    });
   }
 }
 
-const $debugger = debug("gramio");
-const debug$api = $debugger.extend("api");
 class Bot {
   /** @deprecated use `~` instead*/
   _ = {
@@ -1012,20 +1057,30 @@ class Bot {
    */
   async start({
     webhook,
+    longPolling,
     dropPendingUpdates,
-    allowedUpdates
+    allowedUpdates,
+    deleteWebhook: deleteWebhookRaw
   } = {}) {
     await this.init();
+    const deleteWebhook = deleteWebhookRaw ?? "on-conflict-with-polling";
     if (!webhook) {
-      await withRetries(
-        () => this.api.deleteWebhook({
-          drop_pending_updates: dropPendingUpdates
-          // suppress: true,
-        })
+      if (deleteWebhook === true)
+        await withRetries(
+          () => this.api.deleteWebhook({
+            drop_pending_updates: dropPendingUpdates
+          })
+        );
+      this.updates.startPolling(
+        {
+          ...longPolling,
+          allowed_updates: allowedUpdates
+        },
+        {
+          dropPendingUpdates,
+          deleteWebhookOnConflict: deleteWebhook === "on-conflict-with-polling"
+        }
       );
-      this.updates.startPolling({
-        allowed_updates: allowedUpdates
-      });
       this.runImmutableHooks("onStart", {
         plugins: this.dependencies,
         // biome-ignore lint/style/noNonNullAssertion: bot.init() guarantees this.info
@@ -1035,14 +1090,15 @@ class Bot {
       return this.info;
     }
     if (this.updates.isStarted) this.updates.stopPolling();
-    await withRetries(
-      async () => this.api.setWebhook({
-        ...webhook,
-        drop_pending_updates: dropPendingUpdates,
-        allowed_updates: allowedUpdates
-        // suppress: true,
-      })
-    );
+    if (webhook !== true)
+      await withRetries(
+        async () => this.api.setWebhook({
+          ...typeof webhook === "string" ? { url: webhook } : 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
@@ -1053,13 +1109,14 @@ class Bot {
   }
   /**
    * Stops receiving events via long-polling or webhook
-   * Currently does not implement graceful shutdown
    * */
   async stop(timeout = 3e3) {
-    if (this.updates.isStarted) {
-      this.updates.stopPolling();
-    }
-    await this.updates.queue.stop(timeout);
+    await Promise.all(
+      [
+        this.updates.queue.stop(timeout),
+        this.updates.isStarted ? this.updates.stopPolling() : void 0
+      ].filter(Boolean)
+    );
     await this.runImmutableHooks("onStop", {
       plugins: this.dependencies,
       // biome-ignore lint/style/noNonNullAssertion: bot.init() guarantees this.info
@@ -1136,7 +1193,7 @@ function webhookHandler(bot, framework, secretToken) {
       ...args
     );
     if (secretToken && header !== secretToken) return unauthorized();
-    await bot.updates.handleUpdate(await update);
+    bot.updates.queue.add(await update);
     if (response) return response();
   };
 }

package/dist/{utils-BbVj3DtT.cjs → utils-BIdmQNPz.cjs}

@@ -1,5 +1,7 @@
 'use strict';
 
+var debug = require('debug');
+
 const ErrorKind = Symbol("ErrorKind");
 class TelegramError extends Error {
   /** Name of the API Method */
@@ -40,6 +42,9 @@ function simplifyObject(obj) {
   return result;
 }
 const IS_BUN = typeof Bun !== "undefined";
+const $debugger = debug("gramio");
+const debug$api = $debugger.extend("api");
+const debug$updates = $debugger.extend("updates");
 
 async function suppressError(fn) {
   try {
@@ -67,6 +72,8 @@ async function withRetries(resultPromise) {
 exports.ErrorKind = ErrorKind;
 exports.IS_BUN = IS_BUN;
 exports.TelegramError = TelegramError;
+exports.debug$api = debug$api;
+exports.debug$updates = debug$updates;
 exports.simplifyObject = simplifyObject;
 exports.sleep = sleep;
 exports.withRetries = withRetries;

package/dist/{utils-DTFsIb2X.js → utils-CV4fnsQV.js}

@@ -1,3 +1,5 @@
+import debug from 'debug';
+
 const ErrorKind = Symbol("ErrorKind");
 class TelegramError extends Error {
   /** Name of the API Method */
@@ -38,6 +40,9 @@ function simplifyObject(obj) {
   return result;
 }
 const IS_BUN = typeof Bun !== "undefined";
+const $debugger = debug("gramio");
+const debug$api = $debugger.extend("api");
+const debug$updates = $debugger.extend("updates");
 
 async function suppressError(fn) {
   try {
@@ -62,4 +67,4 @@ async function withRetries(resultPromise) {
   return result;
 }
 
-export { ErrorKind as E, IS_BUN as I, TelegramError as T, simplifyObject as a, sleep as s, withRetries as w };
+export { ErrorKind as E, IS_BUN as I, TelegramError as T, debug$api as a, simplifyObject as b, debug$updates as d, sleep as s, withRetries as w };

package/dist/utils.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
-var utils = require('./utils-BbVj3DtT.cjs');
+var utils = require('./utils-BIdmQNPz.cjs');
+require('debug');
 
 
 

package/dist/utils.js

@@ -1 +1,2 @@
-export { w as withRetries } from './utils-DTFsIb2X.js';
+export { w as withRetries } from './utils-CV4fnsQV.js';
+import 'debug';

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.3.1",
+	"version": "0.4.1",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
@@ -68,7 +68,7 @@
 		"@gramio/files": "^0.3.0",
 		"@gramio/format": "^0.2.0",
 		"@gramio/keyboards": "^1.2.1",
-		"@gramio/types": "^9.0.1",
+		"@gramio/types": "^9.0.2",
 		"debug": "^4.4.0",
 		"middleware-io": "^2.8.1"
 	},