chz-telegram-bot 0.0.20 → 0.0.22

package/dist/entities/botInstance.d.ts

@@ -9,7 +9,6 @@ export declare class BotInstance {
     private commands;
     private scheduled;
     private chats;
-    private messageQueue;
     storage: IStorageClient;
     constructor(options: {
         name: string;
@@ -20,8 +19,10 @@ export declare class BotInstance {
         storageClient?: IStorageClient;
         storagePath?: string;
     });
+    private initializeScheduledProcessing;
+    private initializeMessageProcessing;
     stop(code: string): Promise<void>;
     private runScheduled;
-    private processMessages;
+    private processMessage;
 }
 //# sourceMappingURL=botInstance.d.ts.map

package/dist/entities/botInstance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAK5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,CAAC,YAAY,CAAyB;IAC7C,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB;IAuEK,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAqBZ,eAAe;CAmBhC"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAK5D,qBAAa,WAAW;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,SAAS,CAAkC;IACnD,OAAO,CAAC,KAAK,CAAsB;IACnC,OAAO,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3B,aAAa,CAAC,EAAE,cAAc,CAAC;QAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;KACxB;IAkCD,OAAO,CAAC,6BAA6B;IAcrC,OAAO,CAAC,2BAA2B;IAsB7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAoBZ,cAAc;CAmB/B"}

package/dist/entities/botInstance.js

@@ -10,7 +10,6 @@ const taskScheduler_1 = require("../services/taskScheduler");
 const incomingMessage_1 = require("./incomingMessage");
 class BotInstance {
     constructor(options) {
-        this.messageQueue = [];
         this.name = options.name;
         this.commands = options.commands;
         this.scheduled = options.scheduled;
@@ -21,26 +20,31 @@ class BotInstance {
             options.storageClient ??
                 new jsonFileStorage_1.JsonFileStorage(options.name, options.storagePath);
         this.api = new telegramApi_1.TelegramApiService(this.name, this.telegraf.telegram, this.storage, this.chats);
-        this.telegraf.on('message', async (ctx) => {
-            const msg = new incomingMessage_1.IncomingMessage(ctx.update.message);
-            const messageContent = msg.text || '<non-text message>';
-            const messageFromName = msg.from?.first_name ?? 'Unknown';
-            const messageFromId = msg.from?.id ?? 'Unknown';
-            logger_1.Logger.logWithTraceId(this.name, msg.traceId, msg.chatName, `${messageFromName} (${messageFromId}): ${messageContent}`);
-            if (msg.text) {
-                this.messageQueue.push(msg);
-            }
-        });
-        this.telegraf.launch();
-        taskScheduler_1.Scheduler.createTask('MessageProcessing', async () => {
-            while (this.messageQueue.length > 0) {
-                await this.processMessages();
-            }
-        }, (0, timeConvertions_1.secondsToMilliseconds)(0.3), false, this.name);
-        taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
-            await this.runScheduled();
-        }, (0, timeConvertions_1.hoursToMilliseconds)(0.5), true, this.name);
+        this.initializeMessageProcessing();
+        this.initializeScheduledProcessing();
         this.storage.saveMetadata([...this.commands, ...this.scheduled], this.name);
+        this.telegraf.launch();
+    }
+    initializeScheduledProcessing() {
+        if (this.scheduled.length > 0) {
+            taskScheduler_1.Scheduler.createTask('ScheduledProcessing', async () => {
+                await this.runScheduled();
+            }, (0, timeConvertions_1.hoursToMilliseconds)(0.5), true, this.name);
+        }
+    }
+    initializeMessageProcessing() {
+        if (this.commands.length > 0) {
+            this.telegraf.on('message', async (ctx) => {
+                const msg = new incomingMessage_1.IncomingMessage(ctx.update.message);
+                const messageContent = msg.text || '<non-text message>';
+                const messageFromName = msg.from?.first_name ?? 'Unknown';
+                const messageFromId = msg.from?.id ?? 'Unknown';
+                logger_1.Logger.logWithTraceId(this.name, msg.traceId, msg.chatName, `${messageFromName} (${messageFromId}): ${messageContent}`);
+                if (msg.text) {
+                    await this.processMessage(msg);
+                }
+            });
+        }
     }
     async stop(code) {
         logger_1.Logger.logWithTraceId(this.name, `System:Bot-${this.name}-Stop`, 'System', 'Stopping bot...');
@@ -55,14 +59,12 @@ class BotInstance {
                     await trig.exec(ctx);
                 }
                 catch (error) {
-                    console.dir(error);
                     logger_1.Logger.errorWithTraceId(ctx.botName, ctx.traceId, chatName, error, ctx);
                 }
             }
         }
     }
