balebaazoo 1.0.1 → 1.2.1

package/dist/index.d.ts

@@ -593,6 +593,9 @@ interface ApiClientOptions {
     maxRetries?: number;
     retryDelayMs?: number;
 }
+interface CallOptions {
+    signal?: AbortSignal;
+}
 declare class Api {
     readonly token: string;
     private readonly baseUrl;
@@ -602,14 +605,14 @@ declare class Api {
     constructor(options: ApiClientOptions);
     get fileBaseUrl(): string;
     private methodUrl;
-    call<M extends ApiMethod>(method: M, params?: Record<string, unknown>): Promise<ApiMethodResultMap[M]>;
+    call<M extends ApiMethod>(method: M, params?: Record<string, unknown>, options?: CallOptions): Promise<ApiMethodResultMap[M]>;
     private invoke;
     downloadFile(filePath: string): Promise<ArrayBuffer>;
     private prepareBody;
     private request;
     private fetchWithRetry;
     getMe(): Promise<User>;
-    getUpdates(params?: GetUpdatesParams): Promise<Update[]>;
+    getUpdates(params?: GetUpdatesParams, options?: CallOptions): Promise<Update[]>;
     setWebhook(params: SetWebhookParams): Promise<boolean>;
     deleteWebhook(): Promise<boolean>;
     getWebhookInfo(): Promise<WebhookInfo>;
@@ -674,8 +677,10 @@ declare class Context {
     readonly update: Update;
     readonly botInfo?: User;
     callbackQueryAnswered: boolean;
+    private _updateTypes?;
     constructor(options: ContextOptions);
     get updateId(): number;
+    get updateTypes(): string[];
     get message(): Message | undefined;
     get editedMessage(): Message | undefined;
     get callbackQuery(): CallbackQuery | undefined;
@@ -768,36 +773,48 @@ interface PollingOptions {
     limit?: number;
     timeout?: number;
     allowedUpdates?: string[];
+    dropPendingUpdates?: boolean;
+    onStart?: (botInfo: User) => void | Promise<void>;
     onError?: (error: unknown) => void;
     signal?: AbortSignal;
 }
+interface WebhookHandlerOptions {
+    secretToken?: string;
+    maxBodyBytes?: number;
+    onError?: (error: unknown) => Response | void;
+}
 declare class PollingRunner {
     private running;
     private abortController?;
     private offset;
+    private loopPromise?;
+    private backoffAttempt;
     start(bot: PollingBot, options?: PollingOptions): Promise<void>;
+    private runLoop;
+    setOffset(offset: number): void;
     stop(): Promise<void>;
 }
-declare function createWebhookHandler(bot: PollingBot, getUpdate: (request: Request) => Promise<Update>, options?: {
-    secretToken?: string;
-    maxBodyBytes?: number;
-}): Promise<(request: Request) => Promise<Response>>;
+declare function createWebhookHandler(bot: PollingBot, getUpdate: (request: Request) => Promise<Update>, options?: WebhookHandlerOptions): Promise<(request: Request) => Promise<Response>>;
 declare function webhookFromJson(bot: PollingBot): Promise<(request: Request) => Promise<Response>>;
 
 interface BotOptions extends ApiClientOptions {
     botInfo?: User;
     autoAnswerCallback?: boolean;
 }
+
 declare class Bot<C extends Context = Context> extends Composer<C> {
     readonly api: Api;
     private botInfo?;
     private readonly polling;
     private readonly autoAnswer;
+    private catchHandler?;
     constructor(token: string, options?: Omit<BotOptions, "token">);
     init(): Promise<User>;
+    catch(handler: (error: unknown, ctx: C) => void | Promise<void>): this;
     handleUpdate(update: Update): Promise<void>;
     createContext(update: Update): Context;
     start(options?: PollingOptions): Promise<void>;
+    launch(options?: PollingOptions): Promise<void>;
     stop(): Promise<void>;
     webhookCallback(): (update: Update) => Promise<void>;
     use(...middleware: MiddlewareLike<C>[]): this;
@@ -855,6 +872,13 @@ declare class ReplyKeyboard implements ReplyKeyboardMarkup {
 declare function removeKeyboard(): ReplyKeyboardRemove;
 
 declare function autoAnswerCallback(): Middleware<Context>;
+
 declare function errorHandler(onError: (error: unknown, ctx: Context) => Promise<void> | void): Middleware<Context>;
 
-export { type AddStickerToSetParams, type Animation, type AnswerCallbackQueryParams, type AnswerPreCheckoutQueryParams, Api, type ApiClientOptions, type ApiMethod, type ApiMethodResultMap, type AskReviewParams, type Audio, BaleAPIError, type BaleApiResponse, BaleError, BaleNetworkError, type BanChatMemberParams, Bot, type BotOptions, type CallbackQuery, type Chat, type ChatAction, type ChatFullInfo, type ChatId, type ChatMember, type ChatMemberAdministrator, type ChatMemberMember, type ChatMemberOwner, type ChatMemberRestricted, type ChatPhoto, Composer, type Contact, Context, type ContextOptions, type CopyMessageParams, type CopyTextButton, type CreateChatInviteLinkParams, type CreateInvoiceLinkParams, type CreateNewStickerSetParams, DEFAULT_API_BASE, type DeleteMessageParams, type Document, type EditMessageCaptionParams, type EditMessageReplyMarkupParams, type EditMessageTextParams, type File, type FilterContext, type FilterQuery, type ForwardMessageParams, type GetChatMemberParams, type GetChatParams, type GetFileParams, type GetUpdatesParams, InlineKeyboard, type InlineKeyboardButton, type InlineKeyboardMarkup, InputFile, type InputMedia, type InputMediaAnimation, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type InputSticker, type InquireTransactionParams, type Invoice, type KeyboardButton, type LabeledPrice, type LeaveChatParams, type Location, type Message, type MessageEntity, type MessageId, type Middleware, type MiddlewareLike, type MiddlewareObject, type NextFunction, type PhotoSize, type PinChatMessageParams, type PollingBot, type PollingOptions, PollingRunner, type PreCheckoutQuery, type PromoteChatMemberParams, ReplyKeyboard, type ReplyKeyboardMarkup, type ReplyKeyboardRemove, type ReplyMarkup, type ReplyOptions, type ResponseParameters, type RevokeChatInviteLinkParams, type SendAnimationParams, type SendAudioParams, type SendChatActionParams, type SendContactParams, type SendDocumentParams, type SendInvoiceParams, type SendLocationParams, type SendMediaGroupParams, type SendMediaParams, type SendMessageParams, type SendPhotoParams, type SendVideoParams, type SendVoiceParams, type SetChatDescriptionParams, type SetChatPhotoParams, type SetChatTitleParams, type SetWebhookParams, type Sticker, type StickerSet, type SuccessfulPayment, type Transaction, type UnbanChatMemberParams, type Update, type UploadStickerFileParams, type User, type UserId, type Video, type Voice, type WebAppData, type WebAppInfo, type WebhookInfo, autoAnswerCallback, bold, createWebhookHandler, errorHandler, extractCommand, isFilePath, isMiddlewareObject, italic, link, matchUpdate, matchesAnyFilter, matchesChatType, matchesFilter, md, normalizeMiddleware, removeKeyboard, runMiddleware, spoiler, webhookFromJson };
+interface GracefulShutdownOptions {
+    signals?: NodeJS.Signals[];
+    onShutdown?: () => void | Promise<void>;
+}
+declare function setupGracefulShutdown(bot: Bot, options?: GracefulShutdownOptions): void;
+
+export { type AddStickerToSetParams, type Animation, type AnswerCallbackQueryParams, type AnswerPreCheckoutQueryParams, Api, type ApiClientOptions, type ApiMethod, type ApiMethodResultMap, type AskReviewParams, type Audio, BaleAPIError, type BaleApiResponse, BaleError, BaleNetworkError, type BanChatMemberParams, Bot, type BotOptions, type CallOptions, type CallbackQuery, type Chat, type ChatAction, type ChatFullInfo, type ChatId, type ChatMember, type ChatMemberAdministrator, type ChatMemberMember, type ChatMemberOwner, type ChatMemberRestricted, type ChatPhoto, Composer, type Contact, Context, type ContextOptions, type CopyMessageParams, type CopyTextButton, type CreateChatInviteLinkParams, type CreateInvoiceLinkParams, type CreateNewStickerSetParams, DEFAULT_API_BASE, type DeleteMessageParams, type Document, type EditMessageCaptionParams, type EditMessageReplyMarkupParams, type EditMessageTextParams, type File, type FilterContext, type FilterQuery, type ForwardMessageParams, type GetChatMemberParams, type GetChatParams, type GetFileParams, type GetUpdatesParams, type GracefulShutdownOptions, InlineKeyboard, type InlineKeyboardButton, type InlineKeyboardMarkup, InputFile, type InputMedia, type InputMediaAnimation, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type InputSticker, type InquireTransactionParams, type Invoice, type KeyboardButton, type LabeledPrice, type LeaveChatParams, type Location, type Message, type MessageEntity, type MessageId, type Middleware, type MiddlewareLike, type MiddlewareObject, type NextFunction, type PhotoSize, type PinChatMessageParams, type PollingBot, type PollingOptions, PollingRunner, type PreCheckoutQuery, type PromoteChatMemberParams, ReplyKeyboard, type ReplyKeyboardMarkup, type ReplyKeyboardRemove, type ReplyMarkup, type ReplyOptions, type ResponseParameters, type RevokeChatInviteLinkParams, type SendAnimationParams, type SendAudioParams, type SendChatActionParams, type SendContactParams, type SendDocumentParams, type SendInvoiceParams, type SendLocationParams, type SendMediaGroupParams, type SendMediaParams, type SendMessageParams, type SendPhotoParams, type SendVideoParams, type SendVoiceParams, type SetChatDescriptionParams, type SetChatPhotoParams, type SetChatTitleParams, type SetWebhookParams, type Sticker, type StickerSet, type SuccessfulPayment, type Transaction, type UnbanChatMemberParams, type Update, type UploadStickerFileParams, type User, type UserId, type Video, type Voice, type WebAppData, type WebAppInfo, type WebhookHandlerOptions, type WebhookInfo, autoAnswerCallback, bold, createWebhookHandler, errorHandler, extractCommand, isFilePath, isMiddlewareObject, italic, link, matchUpdate, matchesAnyFilter, matchesChatType, matchesFilter, md, normalizeMiddleware, removeKeyboard, runMiddleware, setupGracefulShutdown, spoiler, webhookFromJson };

package/dist/index.js

@@ -92,6 +92,9 @@ async function isFilePath(source) {
   if (source.startsWith("http://") || source.startsWith("https://")) {
     return false;
   }
+  if (!looksLikePath(source)) {
+    return false;
+  }
   try {
     const info = await stat(source);
     return info.isFile();
@@ -99,6 +102,9 @@ async function isFilePath(source) {
     return false;
   }
 }
+function looksLikePath(source) {
+  return source.startsWith("./") || source.startsWith("../") || source.includes("/") || source.includes("\\");
+}
 
 // src/api/client.ts
 var DEFAULT_API_BASE = "https://tapi.bale.ai";
@@ -121,12 +127,15 @@ var Api = class {
   methodUrl(method) {
     return `${this.baseUrl}/bot${this.token}/${method}`;
   }
-  async call(method, params) {
+  async call(method, params, options) {
     let attempt = 0;
     while (true) {
       try {
-        return await this.invoke(method, params);
+        return await this.invoke(method, params, options);
       } catch (error) {
+        if (options?.signal?.aborted || isAbortError(error)) {
+          throw error;
+        }
         if (error instanceof BaleAPIError && error.errorCode === 429 && attempt < this.maxRetries) {
           const retryAfter = (error.parameters?.retry_after ?? 1) * 1e3;
           await sleep(retryAfter);
@@ -137,7 +146,7 @@ var Api = class {
       }
     }
   }
-  async invoke(method, params) {
+  async invoke(method, params, options) {
     const { body } = await this.prepareBody(params ?? {});
     const headers = {};
     if (!(body instanceof FormData)) {
@@ -147,7 +156,7 @@ var Api = class {
       method: "POST",
       headers,
       body: body instanceof FormData ? body : JSON.stringify(body ?? {})
-    });
+    }, options);
   }
   async downloadFile(filePath) {
     const url = `${this.fileBaseUrl}/${filePath}`;
@@ -189,8 +198,8 @@ var Api = class {
     }
     return { body: formData, isMultipart: true };
   }
-  async request(method, init) {
-    const response = await this.fetchWithRetry(this.methodUrl(method), init);
+  async request(method, init, options) {
+    const response = await this.fetchWithRetry(this.methodUrl(method), init, options);
     const payload = await response.json();
     if (!payload.ok) {
       throw new BaleAPIError(
@@ -201,12 +210,18 @@ var Api = class {
     }
     return payload.result;
   }
-  async fetchWithRetry(url, init) {
+  async fetchWithRetry(url, init, options) {
     let attempt = 0;
     let lastError;
     while (attempt <= this.maxRetries) {
+      if (options?.signal?.aborted) {
+        throw new DOMException("The operation was aborted", "AbortError");
+      }
       try {
-        const response = await this.fetchFn(url, init);
+        const response = await this.fetchFn(url, {
+          ...init,
+          signal: options?.signal
+        });
         if (response.status === 429) {
           const retryAfter = Number(response.headers.get("retry-after") ?? "1");
           await sleep(retryAfter * 1e3);
@@ -221,6 +236,9 @@ var Api = class {
         return response;
       } catch (error) {
         lastError = error;
+        if (isAbortError(error) || options?.signal?.aborted) {
+          throw error;
+        }
         if (attempt >= this.maxRetries) {
           break;
         }
@@ -236,8 +254,8 @@ var Api = class {
   getMe() {
     return this.call("getMe");
   }
-  getUpdates(params) {
-    return this.call("getUpdates", asParams(params));
+  getUpdates(params, options) {
+    return this.call("getUpdates", asParams(params), options);
   }
   setWebhook(params) {
     return this.call("setWebhook", asParams(params));
@@ -425,6 +443,9 @@ function appendFormValue(formData, key, value) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function isAbortError(error) {
+  return error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted"));
+}
 
 // src/middleware/types.ts
 function isMiddlewareObject(value) {
@@ -495,12 +516,10 @@ function extractCommand(text) {
 
 // src/filters/query.ts
 function matchesFilter(ctx, filter) {
-  const updateMatches = matchUpdate(ctx.update);
-  return updateMatches.includes(filter);
+  return ctx.updateTypes.includes(filter);
 }
 function matchesAnyFilter(ctx, filters) {
-  const updateMatches = matchUpdate(ctx.update);
-  return filters.some((filter) => updateMatches.includes(filter));
+  return filters.some((filter) => ctx.updateTypes.includes(filter));
 }
 function matchesChatType(ctx, chatType) {
   const chat = ctx.chat;
@@ -613,6 +632,7 @@ var Context = class {
   update;
   botInfo;
   callbackQueryAnswered = false;
+  _updateTypes;
   constructor(options) {
     this.api = options.api;
     this.update = options.update;
@@ -621,6 +641,12 @@ var Context = class {
   get updateId() {
     return this.update.update_id;
   }
+  get updateTypes() {
+    if (!this._updateTypes) {
+      this._updateTypes = matchUpdate(this.update);
+    }
+    return this._updateTypes;
+  }
   get message() {
     return this.update.message ?? this.update.edited_message;
   }
@@ -780,21 +806,14 @@ function autoAnswerCallback() {
     }
   };
 }
-function errorHandler(onError) {
-  return async (ctx, next) => {
-    try {
-      await next();
-    } catch (error) {
-      await onError(error, ctx);
-    }
-  };
-}
 
 // src/runner/polling.ts
 var PollingRunner = class {
   running = false;
   abortController;
   offset = 0;
+  loopPromise;
+  backoffAttempt = 0;
   async start(bot, options = {}) {
     if (this.running) {
       throw new Error("Polling is already running");
@@ -805,14 +824,22 @@ var PollingRunner = class {
     const onError = options.onError ?? ((error) => {
       console.error("[balebaazoo] polling error:", error);
     });
+    this.loopPromise = this.runLoop(bot, options, signal, onError);
+    await this.loopPromise;
+  }
+  async runLoop(bot, options, signal, onError) {
     while (this.running && !signal.aborted) {
       try {
-        const updates = await bot.api.getUpdates({
-          offset: this.offset,
-          limit: options.limit ?? 100,
-          timeout: options.timeout ?? 30,
-          allowed_updates: options.allowedUpdates
-        });
+        const updates = await bot.api.getUpdates(
+          {
+            offset: this.offset,
+            limit: options.limit ?? 100,
+            timeout: options.timeout ?? 30,
+            allowed_updates: options.allowedUpdates
+          },
+          { signal }
+        );
+        this.backoffAttempt = 0;
         for (const update of updates) {
           this.offset = update.update_id + 1;
           try {
@@ -825,23 +852,49 @@ var PollingRunner = class {
           break;
         }
       } catch (error) {
-        if (signal.aborted) break;
+        if (signal.aborted || isAbortError2(error)) {
+          break;
+        }
+        if (error instanceof BaleAPIError && error.errorCode === 401) {
+          onError(error);
+          this.running = false;
+          break;
+        }
         onError(error);
-        await sleep2(1e3);
+        await sleep2(backoffDelay(this.backoffAttempt));
+        this.backoffAttempt++;
       }
     }
   }
+  setOffset(offset) {
+    this.offset = offset;
+  }
   async stop() {
     this.running = false;
     this.abortController?.abort();
+    await this.loopPromise;
   }
 };
+function isAbortError2(error) {
+  return error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted"));
+}
+function backoffDelay(attempt) {
+  const base = 1e3;
+  const max = 3e4;
+  const exponential = Math.min(base * 2 ** attempt, max);
+  const jitter = Math.random() * 0.3 * exponential;
+  return Math.floor(exponential + jitter);
+}
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 async function createWebhookHandler(bot, getUpdate, options = {}) {
   await bot.init();
   const maxBodyBytes = options.maxBodyBytes ?? 1024 * 1024;
+  const onError = options.onError ?? ((error) => {
+    console.error("[balebaazoo] webhook error:", error);
+    return new Response("Internal Server Error", { status: 500 });
+  });
   return async (request) => {
     if (request.method !== "POST") {
       return new Response("Method Not Allowed", { status: 405 });
@@ -866,8 +919,8 @@ async function createWebhookHandler(bot, getUpdate, options = {}) {
       await bot.handleUpdate(update);
       return new Response("OK", { status: 200 });
     } catch (error) {
-      console.error("[balebaazoo] webhook error:", error);
-      return new Response("Internal Server Error", { status: 500 });
+      const response = onError(error);
+      return response ?? new Response("Internal Server Error", { status: 500 });
     }
   };
 }
@@ -883,6 +936,7 @@ var Bot = class extends Composer {
   botInfo;
   polling = new PollingRunner();
   autoAnswer;
+  catchHandler;
   constructor(token, options = {}) {
     const api = new Api({ token, ...options });
     super();
@@ -899,9 +953,22 @@ var Bot = class extends Composer {
     }
     return this.botInfo;
   }
+  catch(handler) {
+    this.catchHandler = handler;
+    return this;
+  }
   async handleUpdate(update) {
+    await this.init();
     const ctx = this.createContext(update);
-    await this.middleware()(ctx, async () => void 0);
+    try {
+      await this.middleware()(ctx, async () => void 0);
+    } catch (error) {
+      if (this.catchHandler) {
+        await this.catchHandler(error, ctx);
+        return;
+      }
+      throw error;
+    }
   }
   createContext(update) {
     return new Context({
@@ -911,9 +978,44 @@ var Bot = class extends Composer {
     });
   }
   async start(options = {}) {
-    await this.init();
+    const onError = options.onError ?? ((error) => {
+      console.error("[balebaazoo] polling error:", error);
+    });
+    try {
+      await this.init();
+    } catch (error) {
+      onError(error);
+      return;
+    }
+    if (options.dropPendingUpdates) {
+      try {
+        const updates = await this.api.getUpdates({
+          offset: -1,
+          limit: 1,
+          timeout: 0
+        });
+        if (updates.length > 0) {
+          const last = updates[updates.length - 1];
+          this.polling.setOffset(last.update_id + 1);
+        }
+      } catch (error) {
+        onError(error);
+        return;
+      }
+    }
+    if (options.onStart) {
+      try {
+        await options.onStart(this.botInfo);
+      } catch (error) {
+        onError(error);
+        return;
+      }
+    }
     await this.polling.start(this, options);
   }
+  launch(options) {
+    return this.start(options);
+  }
   async stop() {
     await this.polling.stop();
   }
@@ -1010,6 +1112,30 @@ function removeKeyboard() {
   return { remove_keyboard: true };
 }
 
-export { Api, BaleAPIError, BaleError, BaleNetworkError, Bot, Composer, Context, DEFAULT_API_BASE, InlineKeyboard, InputFile, PollingRunner, ReplyKeyboard, autoAnswerCallback, bold, createWebhookHandler, errorHandler, extractCommand, isFilePath, isMiddlewareObject, italic, link, matchUpdate, matchesAnyFilter, matchesChatType, matchesFilter, md, normalizeMiddleware, removeKeyboard, runMiddleware, spoiler, webhookFromJson };
+// src/middleware/error-handler.ts
+function errorHandler(onError) {
+  return async (ctx, next) => {
+    try {
+      await next();
+    } catch (error) {
+      await onError(error, ctx);
+    }
+  };
+}
+
+// src/runner/shutdown.ts
+function setupGracefulShutdown(bot, options = {}) {
+  const signals = options.signals ?? ["SIGINT", "SIGTERM"];
+  for (const signal of signals) {
+    process.once(signal, () => {
+      void (async () => {
+        await bot.stop();
+        await options.onShutdown?.();
+      })();
+    });
+  }
+}
+
+export { Api, BaleAPIError, BaleError, BaleNetworkError, Bot, Composer, Context, DEFAULT_API_BASE, InlineKeyboard, InputFile, PollingRunner, ReplyKeyboard, autoAnswerCallback, bold, createWebhookHandler, errorHandler, extractCommand, isFilePath, isMiddlewareObject, italic, link, matchUpdate, matchesAnyFilter, matchesChatType, matchesFilter, md, normalizeMiddleware, removeKeyboard, runMiddleware, setupGracefulShutdown, spoiler, webhookFromJson };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map