chz-telegram-bot 0.1.19 → 0.1.20

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

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,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;AAO5D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAMhE,qBAAa,WAAW;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,IAAI,EAAG,MAAM,CAAC;IACd,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,KAAK,CAA0B;gBAE3B,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE;YACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;SACtC,CAAC;QACF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IA2BK,KAAK,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE;YACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;SACtC,CAAC;QACF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IAsCD,OAAO,CAAC,6BAA6B;IA4CrC,OAAO,CAAC,+BAA+B;IA2EvC,OAAO,CAAC,2BAA2B;IAiC7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAaT,YAAY;YAuCZ,cAAc;CA2B/B"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAKA,OAAO,EAAuB,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnE,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;AAO5D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAUhE,qBAAa,WAAW;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,IAAI,EAAG,MAAM,CAAC;IACd,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,SAAS,CAAmC;IACpD,OAAO,CAAC,aAAa,CAAuB;IAC5C,OAAO,CAAC,KAAK,CAA0B;gBAE3B,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE;YACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;SACtC,CAAC;QACF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IA2BK,KAAK,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE;YACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;SACtC,CAAC;QACF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,gCAAgC,CAAC,EAAE,OAAO,CAAC;QAC3C,QAAQ,CAAC,EAAE;YACP,aAAa,CAAC,EAAE,cAAc,CAAC;YAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,SAAS,CAAC,EAAE,UAAU,CAAC;SAC1B,CAAC;KACL;IAsCD,OAAO,CAAC,6BAA6B;IA4CrC,OAAO,CAAC,+BAA+B;IA2EvC,OAAO,CAAC,2BAA2B;IA2C7B,IAAI,CAAC,IAAI,EAAE,MAAM;YAaT,YAAY;YAuCZ,cAAc;CA2B/B"}

package/dist/entities/botInstance.js

@@ -19,6 +19,7 @@ const traceFactory_1 = require("../helpers/traceFactory");
 const incomingQuery_1 = require("../dtos/incomingQuery");
 const inlineQueryContext_1 = require("./context/inlineQueryContext");
 const helpAction_1 = require("../builtin/helpAction");
