chz-telegram-bot 0.3.30 → 0.5.0

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -21,7 +21,7 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         x,
         []
     ]));
-    initialize(api, telegraf, commands, verboseLoggingForIncomingMessage, botInfo) {
+    initialize(api, telegram, commands, verboseLoggingForIncomingMessage, botInfo) {
         this.botInfo = botInfo;
         this.initializeDependencies(api);
         for (const msgType of Object.values(messageTypes_1.MessageType)) {
@@ -38,16 +38,16 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
                 cmd.triggers.includes(messageTypes_1.MessageType.Any));
         }
         if (commands.length > 0) {
-            telegraf.on('message', (ctx) => {
-                const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.botName, (0, mapUtils_1.getOrSetIfNotExists)(this.chatHistory, ctx.chat.id, []));
-                const logger = this.logger.createScope(this.botName, msg.traceId, msg.chatInfo.name);
+            telegram.on('message', ({ message }) => {
+                const internalMessage = new incomingMessage_1.IncomingMessage(message, this.botName, (0, mapUtils_1.getOrSetIfNotExists)(this.chatHistory, message.chat.id, []));
+                const logger = this.logger.createScope(this.botName, internalMessage.traceId, internalMessage.chatInfo.name);
                 if (verboseLoggingForIncomingMessage) {
-                    logger.logObjectWithTraceId(ctx.update.message);
+                    logger.logObjectWithTraceId(message);
                 }
                 else {
-                    logger.logWithTraceId(`${msg.from?.first_name ?? 'Unknown'} (${msg.from?.id ?? 'Unknown'}): ${msg.text || msg.type}`);
+                    logger.logWithTraceId(`${internalMessage.from?.first_name ?? 'Unknown'} (${internalMessage.from?.id ?? 'Unknown'}): ${internalMessage.text || internalMessage.type}`);
                 }
-                void this.processMessage(msg);
+                void this.processMessage(internalMessage);
             });
         }
     }

package/dist/services/actionProcessors/inlineQueryActionProcessor.d.ts

@@ -1,11 +1,11 @@
-import { Telegraf } from 'telegraf';
 import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
+import { TelegramBot } from '../../types/externalAliases';
 import { Milliseconds } from '../../types/timeValues';
 import { TelegramApiService } from '../telegramApi';
 import { BaseActionProcessor } from './baseProcessor';
 export declare class InlineQueryActionProcessor extends BaseActionProcessor {
     private inlineQueries;
-    initialize(api: TelegramApiService, telegraf: Telegraf, inlineQueries: InlineQueryAction[], period: Milliseconds): void;
+    initialize(api: TelegramApiService, telegram: TelegramBot, inlineQueries: InlineQueryAction[], period: Milliseconds): void;
     private initializeInlineQueryContext;
 }
 //# sourceMappingURL=inlineQueryActionProcessor.d.ts.map

package/dist/services/actionProcessors/inlineQueryActionProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inlineQueryActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/inlineQueryActionProcessor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAG7E,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,0BAA2B,SAAQ,mBAAmB;IAC/D,OAAO,CAAC,aAAa,CAAuB;IAE5C,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,iBAAiB,EAAE,EAClC,MAAM,EAAE,YAAY;IAuGxB,OAAO,CAAC,4BAA4B;CAqBvC"}
+{"version":3,"file":"inlineQueryActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/inlineQueryActionProcessor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,0BAA2B,SAAQ,mBAAmB;IAC/D,OAAO,CAAC,aAAa,CAAuB;IAE5C,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,WAAW,EACrB,aAAa,EAAE,iBAAiB,EAAE,EAClC,MAAM,EAAE,YAAY;IAuGxB,OAAO,CAAC,4BAA4B;CAqBvC"}

package/dist/services/actionProcessors/inlineQueryActionProcessor.js

@@ -7,16 +7,16 @@ const traceFactory_1 = require("../../helpers/traceFactory");
 const baseProcessor_1 = require("./baseProcessor");
 class InlineQueryActionProcessor extends baseProcessor_1.BaseActionProcessor {
     inlineQueries;
-    initialize(api, telegraf, inlineQueries, period) {
+    initialize(api, telegram, inlineQueries, period) {
         this.initializeDependencies(api);
         this.inlineQueries = inlineQueries;
         let pendingInlineQueries = [];
         const queriesInProcessing = new Map();
         if (this.inlineQueries.length > 0) {
-            telegraf.on('inline_query', (ctx) => {
-                const query = new incomingQuery_1.IncomingInlineQuery(ctx.inlineQuery.id, ctx.inlineQuery.query, ctx.inlineQuery.from.id, (0, traceFactory_1.createTrace)('InlineQuery', this.botName, ctx.inlineQuery.id));
+            telegram.on('inline_query', ({ inlineQuery }) => {
+                const query = new incomingQuery_1.IncomingInlineQuery(inlineQuery.id, inlineQuery.query, inlineQuery.from.id, (0, traceFactory_1.createTrace)('InlineQuery', this.botName, inlineQuery.id));
                 const logger = this.logger.createScope(this.botName, query.traceId, 'Query');
-                logger.logWithTraceId(`${ctx.inlineQuery.from.username ?? 'Unknown'} (${ctx.inlineQuery.from.id}): Query for ${ctx.inlineQuery.query}`);
+                logger.logWithTraceId(`${inlineQuery.from.username ?? 'Unknown'} (${inlineQuery.from.id}): Query for ${inlineQuery.query}`);
                 const queryBeingProcessed = queriesInProcessing.get(query.userId);
                 if (queryBeingProcessed) {
                     logger.logWithTraceId(`Aborting query ${queryBeingProcessed.queryId} (${queryBeingProcessed.query}): new query recieved from ${query.userId}`);

package/dist/services/jsonLogger.d.ts

@@ -4,7 +4,7 @@ export declare class JsonLogger implements ILogger {
     private serializeError;
     private getCircularReplacer;
     createScope(botName: string, traceId: TraceId, chatName: string): IScopedLogger;
-    logObjectWithTraceId(botName: string, traceId: TraceId, chatName: string, data: any): void;
+    logObjectWithTraceId(botName: string, traceId: TraceId, chatName: string, data: unknown): void;
     logWithTraceId(botName: string, traceId: TraceId, chatName: string, text: string): void;
     errorWithTraceId(botName: string, traceId: TraceId, chatName: string, errorObj: unknown, extraData?: unknown): void;
 }

package/dist/services/jsonLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,UAAW,YAAW,OAAO;IACtC,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,mBAAmB;IAmB3B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAiBtD,aAAa;IAGtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,GAAG;IAQb,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO;CAe1B"}
+{"version":3,"file":"jsonLogger.d.ts","sourceRoot":"","sources":["../../services/jsonLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,UAAW,YAAW,OAAO;IACtC,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,mBAAmB;IAc3B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAiBtD,aAAa;IAGtB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO;IAoBjB,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO;CAe1B"}

package/dist/services/jsonLogger.js

@@ -3,27 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonLogger = void 0;
 class JsonLogger {
     serializeError(error) {
-        const plainObject = {};
-        Object.getOwnPropertyNames(error).forEach(function (key) {
-            plainObject[key] = error[key];
-        });
-        return JSON.stringify(plainObject);
+        if (error instanceof Error) {
+            const plainObject = {
+                name: error.name,
+                message: error.message,
+                stack: error.stack
+            };
+            for (const [key, value] of Object.entries(error)) {
+                plainObject[key] = value;
+            }
+            return JSON.stringify(plainObject);
+        }
+        return JSON.stringify({ error });
     }
     getCircularReplacer() {
-        const ancestors = [];
-        return function (_, value) {
-            if (typeof value !== 'object' || value === null) {
-                return value;
-            }
-            // `this` is the object that value is contained in,
-            // i.e., its direct parent.
-            while (ancestors.length > 0 && ancestors.at(-1) !== this) {
-                ancestors.pop();
+        const cache = new Set();
+        return (_, value) => {
+            if (typeof value === 'object' && value !== null) {
+                if (cache.has(value)) {
+                    return;
+                }
+                cache.add(value);
             }
-            if (ancestors.includes(value)) {
-                return '[Circular]';
-            }
-            ancestors.push(value);
             return value;
         };
     }
@@ -41,10 +42,20 @@ class JsonLogger {
         };
     }
     logObjectWithTraceId(botName, traceId, chatName, data) {
-        data.botName = botName;
-        data.traceId = traceId;
-        data.chatName = chatName;
-        console.log(data);
+        const enrichedData = typeof data == 'object'
+            ? {
+                ...data,
+                botName,
+                traceId,
+                chatName
+            }
+            : {
+                botName,
+                traceId,
+                chatName,
+                data
+            };
+        console.log(enrichedData);
     }
     logWithTraceId(botName, traceId, chatName, text) {
         console.log(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","text":"${text}"}`);

package/dist/services/telegramApi.d.ts

@@ -1,10 +1,10 @@
 import { IStorageClient } from '../types/storage';
 import { BotResponse } from '../types/response';
-import { Telegram } from 'telegraf/typings/telegram';
 import { ILogger } from '../types/logger';
 import { IReplyCapture } from '../types/capture';
 import { TraceId } from '../types/trace';
 import { ChatInfo } from '../dtos/chatInfo';
+import { TelegramApiClient } from '../types/externalAliases';
 export declare const TELEGRAM_ERROR_QUOTE_INVALID = "QUOTE_TEXT_INVALID";
 export declare class TelegramApiService {
     private readonly queue;
@@ -13,7 +13,7 @@ export declare class TelegramApiService {
     private readonly logger;
     private readonly captureRegistrationCallback;
     private readonly botName;
-    constructor(botName: string, telegram: Telegram, storage: IStorageClient, logger: ILogger, captureRegistrationCallback: (capture: IReplyCapture, parentMessageId: number, chatInfo: ChatInfo, traceId: TraceId) => void);
+    constructor(botName: string, telegram: TelegramApiClient, storage: IStorageClient, logger: ILogger, captureRegistrationCallback: (capture: IReplyCapture, parentMessageId: number, chatInfo: ChatInfo, traceId: TraceId) => void);
     enqueueBatchedResponses(responses: BotResponse[]): void;
     flushResponses(): void;
     private pinIfShould;

package/dist/services/telegramApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AAEjE,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAKlC;IAEV,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG7B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,2BAA2B,EAAE,CACzB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,KACf,IAAI;IASb,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE;IAsDhD,cAAc;YAIA,WAAW;YAkBX,eAAe;CAsGhC"}
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAmB,MAAM,0BAA0B,CAAC;AAE9E,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AAEjE,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IACvD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAKlC;IAEV,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG7B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,OAAO,EACf,2BAA2B,EAAE,CACzB,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,KACf,IAAI;IASb,uBAAuB,CAAC,SAAS,EAAE,WAAW,EAAE;IAwDhD,cAAc;YAIA,WAAW;YAqBX,eAAe;CAqGhC"}

package/dist/services/telegramApi.js

@@ -57,11 +57,11 @@ class TelegramApiService {
     flushResponses() {
         void this.queue.flushReadyItems();
     }
-    async pinIfShould(response, sentMessage) {
+    async pinIfShould(response, message) {
         if (response.shouldPin) {
-            await this.telegram.pinChatMessage(response.chatInfo.id, sentMessage.message_id, { disable_notification: true });
+            await this.telegram.pinChatMessage(response.chatInfo.id, message.message_id, { disable_notification: true });
             await this.storage.updateStateFor(response.action, response.chatInfo.id, (state) => {
-                state.pinnedMessages.push(sentMessage.message_id);
+                state.pinnedMessages.push(message.message_id);
             });
         }
     }
@@ -108,7 +108,7 @@ class TelegramApiService {
                         type: 'emoji',
                         emoji: response.emoji
                     }
-                ], true);
+                ]);
                 return;
             case 'unpin':
                 await this.telegram.unpinChatMessage(response.chatInfo.id, response.messageId);

package/dist/types/externalAliases.d.ts

@@ -0,0 +1,11 @@
+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;
+//# sourceMappingURL=externalAliases.d.ts.map

package/dist/types/externalAliases.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"externalAliases.d.ts","sourceRoot":"","sources":["../../types/externalAliases.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,IAAI,EACJ,OAAO,EACP,iBAAiB,EACjB,aAAa,IAAI,KAAK,EACtB,aAAa,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AAEjD,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC;AAChC,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC;AACtC,MAAM,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC1D,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC;AAClC,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC;AACzC,MAAM,MAAM,OAAO,GAAG,aAAa,CAAC;AACpC,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC"}

package/dist/types/externalAliases.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/inputFile.d.ts

@@ -0,0 +1,5 @@
+export interface InputFile {
+    source: string;
+    filename?: string;
+}
+//# sourceMappingURL=inputFile.d.ts.map

package/dist/types/inputFile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inputFile.d.ts","sourceRoot":"","sources":["../../types/inputFile.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB"}

package/dist/types/inputFile.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/logger.d.ts

@@ -1,12 +1,12 @@
 import { TraceId } from './trace';
 export interface IScopedLogger {
-    logObjectWithTraceId(data: any): void;
+    logObjectWithTraceId(data: unknown): void;
     logWithTraceId(text: string): void;
     errorWithTraceId(errorObj: unknown, extraData?: unknown): void;
 }
 export interface ILogger {
     createScope(botName: string, traceId: TraceId, chatName: string): IScopedLogger;
-    logObjectWithTraceId(botName: string, traceId: TraceId, chatName: string, data: any): void;
+    logObjectWithTraceId(botName: string, traceId: TraceId, chatName: string, data: unknown): void;
     logWithTraceId(botName: string, traceId: TraceId, chatName: string, text: string): void;
     errorWithTraceId(botName: string, traceId: TraceId, chatName: string, errorObj: unknown, extraData?: unknown): void;
 }

package/dist/types/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../types/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,WAAW,aAAa;IAC1B,oBAAoB,CAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,OAAO;IACpB,WAAW,CACP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,GACjB,aAAa,CAAC;IAEjB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAEhB,IAAI,EAAE,GAAG,GACV,IAAI,CAAC;IAER,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACb,IAAI,CAAC;IAER,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI,CAAC;CACX"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../types/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,WAAW,aAAa;IAC1B,oBAAoB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAC;IAE1C,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAEnC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CAClE;AAED,MAAM,WAAW,OAAO;IACpB,WAAW,CACP,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,GACjB,aAAa,CAAC;IAEjB,oBAAoB,CAChB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,GACd,IAAI,CAAC;IAER,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,GACb,IAAI,CAAC;IAER,gBAAgB,CACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,OAAO,GACpB,IAAI,CAAC;CACX"}

package/dist/types/messageTypes.d.ts

@@ -1,4 +1,3 @@
-import { Message, Update } from 'telegraf/types';
 export declare const INTERNAL_MESSAGE_TYPE_PREFIX = "__msg:";
 export declare const MessageType: {
     readonly Any: "__msg:Any";
@@ -18,5 +17,4 @@ export declare const MessageType: {
     readonly Unknown: "__msg:Unknown";
 };
 export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];
-export type TelegrafContextMessage = Update.New & (Update.NonChannel & Message);
 //# sourceMappingURL=messageTypes.d.ts.map

package/dist/types/messageTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAEjD,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAErD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;CAgBd,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAE9E,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC"}
+{"version":3,"file":"messageTypes.d.ts","sourceRoot":"","sources":["../../types/messageTypes.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAErD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;CAgBd,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC"}

package/dtos/chatHistoryMessage.ts

@@ -1,11 +1,11 @@
-import { User } from 'telegraf/types';
+import { TelegramUser } from '../types/externalAliases';
 import { MessageTypeValue } from '../types/messageTypes';
 import { TraceId } from '../types/trace';
 
 export class ChatHistoryMessage {
     constructor(
         readonly id: number,
-        readonly from: User | undefined,
+        readonly from: TelegramUser | undefined,
         readonly text: string,
         readonly type: MessageTypeValue,
         readonly traceId: TraceId,

package/dtos/incomingMessage.ts

@@ -1,29 +1,23 @@
-import { Message, Update, User } from 'telegraf/types';
 import { randomInt } from 'crypto';
-import {
-    MessageType,
-    MessageTypeValue,
-    TelegrafContextMessage
-} from '../types/messageTypes';
+import { MessageType, MessageTypeValue } from '../types/messageTypes';
 import { ChatInfo } from './chatInfo';
 import { createTrace } from '../helpers/traceFactory';
 import { TraceId } from '../types/trace';
 import { ChatHistoryMessage } from './chatHistoryMessage';
+import { TelegramMessage, TelegramUser } from '../types/externalAliases';
 
 export class IncomingMessage {
     readonly messageId: number;
     readonly chatInfo: ChatInfo;
-    readonly from: User | undefined;
+    readonly from: TelegramUser | undefined;
     readonly text: string;
     readonly type: MessageTypeValue;
     readonly traceId: TraceId;
     readonly replyToMessageId: number | undefined;
 
-    readonly updateObject: TelegrafContextMessage;
+    readonly updateObject: TelegramMessage;
 
-    private detectMessageType(
-        message: Update.New & (Update.NonChannel & Message)
-    ) {
+    private detectMessageType(message: TelegramMessage) {
         if ('forward_origin' in message) return MessageType.Forward;
         if ('text' in message) return MessageType.Text;
         if ('video' in message) return MessageType.Video;
@@ -42,7 +36,7 @@ export class IncomingMessage {
     }
 
     constructor(
-        ctxMessage: TelegrafContextMessage,
+        ctxMessage: TelegramMessage,
         botName: string,
         history: ChatHistoryMessage[]
     ) {
@@ -69,7 +63,7 @@ export class IncomingMessage {
         this.updateObject = ctxMessage;
     }
 
-    private getMessageText(ctxMessage: TelegrafContextMessage) {
+    private getMessageText(ctxMessage: TelegramMessage) {
         if ('text' in ctxMessage) return ctxMessage.text;
 
         return 'caption' in ctxMessage ? ctxMessage.caption ?? '' : '';

package/dtos/messageInfo.ts

@@ -1,7 +1,5 @@
-import {
-    MessageTypeValue,
-    TelegrafContextMessage
-} from '../types/messageTypes';
+import { TelegramMessage } from '../types/externalAliases';
+import { MessageTypeValue } from '../types/messageTypes';
 
 export class MessageInfo {
     constructor(
@@ -12,6 +10,6 @@ export class MessageInfo {
         /** Type of message being received */
         readonly type: MessageTypeValue,
         /** Message object recieved from Telegram */
-        readonly telegramUpdateObject: TelegrafContextMessage
+        readonly telegramUpdateObject: TelegramMessage
     ) {}
 }

package/dtos/responses/imageMessage.ts

@@ -1,4 +1,3 @@
-import { InputFile } from 'telegraf/types';
 import {
     BotResponseTypes,
     IReplyResponseWithContent
@@ -9,6 +8,7 @@ import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
 import { ReplyInfo } from '../replyInfo';
 import { IReplyCapture } from '../../types/capture';
+import { InputFile } from '../../types/inputFile';
 
 export class ImageMessage implements IReplyResponseWithContent<InputFile> {
     readonly kind = BotResponseTypes.image;

package/dtos/responses/inlineQueryResponse.ts

@@ -1,5 +1,5 @@
-import { InlineQueryResult } from 'telegraf/types';
 import { InlineQueryAction } from '../../entities/actions/inlineQueryAction';
+import { TelegramInlineQueryResult } from '../../types/externalAliases';
 import { BotResponseTypes } from '../../types/response';
 import { TraceId } from '../../types/trace';
 
@@ -10,10 +10,10 @@ export class InlineQueryResponse {
     readonly queryId: string;
     readonly traceId: TraceId;
     readonly action: InlineQueryAction;
-    readonly queryResults: InlineQueryResult[];
+    readonly queryResults: TelegramInlineQueryResult[];
 
     constructor(
-        queryResult: InlineQueryResult[],
+        queryResult: TelegramInlineQueryResult[],
         queryId: string,
         traceId: TraceId,
         action: InlineQueryAction

package/dtos/responses/reaction.ts

@@ -1,8 +1,8 @@
-import { TelegramEmoji } from 'telegraf/types';
 import { BotResponseTypes, IChatResponse } from '../../types/response';
 import { IAction } from '../../types/action';
 import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
+import { TelegramEmoji } from '../../types/externalAliases';
 
 export class Reaction implements IChatResponse {
     readonly kind = BotResponseTypes.react;

package/dtos/responses/videoMessage.ts

@@ -1,4 +1,3 @@
-import { InputFile } from 'telegraf/types';
 import {
     BotResponseTypes,
     IReplyResponseWithContent
@@ -9,6 +8,7 @@ import { ChatInfo } from '../chatInfo';
 import { TraceId } from '../../types/trace';
 import { ReplyInfo } from '../replyInfo';
 import { IReplyCapture } from '../../types/capture';
+import { InputFile } from '../../types/inputFile';
 
 export class VideoMessage implements IReplyResponseWithContent<InputFile> {
     readonly kind = BotResponseTypes.video;

package/entities/botInstance.ts

@@ -83,7 +83,7 @@ export class BotInstance {
         );
     }
 
-    async stop(code: string) {
+    async stop() {
         this.logger.logWithTraceId(
             this.name,
             createTrace(this, this.name, 'Stop'),
@@ -93,6 +93,6 @@ export class BotInstance {
 
         this.scheduler.stopAll();
         await this.storage.close();
-        this.actionProcessingService.stop(code);
+        await this.actionProcessingService.stop();
     }
 }

package/entities/context/inlineQueryContext.ts

@@ -1,4 +1,3 @@
-import { InlineQueryResult } from 'telegraf/types';
 import { BotResponse } from '../../types/response';
 import { InlineQueryAction } from '../actions/inlineQueryAction';
 import { InlineQueryResponse } from '../../dtos/responses/inlineQueryResponse';
@@ -6,6 +5,7 @@ import {
     BaseContextInternal,
     BaseContextPropertiesToOmit
 } from './baseContext';
+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

@@ -1,5 +1,4 @@
 import { resolve } from 'path';
-import { TelegramEmoji, UserFromGetMe } from 'telegraf/types';
 import { IActionState } from '../../types/actionState';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
@@ -16,6 +15,7 @@ import { Seconds } from '../../types/timeValues';
 import { BaseContextPropertiesToOmit } from './baseContext';
 import { MessageInfo } from '../../dtos/messageInfo';
 import { UserInfo } from '../../dtos/userInfo';
+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!: UserFromGetMe;
+    botInfo!: BotInfo;
     customCooldown: Seconds | undefined;
 
     private getQuotePart(quote: boolean | string) {

package/entities/context/replyContext.ts

@@ -1,4 +1,3 @@
-import { TelegramEmoji, UserFromGetMe } from 'telegraf/types';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
@@ -17,6 +16,7 @@ import {
 } from './baseContext';
 import { UserInfo } from '../../dtos/userInfo';
 import { MessageInfo } from '../../dtos/messageInfo';
+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!: UserFromGetMe;
+    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/main.ts

@@ -73,9 +73,9 @@ class BotOrchestrator {
     /**
      * Terminates all scheduled tasks, closes storage connections and stops all bots.
      */
-    async stopBots(reason: string) {
+    async stopBots() {
         for (const bot of this.bots) {
-            await bot.stop(reason);
+            await bot.stop();
         }
     }
 }