chz-telegram-bot 0.3.8 → 0.3.10

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

@@ -1 +1 @@
-{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,qBAAa,WAAW;IACpB,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,uBAAuB,CAA0B;IAElE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,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,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;IA0BK,KAAK,CACP,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;QACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACtC,EACD,eAAe,CAAC,EAAE,OAAO,EACzB,gCAAgC,CAAC,EAAE,OAAO;IAiBxC,IAAI,CAAC,IAAI,EAAE,MAAM;CAY1B"}
+{"version":3,"file":"botInstance.d.ts","sourceRoot":"","sources":["../../entities/botInstance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,qBAAa,WAAW;IACpB,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,uBAAuB,CAA0B;IAElE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,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,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;IAwBK,KAAK,CACP,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;QACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACtC,EACD,eAAe,CAAC,EAAE,OAAO,EACzB,gCAAgC,CAAC,EAAE,OAAO;IAiBxC,IAAI,CAAC,IAAI,EAAE,MAAM;CAY1B"}

package/dist/entities/botInstance.js

@@ -21,7 +21,6 @@ class BotInstance {
             options.services?.storageClient ??
                 new jsonFileStorage_1.JsonFileStorage(options.name, actions, options.storagePath);
         this.actionProcessingService = new actionProcessingService_1.ActionProcessingService(this.name, options.chats, this.storage, this.scheduler, this.logger);
-        this.storage.saveMetadata(actions, this.name);
     }
     async start(token, actions, scheduledPeriod, verboseLoggingForIncomingMessage) {
         this.actionProcessingService.initialize(token, actions, scheduledPeriod, verboseLoggingForIncomingMessage);

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

@@ -1 +1 @@
-{"version":3,"file":"actionProcessingService.d.ts","sourceRoot":"","sources":["../../services/actionProcessingService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuB,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qBAAa,uBAAuB;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAElE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,QAAQ,CAAY;gBAGxB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IA4Bb,UAAU,CACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;QACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACtC,EACD,eAAe,CAAC,EAAE,OAAO,EACzB,gCAAgC,CAAC,EAAE,OAAO;IAkD9C,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}
+{"version":3,"file":"actionProcessingService.d.ts","sourceRoot":"","sources":["../../services/actionProcessingService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAuB,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAMtE,qBAAa,uBAAuB;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAElE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,QAAQ,CAAY;gBAGxB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IA4Bb,UAAU,CACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE;QACL,QAAQ,EAAE,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QACxC,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACtC,EACD,eAAe,CAAC,EAAE,OAAO,EACzB,gCAAgC,CAAC,EAAE,OAAO;IAsD9C,IAAI,CAAC,IAAI,EAAE,MAAM;CAGpB"}

package/dist/services/actionProcessingService.js

@@ -21,16 +21,18 @@ class ActionProcessingService {
         this.telegraf = new telegraf_1.Telegraf(token);
         const api = new telegramApi_1.TelegramApiService(this.botName, this.telegraf.telegram, this.storage, this.logger, (capture, id, chatInfo, traceId) => this.commandProcessor.captureRegistrationCallback(capture, id, chatInfo, traceId));
         const botInfo = await this.telegraf.telegram.getMe();
-        this.commandProcessor.initialize(api, this.telegraf, actions.commands.length > 0
+        const commandActions = actions.commands.length > 0
             ? [
                 (0, helpAction_1.buildHelpCommand)(actions.commands
                     .map((x) => x.readmeFactory(botInfo.username))
                     .filter((x) => !!x), botInfo.username),
                 ...actions.commands
             ]
-            : [], verboseLoggingForIncomingMessage ?? false);
+            : [];
+        this.commandProcessor.initialize(api, this.telegraf, commandActions, verboseLoggingForIncomingMessage ?? false);
         this.inlineQueryProcessor.initialize(api, this.telegraf, actions.inlineQueries, 300);
         this.scheduledProcessor.initialize(api, actions.scheduled, scheduledPeriod ?? (0, timeConvertions_1.hoursToSeconds)(1));
+        this.storage.saveMetadata([...actions.scheduled, ...commandActions]);
         this.telegraf.launch();
     }
     stop(code) {

package/dist/services/actionProcessors/commandActionProcessor.js

@@ -65,13 +65,13 @@ class CommandActionProcessor extends baseProcessor_1.BaseActionProcessor {
         }
         for (const commandAction of commandsToCheck) {
             this.initializeMessageContext(ctx, commandAction, msg);
-            this.executeAction(commandAction, ctx);
+            await this.executeAction(commandAction, ctx);
         }
         if (this.replyCaptures.length != 0) {
             const replyCtx = new replyContext_1.ReplyContext(this.storage, this.scheduler);
             for (const replyAction of this.replyCaptures) {
                 this.initializeReplyCaptureContext(replyCtx, replyAction, msg);
-                this.executeAction(replyAction, replyCtx);
+                await this.executeAction(replyAction, replyCtx);
             }
         }
         this.api.flushResponses();

package/dist/services/actionProcessors/inlineQueryActionProcessor.js

@@ -36,7 +36,7 @@ class InlineQueryActionProcessor extends baseProcessor_1.BaseActionProcessor {
                     queriesInProcessing.set(inlineQuery.userId, inlineQuery);
                     for (const inlineQueryAction of this.inlineQueries) {
                         this.initializeInlineQueryContext(ctx, inlineQuery.query, inlineQuery.queryId, inlineQueryAction, inlineQuery.abortController.signal, inlineQuery.traceId);
-                        this.executeAction(inlineQueryAction, ctx, (error, ctx) => {
+                        await this.executeAction(inlineQueryAction, ctx, (error, ctx) => {
                             if (error.name == 'AbortError') {
                                 ctx.logger.logWithTraceId(`Aborting query ${inlineQuery.queryId} (${inlineQuery.query}) successful.`);
                             }

package/dist/services/actionProcessors/scheduledActionProcessor.js

@@ -43,7 +43,7 @@ class ScheduledActionProcessor extends baseProcessor_1.BaseActionProcessor {
         for (const [chatName, chatId] of Object.entries(this.chats)) {
             for (const scheduledAction of this.scheduled) {
                 this.initializeChatContext(ctx, scheduledAction, new chatInfo_1.ChatInfo(chatId, chatName), (0, traceFactory_1.createTrace)(scheduledAction, this.botName, `${scheduledAction.key}-${chatId}`));
-                this.executeAction(scheduledAction, ctx);
+                await this.executeAction(scheduledAction, ctx);
             }
         }
         this.api.flushResponses();

package/dist/services/jsonFileStorage.d.ts

@@ -2,17 +2,18 @@ import { IStorageClient } from '../types/storage';
 import { IActionState } from '../types/actionState';
 import { IActionWithState, ActionKey } from '../types/action';
 export declare class JsonFileStorage implements IStorageClient {
+    private readonly filePaths;
     private readonly locks;
     private readonly cache;
     private readonly storagePath;
     private readonly botName;
     constructor(botName: string, actions: IActionWithState<IActionState>[], path?: string);
     private lock;
-    private loadInternal;
-    private save;
-    private buidPathFromKey;
+    private tryGetFromCache;
+    private loadFromFile;
+    private updateCacheAndSaveToFile;
     load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
-    saveMetadata(actions: IActionWithState<IActionState>[], botName: string): Promise<void>;
+    saveMetadata(actions: IActionWithState<IActionState>[]): Promise<void>;
     getActionState<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number): Promise<TActionState>;
     saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, state: TActionState): Promise<void>;
     close(): Promise<void>;

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

@@ -1 +1 @@
-{"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,iBAAiB,CAAC;AAE9D,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"}
+{"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,iBAAiB,CAAC;AAM9D,qBAAa,eAAgB,YAAW,cAAc;IAClD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgC;IAC1D,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;YAqBH,IAAI;IAclB,OAAO,CAAC,eAAe;YAIT,YAAY;YAwBZ,wBAAwB;IAgBhC,IAAI,CAAC,YAAY,SAAS,YAAY,EAAE,GAAG,EAAE,SAAS;IAStD,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE;IAQtD,cAAc,CAAC,YAAY,SAAS,YAAY,EAClD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM;IAWZ,yBAAyB,CAAC,YAAY,SAAS,YAAY,EAC7D,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY;IAajB,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;CAiBrD"}

package/dist/services/jsonFileStorage.js

@@ -4,8 +4,12 @@ exports.JsonFileStorage = void 0;
 const fs_1 = require("fs");
 const promises_1 = require("fs/promises");
 const async_sema_1 = require("async-sema");
+function buildPath(storagePath, botName, actionKey) {
+    return `${storagePath}/${botName}/${actionKey.replaceAll(':', '/')}.json`;
+}
 class JsonFileStorage {
     constructor(botName, actions, path) {
+        this.filePaths = new Map();
         this.locks = new Map();
         this.cache = new Map();
         this.botName = botName;
@@ -17,6 +21,7 @@ class JsonFileStorage {
         }
         for (const action of actions) {
             this.locks.set(action.key, new async_sema_1.Sema(1));
+            this.filePaths.set(action.key, buildPath(this.storagePath, this.botName, action.key));
         }
     }
     async lock(key, action) {
@@ -31,50 +36,55 @@ class JsonFileStorage {
             lock.release();
         }
     }
-    async loadInternal(key) {
-        if (!this.cache.has(key)) {
-            const targetPath = this.buidPathFromKey(key);
-            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);
-            }
+    tryGetFromCache(key) {
+        return this.cache.get(key);
+    }
+    async loadFromFile(key) {
+        if (!this.filePaths.has(key))
+            this.filePaths.set(key, buildPath(this.storagePath, this.botName, key));
+        const targetPath = this.filePaths.get(key);
+        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);
         }
         return (this.cache.get(key) ?? {});
     }
-    async save(data, key) {
+    async updateCacheAndSaveToFile(data, key) {
         this.cache.set(key, data);
-        const targetPath = this.buidPathFromKey(key);
+        if (!this.filePaths.has(key))
+            this.filePaths.set(key, buildPath(this.storagePath, this.botName, key));
+        const targetPath = this.filePaths.get(key);
         await (0, promises_1.writeFile)(targetPath, JSON.stringify(data), { flag: 'w+' });
     }
-    buidPathFromKey(key) {
-        return `${this.storagePath}/${this.botName}/${key.replaceAll(':', '/')}.json`;
-    }
     async load(key) {
-        return await this.lock(key, async () => {
-            return await this.loadInternal(key);
-        });
+        return (this.tryGetFromCache(key) ??
+            (await this.lock(key, async () => {
+                return await this.loadFromFile(key);
+            })));
     }
-    async saveMetadata(actions, botName) {
-        const targetPath = this.buidPathFromKey(`Metadata-${botName}`);
+    async saveMetadata(actions) {
+        const targetPath = `${this.storagePath}/${this.botName}/Metadata-${this.botName}.json`;
         await (0, promises_1.writeFile)(targetPath, JSON.stringify(actions), {
             flag: 'w+'
         });
     }
     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]);
-        });
+        const value = this.tryGetFromCache(action.key) ??
+            (await this.lock(action.key, async () => {
+                return await this.loadFromFile(action.key);
+            }));
+        return Object.assign(action.stateConstructor(), value[chatId]);
     }
     async saveActionExecutionResult(action, chatId, state) {
         return await this.lock(action.key, async () => {
-            const data = await this.loadInternal(action.key);
+            const data = this.tryGetFromCache(action.key) ??
+                (await this.loadFromFile(action.key));
             data[chatId] = state;
-            await this.save(data, action.key);
+            await this.updateCacheAndSaveToFile(data, action.key);
         });
     }
     async close() {
@@ -84,10 +94,11 @@ class JsonFileStorage {
     }
     async updateStateFor(action, chatId, update) {
         await this.lock(action.key, async () => {
-            const data = await this.loadInternal(action.key);
+            const data = this.tryGetFromCache(action.key) ??
+                (await this.loadFromFile(action.key));
             const state = Object.assign(action.stateConstructor(), data[chatId]);
             await update(state);
-            await this.save(data, action.key);
+            await this.updateCacheAndSaveToFile(data, action.key);
         });
     }
 }

package/dist/services/responseProcessingQueue.d.ts

@@ -3,6 +3,7 @@ export type QueueItem = {
     callback: () => Promise<void>;
 };
 export declare class ResponseProcessingQueue {
+    rateLimiter: () => Promise<void>;
     items: QueueItem[];
     isFlushing: boolean;
     enqueue(item: QueueItem): void;

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;CAiBxB"}
+{"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,WAAW,sBAAwD;IACnE,KAAK,EAAE,SAAS,EAAE,CAAM;IACxB,UAAU,UAAS;IAEnB,OAAO,CAAC,IAAI,EAAE,SAAS;IAmBjB,eAAe;CAiBxB"}

package/dist/services/responseProcessingQueue.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResponseProcessingQueue = void 0;
-const promises_1 = require("timers/promises");
+const async_sema_1 = require("async-sema");
 const TELEGRAM_RATELIMIT_DELAY = 35;
 class ResponseProcessingQueue {
     constructor() {
+        this.rateLimiter = (0, async_sema_1.RateLimit)(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
         this.items = [];
         this.isFlushing = false;
     }
@@ -27,12 +28,10 @@ class ResponseProcessingQueue {
         this.isFlushing = true;
         while (this.items.length) {
             if (Date.now() >= this.items[0].priority) {
+                await this.rateLimiter();
                 const item = this.items.shift();
                 await item.callback();
             }
-            else {
-                await (0, promises_1.setTimeout)(TELEGRAM_RATELIMIT_DELAY);
-            }
         }
         this.isFlushing = false;
     }

package/dist/types/storage.d.ts

@@ -4,7 +4,7 @@ export interface IStorageClient {
     updateStateFor<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, update: (state: TActionState) => Promise<void>): Promise<void>;
     close(): Promise<void>;
     load<TActionState extends IActionState>(key: ActionKey): Promise<Record<number, TActionState>>;
-    saveMetadata<TActionState extends IActionState>(actions: IActionWithState<TActionState>[], botName: string): Promise<void>;
+    saveMetadata<TActionState extends IActionState>(actions: IActionWithState<TActionState>[]): Promise<void>;
     getActionState<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number): Promise<TActionState>;
     saveActionExecutionResult<TActionState extends IActionState>(action: IActionWithState<TActionState>, chatId: number, state: TActionState): Promise<void>;
 }

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,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,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,YAAY,SAAS,YAAY,EAC1C,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EACzC,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CAAC,YAAY,SAAS,YAAY,EACvD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../types/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,WAAW,cAAc;IAC3B,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,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,YAAY,SAAS,YAAY,EAC1C,OAAO,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,GAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,cAAc,CAAC,YAAY,SAAS,YAAY,EAC5C,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,yBAAyB,CAAC,YAAY,SAAS,YAAY,EACvD,MAAM,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CAAC;CACpB"}

package/entities/botInstance.ts

@@ -56,8 +56,6 @@ export class BotInstance {
             this.scheduler,
             this.logger
         );
-
-        this.storage.saveMetadata(actions, this.name);
     }
 
     async start(

package/package.json

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

package/services/actionProcessingService.ts

@@ -85,10 +85,7 @@ export class ActionProcessingService {
         );
 
         const botInfo = await this.telegraf.telegram.getMe();
-
-        this.commandProcessor.initialize(
-            api,
-            this.telegraf,
+        const commandActions =
             actions.commands.length > 0
                 ? [
                       buildHelpCommand(
@@ -99,7 +96,12 @@ export class ActionProcessingService {
                       ),
                       ...actions.commands
                   ]
-                : [],
+                : [];
+
+        this.commandProcessor.initialize(
+            api,
+            this.telegraf,
+            commandActions,
             verboseLoggingForIncomingMessage ?? false
         );
         this.inlineQueryProcessor.initialize(
@@ -114,6 +116,8 @@ export class ActionProcessingService {
             scheduledPeriod ?? hoursToSeconds(1 as Hours)
         );
 
+        this.storage.saveMetadata([...actions.scheduled, ...commandActions]);
+
         this.telegraf.launch();
     }
 

package/services/actionProcessors/commandActionProcessor.ts

@@ -149,7 +149,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
 
         for (const commandAction of commandsToCheck) {
             this.initializeMessageContext(ctx, commandAction, msg);
-            this.executeAction(commandAction, ctx);
+            await this.executeAction(commandAction, ctx);
         }
 
         if (this.replyCaptures.length != 0) {
@@ -160,7 +160,7 @@ export class CommandActionProcessor extends BaseActionProcessor {
 
             for (const replyAction of this.replyCaptures) {
                 this.initializeReplyCaptureContext(replyCtx, replyAction, msg);
-                this.executeAction(replyAction, replyCtx);
+                await this.executeAction(replyAction, replyCtx);
             }
         }
 

package/services/actionProcessors/inlineQueryActionProcessor.ts

@@ -101,7 +101,7 @@ export class InlineQueryActionProcessor extends BaseActionProcessor {
                                 inlineQuery.traceId
                             );
 
-                            this.executeAction(
+                            await this.executeAction(
                                 inlineQueryAction,
                                 ctx,
                                 (error, ctx) => {

package/services/actionProcessors/scheduledActionProcessor.ts

@@ -96,7 +96,7 @@ export class ScheduledActionProcessor extends BaseActionProcessor {
                     )
                 );
 
-                this.executeAction(scheduledAction, ctx);
+                await this.executeAction(scheduledAction, ctx);
             }
         }
 

package/services/jsonFileStorage.ts

@@ -5,7 +5,12 @@ import { IStorageClient } from '../types/storage';
 import { IActionState } from '../types/actionState';
 import { IActionWithState, ActionKey } from '../types/action';
 
+function buildPath(storagePath: string, botName: string, actionKey: string) {
+    return `${storagePath}/${botName}/${actionKey.replaceAll(':', '/')}.json`;
+}
+
 export class JsonFileStorage implements IStorageClient {
+    private readonly filePaths = new Map<ActionKey, string>();
     private readonly locks = new Map<ActionKey, Semaphore>();
     private readonly cache: Map<string, Record<number, IActionState>>;
     private readonly storagePath: string;
@@ -28,6 +33,10 @@ export class JsonFileStorage implements IStorageClient {
 
         for (const action of actions) {
             this.locks.set(action.key, new Semaphore(1));
+            this.filePaths.set(
+                action.key,
+                buildPath(this.storagePath, this.botName, action.key)
+            );
         }
     }
 
@@ -45,58 +54,61 @@ export class JsonFileStorage implements IStorageClient {
         }
     }
 
-    private async loadInternal<TActionState extends IActionState>(
+    private tryGetFromCache<TActionState extends IActionState>(key: ActionKey) {
+        return this.cache.get(key) as Record<number, TActionState> | undefined;
+    }
+
+    private async loadFromFile<TActionState extends IActionState>(
         key: ActionKey
     ) {
-        if (!this.cache.has(key)) {
-            const targetPath = this.buidPathFromKey(key);
+        if (!this.filePaths.has(key))
+            this.filePaths.set(
+                key,
+                buildPath(this.storagePath, this.botName, key)
+            );
+        const targetPath = this.filePaths.get(key)!;
 
-            const fileContent = await readFile(targetPath, {
-                encoding: 'utf-8',
-                flag: 'a+'
-            });
+        const fileContent = await readFile(targetPath, {
+            encoding: 'utf-8',
+            flag: 'a+'
+        });
 
-            if (fileContent) {
-                const data = JSON.parse(fileContent);
+        if (fileContent) {
+            const data = JSON.parse(fileContent);
 
-                this.cache.set(key, data);
-            }
+            this.cache.set(key, data);
         }
 
         return (this.cache.get(key) ?? {}) as Record<number, TActionState>;
     }
 
-    private async save<TActionState extends IActionState>(
+    private async updateCacheAndSaveToFile<TActionState extends IActionState>(
         data: Record<number, TActionState>,
         key: ActionKey
     ) {
         this.cache.set(key, data);
 
-        const targetPath = this.buidPathFromKey(key);
+        if (!this.filePaths.has(key))
+            this.filePaths.set(
+                key,
+                buildPath(this.storagePath, this.botName, key)
+            );
+        const targetPath = this.filePaths.get(key)!;
 
         await writeFile(targetPath, JSON.stringify(data), { flag: 'w+' });
     }
 
-    private buidPathFromKey(key: ActionKey) {
-        return `${this.storagePath}/${this.botName}/${key.replaceAll(
-            ':',
-            '/'
-        )}.json`;
-    }
-
     async load<TActionState extends IActionState>(key: ActionKey) {
-        return await this.lock(key, async () => {
-            return await this.loadInternal<TActionState>(key);
-        });
+        return (
+            this.tryGetFromCache<TActionState>(key) ??
+            (await this.lock(key, async () => {
+                return await this.loadFromFile<TActionState>(key);
+            }))
+        );
     }
 
-    async saveMetadata(
-        actions: IActionWithState<IActionState>[],
-        botName: string
-    ) {
-        const targetPath = this.buidPathFromKey(
-            `Metadata-${botName}` as ActionKey
-        );
+    async saveMetadata(actions: IActionWithState<IActionState>[]) {
+        const targetPath = `${this.storagePath}/${this.botName}/Metadata-${this.botName}.json`;
 
         await writeFile(targetPath, JSON.stringify(actions), {
             flag: 'w+'
@@ -107,14 +119,13 @@ export class JsonFileStorage implements IStorageClient {
         action: IActionWithState<TActionState>,
         chatId: number
     ) {
-        return await this.lock(action.key, async () => {
-            const data = await this.loadInternal(action.key);
+        const value =
+            this.tryGetFromCache<TActionState>(action.key) ??
+            (await this.lock(action.key, async () => {
+                return await this.loadFromFile<TActionState>(action.key);
+            }));
 
-            return Object.assign(
-                action.stateConstructor(),
-                data[chatId]
-            ) as TActionState;
-        });
+        return Object.assign(action.stateConstructor(), value[chatId]);
     }
 
     async saveActionExecutionResult<TActionState extends IActionState>(
@@ -123,11 +134,13 @@ export class JsonFileStorage implements IStorageClient {
         state: TActionState
     ) {
         return await this.lock(action.key, async () => {
-            const data = await this.loadInternal<TActionState>(action.key);
+            const data =
+                this.tryGetFromCache<TActionState>(action.key) ??
+                (await this.loadFromFile<TActionState>(action.key));
 
             data[chatId] = state;
 
-            await this.save(data, action.key);
+            await this.updateCacheAndSaveToFile(data, action.key);
         });
     }
 
@@ -143,7 +156,10 @@ export class JsonFileStorage implements IStorageClient {
         update: (state: TActionState) => Promise<void>
     ) {
         await this.lock(action.key, async () => {
-            const data = await this.loadInternal<TActionState>(action.key);
+            const data =
+                this.tryGetFromCache<TActionState>(action.key) ??
+                (await this.loadFromFile<TActionState>(action.key));
+
             const state = Object.assign(
                 action.stateConstructor(),
                 data[chatId]
@@ -151,7 +167,7 @@ export class JsonFileStorage implements IStorageClient {
 
             await update(state);
 
-            await this.save(data, action.key);
+            await this.updateCacheAndSaveToFile(data, action.key);
         });
     }
 }

package/services/responseProcessingQueue.ts

@@ -1,5 +1,5 @@
-import { setTimeout } from 'timers/promises';
 import { Milliseconds } from '../types/timeValues';
+import { RateLimit } from 'async-sema';
 
 export type QueueItem = {
     priority: number;
@@ -9,6 +9,7 @@ export type QueueItem = {
 const TELEGRAM_RATELIMIT_DELAY = 35 as Milliseconds;
 
 export class ResponseProcessingQueue {
+    rateLimiter = RateLimit(1, { timeUnit: TELEGRAM_RATELIMIT_DELAY });
     items: QueueItem[] = [];
     isFlushing = false;
 
@@ -38,11 +39,11 @@ export class ResponseProcessingQueue {
 
         while (this.items.length) {
             if (Date.now() >= this.items[0].priority) {
+                await this.rateLimiter();
+
                 const item = this.items.shift()!;
 
                 await item.callback();
-            } else {
-                await setTimeout(TELEGRAM_RATELIMIT_DELAY);
             }
         }
 

package/types/storage.ts

@@ -12,8 +12,7 @@ export interface IStorageClient {
         key: ActionKey
     ): Promise<Record<number, TActionState>>;
     saveMetadata<TActionState extends IActionState>(
-        actions: IActionWithState<TActionState>[],
-        botName: string
+        actions: IActionWithState<TActionState>[]
     ): Promise<void>;
     getActionState<TActionState extends IActionState>(
         action: IActionWithState<TActionState>,