chz-telegram-bot 0.0.15 → 0.0.17

package/dist/services/taskScheduler.js

@@ -1,11 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const taskRecord_1 = __importDefault(require("../entities/taskRecord"));
+exports.Scheduler = void 0;
+const taskRecord_1 = require("../entities/taskRecord");
 const timeConvertions_1 = require("../helpers/timeConvertions");
-const logger_1 = __importDefault(require("./logger"));
+const logger_1 = require("./logger");
 class TaskScheduler {
     constructor() {
         this.activeTasks = [];
@@ -18,20 +16,20 @@ class TaskScheduler {
     createTask(name, action, interval, executeRightAway, ownerName) {
         executeRightAway = executeRightAway ?? false;
         const taskId = setInterval(action, interval);
-        const task = new taskRecord_1.default(name, taskId, interval);
+        const task = new taskRecord_1.TaskRecord(name, taskId, interval);
         if (executeRightAway) {
             setTimeout(action, (0, timeConvertions_1.secondsToMilliseconds)(1));
         }
-        logger_1.default.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Created task [${taskId}]${name}, that will run every ${interval}ms.`);
+        logger_1.Logger.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Created task [${taskId}]${name}, that will run every ${interval}ms.`);
         this.activeTasks.push(task);
     }
     createOnetimeTask(name, action, delay, ownerName) {
         const actionWrapper = () => {
-            logger_1.default.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Executing delayed oneshot [${taskId}]${name}`);
+            logger_1.Logger.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Executing delayed oneshot [${taskId}]${name}`);
             action();
         };
         const taskId = setTimeout(actionWrapper, delay);
-        logger_1.default.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Created oneshot task [${taskId}]${name}, that will run in ${delay}ms.`);
+        logger_1.Logger.logWithTraceId(ownerName, `System:TaskScheduler-${ownerName}-${name}`, 'System', `Created oneshot task [${taskId}]${name}, that will run in ${delay}ms.`);
     }
 }
-exports.default = new TaskScheduler();
+exports.Scheduler = new TaskScheduler();

package/dist/services/telegramApi.d.ts

@@ -1,27 +1,32 @@
-import MessageContext from '../entities/context/messageContext';
-import ChatContext from '../entities/context/chatContext';
-import { Telegraf } from 'telegraf';
-import IReplyMessage from '../types/replyMessage';
-import IncomingMessage from '../entities/incomingMessage';
-import Reaction from '../entities/responses/reaction';
+import { ChatContext } from '../entities/context/chatContext';
+import { MessageContext } from '../entities/context/messageContext';
 import { IStorageClient } from '../types/storage';
-export default class TelegramApiService {
+import { Reaction } from '../entities/responses/reaction';
+import { IncomingMessage } from '../entities/incomingMessage';
+import { BotResponse } from '../types/response';
+import { UnpinResponse } from '../entities/responses/unpin';
+import { TextMessage } from '../entities/responses/textMessage';
+import { VideoMessage } from '../entities/responses/videoMessage';
+import { ImageMessage } from '../entities/responses/imageMessage';
+import { Telegram } from 'telegraf/typings/telegram';
+export declare class TelegramApiService {
     botName: string;
-    telegraf: Telegraf;
+    telegram: Telegram;
     chats: Map<number, string>;
-    messageQueue: Array<IReplyMessage<unknown> | Reaction>;
+    messageQueue: Array<BotResponse>;
     storage: IStorageClient;
-    constructor(botName: string, telegraf: Telegraf, storage: IStorageClient, chats: Map<string, number>);
+    constructor(botName: string, telegram: Telegram, storage: IStorageClient, chats: Map<string, number>);
     private dequeueResponse;
+    private pinIfShould;
     private processResponse;
-    private enqueueResponse;
-    private enqueueReaction;
+    private enqueue;
     private getInteractions;
-    createContextForMessage(incomingMessage: IncomingMessage): MessageContext<import("../types/actionState").default>;
-    createContextForChat(chatId: number, scheduledName: string): ChatContext;
+    createContextForMessage(incomingMessage: IncomingMessage, commandKey: string): MessageContext<import("..").IActionState>;
+    createContextForChat(chatId: number, scheduledKey: string): ChatContext;
 }
 export interface IBotApiInteractions {
-    respond: <TType>(response: IReplyMessage<TType>) => void;
+    respond: (response: TextMessage | VideoMessage | ImageMessage) => void;
     react: (reaction: Reaction) => void;
+    unpin: (unpinMessage: UnpinResponse) => void;
 }
 //# sourceMappingURL=telegramApi.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAM1D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,aAAa,MAAM,uBAAuB,CAAC;AAClD,OAAO,eAAe,MAAM,6BAA6B,CAAC;AAE1D,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AAGtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAM;IAC5D,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;YAkBhB,eAAe;YAkBf,eAAe;IAgE7B,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,eAAe;IAOvB,uBAAuB,CAAC,eAAe,EAAE,eAAe;IAoBxD,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CAU7D;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC;IACzD,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;CACvC"}
+{"version":3,"file":"telegramApi.d.ts","sourceRoot":"","sources":["../../services/telegramApi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIlD,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAiB,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,qBAAa,kBAAkB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAM;IACtC,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;YAkBhB,eAAe;YAkBf,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe;IAQvB,uBAAuB,CACnB,eAAe,EAAE,eAAe,EAChC,UAAU,EAAE,MAAM;IAsBtB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;CAW5D;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,CAAC,QAAQ,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,KAAK,IAAI,CAAC;IACvE,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,YAAY,EAAE,aAAa,KAAK,IAAI,CAAC;CAChD"}

package/dist/services/telegramApi.js

@@ -1,24 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const messageContext_1 = __importDefault(require("../entities/context/messageContext"));
-const chatContext_1 = __importDefault(require("../entities/context/chatContext"));
-const imageMessage_1 = __importDefault(require("../entities/responses/imageMessage"));
-const textMessage_1 = __importDefault(require("../entities/responses/textMessage"));
-const videoMessage_1 = __importDefault(require("../entities/responses/videoMessage"));
-const taskScheduler_1 = __importDefault(require("./taskScheduler"));
-const logger_1 = __importDefault(require("./logger"));
+exports.TelegramApiService = void 0;
+const chatContext_1 = require("../entities/context/chatContext");
+const messageContext_1 = require("../entities/context/messageContext");
 const reverseMap_1 = require("../helpers/reverseMap");
+const taskScheduler_1 = require("./taskScheduler");
+const logger_1 = require("./logger");
 class TelegramApiService {
-    constructor(botName, telegraf, storage, chats) {
+    constructor(botName, telegram, storage, chats) {
         this.messageQueue = [];
-        this.telegraf = telegraf;
+        this.telegram = telegram;
         this.botName = botName;
         this.chats = (0, reverseMap_1.reverseMap)(chats);
         this.storage = storage;
-        taskScheduler_1.default.createTask('MessageSending', () => {
+        taskScheduler_1.Scheduler.createTask('MessageSending', () => {
             this.dequeueResponse();
         }, 100, false, this.botName);
     }
@@ -30,66 +25,78 @@ class TelegramApiService {
             await this.processResponse(message);
         }
         catch (error) {
-            logger_1.default.errorWithTraceId(this.botName, message.traceId, this.chats.get(message.chatId), error, message);
+            logger_1.Logger.errorWithTraceId(this.botName, message.traceId, this.chats.get(message.chatId), error, message);
         }
     }
-    async processResponse(response) {
-        if ('emoji' in response) {
-            this.telegraf.telegram.setMessageReaction(response.chatId, response.messageId, [
-                {
-                    type: 'emoji',
-                    emoji: response.emoji
-                }
-            ], true);
-            return;
+    async pinIfShould(response, sentMessage) {
+        if (response.shouldPin) {
+            await this.telegram.pinChatMessage(response.chatId, sentMessage.message_id, { disable_notification: true });
+            await this.storage.updateStateFor(response.sourceActionKey, response.chatId, async (state) => {
+                state.pinnedMessages.push(sentMessage.message_id);
+            });
         }
-        switch (response.constructor) {
-            case textMessage_1.default:
-                await this.telegraf.telegram.sendMessage(response.chatId, response.content, {
+    }
+    async processResponse(response) {
+        let sentMessage;
+        switch (response.kind) {
+            case 'text':
+                sentMessage = await this.telegram.sendMessage(response.chatId, response.content, {
                     reply_to_message_id: response.replyId,
                     parse_mode: 'MarkdownV2',
                     disable_web_page_preview: response.disableWebPreview
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 });
+                await this.pinIfShould(response, sentMessage);
                 break;
-            case imageMessage_1.default:
-                await this.telegraf.telegram.sendPhoto(response.chatId, response.content, response.replyId
+            case 'image':
+                sentMessage = await this.telegram.sendPhoto(response.chatId, response.content, response.replyId
                     ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         { reply_to_message_id: response.replyId }
                     : undefined);
+                await this.pinIfShould(response, sentMessage);
                 break;
-            case videoMessage_1.default:
-                await this.telegraf.telegram.sendVideo(response.chatId, response.content, response.replyId
+            case 'video':
+                sentMessage = await this.telegram.sendVideo(response.chatId, response.content, response.replyId
                     ? // eslint-disable-next-line @typescript-eslint/no-explicit-any
                         { reply_to_message_id: response.replyId }
                     : undefined);
+                await this.pinIfShould(response, sentMessage);
                 break;
-            default:
-                logger_1.default.errorWithTraceId(this.botName, response.traceId, this.chats.get(response.chatId), `Unknown message type: ${response.constructor}`, response);
+            case 'react':
+                await this.telegram.setMessageReaction(response.chatId, response.messageId, [
+                    {
+                        type: 'emoji',
+                        emoji: response.emoji
+                    }
+                ], true);
+                return;
+            case 'unpin':
+                await this.telegram.unpinChatMessage(response.chatId, response.messageId);
+                await this.storage.updateStateFor(response.sourceActionKey, response.chatId, async (state) => {
+                    state.pinnedMessages = state.pinnedMessages.filter((x) => x != response.messageId);
+                });
                 break;
         }
     }
-    enqueueResponse(response) {
-        this.messageQueue.push(response);
-    }
-    enqueueReaction(reaction) {
+    enqueue(reaction) {
         this.messageQueue.push(reaction);
     }
     getInteractions() {
         return {
-            react: (reaction) => this.enqueueReaction(reaction),
-            respond: (response) => this.enqueueResponse(response)
+            react: (reaction) => this.enqueue(reaction),
+            respond: (response) => this.enqueue(response),
+            unpin: (unpinMessage) => this.enqueue(unpinMessage)
         };
     }
-    createContextForMessage(incomingMessage) {
+    createContextForMessage(incomingMessage, commandKey) {
         const firstName = incomingMessage.from?.first_name ?? 'Unknown user';
         const lastName = incomingMessage.from?.last_name
             ? ` ${incomingMessage.from?.last_name}`
             : '';
-        return new messageContext_1.default(this.botName, this.getInteractions(), incomingMessage.chat.id, incomingMessage.chatName, incomingMessage.message_id, incomingMessage.text, incomingMessage.from?.id, incomingMessage.traceId, firstName + lastName, this.storage);
+        return new messageContext_1.MessageContext(this.botName, commandKey, this.getInteractions(), incomingMessage.chat.id, incomingMessage.chatName, incomingMessage.message_id, incomingMessage.text, incomingMessage.from?.id, incomingMessage.traceId, firstName + lastName, this.storage);
     }
-    createContextForChat(chatId, scheduledName) {
-        return new chatContext_1.default(this.botName, this.getInteractions(), chatId, this.chats.get(chatId), `Scheduled:${scheduledName}:${chatId}`, this.storage);
+    createContextForChat(chatId, scheduledKey) {
+        return new chatContext_1.ChatContext(this.botName, scheduledKey, this.getInteractions(), chatId, this.chats.get(chatId), `Scheduled:${scheduledKey}:${chatId}`, this.storage);
     }
 }
-exports.default = TelegramApiService;
+exports.TelegramApiService = TelegramApiService;

package/dist/types/actionState.d.ts

@@ -1,4 +1,5 @@
-export default interface IActionState {
+export interface IActionState {
     lastExecutedDate: number;
+    pinnedMessages: number[];
 }
 //# sourceMappingURL=actionState.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"actionState.d.ts","sourceRoot":"","sources":["../../types/actionState.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,WAAW,YAAY;IACjC,gBAAgB,EAAE,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"actionState.d.ts","sourceRoot":"","sources":["../../types/actionState.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC5B"}

package/dist/types/actionWithState.d.ts

@@ -1,5 +1,5 @@
-import IActionState from './actionState';
-export default interface IActionWithState {
+import { IActionState } from './actionState';
+export interface IActionWithState {
     key: string;
     stateConstructor: () => IActionState;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,CAAC,OAAO,WAAW,gBAAgB;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}
+{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}

package/dist/types/commandCondition.d.ts

@@ -1,4 +1,4 @@
-import MessageContext from '../entities/context/messageContext';
-import IActionState from './actionState';
+import { MessageContext } from '../entities/context/messageContext';
+import { IActionState } from './actionState';
 export type CommandCondition<TActionState extends IActionState> = (ctx: MessageContext<TActionState>) => Promise<boolean>;
 //# sourceMappingURL=commandCondition.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"commandCondition.d.ts","sourceRoot":"","sources":["../../types/commandCondition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,gBAAgB,CAAC,YAAY,SAAS,YAAY,IAAI,CAC9D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,KAChC,OAAO,CAAC,OAAO,CAAC,CAAC"}

package/dist/types/handlers.d.ts

@@ -1,6 +1,6 @@
-import ChatContext from '../entities/context/chatContext';
-import MessageContext from '../entities/context/messageContext';
-import IActionState from './actionState';
+import { ChatContext } from '../entities/context/chatContext';
+import { MessageContext } from '../entities/context/messageContext';
+import { IActionState } from './actionState';
 import { CachedValueAccessor } from './cachedValueAccessor';
 export type CommandHandler<TActionState extends IActionState> = (ctx: MessageContext<TActionState>, state: TActionState) => Promise<void>;
 export type ScheduledHandler = (ctx: ChatContext, getCached: CachedValueAccessor) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,cAAc,MAAM,oCAAoC,CAAC;AAChE,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI,CAC5D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,gBAAgB,GAAG,CAC3B,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,mBAAmB,KAC7B,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["../../types/handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,cAAc,CAAC,YAAY,SAAS,YAAY,IAAI,CAC5D,GAAG,EAAE,cAAc,CAAC,YAAY,CAAC,EACjC,KAAK,EAAE,YAAY,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,MAAM,MAAM,gBAAgB,GAAG,CAC3B,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,mBAAmB,KAC7B,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/types/replyMessage.d.ts

@@ -1,4 +1,4 @@
-export default interface IReplyMessage<TType> {
+export interface IReplyMessage<TType> {
     content: TType;
     chatId: number;
     replyId: number | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"replyMessage.d.ts","sourceRoot":"","sources":["../../types/replyMessage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,WAAW,aAAa,CAAC,KAAK;IACxC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC9B"}
+{"version":3,"file":"replyMessage.d.ts","sourceRoot":"","sources":["../../types/replyMessage.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa,CAAC,KAAK;IAChC,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;CAC9B"}

package/dist/types/response.d.ts

@@ -0,0 +1,26 @@
+import { ImageMessage } from '../entities/responses/imageMessage';
+import { Reaction } from '../entities/responses/reaction';
+import { TextMessage } from '../entities/responses/textMessage';
+import { UnpinResponse } from '../entities/responses/unpin';
+import { VideoMessage } from '../entities/responses/videoMessage';
+export declare const BotResponseTypes: {
+    readonly unpin: "unpin";
+    readonly text: "text";
+    readonly image: "image";
+    readonly video: "video";
+    readonly react: "react";
+};
+export type BotResponse = UnpinResponse | Reaction | TextMessage | VideoMessage | ImageMessage;
+export interface IChatResponse {
+    kind: keyof typeof BotResponseTypes;
+    chatId: number;
+    traceId: number | string;
+    sourceActionKey: string;
+}
+export interface IReplyMessage<TType> extends IChatResponse {
+    content: TType;
+    replyId: number | undefined;
+    disableWebPreview: boolean;
+    shouldPin: boolean;
+}
+//# sourceMappingURL=response.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../types/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAElE,eAAO,MAAM,gBAAgB;;;;;;CAMnB,CAAC;AAEX,MAAM,MAAM,WAAW,GACjB,aAAa,GACb,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,YAAY,CAAC;AAEnB,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,OAAO,gBAAgB,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa,CAAC,KAAK,CAAE,SAAQ,aAAa;IACvD,OAAO,EAAE,KAAK,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;CACtB"}

package/dist/types/response.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BotResponseTypes = void 0;
+exports.BotResponseTypes = {
+    unpin: 'unpin',
+    text: 'text',
+    image: 'image',
+    video: 'video',
+    react: 'react'
+};

package/dist/types/storage.d.ts

@@ -1,11 +1,12 @@
-import TransactionResult from '../entities/transactionResult';
-import IActionState from './actionState';
-import IActionWithState from './actionWithState';
+import { ActionExecutionResult } from '../entities/actionExecutionResult';
+import { IActionState } from './actionState';
+import { IActionWithState } from './actionWithState';
 export interface IStorageClient {
+    updateStateFor<TActionState extends IActionState>(sourceActionKey: string, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
     close(): Promise<void>;
     load<TActionState extends IActionState>(key: string): Promise<Record<number, TActionState>>;
     saveMetadata(actions: IActionWithState[], botName: string): Promise<void>;
     getActionState<TActionState extends IActionState>(entity: IActionWithState, chatId: number): Promise<TActionState>;
-    saveActionExecutionResult(action: IActionWithState, chatId: number, transactionResult: TransactionResult): Promise<void>;
+    saveActionExecutionResult(action: IActionWithState, chatId: number, transactionResult: ActionExecutionResult): Promise<void>;
 }
 //# sourceMappingURL=storage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AACA,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CACrB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,GACrC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,IAAI,CAAC,YAAY,SAAS,YAAY,EAClC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzC,YAAY,CAAC,OAAO,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CACrB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,qBAAqB,GACzC,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/entities/{transactionResult.ts → actionExecutionResult.ts}

@@ -1,6 +1,6 @@
-import IActionState from '../types/actionState';
+import { IActionState } from '../types/actionState';
 
-export default class TransactionResult {
+export class ActionExecutionResult {
     data: IActionState;
     shouldUpdate: boolean;
 

package/entities/actions/commandAction.ts

@@ -1,17 +1,17 @@
-import ActionExecutionResult from '../transactionResult';
 import moment from 'moment';
-import logger from '../../services/logger';
-import MessageContext from '../context/messageContext';
-import IActionWithState from '../../types/actionWithState';
-import toArray from '../../helpers/toArray';
-import IActionState from '../../types/actionState';
-import CommandTriggerCheckResult from '../commandTriggerCheckResult';
 import { CommandHandler } from '../../types/handlers';
 import { CommandCondition } from '../../types/commandCondition';
 import { Seconds } from '../../types/timeValues';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
-
-export default class CommandAction<TActionState extends IActionState>
+import { toArray } from '../../helpers/toArray';
+import { IActionState } from '../../types/actionState';
+import { IActionWithState } from '../../types/actionWithState';
+import { CommandTriggerCheckResult } from '../commandTriggerCheckResult';
+import { MessageContext } from '../context/messageContext';
+import { Logger } from '../../services/logger';
+import { ActionExecutionResult } from '../actionExecutionResult';
+
+export class CommandAction<TActionState extends IActionState>
     implements IActionWithState
 {
     triggers: (string | RegExp)[];
@@ -70,7 +70,7 @@ export default class CommandAction<TActionState extends IActionState>
 
         if (!shouldTrigger) return;
 
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             ctx.botName,
             ctx.traceId,
             ctx.chatName,

package/entities/actions/scheduledAction.ts

@@ -1,18 +1,18 @@
-import TransactionResult from '../transactionResult';
 import moment from 'moment';
-import logger from '../../services/logger';
-import taskScheduler from '../../services/taskScheduler';
 import { Sema as Semaphore } from 'async-sema';
-import ChatContext from '../context/chatContext';
-import IActionWithState from '../../types/actionWithState';
-import ActionStateBase from '../states/actionStateBase';
-import IActionState from '../../types/actionState';
 import { ScheduledHandler } from '../../types/handlers';
-import CachedStateFactory from '../cachedStateFactory';
 import { hoursToMilliseconds } from '../../helpers/timeConvertions';
 import { HoursOfDay } from '../../types/timeValues';
-
-export default class ScheduledAction implements IActionWithState {
+import { IActionState } from '../../types/actionState';
+import { IActionWithState } from '../../types/actionWithState';
+import { CachedStateFactory } from '../cachedStateFactory';
+import { ChatContext } from '../context/chatContext';
+import { ActionStateBase } from '../states/actionStateBase';
+import { ActionExecutionResult } from '../actionExecutionResult';
+import { Logger } from '../../services/logger';
+import { Scheduler } from '../../services/taskScheduler';
+
+export class ScheduledAction implements IActionWithState {
     static semaphore = new Semaphore(1);
 
     name: string;
@@ -50,7 +50,7 @@ export default class ScheduledAction implements IActionWithState {
         const isAllowedToTrigger = this.shouldTrigger(state);
 
         if (isAllowedToTrigger) {
-            logger.logWithTraceId(
+            Logger.logWithTraceId(
                 ctx.botName,
                 ctx.traceId,
                 ctx.chatName,
@@ -66,7 +66,7 @@ export default class ScheduledAction implements IActionWithState {
             await ctx.storage.saveActionExecutionResult(
                 this,
                 ctx.chatId,
-                new TransactionResult(state, isAllowedToTrigger)
+                new ActionExecutionResult(state, isAllowedToTrigger)
             );
         }
     }
@@ -93,7 +93,7 @@ export default class ScheduledAction implements IActionWithState {
 
             this.cachedState.set(key, value);
 
-            taskScheduler.createOnetimeTask(
+            Scheduler.createOnetimeTask(
                 `Drop cached value [${this.name} : ${key}]`,
                 () => this.cachedState.delete(key),
                 hoursToMilliseconds(

package/entities/{bot.ts → botInstance.ts}

@@ -1,20 +1,20 @@
 import { Telegraf } from 'telegraf';
-import TelegramApiService from '../services/telegramApi';
-import IncomingMessage from './incomingMessage';
-import taskScheduler from '../services/taskScheduler';
-import logger from '../services/logger';
-import CommandAction from './actions/commandAction';
-import ScheduledAction from './actions/scheduledAction';
-import IActionState from '../types/actionState';
 import {
     hoursToMilliseconds,
     secondsToMilliseconds
 } from '../helpers/timeConvertions';
 import { Hours, Seconds } from '../types/timeValues';
-import JsonFileStorage from '../services/jsonFileStorage';
 import { IStorageClient } from '../types/storage';
-
-export default class Bot {
+import { JsonFileStorage } from '../services/jsonFileStorage';
+import { TelegramApiService } from '../services/telegramApi';
+import { IActionState } from '../types/actionState';
+import { CommandAction } from './actions/commandAction';
+import { ScheduledAction } from './actions/scheduledAction';
+import { Logger } from '../services/logger';
+import { Scheduler } from '../services/taskScheduler';
+import { IncomingMessage } from './incomingMessage';
+
+export class BotInstance {
     name: string;
     private api: TelegramApiService;
     private telegraf: Telegraf;
@@ -38,7 +38,7 @@ export default class Bot {
         this.scheduled = options.scheduled;
         this.chats = options.chats;
 
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Start`,
             'System',
@@ -50,7 +50,7 @@ export default class Bot {
             new JsonFileStorage(options.name, options.storagePath);
         this.api = new TelegramApiService(
             this.name,
-            this.telegraf,
+            this.telegraf.telegram,
             this.storage,
             this.chats
         );
@@ -61,7 +61,7 @@ export default class Bot {
 
             const messageFromName = msg.from?.first_name ?? 'Unknown';
             const messageFromId = msg.from?.id ?? 'Unknown';
-            logger.logWithTraceId(
+            Logger.logWithTraceId(
                 this.name,
                 msg.traceId,
                 msg.chatName,
@@ -75,7 +75,7 @@ export default class Bot {
 
         this.telegraf.launch();
 
-        taskScheduler.createTask(
+        Scheduler.createTask(
             'MessageProcessing',
             async () => {
                 while (this.messageQueue.length > 0) {
@@ -87,7 +87,7 @@ export default class Bot {
             this.name
         );
 
-        taskScheduler.createTask(
+        Scheduler.createTask(
             'ScheduledProcessing',
             async () => {
                 await this.runScheduled();
@@ -104,7 +104,7 @@ export default class Bot {
     }
 
     async stop(code: string) {
-        logger.logWithTraceId(
+        Logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Stop`,
             'System',
@@ -118,13 +118,13 @@ export default class Bot {
     private async runScheduled() {
         for (const [chatName, chatId] of this.chats.entries()) {
             for (const trig of this.scheduled) {
-                const ctx = this.api.createContextForChat(chatId, trig.name);
+                const ctx = this.api.createContextForChat(chatId, trig.key);
 
                 try {
                     await trig.exec(ctx);
                 } catch (error) {
                     console.dir(error);
-                    logger.errorWithTraceId(
+                    Logger.errorWithTraceId(
                         ctx.botName,
                         ctx.traceId,
                         chatName,
@@ -140,12 +140,12 @@ export default class Bot {
         const msg = this.messageQueue.pop()!;
 
         for (const cmd of this.commands) {
-            const ctx = this.api.createContextForMessage(msg);
+            const ctx = this.api.createContextForMessage(msg, cmd.key);
 
             try {
                 await cmd.exec(ctx);
             } catch (error) {
-                logger.errorWithTraceId(
+                Logger.errorWithTraceId(
                     ctx.botName,
                     ctx.traceId,
                     ctx.chatName,

package/entities/cachedStateFactory.ts

@@ -1,6 +1,6 @@
 import { Hours } from '../types/timeValues';
 
-export default class CachedStateFactory {
+export class CachedStateFactory {
     getValue: () => Promise<unknown>;
     invalidationTimeoutInHours: Hours;
 

package/entities/commandTriggerCheckResult.ts

@@ -1,4 +1,4 @@
-export default class CommandTriggerCheckResult {
+export class CommandTriggerCheckResult {
     static get DontTriggerAndSkipCooldown() {
         return new CommandTriggerCheckResult(false, [], true);
     }