+const messageTypes_1 = require("../types/messageTypes");
 class BotInstance {
     constructor(options) {
         const actions = [
@@ -110,18 +111,23 @@ class BotInstance {
     }
     initializeMessageProcessing(verboseLoggingForIncomingMessage) {
         if (this.commands.length > 0) {
+            const triggersToBeProcessed = new Set(this.commands
+                .flatMap((x) => x.triggers)
+                .map((x) => typeof x == 'string'
+                ? x.startsWith(messageTypes_1.INTERNAL_MESSAGE_TYPE_PREFIX)
+                    ? x
+                    : messageTypes_1.MessageType.Text
+                : messageTypes_1.MessageType.Text));
             this.telegraf.on('message', async (ctx) => {
                 const msg = new incomingMessage_1.IncomingMessage(ctx.update.message, this.name);
-                const messageContent = msg.text || `<non-text message: ${msg.type}>`;
-                const messageFromName = msg.from?.first_name ?? 'Unknown';
-                const messageFromId = msg.from?.id ?? 'Unknown';
                 if (verboseLoggingForIncomingMessage) {
                     this.logger.logObjectWithTraceId(this.name, msg.traceId, msg.chatInfo.name, ctx.update.message);
                 }
                 else {
-                    this.logger.logWithTraceId(this.name, msg.traceId, msg.chatInfo.name, `${messageFromName} (${messageFromId}): ${messageContent}`);
+                    this.logger.logWithTraceId(this.name, msg.traceId, msg.chatInfo.name, `${msg.from?.first_name ?? 'Unknown'} (${msg.from?.id ?? 'Unknown'}): ${msg.text || `<non-text message: ${msg.type}>`}`);
                 }
-                await this.processMessage(msg);
+                if (triggersToBeProcessed.has(msg.type))
+                    await this.processMessage(msg);
             });
         }
     }

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

@@ -1 +1 @@
-{"version":3,"file":"jsonFileStorage.d.ts","sourceRoot":"","sources":["../../services/jsonFileStorage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEtE,qBAAa,eAAgB,YAAW,cAAc;IAClD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmC;IACzD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA4C;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,IAAI,CAAC,EAAE,MAAM;YAiBH,IAAI;YAcJ,YAAY;YAqBZ,IAAI;IAgBlB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,SAAS;IAMtD,YAAY,CACd,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM;IAWb,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM;IAYZ,yBAAyB,CAAC,YAAY,SAAS,YAAY,EAC7D,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY;IAWjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC;CAcrD"}
+{"version":3,"file":"jsonFileStorage.d.ts","sourceRoot":"","sources":["../../services/jsonFileStorage.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEtE,qBAAa,eAAgB,YAAW,cAAc;IAClD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAmC;IACzD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA4C;IAClE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAG7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,IAAI,CAAC,EAAE,MAAM;YAiBH,IAAI;YAcJ,YAAY;YAqBZ,IAAI;IAWlB,OAAO,CAAC,eAAe;IAOjB,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,SAAS;IAMtD,YAAY,CACd,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM;IAWb,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM;IAYZ,yBAAyB,CAAC,YAAY,SAAS,YAAY,EAC7D,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY;IAWjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC;CAcrD"}

package/dist/services/jsonFileStorage.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonFileStorage = void 0;
 const fs_1 = require("fs");
-const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const async_sema_1 = require("async-sema");
 class JsonFileStorage {
@@ -35,10 +34,10 @@ class JsonFileStorage {
     async loadInternal(key) {
         if (!this.cache.has(key)) {
             const targetPath = this.buidPathFromKey(key);
-            if (!(0, fs_1.existsSync)(targetPath)) {
-                return {};
-            }
-            const fileContent = await (0, promises_1.readFile)(targetPath, 'utf8');
+            const fileContent = await (0, promises_1.readFile)(targetPath, {
+                encoding: 'utf-8',
+                flag: 'a+'
+            });
             if (fileContent) {
                 const data = JSON.parse(fileContent);
                 this.cache.set(key, data);
@@ -49,10 +48,6 @@ class JsonFileStorage {
     async save(data, key) {
         this.cache.set(key, data);
         const targetPath = this.buidPathFromKey(key);
-        const folderName = (0, path_1.dirname)(targetPath);
-        if (!(0, fs_1.existsSync)(folderName)) {
-            await (0, promises_1.mkdir)(folderName, { recursive: true });
-        }
         await (0, promises_1.writeFile)(targetPath, JSON.stringify(data), { flag: 'w+' });
     }
     buidPathFromKey(key) {
@@ -60,7 +55,7 @@ class JsonFileStorage {
     }
     async load(key) {
         return await this.lock(key, async () => {
-            return this.loadInternal(key);
+            return await this.loadInternal(key);
         });
     }
     async saveMetadata(actions, botName) {
@@ -76,7 +71,7 @@ class JsonFileStorage {
         });
     }
     async saveActionExecutionResult(action, chatId, state) {
-        await this.lock(action.key, async () => {
+        return await this.lock(action.key, async () => {
             const data = await this.loadInternal(action.key);
             data[chatId] = state;
             await this.save(data, action.key);

package/dist/services/responseProcessingQueue.d.ts

@@ -7,6 +7,5 @@ export declare class ResponseProcessingQueue {
     isFlushing: boolean;
     enqueue(item: QueueItem): void;
     flushReadyItems(): Promise<void>;
-    private peek;
 }
 //# sourceMappingURL=responseProcessingQueue.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"responseProcessingQueue.d.ts","sourceRoot":"","sources":["../../services/responseProcessingQueue.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC,CAAC;AAIF,qBAAa,uBAAuB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAM;IACxB,UAAU,UAAS;IAEnB,OAAO,CAAC,IAAI,EAAE,SAAS;IAmBjB,eAAe;IAoBrB,OAAO,CAAC,IAAI;CAGf"}
+{"version":3,"file":"responseProcessingQueue.d.ts","sourceRoot":"","sources":["../../services/responseProcessingQueue.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,SAAS,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACjC,CAAC;AAIF,qBAAa,uBAAuB;IAChC,KAAK,EAAE,SAAS,EAAE,CAAM;IACxB,UAAU,UAAS;IAEnB,OAAO,CAAC,IAAI,EAAE,SAAS;IAmBjB,eAAe;CAiBxB"}

package/dist/services/responseProcessingQueue.js

@@ -26,10 +26,8 @@ class ResponseProcessingQueue {
             return;
         this.isFlushing = true;
         while (this.items.length) {
-            if (Date.now() >= this.peek().priority) {
+            if (Date.now() >= this.items[0].priority) {
                 const item = this.items.shift();
-                if (!item)
-                    return;
                 await item.callback();
             }
             else {
@@ -38,8 +36,5 @@ class ResponseProcessingQueue {
         }
         this.isFlushing = false;
     }
-    peek() {
-        return this.items[0];
-    }
 }
 exports.ResponseProcessingQueue = ResponseProcessingQueue;

package/dist/types/messageTypes.d.ts

@@ -1,4 +1,5 @@
 import { Message, Update } from 'telegraf/types';
+export declare const INTERNAL_MESSAGE_TYPE_PREFIX = "__msg:";
 export declare const MessageType: {
     readonly Text: "__msg:Text";
     readonly Sticker: "__msg:Sticker";

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

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

package/dist/types/messageTypes.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageType = void 0;
+exports.MessageType = exports.INTERNAL_MESSAGE_TYPE_PREFIX = void 0;
+exports.INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
 exports.MessageType = {
-    Text: '__msg:Text',
-    Sticker: '__msg:Sticker',
-    Animation: '__msg:Animation',
-    Document: '__msg:Document',
-    Voice: '__msg:Voice',
-    Audio: '__msg:Audio',
-    LeftChatMember: '__msg:LeftChatMember',
-    NewChatMember: '__msg:NewChatMember',
-    Poll: '__msg:Poll',
-    Location: '__msg:Location',
-    Photo: '__msg:Photo',
-    Forward: '__msg:Forward',
-    Unknown: '__msg:Unknown'
+    Text: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
+    Sticker: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
+    Animation: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,
+    Document: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Document`,
+    Voice: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Voice`,
+    Audio: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Audio`,
+    LeftChatMember: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}LeftChatMember`,
+    NewChatMember: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}NewChatMember`,
+    Poll: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Poll`,
+    Location: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Location`,
+    Photo: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Photo`,
+    Forward: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Forward`,
+    Unknown: `${exports.INTERNAL_MESSAGE_TYPE_PREFIX}Unknown`
 };

package/entities/botInstance.ts

@@ -25,6 +25,10 @@ import { IncomingInlineQuery } from '../dtos/incomingQuery';
 import { InlineQueryContext } from './context/inlineQueryContext';
 import { buildHelpCommand } from '../builtin/helpAction';
 import { UserFromGetMe } from 'telegraf/types';
+import {
+    INTERNAL_MESSAGE_TYPE_PREFIX,
+    MessageType
+} from '../types/messageTypes';
 
 export class BotInstance {
     private readonly api: TelegramApiService;
@@ -262,13 +266,20 @@ export class BotInstance {
         verboseLoggingForIncomingMessage: boolean
     ) {
         if (this.commands.length > 0) {
+            const triggersToBeProcessed = new Set(
+                this.commands
+                    .flatMap((x) => x.triggers)
+                    .map((x) =>
+                        typeof x == 'string'
+                            ? x.startsWith(INTERNAL_MESSAGE_TYPE_PREFIX)
+                                ? x
+                                : MessageType.Text
+                            : MessageType.Text
+                    )
+            );
+
             this.telegraf.on('message', async (ctx) => {
                 const msg = new IncomingMessage(ctx.update.message, this.name);
-                const messageContent =
-                    msg.text || `<non-text message: ${msg.type}>`;
-
-                const messageFromName = msg.from?.first_name ?? 'Unknown';
-                const messageFromId = msg.from?.id ?? 'Unknown';
 
                 if (verboseLoggingForIncomingMessage) {
                     this.logger.logObjectWithTraceId(
@@ -282,11 +293,14 @@ export class BotInstance {
                         this.name,
                         msg.traceId,
                         msg.chatInfo.name,
-                        `${messageFromName} (${messageFromId}): ${messageContent}`
+                        `${msg.from?.first_name ?? 'Unknown'} (${
+                            msg.from?.id ?? 'Unknown'
+                        }): ${msg.text || `<non-text message: ${msg.type}>`}`
                     );
                 }
 
-                await this.processMessage(msg);
+                if (triggersToBeProcessed.has(msg.type))
+                    await this.processMessage(msg);
             });
         }
     }

package/eslint.config.js

@@ -5,7 +5,6 @@ export default tseslint.config(
     eslint.configs.recommended,
     ...tseslint.configs.recommended,
     {
-        ignores: ['dist/*'],
         rules: {
             '@typescript-eslint/no-unused-vars': [
                 'error',

package/package.json

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

package/services/jsonFileStorage.ts

@@ -1,6 +1,5 @@
 import { existsSync, mkdirSync } from 'fs';
-import { dirname } from 'path';
-import { mkdir, readFile, writeFile } from 'fs/promises';
+import { readFile, writeFile } from 'fs/promises';
 import { Sema as Semaphore } from 'async-sema';
 import { IStorageClient } from '../types/storage';
 import { IActionState } from '../types/actionState';
@@ -51,11 +50,11 @@ export class JsonFileStorage implements IStorageClient {
     ) {
         if (!this.cache.has(key)) {
             const targetPath = this.buidPathFromKey(key);
-            if (!existsSync(targetPath)) {
-                return {};
-            }
 
-            const fileContent = await readFile(targetPath, 'utf8');
+            const fileContent = await readFile(targetPath, {
+                encoding: 'utf-8',
+                flag: 'a+'
+            });
 
             if (fileContent) {
                 const data = JSON.parse(fileContent);
@@ -74,11 +73,6 @@ export class JsonFileStorage implements IStorageClient {
         this.cache.set(key, data);
 
         const targetPath = this.buidPathFromKey(key);
-        const folderName = dirname(targetPath);
-
-        if (!existsSync(folderName)) {
-            await mkdir(folderName, { recursive: true });
-        }
 
         await writeFile(targetPath, JSON.stringify(data), { flag: 'w+' });
     }
@@ -92,7 +86,7 @@ export class JsonFileStorage implements IStorageClient {
 
     async load<TActionState extends IActionState>(key: ActionKey) {
         return await this.lock(key, async () => {
-            return this.loadInternal<TActionState>(key);
+            return await this.loadInternal<TActionState>(key);
         });
     }
 
@@ -128,7 +122,7 @@ export class JsonFileStorage implements IStorageClient {
         chatId: number,
         state: TActionState
     ) {
-        await this.lock(action.key, async () => {
+        return await this.lock(action.key, async () => {
             const data = await this.loadInternal<TActionState>(action.key);
 
             data[chatId] = state;

package/services/responseProcessingQueue.ts

@@ -37,10 +37,8 @@ export class ResponseProcessingQueue {
         this.isFlushing = true;
 
         while (this.items.length) {
-            if (Date.now() >= this.peek()!.priority) {
-                const item = this.items.shift();
-
-                if (!item) return;
+            if (Date.now() >= this.items[0].priority) {
+                const item = this.items.shift()!;
 
                 await item.callback();
             } else {
@@ -50,8 +48,4 @@ export class ResponseProcessingQueue {
 
         this.isFlushing = false;
     }
-
-    private peek() {
-        return this.items[0];
-    }
 }

package/types/messageTypes.ts

@@ -1,19 +1,21 @@
 import { Message, Update } from 'telegraf/types';
 
+export const INTERNAL_MESSAGE_TYPE_PREFIX = `__msg:`;
+
 export const MessageType = {
-    Text: '__msg:Text',
-    Sticker: '__msg:Sticker',
-    Animation: '__msg:Animation',
-    Document: '__msg:Document',
-    Voice: '__msg:Voice',
-    Audio: '__msg:Audio',
-    LeftChatMember: '__msg:LeftChatMember',
-    NewChatMember: '__msg:NewChatMember',
-    Poll: '__msg:Poll',
-    Location: '__msg:Location',
-    Photo: '__msg:Photo',
-    Forward: '__msg:Forward',
-    Unknown: '__msg:Unknown'
+    Text: `${INTERNAL_MESSAGE_TYPE_PREFIX}Text`,
+    Sticker: `${INTERNAL_MESSAGE_TYPE_PREFIX}Sticker`,
+    Animation: `${INTERNAL_MESSAGE_TYPE_PREFIX}Animation`,
+    Document: `${INTERNAL_MESSAGE_TYPE_PREFIX}Document`,
+    Voice: `${INTERNAL_MESSAGE_TYPE_PREFIX}Voice`,
+    Audio: `${INTERNAL_MESSAGE_TYPE_PREFIX}Audio`,
+    LeftChatMember: `${INTERNAL_MESSAGE_TYPE_PREFIX}LeftChatMember`,
+    NewChatMember: `${INTERNAL_MESSAGE_TYPE_PREFIX}NewChatMember`,
+    Poll: `${INTERNAL_MESSAGE_TYPE_PREFIX}Poll`,
+    Location: `${INTERNAL_MESSAGE_TYPE_PREFIX}Location`,
+    Photo: `${INTERNAL_MESSAGE_TYPE_PREFIX}Photo`,
+    Forward: `${INTERNAL_MESSAGE_TYPE_PREFIX}Forward`,
+    Unknown: `${INTERNAL_MESSAGE_TYPE_PREFIX}Unknown`
 } as const;
 
 export type MessageTypeValue = (typeof MessageType)[keyof typeof MessageType];