chz-telegram-bot 0.4.0 → 0.5.0

package/entities/context/inlineQueryContext.ts

@@ -5,7 +5,7 @@ import {
     BaseContextInternal,
     BaseContextPropertiesToOmit
 } from './baseContext';
-import { InlineQueryResult } from 'node-telegram-bot-api';
+import { TelegramInlineQueryResult } from '../../types/externalAliases';
 
 export type InlineQueryContext = Omit<
     InlineQueryContextInternal,
@@ -13,7 +13,7 @@ export type InlineQueryContext = Omit<
 >;
 
 export class InlineQueryContextInternal extends BaseContextInternal<InlineQueryAction> {
-    queryResults: InlineQueryResult[] = [];
+    queryResults: TelegramInlineQueryResult[] = [];
     /**
      * Abort signal to be utilized in query handler.
      * Signal will be aborted if new query comes from the same user.
@@ -42,7 +42,7 @@ export class InlineQueryContextInternal extends BaseContextInternal<InlineQueryA
      * This result will be shown to user as a response to inline query.
      * @param queryResult Inline query result to be shown to user.
      */
-    showInlineQueryResult(queryResult: InlineQueryResult) {
+    showInlineQueryResult(queryResult: TelegramInlineQueryResult) {
         this.queryResults.push(queryResult);
     }
 }

package/entities/context/messageContext.ts

@@ -15,7 +15,7 @@ import { Seconds } from '../../types/timeValues';
 import { BaseContextPropertiesToOmit } from './baseContext';
 import { MessageInfo } from '../../dtos/messageInfo';
 import { UserInfo } from '../../dtos/userInfo';
-import { TelegramEmoji, User } from 'node-telegram-bot-api';
+import { BotInfo, TelegramEmoji } from '../../types/externalAliases';
 
 export type MessageContext<TActionState extends IActionState> = Omit<
     MessageContextInternal<TActionState>,
@@ -37,7 +37,7 @@ export class MessageContextInternal<
     /** Indicates if cooldown should be started after action is executed. Set to `true` by default. */
     startCooldown: boolean = true;
     /** Bot info from Telegram */
-    botInfo!: User;
+    botInfo!: BotInfo;
     customCooldown: Seconds | undefined;
 
     private getQuotePart(quote: boolean | string) {

package/entities/context/replyContext.ts

@@ -16,7 +16,7 @@ import {
 } from './baseContext';
 import { UserInfo } from '../../dtos/userInfo';
 import { MessageInfo } from '../../dtos/messageInfo';
-import { TelegramEmoji, User } from 'node-telegram-bot-api';
+import { TelegramUser, TelegramEmoji } from '../../types/externalAliases';
 
 export type ReplyContext<TActionState extends IActionState> = Omit<
     ReplyContextInternal<TActionState>,
@@ -38,7 +38,7 @@ export class ReplyContextInternal<
     /** Information about the message that triggered this action */
     messageInfo!: MessageInfo;
     /** Bot info from Telegram */
-    botInfo!: User;
+    botInfo!: TelegramUser;
 
     isInitialized = false;
 

package/index.ts

@@ -7,6 +7,7 @@ export * from './entities/states/actionStateBase';
 export * from './types/messageTypes';
 export * from './helpers/timeConvertions';
 export * from './types/action';
+export * from './types/externalAliases';
 export { CommandAction } from './entities/actions/commandAction';
 export { InlineQueryAction } from './entities/actions/inlineQueryAction';
 export { ReplyCaptureAction } from './entities/actions/replyCaptureAction';

package/package.json

@@ -1,40 +1,37 @@
-{
-    "name": "chz-telegram-bot",
-    "description": "Opinionated TypeScript framework that provides a structured approach to building Telegram bots.",
-    "author": {
-        "name": "Alex Halanin",
-        "url": "https://github.com/AlexSolari"
-    },
-    "license": "MIT",
-    "keywords": [
-        "telegram",
-        "telegram bot"
-    ],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/AlexSolari/botFramework.git"
-    },
-    "version": "0.4.0",
-    "type": "module",
-    "dependencies": {
-        "async-sema": "^3.1.1",
-        "moment": "^2.29.4",
-        "node-telegram-bot-api": "^0.66.0"
-    },
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "devDependencies": {
-        "@types/node-telegram-bot-api": "^0.64.10",
-        "@eslint/js": "^9.29.0",
-        "@types/markdown-escape": "^1.1.3",
-        "@types/node": "^22.5.5",
-        "eslint": "^9.29.0",
-        "globals": "^16.2.0",
-        "typescript": "^5.9.0-beta",
-        "typescript-eslint": "^8.34.1"
-    },
-    "scripts": {
-        "build": "tsc",
-        "lint": "npx eslint && tsc --noEmit"
-    }
-}
+{
+    "name": "chz-telegram-bot",
+    "description": "Opinionated TypeScript framework that provides a structured approach to building Telegram bots.",
+    "author": {
+        "name": "Alex Halanin",
+        "url": "https://github.com/AlexSolari"
+    },
+    "license": "MIT",
+    "keywords": [
+        "telegram",
+        "telegram bot"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/AlexSolari/botFramework.git"
+    },
+    "version": "0.5.0",
+    "type": "module",
+    "dependencies": {
+        "async-sema": "^3.1.1",
+        "moment": "^2.29.4",
+        "telegraf": "^4.16.3"
+    },
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "devDependencies": {
+        "@eslint/js": "^9.29.0",
+        "@types/node": "^22.5.5",
+        "eslint": "^9.29.0",
+        "typescript": "^5.9.0-beta",
+        "typescript-eslint": "^8.34.1"
+    },
+    "scripts": {
+        "build": "tsc",
+        "lint": "npx eslint && tsc --noEmit"
+    }
+}

package/services/actionProcessingService.ts

@@ -12,7 +12,8 @@ import { buildHelpCommand } from '../builtin/helpAction';
 import { CommandActionProcessor } from './actionProcessors/commandActionProcessor';
 import { InlineQueryActionProcessor } from './actionProcessors/inlineQueryActionProcessor';
 import { ScheduledActionProcessor } from './actionProcessors/scheduledActionProcessor';
-import TelegramBot from 'node-telegram-bot-api';
+import { TelegramBot } from '../types/externalAliases';
+import { Telegraf } from 'telegraf';
 
 export class ActionProcessingService {
     private readonly storage: IStorageClient;
@@ -69,10 +70,10 @@ export class ActionProcessingService {
         scheduledPeriod?: Seconds,
         verboseLoggingForIncomingMessage?: boolean
     ) {
-        this.telegramBot = new TelegramBot(token, { polling: true });
+        this.telegramBot = new Telegraf(token);
         const api = new TelegramApiService(
             this.botName,
-            this.telegramBot,
+            this.telegramBot.telegram,
             this.storage,
             this.logger,
             (capture, id, chatInfo, traceId) => {
@@ -85,15 +86,13 @@ export class ActionProcessingService {
             }
         );
 
-        const botInfo = await this.telegramBot.getMe();
+        const botInfo = await this.telegramBot.telegram.getMe();
         const commandActions =
             actions.commands.length > 0 && botInfo.username
                 ? [
                       buildHelpCommand(
                           actions.commands
-                              .map((x) =>
-                                  x.readmeFactory(botInfo.username as string)
-                              )
+                              .map((x) => x.readmeFactory(botInfo.username))
                               .filter((x) => !!x),
                           botInfo.username
                       ),
@@ -120,13 +119,15 @@ export class ActionProcessingService {
             scheduledPeriod ?? hoursToSeconds(1 as Hours)
         );
 
+        void this.telegramBot.launch();
+
         void this.storage.saveMetadata([
             ...actions.scheduled,
             ...commandActions
         ]);
     }
 
-    async stop() {
-        await this.telegramBot.stopPolling();
+    stop() {
+        this.telegramBot.stop();
     }
 }

package/services/actionProcessors/commandActionProcessor.ts

@@ -18,14 +18,14 @@ import { getOrSetIfNotExists } from '../../helpers/mapUtils';
 import { MessageInfo } from '../../dtos/messageInfo';
 import { UserInfo } from '../../dtos/userInfo';
 import { ChatHistoryMessage } from '../../dtos/chatHistoryMessage';
-import TelegramBot from 'node-telegram-bot-api';
+import { BotInfo, TelegramBot } from '../../types/externalAliases';
 
 const MESSAGE_HISTORY_LENGTH_LIMIT = 100;
 
 export class CommandActionProcessor extends BaseActionProcessor {
     private readonly replyCaptures: ReplyCaptureAction<IActionState>[] = [];
     private readonly chatHistory = new Map<number, ChatHistoryMessage[]>();
-    private botInfo!: TelegramBot.User;
+    private botInfo!: BotInfo;
 
     private commands = typeSafeObjectFromEntries(
         Object.values(MessageType).map((x) => [
@@ -39,7 +39,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
         telegram: TelegramBot,
         commands: CommandAction<IActionState>[],
         verboseLoggingForIncomingMessage: boolean,
-        botInfo: TelegramBot.User
+        botInfo: BotInfo
     ) {
         this.botInfo = botInfo;
         this.initializeDependencies(api);
@@ -70,11 +70,11 @@ export class CommandActionProcessor extends BaseActionProcessor {
         }
 
         if (commands.length > 0) {
-            telegram.on('message', (msg) => {
+            telegram.on('message', ({ message }) => {
                 const internalMessage = new IncomingMessage(
-                    msg,
+                    message,
                     this.botName,
-                    getOrSetIfNotExists(this.chatHistory, msg.chat.id, [])
+                    getOrSetIfNotExists(this.chatHistory, message.chat.id, [])
                 );
 
                 const logger = this.logger.createScope(
@@ -84,7 +84,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
                 );
 
                 if (verboseLoggingForIncomingMessage) {
-                    logger.logObjectWithTraceId(msg);
+                    logger.logObjectWithTraceId(message);
                 } else {
                     logger.logWithTraceId(
                         `${internalMessage.from?.first_name ?? 'Unknown'} (${

package/services/actionProcessors/inlineQueryActionProcessor.ts

@@ -1,8 +1,8 @@
-import TelegramBot from 'node-telegram-bot-api';
 import { IncomingInlineQuery } from '../../dtos/incomingQuery';
 import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
 import { InlineQueryContextInternal } from '../../entities/context/inlineQueryContext';
 import { createTrace } from '../../helpers/traceFactory';
+import { TelegramBot } from '../../types/externalAliases';
 import { Milliseconds } from '../../types/timeValues';
 import { TraceId } from '../../types/trace';
 import { TelegramApiService } from '../telegramApi';
@@ -25,7 +25,7 @@ export class InlineQueryActionProcessor extends BaseActionProcessor {
         const queriesInProcessing = new Map<number, IncomingInlineQuery>();
 
         if (this.inlineQueries.length > 0) {
-            telegram.on('inline_query', (inlineQuery) => {
+            telegram.on('inline_query', ({ inlineQuery }) => {
                 const query = new IncomingInlineQuery(
                     inlineQuery.id,
                     inlineQuery.query,

package/services/telegramApi.ts

@@ -7,14 +7,13 @@ import { IActionWithState } from '../types/action';
 import { IActionState } from '../types/actionState';
 import { TraceId } from '../types/trace';
 import { ChatInfo } from '../dtos/chatInfo';
-import TelegramBot, { Message } from 'node-telegram-bot-api';
-import { createReadStream } from 'fs';
+import { TelegramApiClient, TelegramMessage } from '../types/externalAliases';
 
 export const TELEGRAM_ERROR_QUOTE_INVALID = 'QUOTE_TEXT_INVALID';
 
 export class TelegramApiService {
     private readonly queue = new ResponseProcessingQueue();
-    private readonly telegram: TelegramBot;
+    private readonly telegram: TelegramApiClient;
     private readonly storage: IStorageClient;
     private readonly logger: ILogger;
     private readonly captureRegistrationCallback: (
@@ -28,7 +27,7 @@ export class TelegramApiService {
 
     constructor(
         botName: string,
-        telegram: TelegramBot,
+        telegram: TelegramApiClient,
         storage: IStorageClient,
         logger: ILogger,
         captureRegistrationCallback: (
@@ -105,7 +104,10 @@ export class TelegramApiService {
         void this.queue.flushReadyItems();
     }
 
-    private async pinIfShould(response: IReplyResponse, message: Message) {
+    private async pinIfShould(
+        response: IReplyResponse,
+        message: TelegramMessage
+    ) {
         if (response.shouldPin) {
             await this.telegram.pinChatMessage(
                 response.chatInfo.id,
@@ -124,7 +126,7 @@ export class TelegramApiService {
     }
 
     private async processResponse(response: BotResponse, ignoreQuote = false) {
-        let sentMessage: Message | null = null;
+        let sentMessage: TelegramMessage | null = null;
 
         switch (response.kind) {
             case 'text':
@@ -150,22 +152,24 @@ export class TelegramApiService {
             case 'image':
                 sentMessage = await this.telegram.sendPhoto(
                     response.chatInfo.id,
-                    createReadStream(response.content.source),
+                    response.content,
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                     response.replyInfo?.id
-                        ? {
-                              reply_to_message_id: response.replyInfo.id
-                          }
+                        ? ({
+                              reply_to_message_id: response.replyInfo.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                          } as any)
                         : undefined
                 );
                 break;
             case 'video':
                 sentMessage = await this.telegram.sendVideo(
                     response.chatInfo.id,
-                    createReadStream(response.content.source),
+                    response.content,
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                     response.replyInfo?.id
-                        ? {
-                              reply_to_message_id: response.replyInfo.id
-                          }
+                        ? ({
+                              reply_to_message_id: response.replyInfo.id // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                          } as any)
                         : undefined
                 );
                 break;
@@ -173,21 +177,20 @@ export class TelegramApiService {
                 await this.telegram.setMessageReaction(
                     response.chatInfo.id,
                     response.messageId,
-                    {
-                        reaction: [
-                            {
-                                type: 'emoji',
-                                emoji: response.emoji
-                            }
-                        ]
-                    }
+                    [
+                        {
+                            type: 'emoji',
+                            emoji: response.emoji
+                        }
+                    ]
                 );
 
                 return;
             case 'unpin':
-                await this.telegram.unpinChatMessage(response.chatInfo.id, {
-                    message_id: response.messageId
-                });
+                await this.telegram.unpinChatMessage(
+                    response.chatInfo.id,
+                    response.messageId
+                );
 
                 await this.storage.updateStateFor(
                     response.action,

package/types/externalAliases.ts

@@ -0,0 +1,17 @@
+import {
+    User,
+    Message,
+    InlineQueryResult,
+    TelegramEmoji as Emoji,
+    UserFromGetMe
+} from 'telegraf/typings/core/types/typegram';
+import { Telegraf } from 'telegraf';
+import Telegram from 'telegraf/typings/telegram';
+
+export type TelegramUser = User;
+export type TelegramMessage = Message;
+export type TelegramInlineQueryResult = InlineQueryResult;
+export type TelegramEmoji = Emoji;
+export type TelegramApiClient = Telegram;
+export type BotInfo = UserFromGetMe;
+export type TelegramBot = Telegraf;