chz-telegram-bot 0.0.25 → 0.0.27

package/dist/services/jsonFileStorage.js

@@ -5,10 +5,9 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const promises_1 = require("fs/promises");
 const async_sema_1 = require("async-sema");
-const actionStateBase_1 = require("../entities/states/actionStateBase");
 class JsonFileStorage {
-    constructor(botName, path) {
-        this.semaphore = new async_sema_1.Sema(1);
+    constructor(botName, actions, path) {
+        this.locks = new Map();
         this.cache = new Map();
         this.botName = botName;
         this.storagePath = path ?? 'storage';
@@ -17,14 +16,21 @@ class JsonFileStorage {
                 recursive: true
             });
         }
+        for (const action of actions) {
+            this.locks.set(action.key, new async_sema_1.Sema(1));
+        }
     }
-    async lock(action) {
-        await this.semaphore.acquire();
+    async lock(key, action) {
+        const lock = this.locks.get(key);
+        if (!lock) {
+            throw new Error(`Lock for action ${key} not found`);
+        }
+        await lock.acquire();
         try {
             return await action();
         }
         finally {
-            this.semaphore.release();
+            lock.release();
         }
     }
     async loadInternal(key) {
@@ -54,26 +60,24 @@ class JsonFileStorage {
         return `${this.storagePath}/${this.botName}/${key.replaceAll(':', '/')}.json`;
     }
     async load(key) {
-        return await this.lock(async () => {
+        return await this.lock(key, async () => {
             return this.loadInternal(key);
         });
     }
     async saveMetadata(actions, botName) {
-        return await this.lock(async () => {
-            const targetPath = this.buidPathFromKey(`Metadata-${botName}`);
-            await (0, promises_1.writeFile)(targetPath, JSON.stringify(actions), {
-                flag: 'w+'
-            });
+        const targetPath = this.buidPathFromKey(`Metadata-${botName}`);
+        await (0, promises_1.writeFile)(targetPath, JSON.stringify(actions), {
+            flag: 'w+'
         });
     }
-    async getActionState(entity, chatId) {
-        return await this.lock(async () => {
-            const data = await this.loadInternal(entity.key);
-            return Object.assign(entity.stateConstructor(), data[chatId]);
+    async getActionState(action, chatId) {
+        return await this.lock(action.key, async () => {
+            const data = await this.loadInternal(action.key);
+            return Object.assign(action.stateConstructor(), data[chatId]);
         });
     }
     async saveActionExecutionResult(action, chatId, transactionResult) {
-        await this.lock(async () => {
+        await this.lock(action.key, async () => {
             const data = await this.loadInternal(action.key);
             if (transactionResult.shouldUpdate) {
                 data[chatId] = transactionResult.data;
@@ -82,14 +86,16 @@ class JsonFileStorage {
         });
     }
     async close() {
-        await this.semaphore.acquire();
+        for (const lock of this.locks.values()) {
+            await lock.acquire();
+        }
     }
-    async updateStateFor(sourceActionKey, chatId, update) {
-        await this.lock(async () => {
-            const data = await this.loadInternal(sourceActionKey);
-            const state = Object.assign(new actionStateBase_1.ActionStateBase(), data[chatId]);
+    async updateStateFor(action, chatId, update) {
+        await this.lock(action.key, async () => {
+            const data = await this.loadInternal(action.key);
+            const state = Object.assign(action.stateConstructor(), data[chatId]);
             await update(state);
-            await this.save(data, sourceActionKey);
+            await this.save(data, action.key);
         });
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../services/logger.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IAEZ,OAAO,CAAC,cAAc;IAQtB,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAKhB,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS;CAYpC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../services/logger.ts"],"names":[],"mappings":"AAAA,cAAM,UAAU;IAEZ,OAAO,CAAC,cAAc;IAQtB,cAAc,CACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM;IAOhB,gBAAgB,CAAC,KAAK,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS;CAQpC;AAED,eAAO,MAAM,MAAM,YAAmB,CAAC"}

package/dist/services/logger.js

@@ -11,16 +11,10 @@ class JsonLogger {
         return JSON.stringify(plainObject);
     }
     logWithTraceId(botName, traceId, chatName, text) {
-        console.log(JSON.stringify({ botName, traceId, chatName, text }));
+        console.log(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","text":"${text}"}`);
     }
     errorWithTraceId(botName, traceId, chatName, errorObj, extraData) {
-        console.error(JSON.stringify({
-            botName,
-            traceId,
-            chatName,
-            error: this.serializeError(errorObj),
-            extraData
-        }));
+        console.error(`{"botName":"${botName}","traceId":"${traceId}","chatName":"${chatName}","error":${this.serializeError(errorObj)}${extraData ? `,"extraData":${JSON.stringify(extraData)}` : ''}}`);
     }
 }
 exports.Logger = new JsonLogger();

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

@@ -1 +1 @@
-{"version":3,"file":"taskScheduler.d.ts","sourceRoot":"","sources":["../../services/taskScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,cAAM,aAAa;IACf,WAAW,EAAE,UAAU,EAAE,CAAM;IAE/B,OAAO;IAMP,UAAU,CACN,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,QAAQ,EAAE,YAAY,EACtB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM;IAoBrB,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM;CAoBxB;AAED,eAAO,MAAM,SAAS,eAAsB,CAAC"}
+{"version":3,"file":"taskScheduler.d.ts","sourceRoot":"","sources":["../../services/taskScheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,cAAM,aAAa;IACf,WAAW,EAAE,UAAU,EAAE,CAAM;IAE/B,OAAO;IAMP,UAAU,CACN,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,QAAQ,EAAE,YAAY,EACtB,gBAAgB,EAAE,OAAO,EACzB,SAAS,EAAE,MAAM;IAmBrB,iBAAiB,CACb,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,IAAI,EAClB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM;CAoBxB;AAED,eAAO,MAAM,SAAS,eAAsB,CAAC"}

package/dist/services/taskScheduler.js

@@ -13,7 +13,6 @@ class TaskScheduler {
         });
     }
     createTask(name, action, interval, executeRightAway, ownerName) {
-        executeRightAway = executeRightAway ?? false;
         const taskId = setInterval(action, interval);
         const task = new taskRecord_1.TaskRecord(name, taskId, interval);
         if (executeRightAway) {

package/dist/services/telegramApi.d.ts

@@ -14,7 +14,7 @@ import { IActionState } from '../types/actionState';
 import { CommandAction } from '../entities/actions/commandAction';
 export declare class TelegramApiService {
     isFlushing: boolean;
-    messageQueue: Array<BotResponse>;
+    messageQueue: BotResponse[];
     botName: string;
     telegram: Telegram;
     chats: Record<number, string>;

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;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;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,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,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe;IAQvB,uBAAuB,CAAC,YAAY,SAAS,YAAY,EACrD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;IAsBxC,oBAAoB,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,CAAC,YAAY,CAAC;CAYrD;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;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAIlE,qBAAa,kBAAkB;IAC3B,UAAU,UAAS;IACnB,YAAY,EAAE,WAAW,EAAE,CAAM;IAEjC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,OAAO,EAAE,cAAc,CAAC;gBAGpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ3B,cAAc;YA2BN,WAAW;YAqBX,eAAe;IA2E7B,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,eAAe;IAQvB,uBAAuB,CAAC,YAAY,SAAS,YAAY,EACrD,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC;IAWxC,oBAAoB,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,eAAe,CAAC,YAAY,CAAC;CAYrD;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

@@ -6,6 +6,7 @@ const messageContext_1 = require("../entities/context/messageContext");
 const reverseRecord_1 = require("../helpers/reverseRecord");
 const logger_1 = require("./logger");
 const promises_1 = require("timers/promises");
+const TELEGRAM_RATELIMIT_DELAY = 35;
 class TelegramApiService {
     constructor(botName, telegram, storage, chats) {
         this.isFlushing = false;
@@ -25,7 +26,7 @@ class TelegramApiService {
                 break;
             try {
                 await this.processResponse(message);
-                await (0, promises_1.setTimeout)(100);
+                await (0, promises_1.setTimeout)(TELEGRAM_RATELIMIT_DELAY);
             }
             catch (error) {
                 logger_1.Logger.errorWithTraceId(this.botName, message.traceId, this.chats[message.chatId], error, message);
@@ -36,7 +37,7 @@ class TelegramApiService {
     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) => {
+            await this.storage.updateStateFor(response.action, response.chatId, async (state) => {
                 state.pinnedMessages.push(sentMessage.message_id);
             });
         }
@@ -77,7 +78,7 @@ class TelegramApiService {
                 return;
             case 'unpin':
                 await this.telegram.unpinChatMessage(response.chatId, response.messageId);
-                await this.storage.updateStateFor(response.sourceActionKey, response.chatId, async (state) => {
+                await this.storage.updateStateFor(response.action, response.chatId, async (state) => {
                     state.pinnedMessages = state.pinnedMessages.filter((x) => x != response.messageId);
                 });
                 break;
@@ -94,14 +95,10 @@ class TelegramApiService {
         };
     }
     createContextForMessage(incomingMessage, command) {
-        const firstName = incomingMessage.from?.first_name ?? 'Unknown user';
-        const lastName = incomingMessage.from?.last_name
-            ? ` ${incomingMessage.from?.last_name}`
-            : '';
-        return new messageContext_1.MessageContext(this.botName, command.key, 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, command, this.getInteractions(), incomingMessage, this.storage);
     }
     createContextForChat(chatId, scheduledAction) {
-        return new chatContext_1.ChatContext(this.botName, scheduledAction.key, this.getInteractions(), chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
+        return new chatContext_1.ChatContext(this.botName, scheduledAction, this.getInteractions(), chatId, this.chats[chatId], `Scheduled:${scheduledAction.key}:${chatId}`, this.storage);
     }
 }
 exports.TelegramApiService = TelegramApiService;

package/dist/types/actionWithState.d.ts

@@ -1,6 +1,9 @@
 import { IActionState } from './actionState';
+export type ActionKey = string & {
+    __brand: 'actionKey';
+};
 export interface IActionWithState {
-    key: string;
+    key: ActionKey;
     stateConstructor: () => IActionState;
 }
 //# sourceMappingURL=actionWithState.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"actionWithState.d.ts","sourceRoot":"","sources":["../../types/actionWithState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,gBAAgB;IAC7B,GAAG,EAAE,SAAS,CAAC;IACf,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACxC"}

package/dist/types/response.d.ts

@@ -3,6 +3,7 @@ import { Reaction } from '../entities/responses/reaction';
 import { TextMessage } from '../entities/responses/textMessage';
 import { UnpinResponse } from '../entities/responses/unpin';
 import { VideoMessage } from '../entities/responses/videoMessage';
+import { IActionWithState } from './actionWithState';
 export declare const BotResponseTypes: {
     readonly unpin: "unpin";
     readonly text: "text";
@@ -15,7 +16,7 @@ export interface IChatResponse {
     kind: keyof typeof BotResponseTypes;
     chatId: number;
     traceId: number | string;
-    sourceActionKey: string;
+    action: IActionWithState;
 }
 export interface IReplyMessage<TType> extends IChatResponse {
     content: TType;

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

@@ -1 +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"}
+{"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;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,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;IAEzB,MAAM,EAAE,gBAAgB,CAAC;CAC5B;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/storage.d.ts

@@ -1,12 +1,12 @@
 import { ActionExecutionResult } from '../entities/actionExecutionResult';
 import { IActionState } from './actionState';
-import { IActionWithState } from './actionWithState';
+import { ActionKey, IActionWithState } from './actionWithState';
 export interface IStorageClient {
-    updateStateFor<TActionState extends IActionState>(sourceActionKey: string, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
+    updateStateFor<TActionState extends IActionState>(action: IActionWithState, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
     close(): Promise<void>;
-    load<TActionState extends IActionState>(key: string): Promise<Record<number, TActionState>>;
+    load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
     saveMetadata(actions: IActionWithState[], botName: string): Promise<void>;
-    getActionState<TActionState extends IActionState>(entity: IActionWithState, chatId: number): Promise<TActionState>;
+    getActionState<TActionState extends IActionState>(action: IActionWithState, chatId: number): Promise<TActionState>;
     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":"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"}
+{"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,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEhE,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,EACxB,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,SAAS,GACf,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/actions/commandAction.ts

@@ -5,7 +5,7 @@ import { Seconds } from '../../types/timeValues';
 import { secondsToMilliseconds } from '../../helpers/timeConvertions';
 import { toArray } from '../../helpers/toArray';
 import { IActionState } from '../../types/actionState';
-import { IActionWithState } from '../../types/actionWithState';
+import { IActionWithState, ActionKey } from '../../types/actionWithState';
 import { CommandTriggerCheckResult } from '../commandTriggerCheckResult';
 import { MessageContext } from '../context/messageContext';
 import { Logger } from '../../services/logger';
@@ -23,16 +23,16 @@ export class CommandAction<TActionState extends IActionState>
     allowedUsers: number[];
     condition: CommandCondition<TActionState>;
     stateConstructor: () => TActionState;
-    key: string;
+    key: ActionKey;
 
     constructor(
-        trigger: string | RegExp | Array<string> | Array<RegExp>,
+        trigger: string | RegExp | string[] | RegExp[],
         handler: CommandHandler<TActionState>,
         name: string,
         active: boolean,
         cooldown: Seconds,
-        chatsBlacklist: Array<number>,
-        allowedUsers: Array<number>,
+        chatsBlacklist: number[],
+        allowedUsers: number[],
         condition: CommandCondition<TActionState>,
         stateConstructor: () => TActionState
     ) {
@@ -46,7 +46,7 @@ export class CommandAction<TActionState extends IActionState>
         this.condition = condition;
         this.stateConstructor = stateConstructor;
 
-        this.key = `command:${this.name.replace('.', '-')}`;
+        this.key = `command:${this.name.replace('.', '-')}` as ActionKey;
     }
 
     async exec(ctx: MessageContext<TActionState>) {
@@ -122,14 +122,22 @@ export class CommandAction<TActionState extends IActionState>
             if (typeof trigger == 'string') {
                 shouldTrigger = ctx.messageText.toLowerCase() == trigger;
             } else {
-                let matchCount = ctx.messageText.match(trigger)?.length ?? 0;
-                if (matchCount > 0) {
-                    for (; matchCount > 0; matchCount--) {
-                        const execResult = trigger.exec(ctx.messageText);
-                        if (execResult) matchResults.push(execResult);
+                trigger.lastIndex = 0;
+
+                const execResult = trigger.exec(ctx.messageText);
+                if (execResult != null) {
+                    matchResults.push(execResult);
+
+                    if (trigger.global) {
+                        while (true) {
+                            const nextResult = trigger.exec(ctx.messageText);
+                            if (nextResult == null) break;
+                            matchResults.push(nextResult);
+                        }
                     }
-                    shouldTrigger = true;
                 }
+
+                shouldTrigger = matchResults.length > 0;
             }
         }
 

package/entities/actions/scheduledAction.ts

@@ -4,7 +4,7 @@ import { ScheduledHandler } from '../../types/handlers';
 import { hoursToMilliseconds } from '../../helpers/timeConvertions';
 import { HoursOfDay } from '../../types/timeValues';
 import { IActionState } from '../../types/actionState';
-import { IActionWithState } from '../../types/actionWithState';
+import { IActionWithState, ActionKey } from '../../types/actionWithState';
 import { CachedStateFactory } from '../cachedStateFactory';
 import { ChatContext } from '../context/chatContext';
 import { ActionExecutionResult } from '../actionExecutionResult';
@@ -20,7 +20,7 @@ export class ScheduledAction<TActionState extends IActionState>
     timeinHours: HoursOfDay;
     active: boolean;
     chatsWhitelist: number[];
-    key: string;
+    key: ActionKey;
 
     cachedState = new Map<string, unknown>();
     stateConstructor: () => TActionState;
@@ -42,7 +42,7 @@ export class ScheduledAction<TActionState extends IActionState>
         this.active = active;
         this.chatsWhitelist = whitelist;
         this.cachedStateFactories = cachedStateFactories;
-        this.key = `scheduled:${this.name.replace('.', '-')}`;
+        this.key = `scheduled:${this.name.replace('.', '-')}` as ActionKey;
         this.stateConstructor = stateConstructor;
     }
 

package/entities/botInstance.ts

@@ -35,6 +35,8 @@ export class BotInstance {
         this.scheduled = options.scheduled;
         this.chats = options.chats;
 
+        const actions = [...this.commands, ...this.scheduled];
+
         Logger.logWithTraceId(
             this.name,
             `System:Bot-${this.name}-Start`,
@@ -44,7 +46,7 @@ export class BotInstance {
         this.telegraf = new Telegraf(options.token);
         this.storage =
             options.storageClient ??
-            new JsonFileStorage(options.name, options.storagePath);
+            new JsonFileStorage(options.name, actions, options.storagePath);
         this.api = new TelegramApiService(
             this.name,
             this.telegraf.telegram,
@@ -55,10 +57,7 @@ export class BotInstance {
         this.initializeMessageProcessing();
         this.initializeScheduledProcessing();
 
-        this.storage.saveMetadata(
-            [...this.commands, ...this.scheduled],
-            this.name
-        );
+        this.storage.saveMetadata(actions, this.name);
 
         this.telegraf.launch();
     }

package/entities/context/chatContext.ts

@@ -9,12 +9,13 @@ import {
     MessageSendingOptions,
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
+import { IActionWithState } from '../../types/actionWithState';
 
 /**
  * Context of action executed in chat.
  */
 export class ChatContext<TActionState> {
-    protected actionKey: string;
+    protected action: IActionWithState;
     protected interactions: IBotApiInteractions;
     updateActions: Array<(state: TActionState) => void> = [];
     /** Trace id of a action execution. */
@@ -30,7 +31,7 @@ export class ChatContext<TActionState> {
 
     constructor(
         botName: string,
-        actionKey: string,
+        action: IActionWithState,
         interactions: IBotApiInteractions,
         chatId: number,
         chatName: string,
@@ -38,7 +39,7 @@ export class ChatContext<TActionState> {
         storage: IStorageClient
     ) {
         this.botName = botName;
-        this.actionKey = actionKey;
+        this.action = action;
         this.interactions = interactions;
         this.chatId = chatId;
         this.chatName = chatName;
@@ -51,9 +52,7 @@ export class ChatContext<TActionState> {
      * @param stateUpdateAction Function that will modify state.
      */
     updateState(stateUpdateAction: (state: TActionState) => void) {
-        this.updateActions.push(
-            stateUpdateAction as (state: TActionState) => void
-        );
+        this.updateActions.push(stateUpdateAction);
     }
 
     /**
@@ -68,7 +67,7 @@ export class ChatContext<TActionState> {
                 this.chatId,
                 undefined,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -87,7 +86,7 @@ export class ChatContext<TActionState> {
                 this.chatId,
                 undefined,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -106,7 +105,7 @@ export class ChatContext<TActionState> {
                 this.chatId,
                 undefined,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -118,12 +117,7 @@ export class ChatContext<TActionState> {
      */
     unpinMessage(messageId: number) {
         this.interactions.unpin(
-            new UnpinResponse(
-                messageId,
-                this.chatId,
-                this.traceId,
-                this.actionKey
-            )
+            new UnpinResponse(messageId, this.chatId, this.traceId, this.action)
         );
     }
 }

package/entities/context/messageContext.ts

@@ -9,10 +9,12 @@ import { TextMessage } from '../responses/textMessage';
 import { VideoMessage } from '../responses/videoMessage';
 import { ActionStateBase } from '../states/actionStateBase';
 import { ChatContext } from './chatContext';
+import { IncomingMessage } from '../incomingMessage';
 import {
     MessageSendingOptions,
     TextMessageSendingOptions
 } from '../../types/messageSendingOptions';
+import { IActionWithState, ActionKey } from '../../types/actionWithState';
 
 /**
  * Context of action executed in chat, in response to a message
@@ -35,31 +37,27 @@ export class MessageContext<
 
     constructor(
         botName: string,
-        scheduledKey: string,
+        action: IActionWithState,
         interactions: IBotApiInteractions,
-        chatId: number,
-        chatName: string,
-        messageId: number,
-        messageText: string,
-        fromUserId: number | undefined,
-        traceId: number | string,
-        fromUserName: string,
+        message: IncomingMessage,
         storage: IStorageClient
     ) {
         super(
             botName,
-            scheduledKey,
+            action,
             interactions,
-            chatId,
-            chatName,
-            traceId,
+            message.chat.id,
+            message.chatName,
+            message.traceId,
             storage
         );
 
-        this.messageId = messageId;
-        this.messageText = messageText;
-        this.fromUserId = fromUserId;
-        this.fromUserName = fromUserName;
+        this.messageId = message.message_id;
+        this.messageText = message.text ?? '';
+        this.fromUserId = message.from?.id;
+        this.fromUserName =
+            (message.from?.first_name ?? 'Unknown user') +
+            (message.from?.last_name ? ` ${message.from.last_name}` : '');
     }
 
     /**
@@ -70,13 +68,18 @@ export class MessageContext<
     async loadStateOf<TAnotherActionState extends IActionState>(
         commandName: string
     ): Promise<TAnotherActionState> {
-        return (
-            ((
-                await this.storage.load(
-                    `command:${commandName.replace('.', '-')}`
-                )
-            )[this.chatId] as TAnotherActionState) ?? new ActionStateBase()
-        );
+        const storageKey = `command:${commandName.replace(
+            '.',
+            '-'
+        )}` as ActionKey;
+        const allStates = await this.storage.load(storageKey);
+        const stateForChat = allStates[this.chatId];
+
+        if (!stateForChat) {
+            return new ActionStateBase() as TAnotherActionState;
+        }
+
+        return stateForChat as TAnotherActionState;
     }
 
     /**
@@ -91,7 +94,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -110,7 +113,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -129,7 +132,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 this.traceId,
-                this.actionKey,
+                this.action,
                 options
             )
         );
@@ -146,7 +149,7 @@ export class MessageContext<
                 this.chatId,
                 this.messageId,
                 emoji,
-                this.actionKey
+                this.action
             )
         );
     }

package/entities/responses/imageMessage.ts

@@ -1,6 +1,7 @@
 import { InputFile } from 'telegraf/types';
 import { BotResponseTypes, IReplyMessage } from '../../types/response';
 import { MessageSendingOptions } from '../../types/messageSendingOptions';
+import { IActionWithState } from '../../types/actionWithState';
 
 export class ImageMessage implements IReplyMessage<InputFile> {
     kind = BotResponseTypes.image;
@@ -11,14 +12,14 @@ export class ImageMessage implements IReplyMessage<InputFile> {
     traceId: string | number;
     disableWebPreview = false;
     shouldPin: boolean;
-    sourceActionKey: string;
+    action: IActionWithState;
 
     constructor(
         image: InputFile,
         chatId: number,
         replyId: number | undefined,
         traceId: number | string,
-        sourceActionKey: string,
+        action: IActionWithState,
         options?: MessageSendingOptions
     ) {
         this.content = image;
@@ -26,6 +27,6 @@ export class ImageMessage implements IReplyMessage<InputFile> {
         this.replyId = replyId;
         this.traceId = traceId;
         this.shouldPin = options?.pin ?? false;
-        this.sourceActionKey = sourceActionKey;
+        this.action = action;
     }
 }