@codebam/cf-workers-telegram-bot 11.13.0 → 12.0.0

package/dist/main.d.ts

@@ -1,32 +1,12 @@
+import { Chat as TelegramChat, User as TelegramUser, User as TelegramFrom, MessageEntity as TelegramMessageEntity, PhotoSize as TelegramPhotoSize, Message as TelegramMessage, Voice as TelegramVoice, InputMessageContent as TelegramInputMessageContent, InlineQuery as TelegramInlineQuery, Update as TelegramUpdate, InlineQueryResult as TelegramInlineQueryResult, InlineQueryResultPhoto as TelegramInlineQueryResultPhoto, InlineQueryResultArticle as TelegramInlineQueryResultArticle, InlineQueryResultVideo as TelegramInlineQueryResultVideo, InlineQueryResultVoice as TelegramInlineQueryResultVoice, ChatPermissions as ChatPermissions, Message as TelegramBusinessMessage, CallbackQuery as TelegramCallbackQuery, PreCheckoutQuery as TelegramPreCheckoutQuery, Document as TelegramDocument, SuccessfulPayment as TelegramSuccessfulPayment } from '@grammyjs/types';
 import TelegramBot from './telegram_bot.js';
 import TelegramExecutionContext from './telegram_execution_context.js';
 import Webhook from './webhook.js';
 import TelegramApi, { TelegramApiBaseParams, SendMessageParams, SendMessageDraftParams, SendPhotoParams, SendVideoParams, SendVoiceParams, SendChatActionParams, AnswerCallbackParams, AnswerInlineParams, AnswerGuestParams, SendInvoiceParams, AnswerPreCheckoutParams, TelegramApiParams } from './telegram_api.js';
 import TelegramCommand from './types/TelegramCommand.js';
-import TelegramFrom from './types/TelegramFrom.js';
-import TelegramChat from './types/TelegramChat.js';
-import TelegramUser from './types/TelegramUser.js';
-import TelegramMessageEntity from './types/TelegramMessageEntity.js';
-import TelegramPhotoSize from './types/TelegramPhotoSize.js';
-import TelegramMessage from './types/TelegramMessage.js';
-import { TelegramVoice } from './types/TelegramVoice.js';
 import TelegramGuestMessage from './types/TelegramGuestMessage.js';
-import TelegramInputMessageContent from './types/TelegramInputMessageContent.js';
-import TelegramInlineQuery from './types/TelegramInlineQuery.js';
-import TelegramUpdate from './types/TelegramUpdate.js';
 import PartialTelegramUpdate from './types/PartialTelegramUpdate.js';
 import TelegramInlineQueryType from './types/TelegramInlineQueryType.js';
-import TelegramInlineQueryResult from './types/TelegramInlineQueryResult.js';
-import TelegramInlineQueryResultPhoto from './types/TelegramInlineQueryResultPhoto.js';
-import TelegramInlineQueryResultArticle from './types/TelegramInlineQueryResultArticle.js';
-import TelegramInlineQueryResultVideo from './types/TelegramInlineQueryResultVideo.js';
-import TelegramInlineQueryResultVoice from './types/TelegramInlineQueryResultVoice.js';
-import ChatPermissions from './types/ChatPermissions.js';
-import TelegramBusinessMessage from './types/TelegramBusinessMessage.js';
-import TelegramCallbackQuery from './types/TelegramCallbackQuery.js';
-import TelegramPreCheckoutQuery from './types/TelegramPreCheckoutQuery.js';
-import TelegramDocument from './types/TelegramDocument.js';
-import TelegramSuccessfulPayment from './types/TelegramSuccessfulPayment.js';
 import { markdownToHtml, fetchTool } from './utils.js';
 export default TelegramBot;
 export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, TelegramApiBaseParams, SendMessageParams, SendMessageDraftParams, SendPhotoParams, SendVideoParams, SendVoiceParams, SendChatActionParams, AnswerCallbackParams, AnswerInlineParams, AnswerGuestParams, SendInvoiceParams, AnswerPreCheckoutParams, TelegramApiParams, TelegramCommand, TelegramFrom, TelegramChat, TelegramUser, TelegramMessageEntity, TelegramPhotoSize, TelegramMessage, TelegramVoice, TelegramGuestMessage, TelegramInputMessageContent, TelegramInlineQuery, TelegramUpdate, PartialTelegramUpdate, TelegramInlineQueryType, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, TelegramInlineQueryResultVideo, TelegramInlineQueryResultVoice, ChatPermissions, TelegramBusinessMessage, TelegramCallbackQuery, TelegramPreCheckoutQuery, TelegramDocument, TelegramSuccessfulPayment, markdownToHtml, fetchTool, };

