chz-telegram-bot 0.0.21 → 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;
@@ -24,6 +23,6 @@ export declare class BotInstance {
     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;IAkCD,OAAO,CAAC,6BAA6B;IAcrC,OAAO,CAAC,2BAA2B;IAkC7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAYT,YAAY;YAoBZ,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;
@@ -42,14 +41,9 @@ class BotInstance {
                 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);
+                    await this.processMessage(msg);
                 }
             });
-            taskScheduler_1.Scheduler.createTask('MessageProcessing', async () => {
-                while (this.messageQueue.length > 0) {
-                    await this.processMessages();
-                }
-            }, (0, timeConvertions_1.secondsToMilliseconds)(0.3), false, this.name);
         }
     }
     async stop(code) {
@@ -70,8 +64,7 @@ class BotInstance {
             }
         }
     }
-    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 {
@@ -81,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/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/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: {
@@ -96,21 +92,9 @@ export class BotInstance {
                 );
 
                 if (msg.text) {
-                    this.messageQueue.push(msg);
+                    await this.processMessage(msg);
                 }
             });
-
-            Scheduler.createTask(
-                'MessageProcessing',
-                async () => {
-                    while (this.messageQueue.length > 0) {
-                        await this.processMessages();
-                    }
-                },
-                secondsToMilliseconds(0.3 as Seconds),
-                false,
-                this.name
-            );
         }
     }
 
@@ -146,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);
 
@@ -164,5 +146,7 @@ export class BotInstance {
                 );
             }
         }
+
+        this.api.flushResponses();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.0.21",
+    "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() {