-    async processMessages() {
-        const msg = this.messageQueue.pop();
+    async processMessage(msg) {
         for (const cmd of this.commands) {
             const ctx = this.api.createContextForMessage(msg, cmd.key);
             try {
@@ -72,6 +74,7 @@ class BotInstance {
                 logger_1.Logger.errorWithTraceId(ctx.botName, ctx.traceId, ctx.chatName, error, ctx);
             }
         }
+        this.api.flushResponses();
     }
 }
 exports.BotInstance = BotInstance;

package/dist/entities/context/chatContext.d.ts

@@ -1,5 +1,6 @@
 import { IBotApiInteractions } from '../../services/telegramApi';
 import { IStorageClient } from '../../types/storage';
+import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 export declare class ChatContext {
     botName: string;
     actionKey: string;
@@ -9,9 +10,9 @@ export declare class ChatContext {
     traceId: number | string;
     storage: IStorageClient;
     constructor(botName: string, actionKey: string, interactions: IBotApiInteractions, chatId: number, chatName: string, traceId: number | string, storage: IStorageClient);
-    sendTextToChat(text: string, disableWebPreview?: boolean, pinned?: boolean): void;
-    sendImageToChat(name: string, pinned?: boolean): void;
-    sendVideoToChat(name: string, pinned?: boolean): void;
+    sendTextToChat(text: string, options?: TextMessageSendingOptions): void;
+    sendImageToChat(name: string, options?: MessageSendingOptions): void;
+    sendVideoToChat(name: string, options?: MessageSendingOptions): void;
     unpinMessage(messageId: number): void;
 }
 //# sourceMappingURL=chatContext.d.ts.map

package/dist/entities/context/chatContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAMrD,qBAAa,WAAW;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,cAAc;IAW3B,cAAc,CACV,IAAI,EAAE,MAAM,EACZ,iBAAiB,CAAC,EAAE,OAAO,EAC3B,MAAM,CAAC,EAAE,OAAO;IAepB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAc9C,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAc9C,YAAY,CAAC,SAAS,EAAE,MAAM;CAUjC"}
+{"version":3,"file":"chatContext.d.ts","sourceRoot":"","sources":["../../../entities/context/chatContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAE3C,qBAAa,WAAW;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,mBAAmB,CAAC;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,OAAO,EAAE,cAAc;IAW3B,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAahE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc7D,YAAY,CAAC,SAAS,EAAE,MAAM;CAUjC"}

package/dist/entities/context/chatContext.js

@@ -16,16 +16,16 @@ class ChatContext {
         this.traceId = traceId;
         this.storage = storage;
     }
-    sendTextToChat(text, disableWebPreview, pinned) {
-        this.interactions.respond(new textMessage_1.TextMessage(text, this.chatId, undefined, this.traceId, disableWebPreview ?? false, pinned ?? false, this.actionKey));
+    sendTextToChat(text, options) {
+        this.interactions.respond(new textMessage_1.TextMessage(text, this.chatId, undefined, this.traceId, this.actionKey, options));
     }
-    sendImageToChat(name, pinned) {
+    sendImageToChat(name, options) {
         const filePath = `./content/${name}.png`;
-        this.interactions.respond(new imageMessage_1.ImageMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, undefined, this.traceId, pinned ?? false, this.actionKey));
+        this.interactions.respond(new imageMessage_1.ImageMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, undefined, this.traceId, this.actionKey, options));
     }
-    sendVideoToChat(name, pinned) {
+    sendVideoToChat(name, options) {
         const filePath = `./content/${name}.mp4`;
-        this.interactions.respond(new videoMessage_1.VideoMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, undefined, this.traceId, pinned ?? false, this.actionKey));
+        this.interactions.respond(new videoMessage_1.VideoMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, undefined, this.traceId, this.actionKey, options));
     }
     unpinMessage(messageId) {
         this.interactions.unpin(new unpin_1.UnpinResponse(messageId, this.chatId, this.traceId, this.actionKey));

package/dist/entities/context/messageContext.d.ts

@@ -3,6 +3,7 @@ import { TelegramEmoji } from 'telegraf/types';
 import { IStorageClient } from '../../types/storage';
 import { IActionState } from '../../types/actionState';
 import { ChatContext } from './chatContext';
+import { MessageSendingOptions, TextMessageSendingOptions } from '../../types/messageSendingOptions';
 export declare class MessageContext<TActionState extends IActionState> extends ChatContext {
     messageId: number;
     messageText: string;
@@ -14,9 +15,9 @@ export declare class MessageContext<TActionState extends IActionState> extends C
     constructor(botName: string, scheduledKey: string, interactions: IBotApiInteractions, chatId: number, chatName: string, messageId: number, messageText: string, fromUserId: number | undefined, traceId: number | string, fromUserName: string, storage: IStorageClient);
     loadStateOf<TAnotherActionState extends IActionState>(commandName: string): Promise<TAnotherActionState>;
     updateState(stateUpdateAction: (state: TActionState) => void): void;
-    replyWithText(text: string, disableWebPreview?: boolean, pinned?: boolean): void;
-    replyWithImage(name: string, pinned?: boolean): void;
-    replyWithVideo(name: string, pinned?: boolean): void;
+    replyWithText(text: string, options?: TextMessageSendingOptions): void;
+    replyWithImage(name: string, options?: MessageSendingOptions): void;
+    replyWithVideo(name: string, options?: MessageSendingOptions): void;
     react(emoji: TelegramEmoji): void;
 }
 //# sourceMappingURL=messageContext.d.ts.map

package/dist/entities/context/messageContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAQ;IAC9B,aAAa,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,CAAM;IACzD,YAAY,EAAE,MAAM,CAAC;gBAGjB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,cAAc;IAkBrB,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAU/B,WAAW,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI;IAM5D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO;IAczE,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAc7C,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAc7C,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}
+{"version":3,"file":"messageContext.d.ts","sourceRoot":"","sources":["../../../entities/context/messageContext.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMvD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EACH,qBAAqB,EACrB,yBAAyB,EAC5B,MAAM,mCAAmC,CAAC;AAE3C,qBAAa,cAAc,CACvB,YAAY,SAAS,YAAY,CACnC,SAAQ,WAAW;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,gBAAgB,EAAE,CAAM;IACtC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,aAAa,EAAE,OAAO,CAAQ;IAC9B,aAAa,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI,CAAC,CAAM;IACzD,YAAY,EAAE,MAAM,CAAC;gBAGjB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,cAAc;IAkBrB,WAAW,CAAC,mBAAmB,SAAS,YAAY,EACtD,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,mBAAmB,CAAC;IAU/B,WAAW,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,IAAI;IAM5D,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAa/D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAc5D,KAAK,CAAC,KAAK,EAAE,aAAa;CAW7B"}

package/dist/entities/context/messageContext.js

@@ -25,16 +25,16 @@ class MessageContext extends chatContext_1.ChatContext {
     updateState(stateUpdateAction) {
         this.updateActions.push(stateUpdateAction);
     }
-    replyWithText(text, disableWebPreview, pinned) {
-        this.interactions.respond(new textMessage_1.TextMessage(text, this.chatId, this.messageId, this.traceId, disableWebPreview ?? false, pinned ?? false, this.actionKey));
+    replyWithText(text, options) {
+        this.interactions.respond(new textMessage_1.TextMessage(text, this.chatId, this.messageId, this.traceId, this.actionKey, options));
     }
-    replyWithImage(name, pinned) {
+    replyWithImage(name, options) {
         const filePath = `./content/${name}.png`;
-        this.interactions.respond(new imageMessage_1.ImageMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, this.messageId, this.traceId, pinned ?? false, this.actionKey));
+        this.interactions.respond(new imageMessage_1.ImageMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, this.messageId, this.traceId, this.actionKey, options));
     }
-    replyWithVideo(name, pinned) {
+    replyWithVideo(name, options) {
         const filePath = `./content/${name}.mp4`;
-        this.interactions.respond(new videoMessage_1.VideoMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, this.messageId, this.traceId, pinned ?? false, this.actionKey));
+        this.interactions.respond(new videoMessage_1.VideoMessage({ source: (0, path_1.resolve)(filePath) }, this.chatId, this.messageId, this.traceId, this.actionKey, options));
     }
     react(emoji) {
         this.interactions.react(new reaction_1.Reaction(this.traceId, this.chatId, this.messageId, emoji, this.actionKey));

package/dist/entities/responses/imageMessage.d.ts

@@ -1,5 +1,6 @@
 import { InputFile } from 'telegraf/types';
 import { IReplyMessage } from '../../types/response';
+import { MessageSendingOptions } from '../../types/messageSendingOptions';
 export declare class ImageMessage implements IReplyMessage<InputFile> {
     kind: "image";
     content: InputFile;
@@ -9,6 +10,6 @@ export declare class ImageMessage implements IReplyMessage<InputFile> {
     disableWebPreview: boolean;
     shouldPin: boolean;
     sourceActionKey: string;
-    constructor(image: InputFile, chatId: number, replyId: number | undefined, traceId: number | string, pinned: boolean, sourceActionKey: string);
+    constructor(image: InputFile, chatId: number, replyId: number | undefined, traceId: number | string, sourceActionKey: string, options?: MessageSendingOptions);
 }
 //# sourceMappingURL=imageMessage.d.ts.map

package/dist/entities/responses/imageMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageMessage.d.ts","sourceRoot":"","sources":["../../../entities/responses/imageMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAoB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEvE,qBAAa,YAAa,YAAW,aAAa,CAAC,SAAS,CAAC;IACzD,IAAI,UAA0B;IAE9B,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,UAAS;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAGpB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM;CAS9B"}
+{"version":3,"file":"imageMessage.d.ts","sourceRoot":"","sources":["../../../entities/responses/imageMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAoB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,qBAAa,YAAa,YAAW,aAAa,CAAC,SAAS,CAAC;IACzD,IAAI,UAA0B;IAE9B,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,UAAS;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAGpB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,qBAAqB;CAStC"}

package/dist/entities/responses/imageMessage.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageMessage = void 0;
 const response_1 = require("../../types/response");
 class ImageMessage {
-    constructor(image, chatId, replyId, traceId, pinned, sourceActionKey) {
+    constructor(image, chatId, replyId, traceId, sourceActionKey, options) {
         this.kind = response_1.BotResponseTypes.image;
         this.disableWebPreview = false;
         this.content = image;
         this.chatId = chatId;
         this.replyId = replyId;
         this.traceId = traceId;
-        this.shouldPin = pinned;
+        this.shouldPin = options?.pin ?? false;
         this.sourceActionKey = sourceActionKey;
     }
 }

package/dist/entities/responses/textMessage.d.ts

@@ -1,3 +1,4 @@
+import { TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { IReplyMessage } from '../../types/response';
 export declare class TextMessage implements IReplyMessage<string> {
     kind: "text";
@@ -8,6 +9,6 @@ export declare class TextMessage implements IReplyMessage<string> {
     disableWebPreview: boolean;
     shouldPin: boolean;
     sourceActionKey: string;
-    constructor(text: string, chatId: number, replyId: number | undefined, traceId: string | number, disableWebPreview: boolean, pinned: boolean, sourceActionKey: string);
+    constructor(text: string, chatId: number, replyId: number | undefined, traceId: string | number, sourceActionKey: string, options?: TextMessageSendingOptions);
 }
 //# sourceMappingURL=textMessage.d.ts.map

package/dist/entities/responses/textMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textMessage.d.ts","sourceRoot":"","sources":["../../../entities/responses/textMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEvE,qBAAa,WAAY,YAAW,aAAa,CAAC,MAAM,CAAC;IACrD,IAAI,SAAyB;IAE7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAGpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,iBAAiB,EAAE,OAAO,EAC1B,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM;CAU9B"}
+{"version":3,"file":"textMessage.d.ts","sourceRoot":"","sources":["../../../entities/responses/textMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAoB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEvE,qBAAa,WAAY,YAAW,aAAa,CAAC,MAAM,CAAC;IACrD,IAAI,SAAyB;IAE7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAGpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,yBAAyB;CAU1C"}

package/dist/entities/responses/textMessage.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TextMessage = void 0;
 const response_1 = require("../../types/response");
 class TextMessage {
-    constructor(text, chatId, replyId, traceId, disableWebPreview, pinned, sourceActionKey) {
+    constructor(text, chatId, replyId, traceId, sourceActionKey, options) {
         this.kind = response_1.BotResponseTypes.text;
         this.content = text;
         this.chatId = chatId;
         this.replyId = replyId;
         this.traceId = traceId;
-        this.disableWebPreview = disableWebPreview;
-        this.shouldPin = pinned;
+        this.disableWebPreview = options?.disableWebPreview ?? false;
+        this.shouldPin = options?.pin ?? false;
         this.sourceActionKey = sourceActionKey;
     }
 }

package/dist/entities/responses/videoMessage.d.ts

@@ -1,5 +1,6 @@
 import { InputFile } from 'telegraf/types';
 import { IReplyMessage } from '../../types/response';
+import { MessageSendingOptions } from '../../types/messageSendingOptions';
 export declare class VideoMessage implements IReplyMessage<InputFile> {
     kind: "video";
     content: InputFile;
@@ -9,6 +10,6 @@ export declare class VideoMessage implements IReplyMessage<InputFile> {
     disableWebPreview: boolean;
     shouldPin: boolean;
     sourceActionKey: string;
-    constructor(video: InputFile, chatId: number, replyId: number | undefined, traceId: number | string, pinned: boolean, sourceActionKey: string);
+    constructor(video: InputFile, chatId: number, replyId: number | undefined, traceId: number | string, sourceActionKey: string, options?: MessageSendingOptions);
 }
 //# sourceMappingURL=videoMessage.d.ts.map

package/dist/entities/responses/videoMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"videoMessage.d.ts","sourceRoot":"","sources":["../../../entities/responses/videoMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAoB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEvE,qBAAa,YAAa,YAAW,aAAa,CAAC,SAAS,CAAC;IACzD,IAAI,UAA0B;IAE9B,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,UAAS;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAGpB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,MAAM,EAAE,OAAO,EACf,eAAe,EAAE,MAAM;CAS9B"}
+{"version":3,"file":"videoMessage.d.ts","sourceRoot":"","sources":["../../../entities/responses/videoMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAoB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,qBAAa,YAAa,YAAW,aAAa,CAAC,SAAS,CAAC;IACzD,IAAI,UAA0B;IAE9B,OAAO,EAAE,SAAS,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,iBAAiB,UAAS;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAGpB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,qBAAqB;CAStC"}

package/dist/entities/responses/videoMessage.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VideoMessage = void 0;
 const response_1 = require("../../types/response");
 class VideoMessage {
-    constructor(video, chatId, replyId, traceId, pinned, sourceActionKey) {
+    constructor(video, chatId, replyId, traceId, sourceActionKey, options) {
         this.kind = response_1.BotResponseTypes.video;
         this.disableWebPreview = false;
         this.content = video;
         this.chatId = chatId;
         this.replyId = replyId;
         this.traceId = traceId;
-        this.shouldPin = pinned;
+        this.shouldPin = options?.pin ?? false;
         this.sourceActionKey = sourceActionKey;
     }
 }

package/dist/services/telegramApi.d.ts

@@ -10,13 +10,14 @@ import { VideoMessage } from '../entities/responses/videoMessage';
 import { ImageMessage } from '../entities/responses/imageMessage';
 import { Telegram } from 'telegraf/typings/telegram';
 export declare class TelegramApiService {
+    isFlushing: boolean;
+    messageQueue: Array<BotResponse>;
     botName: string;
     telegram: Telegram;
     chats: Map<number, string>;
-    messageQueue: Array<BotResponse>;
     storage: IStorageClient;
     constructor(botName: string, telegram: Telegram, storage: IStorageClient, chats: Map<string, number>);
-    private dequeueResponse;
+    flushResponses(): Promise<void>;
     private pinIfShould;
     private processResponse;
     private enqueue;

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,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"}
+{"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;AAElD,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;AAIrD,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,CAAM;IAEtC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,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;IAQxB,cAAc;YAyBN,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

@@ -4,29 +4,33 @@ 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");
+const promises_1 = require("timers/promises");
 class TelegramApiService {
     constructor(botName, telegram, storage, chats) {
+        this.isFlushing = false;
         this.messageQueue = [];
         this.telegram = telegram;
         this.botName = botName;
         this.chats = (0, reverseMap_1.reverseMap)(chats);
         this.storage = storage;
-        taskScheduler_1.Scheduler.createTask('MessageSending', () => {
-            this.dequeueResponse();
-        }, 100, false, this.botName);
     }
-    async dequeueResponse() {
-        const message = this.messageQueue.pop();
-        if (!message)
+    async flushResponses() {
+        if (this.isFlushing)
             return;
-        try {
-            await this.processResponse(message);
-        }
-        catch (error) {
-            logger_1.Logger.errorWithTraceId(this.botName, message.traceId, this.chats.get(message.chatId), error, message);
+        while (this.messageQueue.length) {
+            const message = this.messageQueue.pop();
+            if (!message)
+                break;
+            try {
+                await this.processResponse(message);
+                await (0, promises_1.setTimeout)(100);
+            }
+            catch (error) {
+                logger_1.Logger.errorWithTraceId(this.botName, message.traceId, this.chats.get(message.chatId), error, message);
+            }
         }
+        this.isFlushing = false;
     }
     async pinIfShould(response, sentMessage) {
         if (response.shouldPin) {
@@ -78,8 +82,8 @@ class TelegramApiService {
                 break;
         }
     }
-    enqueue(reaction) {
-        this.messageQueue.push(reaction);
+    enqueue(response) {
+        this.messageQueue.push(response);
     }
     getInteractions() {
         return {

package/dist/types/messageSendingOptions.d.ts

@@ -0,0 +1,7 @@
+export interface MessageSendingOptions {
+    pin?: boolean;
+}
+export interface TextMessageSendingOptions extends MessageSendingOptions {
+    disableWebPreview?: boolean;
+}
+//# sourceMappingURL=messageSendingOptions.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"messageSendingOptions.d.ts","sourceRoot":"","sources":["../../types/messageSendingOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IAClC,GAAG,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,yBAA0B,SAAQ,qBAAqB;IACpE,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B"}

package/dist/types/messageSendingOptions.js

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

package/entities/botInstance.ts

@@ -1,9 +1,6 @@
 import { Telegraf } from 'telegraf';
-import {
-    hoursToMilliseconds,
-    secondsToMilliseconds
-} from '../helpers/timeConvertions';
-import { Hours, Seconds } from '../types/timeValues';
+import { hoursToMilliseconds } from '../helpers/timeConvertions';
+import { Hours } from '../types/timeValues';
 import { IStorageClient } from '../types/storage';
 import { JsonFileStorage } from '../services/jsonFileStorage';
 import { TelegramApiService } from '../services/telegramApi';
@@ -21,7 +18,6 @@ export class BotInstance {
     private commands: CommandAction<IActionState>[];
     private scheduled: ScheduledAction<IActionState>[];
     private chats: Map<string, number>;
-    private messageQueue: IncomingMessage[] = [];
     storage: IStorageClient;
 
     constructor(options: {
@@ -55,52 +51,51 @@ export class BotInstance {
             this.chats
         );
 
-        this.telegraf.on('message', async (ctx) => {
-            const msg = new IncomingMessage(ctx.update.message);
-            const messageContent = msg.text || '<non-text message>';
-
-            const messageFromName = msg.from?.first_name ?? 'Unknown';
-            const messageFromId = msg.from?.id ?? 'Unknown';
-            Logger.logWithTraceId(
-                this.name,
-                msg.traceId,
-                msg.chatName,
-                `${messageFromName} (${messageFromId}): ${messageContent}`
-            );
+        this.initializeMessageProcessing();
+        this.initializeScheduledProcessing();
 
-            if (msg.text) {
-                this.messageQueue.push(msg);
-            }
-        });
+        this.storage.saveMetadata(
+            [...this.commands, ...this.scheduled],
+            this.name
+        );
 
         this.telegraf.launch();
+    }
 
-        Scheduler.createTask(
-            'MessageProcessing',
-            async () => {
-                while (this.messageQueue.length > 0) {
-                    await this.processMessages();
-                }
-            },
-            secondsToMilliseconds(0.3 as Seconds),
-            false,
-            this.name
-        );
+    private initializeScheduledProcessing() {
+        if (this.scheduled.length > 0) {
+            Scheduler.createTask(
+                'ScheduledProcessing',
+                async () => {
+                    await this.runScheduled();
+                },
+                hoursToMilliseconds(0.5 as Hours),
+                true,
+                this.name
+            );
+        }
+    }
 
-        Scheduler.createTask(
-            'ScheduledProcessing',
-            async () => {
-                await this.runScheduled();
-            },
-            hoursToMilliseconds(0.5 as Hours),
-            true,
-            this.name
-        );
+    private initializeMessageProcessing() {
+        if (this.commands.length > 0) {
+            this.telegraf.on('message', async (ctx) => {
+                const msg = new IncomingMessage(ctx.update.message);
+                const messageContent = msg.text || '<non-text message>';
+
+                const messageFromName = msg.from?.first_name ?? 'Unknown';
+                const messageFromId = msg.from?.id ?? 'Unknown';
+                Logger.logWithTraceId(
+                    this.name,
+                    msg.traceId,
+                    msg.chatName,
+                    `${messageFromName} (${messageFromId}): ${messageContent}`
+                );
 
-        this.storage.saveMetadata(
-            [...this.commands, ...this.scheduled],
-            this.name
-        );
+                if (msg.text) {
+                    await this.processMessage(msg);
+                }
+            });
+        }
     }
 
     async stop(code: string) {
@@ -123,7 +118,6 @@ export class BotInstance {
                 try {
                     await trig.exec(ctx);
                 } catch (error) {
-                    console.dir(error);
                     Logger.errorWithTraceId(
                         ctx.botName,
                         ctx.traceId,
@@ -136,9 +130,7 @@ export class BotInstance {
         }
     }
 
-    private async processMessages() {
-        const msg = this.messageQueue.pop()!;
-
+    private async processMessage(msg: IncomingMessage) {
         for (const cmd of this.commands) {
             const ctx = this.api.createContextForMessage(msg, cmd.key);
 
@@ -154,5 +146,7 @@ export class BotInstance {
                 );
             }
         }
+
+        this.api.flushResponses();
     }
 }

package/entities/context/chatContext.ts

@@ -5,6 +5,10 @@ import { ImageMessage } from '../responses/imageMessage';
 import { TextMessage } from '../responses/textMessage';
 import { VideoMessage } from '../responses/videoMessage';
 import { UnpinResponse } from '../responses/unpin';
+import {
+    MessageSendingOptions,
+    TextMessageSendingOptions
+} from '../../types/messageSendingOptions';
 
 export class ChatContext {
     botName: string;
@@ -33,25 +37,20 @@ export class ChatContext {
         this.storage = storage;
     }
 
-    sendTextToChat(
-        text: string,
-        disableWebPreview?: boolean,
-        pinned?: boolean
-    ) {
+    sendTextToChat(text: string, options?: TextMessageSendingOptions) {
         this.interactions.respond(
             new TextMessage(
                 text,
                 this.chatId,
                 undefined,
                 this.traceId,
-                disableWebPreview ?? false,
-                pinned ?? false,
-                this.actionKey
+                this.actionKey,
+                options
             )
         );
     }
 
-    sendImageToChat(name: string, pinned?: boolean) {
+    sendImageToChat(name: string, options?: MessageSendingOptions) {
         const filePath = `./content/${name}.png`;
         this.interactions.respond(
             new ImageMessage(
@@ -59,13 +58,13 @@ export class ChatContext {
                 this.chatId,
                 undefined,
                 this.traceId,
-                pinned ?? false,
-                this.actionKey
+                this.actionKey,
+                options
             )
         );
     }
 
-    sendVideoToChat(name: string, pinned?: boolean) {
+    sendVideoToChat(name: string, options?: MessageSendingOptions) {
         const filePath = `./content/${name}.mp4`;
         this.interactions.respond(
             new VideoMessage(
@@ -73,8 +72,8 @@ export class ChatContext {
                 this.chatId,
                 undefined,
                 this.traceId,
-                pinned ?? false,
-                this.actionKey
+                this.actionKey,
+                options
             )
         );
     }

package/entities/context/messageContext.ts

@@ -9,6 +9,10 @@ import { TextMessage } from '../responses/textMessage';
 import { VideoMessage } from '../responses/videoMessage';
 import { ActionStateBase } from '../states/actionStateBase';
 import { ChatContext } from './chatContext';
+import {
+    MessageSendingOptions,
+    TextMessageSendingOptions
+} from '../../types/messageSendingOptions';
 
 export class MessageContext<
     TActionState extends IActionState
@@ -68,21 +72,20 @@ export class MessageContext<
         );
     }
 
-    replyWithText(text: string, disableWebPreview?: boolean, pinned?: boolean) {
+    replyWithText(text: string, options?: TextMessageSendingOptions) {
         this.interactions.respond(
             new TextMessage(
                 text,
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                disableWebPreview ?? false,
-                pinned ?? false,
-                this.actionKey
+                this.actionKey,
+                options
             )
         );
     }
 
-    replyWithImage(name: string, pinned?: boolean) {
+    replyWithImage(name: string, options?: MessageSendingOptions) {
         const filePath = `./content/${name}.png`;
         this.interactions.respond(
             new ImageMessage(
@@ -90,13 +93,13 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                pinned ?? false,
-                this.actionKey
+                this.actionKey,
+                options
             )
         );
     }
 
-    replyWithVideo(name: string, pinned?: boolean) {
+    replyWithVideo(name: string, options?: MessageSendingOptions) {
         const filePath = `./content/${name}.mp4`;
         this.interactions.respond(
             new VideoMessage(
@@ -104,8 +107,8 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                pinned ?? false,
-                this.actionKey
+                this.actionKey,
+                options
             )
         );
     }

package/entities/responses/imageMessage.ts

@@ -1,5 +1,6 @@
 import { InputFile } from 'telegraf/types';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
+import { MessageSendingOptions } from '../../types/messageSendingOptions';
 
 export class ImageMessage implements IReplyMessage<InputFile> {
     kind = BotResponseTypes.image;
@@ -17,14 +18,14 @@ export class ImageMessage implements IReplyMessage<InputFile> {
         chatId: number,
         replyId: number | undefined,
         traceId: number | string,
-        pinned: boolean,
-        sourceActionKey: string
+        sourceActionKey: string,
+        options?: MessageSendingOptions
     ) {
         this.content = image;
         this.chatId = chatId;
         this.replyId = replyId;
         this.traceId = traceId;
-        this.shouldPin = pinned;
+        this.shouldPin = options?.pin ?? false;
         this.sourceActionKey = sourceActionKey;
     }
 }

package/entities/responses/textMessage.ts

@@ -1,3 +1,4 @@
+import { TextMessageSendingOptions } from '../../types/messageSendingOptions';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
 
 export class TextMessage implements IReplyMessage<string> {
@@ -16,16 +17,15 @@ export class TextMessage implements IReplyMessage<string> {
         chatId: number,
         replyId: number | undefined,
         traceId: string | number,
-        disableWebPreview: boolean,
-        pinned: boolean,
-        sourceActionKey: string
+        sourceActionKey: string,
+        options?: TextMessageSendingOptions
     ) {
         this.content = text;
         this.chatId = chatId;
         this.replyId = replyId;
         this.traceId = traceId;
-        this.disableWebPreview = disableWebPreview;
-        this.shouldPin = pinned;
+        this.disableWebPreview = options?.disableWebPreview ?? false;
+        this.shouldPin = options?.pin ?? false;
         this.sourceActionKey = sourceActionKey;
     }
 }

package/entities/responses/videoMessage.ts

@@ -1,5 +1,6 @@
 import { InputFile } from 'telegraf/types';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
+import { MessageSendingOptions } from '../../types/messageSendingOptions';
 
 export class VideoMessage implements IReplyMessage<InputFile> {
     kind = BotResponseTypes.video;
@@ -17,14 +18,14 @@ export class VideoMessage implements IReplyMessage<InputFile> {
         chatId: number,
         replyId: number | undefined,
         traceId: number | string,
-        pinned: boolean,
-        sourceActionKey: string
+        sourceActionKey: string,
+        options?: MessageSendingOptions
     ) {
         this.content = video;
         this.chatId = chatId;
         this.replyId = replyId;
         this.traceId = traceId;
-        this.shouldPin = pinned;
+        this.shouldPin = options?.pin ?? false;
         this.sourceActionKey = sourceActionKey;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.0.20",
+    "version": "0.0.22",
     "type": "module",
     "dependencies": {
         "async-sema": "^3.1.1",

package/services/telegramApi.ts

@@ -3,8 +3,6 @@ import { ChatContext } from '../entities/context/chatContext';
 import { MessageContext } from '../entities/context/messageContext';
 import { reverseMap } from '../helpers/reverseMap';
 import { IStorageClient } from '../types/storage';
-import { Milliseconds } from '../types/timeValues';
-import { Scheduler } from './taskScheduler';
 import { Logger } from './logger';
 import { Reaction } from '../entities/responses/reaction';
 import { IncomingMessage } from '../entities/incomingMessage';
@@ -14,12 +12,16 @@ import { TextMessage } from '../entities/responses/textMessage';
 import { VideoMessage } from '../entities/responses/videoMessage';
 import { ImageMessage } from '../entities/responses/imageMessage';
 import { Telegram } from 'telegraf/typings/telegram';
+import { setTimeout } from 'timers/promises';
+import { Milliseconds } from '../types/timeValues';
 
 export class TelegramApiService {
+    isFlushing = false;
+    messageQueue: Array<BotResponse> = [];
+
     botName: string;
     telegram: Telegram;
     chats: Map<number, string>;
-    messageQueue: Array<BotResponse> = [];
     storage: IStorageClient;
 
     constructor(
@@ -32,34 +34,31 @@ export class TelegramApiService {
         this.botName = botName;
         this.chats = reverseMap(chats);
         this.storage = storage;
-
-        Scheduler.createTask(
-            'MessageSending',
-            () => {
-                this.dequeueResponse();
-            },
-            100 as Milliseconds,
-            false,
-            this.botName
-        );
     }
 
-    private async dequeueResponse() {
-        const message = this.messageQueue.pop();
+    async flushResponses() {
+        if (this.isFlushing) return;
 
-        if (!message) return;
+        while (this.messageQueue.length) {
+            const message = this.messageQueue.pop();
 
-        try {
-            await this.processResponse(message);
-        } catch (error) {
-            Logger.errorWithTraceId(
-                this.botName,
-                message.traceId,
-                this.chats.get(message.chatId)!,
-                error,
-                message
-            );
+            if (!message) break;
+
+            try {
+                await this.processResponse(message);
+                await setTimeout(100 as Milliseconds);
+            } catch (error) {
+                Logger.errorWithTraceId(
+                    this.botName,
+                    message.traceId,
+                    this.chats.get(message.chatId)!,
+                    error,
+                    message
+                );
+            }
         }
+
+        this.isFlushing = false;
     }
 
     private async pinIfShould<T>(
@@ -158,8 +157,8 @@ export class TelegramApiService {
         }
     }
 
-    private enqueue(reaction: BotResponse) {
-        this.messageQueue.push(reaction);
+    private enqueue(response: BotResponse) {
+        this.messageQueue.push(response);
     }
 
     private getInteractions() {

package/types/messageSendingOptions.ts

@@ -0,0 +1,7 @@
+export interface MessageSendingOptions {
+    pin?: boolean;
+}
+
+export interface TextMessageSendingOptions extends MessageSendingOptions {
+    disableWebPreview?: boolean;
+}