package/dist/main.js

@@ -2,12 +2,6 @@ import TelegramBot from './telegram_bot.js';
 import TelegramExecutionContext from './telegram_execution_context.js';
 import Webhook from './webhook.js';
 import TelegramApi from './telegram_api.js';
-import TelegramUpdate from './types/TelegramUpdate.js';
-import TelegramInlineQueryResult from './types/TelegramInlineQueryResult.js';
-import TelegramInlineQueryResultPhoto from './types/TelegramInlineQueryResultPhoto.js';
-import TelegramInlineQueryResultArticle from './types/TelegramInlineQueryResultArticle.js';
-import TelegramInlineQueryResultVideo from './types/TelegramInlineQueryResultVideo.js';
-import TelegramInlineQueryResultVoice from './types/TelegramInlineQueryResultVoice.js';
 import { markdownToHtml, fetchTool } from './utils.js';
 export default TelegramBot;
-export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, TelegramUpdate, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, TelegramInlineQueryResultVideo, TelegramInlineQueryResultVoice, markdownToHtml, fetchTool, };
+export { TelegramBot, TelegramExecutionContext, Webhook, TelegramApi, markdownToHtml, fetchTool, };

package/dist/telegram_api.d.ts

@@ -1,6 +1,7 @@
-import TelegramInlineQueryResult from './types/TelegramInlineQueryResult.js';
+import { InlineQueryResult as TelegramInlineQueryResult } from '@grammyjs/types';
 /** Interface for common Telegram API parameters */
 export interface TelegramApiBaseParams {
+    [key: string]: unknown;
     chat_id: number | string;
     message_thread_id?: number;
     business_connection_id?: string | number;
@@ -95,7 +96,19 @@ export interface SendVoiceParams extends TelegramApiBaseParams {
 }
 /** Type for all possible API parameters */
 export type TelegramApiParams = SendMessageParams | SendPhotoParams | SendVideoParams | SendVoiceParams | SendChatActionParams | AnswerCallbackParams | AnswerInlineParams | AnswerGuestParams | SendInvoiceParams | AnswerPreCheckoutParams | Record<string, unknown>;
-/** Class representing the Telegram API and all its methods */
+/** Interface for edit message text parameters */
+export interface EditMessageTextParams extends Partial<TelegramApiBaseParams> {
+    [key: string]: unknown;
+    chat_id?: number | string;
+    message_id?: number;
+    inline_message_id?: string;
+    text: string;
+    parse_mode?: string;
+    disable_web_page_preview?: boolean;
+    reply_markup?: object;
+    business_connection_id?: string | number;
+}
+/** Class representing the telegram API and all its methods */
 export default class TelegramApi {
     /**
      * Get the API URL for a given bot API and slug
@@ -104,7 +117,7 @@ export default class TelegramApi {
      * @param data - data to append to the request
      * @returns Request object with the full URL and parameters
      */
-    getApiUrl(botApi: string, slug: string, data: TelegramApiParams): Request;
+    getApiUrl(botApi: string, slug: string, data: TelegramApiParams, method?: 'GET' | 'POST'): Request;
     /**
      * Fetch a URL and log the response
      * @param url - the URL to fetch
@@ -195,16 +208,7 @@ export default class TelegramApi {
      * @param data - data to append to the request
      * @returns Promise with the API response
      */
-    editMessageText(botApi: string, data: {
-        chat_id?: number | string;
-        message_id?: number;
-        inline_message_id?: string;
-        text: string;
-        parse_mode?: string;
-        disable_web_page_preview?: boolean;
-        reply_markup?: object;
-        business_connection_id?: string | number;
-    }): Promise<Response>;
+    editMessageText(botApi: string, data: EditMessageTextParams): Promise<Response>;
     sendMessageDraft(botApi: string, data: SendMessageDraftParams): Promise<Response>;
     /**
      * Send an invoice to a user
@@ -220,6 +224,13 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     answerPreCheckoutQuery(botApi: string, data: AnswerPreCheckoutParams): Promise<Response>;
+    /**
+     * Get information about a business connection
+     * @param botApi - full URL to the telegram API without slug
+     * @param business_connection_id - unique identifier of the business connection
+     * @returns Promise with the API response
+     */
+    getBusinessConnection(botApi: string, business_connection_id: string): Promise<Response>;
     /**
      * Get basic information about the bot
      * @param botApi - full URL to the telegram API without slug

package/dist/telegram_api.js

@@ -1,4 +1,4 @@
-/** Class representing the Telegram API and all its methods */
+/** Class representing the telegram API and all its methods */
 export default class TelegramApi {
     /**
      * Get the API URL for a given bot API and slug
@@ -7,15 +7,24 @@ export default class TelegramApi {
      * @param data - data to append to the request
      * @returns Request object with the full URL and parameters
      */
-    getApiUrl(botApi, slug, data) {
-        const request = new URL(botApi + (slug.startsWith('/') || botApi.endsWith('/') ? '' : '/') + slug);
-        const params = new URLSearchParams();
-        for (const [key, value] of Object.entries(data)) {
-            if (value !== undefined) {
-                params.append(key, typeof value === 'object' && value !== null ? JSON.stringify(value) : String(value));
+    getApiUrl(botApi, slug, data, method = 'GET') {
+        const baseUrl = botApi + (slug.startsWith('/') || botApi.endsWith('/') ? '' : '/') + slug;
+        if (method === 'GET') {
+            const url = new URL(baseUrl);
+            for (const [key, value] of Object.entries(data)) {
+                if (value !== undefined) {
+                    url.searchParams.append(key, typeof value === 'object' && value !== null ? JSON.stringify(value) : String(value));
+                }
             }
+            return new Request(url.toString());
         }
-        return new Request(`${request.toString()}?${params.toString()}`);
+        return new Request(baseUrl, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(data),
+        });
     }
     /**
      * Fetch a URL and log the response
@@ -31,12 +40,20 @@ export default class TelegramApi {
             let errorDescription = '';
             try {
                 const json = (await cloned.json());
-                errorDescription = json.description ? `: ${json.description}` : '';
+                errorDescription = json.description || '';
             }
             catch {
                 // ignore
             }
-            throw new Error(`Telegram API error: ${String(response.status)} ${response.statusText}${errorDescription}`);
+            if (errorDescription.includes('BUSINESS_CONNECTION_INVALID') || errorDescription.includes('BUSINESS_PEER_INVALID')) {
+                console.warn(`Telegram API business error: ${errorDescription}`);
+                throw new Error('BUSINESS_CONNECTION_INVALID');
+            }
+            if (errorDescription.includes('PEER_ID_INVALID')) {
+                console.warn(`Telegram API peer error: ${errorDescription}`);
+                throw new Error('PEER_ID_INVALID');
+            }
+            throw new Error(`Telegram API error: ${String(response.status)} ${response.statusText}${errorDescription ? ': ' + errorDescription : ''}`);
         }
         const cloned = response.clone();
         try {
@@ -59,7 +76,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async sendChatAction(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendChatAction', data);
+        const url = this.getApiUrl(botApi, 'sendChatAction', data, 'POST');
         return await this.fetchAndLog(url, 'sendChatAction', data);
     }
     /**
@@ -73,7 +90,7 @@ export default class TelegramApi {
         if (!data.file_id || data.file_id === '') {
             throw new Error('No file_id provided');
         }
-        const url = this.getApiUrl(botApi, 'getFile', data);
+        const url = this.getApiUrl(botApi, 'getFile', data, 'POST');
         const response = await this.fetchAndLog(url, 'getFile', data);
         const json = await response.json();
         if (!json.ok || !json.result?.file_path) {
@@ -92,7 +109,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async sendMessage(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendMessage', data);
+        const url = this.getApiUrl(botApi, 'sendMessage', data, 'POST');
         return await this.fetchAndLog(url, 'sendMessage', data);
     }
     /**
@@ -102,7 +119,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async sendVideo(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendVideo', data);
+        const url = this.getApiUrl(botApi, 'sendVideo', data, 'POST');
         return await this.fetchAndLog(url, 'sendVideo', data);
     }
     /**
@@ -112,7 +129,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async sendPhoto(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendPhoto', data);
+        const url = this.getApiUrl(botApi, 'sendPhoto', data, 'POST');
         return await this.fetchAndLog(url, 'sendPhoto', data);
     }
     /**
@@ -122,7 +139,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async sendVoice(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendVoice', data);
+        const url = this.getApiUrl(botApi, 'sendVoice', data, 'POST');
         return await this.fetchAndLog(url, 'sendVoice', data);
     }
     /**
@@ -139,7 +156,7 @@ export default class TelegramApi {
             is_personal: data.is_personal,
             next_offset: data.next_offset,
         };
-        const url = this.getApiUrl(botApi, 'answerInlineQuery', params);
+        const url = this.getApiUrl(botApi, 'answerInlineQuery', params, 'POST');
         return await this.fetchAndLog(url, 'answerInlineQuery', params);
     }
     /**
@@ -149,7 +166,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async answerCallback(botApi, data) {
-        const url = this.getApiUrl(botApi, 'answerCallbackQuery', data);
+        const url = this.getApiUrl(botApi, 'answerCallbackQuery', data, 'POST');
         return await this.fetchAndLog(url, 'answerCallbackQuery', data);
     }
     /**
@@ -159,7 +176,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async answerGuestQuery(botApi, data) {
-        const url = this.getApiUrl(botApi, 'answerGuestQuery', data);
+        const url = this.getApiUrl(botApi, 'answerGuestQuery', data, 'POST');
         return await this.fetchAndLog(url, 'answerGuestQuery', data);
     }
     /**
@@ -169,7 +186,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async deleteMessage(botApi, data) {
-        const url = this.getApiUrl(botApi, 'deleteMessage', data);
+        const url = this.getApiUrl(botApi, 'deleteMessage', data, 'POST');
         return await this.fetchAndLog(url, 'deleteMessage', data);
     }
     /**
@@ -179,11 +196,11 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async editMessageText(botApi, data) {
-        const url = this.getApiUrl(botApi, 'editMessageText', data);
+        const url = this.getApiUrl(botApi, 'editMessageText', data, 'POST');
         return await this.fetchAndLog(url, 'editMessageText', data);
     }
     async sendMessageDraft(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendMessageDraft', data);
+        const url = this.getApiUrl(botApi, 'sendMessageDraft', data, 'POST');
         return await this.fetchAndLog(url, 'sendMessageDraft', data);
     }
     /**
@@ -193,7 +210,7 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async sendInvoice(botApi, data) {
-        const url = this.getApiUrl(botApi, 'sendInvoice', data);
+        const url = this.getApiUrl(botApi, 'sendInvoice', data, 'POST');
         return await this.fetchAndLog(url, 'sendInvoice', data);
     }
     /**
@@ -203,16 +220,26 @@ export default class TelegramApi {
      * @returns Promise with the API response
      */
     async answerPreCheckoutQuery(botApi, data) {
-        const url = this.getApiUrl(botApi, 'answerPreCheckoutQuery', data);
+        const url = this.getApiUrl(botApi, 'answerPreCheckoutQuery', data, 'POST');
         return await this.fetchAndLog(url, 'answerPreCheckoutQuery', data);
     }
+    /**
+     * Get information about a business connection
+     * @param botApi - full URL to the telegram API without slug
+     * @param business_connection_id - unique identifier of the business connection
+     * @returns Promise with the API response
+     */
+    async getBusinessConnection(botApi, business_connection_id) {
+        const url = this.getApiUrl(botApi, 'getBusinessConnection', { business_connection_id }, 'POST');
+        return await this.fetchAndLog(url, 'getBusinessConnection', { business_connection_id });
+    }
     /**
      * Get basic information about the bot
      * @param botApi - full URL to the telegram API without slug
      * @returns Promise with the API response
      */
     async getMe(botApi) {
-        const url = this.getApiUrl(botApi, 'getMe', {});
+        const url = this.getApiUrl(botApi, 'getMe', {}, 'GET');
         return await this.fetchAndLog(url, 'getMe', {});
     }
 }

package/dist/telegram_bot.d.ts

@@ -1,4 +1,4 @@
-import TelegramUpdate from './types/TelegramUpdate.js';
+import { Update as TelegramUpdate } from '@grammyjs/types';
 import TelegramExecutionContext from './telegram_execution_context.js';
 import Webhook from './webhook.js';
 /** Class representing a telegram bot. */
@@ -10,8 +10,7 @@ export default class TelegramBot {
     /** The telegram webhook object */
     webhook: Webhook;
     /** The telegram update object */
-    update: TelegramUpdate;
-    /** The telegram commands record map */
+    update: TelegramUpdate; /** The telegram commands record map */
     commands: Record<string, (ctx: TelegramExecutionContext) => Promise<Response | void>>;
     /** Middleware functions to run before handlers */
     middleware: ((ctx: TelegramExecutionContext) => Promise<Response | void>)[];

package/dist/telegram_bot.js

@@ -1,4 +1,3 @@
-import TelegramUpdate from './types/TelegramUpdate.js';
 import TelegramExecutionContext from './telegram_execution_context.js';
 import Webhook from './webhook.js';
 /** Class representing a telegram bot. */
@@ -10,8 +9,7 @@ export default class TelegramBot {
     /** The telegram webhook object */
     webhook = new Webhook('', new Request('http://127.0.0.1'));
     /** The telegram update object */
-    update = new TelegramUpdate({});
-    /** The telegram commands record map */
+    update = { update_id: 0 }; /** The telegram commands record map */
     commands = {};
     /** Middleware functions to run before handlers */
     middleware = [];
@@ -162,6 +160,10 @@ export default class TelegramBot {
                     console.log(this.update);
                     const ctx = new TelegramExecutionContext(this, this.update);
                     this.currentContext = ctx;
+                    if (!(await ctx.shouldProcess())) {
+                        console.log('Skipping update processing based on context validation');
+                        return new Response('ok');
+                    }
                     // Run middleware
                     for (const middleware of this.middleware) {
                         const result = await middleware(ctx);

package/dist/telegram_execution_context.d.ts

@@ -1,9 +1,12 @@
+import { Update as TelegramUpdate, InlineQueryResult as TelegramInlineQueryResult } from '@grammyjs/types';
 import TelegramApi from './telegram_api.js';
 import TelegramBot from './telegram_bot.js';
-import TelegramUpdate from './types/TelegramUpdate.js';
-import TelegramInlineQueryResult from './types/TelegramInlineQueryResult.js';
 /** Class representing the context of execution */
 export default class TelegramExecutionContext {
+    /** Cache for business connection owners */
+    private static businessOwners;
+    /** Cache for dead business connections */
+    private static poisonedConnections;
     /** an instance of the telegram bot */
     bot: TelegramBot;
     /** an instance of the telegram update */
@@ -44,6 +47,11 @@ export default class TelegramExecutionContext {
      * Determine the type of update received
      * @returns The update type as a string
      */
+    /**
+     * Determine if the current update should be processed.
+     * For business messages, this checks if the connection is valid and has reply permissions.
+     */
+    shouldProcess(): Promise<boolean>;
     private determineUpdateType;
     /**
      * Get the chat ID from the current update
@@ -66,6 +74,10 @@ export default class TelegramExecutionContext {
      * @param options - any additional options to pass to sendVideo
      * @returns Promise with the API response
      */
+    /**
+     * Helper to handle business connection fallbacks
+     */
+    private withBusinessFallback;
     replyVideo(video: string, options?: Record<string, number | string | boolean>): Promise<Response | null>;
     /**
      * Get File from telegram file_id
@@ -149,14 +161,7 @@ export default class TelegramExecutionContext {
      * @param options - any additional options to pass to sendMessage/editMessageText
      * @returns Promise with the API response
      */
-    streamReply(message: string, draft_id: number, parse_mode?: string, options?: Record<string, number | string | boolean | object>): Promise<Response>;
-    /**
-     * Reply to the last message with text
-     * @param message - text to reply with
-     * @param parse_mode - one of HTML, MarkdownV2, Markdown, or an empty string for ascii
-     * @param options - any additional options to pass to sendMessage
-     * @returns Promise with the API response
-     */
+    streamReply(message: string, draft_id: number, parse_mode?: string, options?: Record<string, number | string | boolean | object>, finish?: boolean): Promise<Response | null>;
     reply(message: string, parse_mode?: string, reply?: boolean, options?: Record<string, number | string | boolean>): Promise<Response | null>;
     /**
      * Send an invoice for Telegram Stars
@@ -166,7 +171,7 @@ export default class TelegramExecutionContext {
      * @param amount - amount of stars
      * @returns Promise with the API response
      */
-    sendStarsInvoice(title: string, description: string, payload: string, amount: number): Promise<Response>;
+    sendStarsInvoice(title: string, description: string, payload: string, amount: number): Promise<Response | null>;
     /**
      * Answer a pre-checkout query
      * @param ok - whether the payment can proceed