chz-telegram-bot 0.3.7 → 0.3.9

package/dist/services/actionProcessors/scheduledActionProcessor.d.ts

@@ -5,13 +5,9 @@ import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
 import { Seconds } from '../../types/timeValues';
 import { TelegramApiService } from '../telegramApi';
-export declare class ScheduledActionProcessor {
-    private readonly storage;
-    private readonly scheduler;
-    private readonly logger;
-    private readonly botName;
+import { BaseActionProcessor } from './baseProcessor';
+export declare class ScheduledActionProcessor extends BaseActionProcessor {
     private readonly chats;
-    private api;
     private scheduled;
     constructor(botName: string, chats: Record<string, number>, storage: IStorageClient, scheduler: IScheduler, logger: ILogger);
     initialize(api: TelegramApiService, scheduled: ScheduledAction<IActionState>[], period: Seconds): void;

package/dist/services/actionProcessors/scheduledActionProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduledActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/scheduledActionProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAKzE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAgB,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,qBAAa,wBAAwB;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAa;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,SAAS,CAAmC;gBAGhD,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IAUnB,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,EAC1C,MAAM,EAAE,OAAO;YAgDL,YAAY;IA6B1B,OAAO,CAAC,qBAAqB;CAmBhC"}
+{"version":3,"file":"scheduledActionProcessor.d.ts","sourceRoot":"","sources":["../../../services/actionProcessors/scheduledActionProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAIzE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAgB,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,qBAAa,wBAAyB,SAAQ,mBAAmB;IAC7D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAyB;IAE/C,OAAO,CAAC,SAAS,CAAmC;gBAGhD,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,OAAO,EAAE,cAAc,EACvB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO;IAMnB,UAAU,CACN,GAAG,EAAE,kBAAkB,EACvB,SAAS,EAAE,eAAe,CAAC,YAAY,CAAC,EAAE,EAC1C,MAAM,EAAE,OAAO;YAgDL,YAAY;IAuB1B,OAAO,CAAC,qBAAqB;CAmBhC"}

package/dist/services/actionProcessors/scheduledActionProcessor.js

@@ -9,16 +9,14 @@ const chatInfo_1 = require("../../dtos/chatInfo");
 const chatContext_1 = require("../../entities/context/chatContext");
 const timeConvertions_1 = require("../../helpers/timeConvertions");
 const traceFactory_1 = require("../../helpers/traceFactory");
-class ScheduledActionProcessor {
+const baseProcessor_1 = require("./baseProcessor");
+class ScheduledActionProcessor extends baseProcessor_1.BaseActionProcessor {
     constructor(botName, chats, storage, scheduler, logger) {
-        this.storage = storage;
-        this.scheduler = scheduler;
-        this.logger = logger;
-        this.botName = botName;
+        super(botName, storage, scheduler, logger);
         this.chats = chats;
     }
     initialize(api, scheduled, period) {
-        this.api = api;
+        this.initializeDependencies(api, null);
         this.scheduled = scheduled;
         if (this.scheduled.length > 0) {
             const now = (0, moment_1.default)();
@@ -45,14 +43,7 @@ class ScheduledActionProcessor {
         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}`));
-                try {
-                    const responses = await scheduledAction.exec(ctx);
-                    this.api.enqueueBatchedResponses(responses);
-                    ctx.isInitialized = false;
-                }
-                catch (error) {
-                    ctx.logger.errorWithTraceId(error, ctx);
-                }
+                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/types/action.d.ts

@@ -1,4 +1,6 @@
+import { BaseContext } from '../entities/context/baseContext';
 import { IActionState } from './actionState';
+import { BotResponse } from './response';
 export type ActionKey = string & {
     __brand: 'actionKey';
 };
@@ -7,5 +9,6 @@ export interface IActionWithState<TActionState extends IActionState> extends IAc
 }
 export interface IAction {
     readonly key: ActionKey;
+    exec(ctx: BaseContext<IAction>): Promise<BotResponse[]>;
 }
 //# sourceMappingURL=action.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../types/action.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,CAAC,YAAY,SAAS,YAAY,CAC/D,SAAQ,OAAO;IACf,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;CAC3B"}
+{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../types/action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1D,MAAM,WAAW,gBAAgB,CAAC,YAAY,SAAS,YAAY,CAC/D,SAAQ,OAAO;IACf,QAAQ,CAAC,gBAAgB,EAAE,MAAM,YAAY,CAAC;CACjD;AAED,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;IACxB,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CAC3D"}

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/entities/context/baseContext.ts

@@ -0,0 +1,58 @@
+import { ChatInfo } from '../../dtos/chatInfo';
+import { IAction, IActionWithState } from '../../types/action';
+import { IActionState } from '../../types/actionState';
+import { IScopedLogger } from '../../types/logger';
+import { BotResponse } from '../../types/response';
+import { IScheduler } from '../../types/scheduler';
+import { IStorageClient } from '../../types/storage';
+import { TraceId } from '../../types/trace';
+
+export abstract class BaseContext<TAction extends IAction> {
+    isInitialized = false;
+    private _responses: BotResponse[] = [];
+
+    action!: TAction;
+
+    /** Storage client instance for the bot executing this action. */
+    readonly storage: IStorageClient;
+    /** Scheduler instance for the bot executing this action */
+    readonly scheduler: IScheduler;
+    logger!: IScopedLogger;
+    /** Trace id of a action execution. */
+    traceId!: TraceId;
+    /** Name of a bot that executes this action. */
+    botName!: string;
+    /** Chat information. */
+    chatInfo!: ChatInfo;
+
+    /** Ordered collection of responses to be processed  */
+    public get responses(): BotResponse[] {
+        return this._responses;
+    }
+    public set responses(value: BotResponse[]) {
+        this._responses = value;
+    }
+
+    constructor(storage: IStorageClient, scheduler: IScheduler) {
+        this.storage = storage;
+        this.scheduler = scheduler;
+    }
+
+    /**
+     * Loads state of another action for current chat.
+     * @param action Action to load state of.
+     * @template TAnotherActionState - Type of a state that is used by another action.
+     */
+    async loadStateOf<TAnotherActionState extends IActionState>(
+        action: IActionWithState<TAnotherActionState>
+    ) {
+        const allStates = await this.storage.load(action.key);
+        const stateForChat = allStates[this.chatInfo.id];
+
+        if (!stateForChat) {
+            return Object.freeze(action.stateConstructor());
+        }
+
+        return Object.freeze(stateForChat as TAnotherActionState);
+    }
+}

package/entities/context/chatContext.ts

@@ -10,44 +10,25 @@ import {
 } from '../../types/messageSendingOptions';
 import { IActionWithState } from '../../types/action';
 import { IActionState } from '../../types/actionState';
-import { BotResponse, IReplyResponse } from '../../types/response';
+import { IReplyResponse } from '../../types/response';
 import { Milliseconds } from '../../types/timeValues';
 import { DelayResponse } from '../../dtos/responses/delay';
-import { ChatInfo } from '../../dtos/chatInfo';
-import { IScopedLogger } from '../../types/logger';
 import { IScheduler } from '../../types/scheduler';
-import { TraceId } from '../../types/trace';
 import { ICaptureController } from '../../types/capture';
 import { CommandTrigger } from '../../types/commandTrigger';
 import { ReplyContext } from './replyContext';
+import { BaseContext } from './baseContext';
+import { ScheduledAction } from '../actions/scheduledAction';
 
 /**
  * Context of action executed in chat.
  */
-export class ChatContext<TActionState extends IActionState> {
-    action!: IActionWithState<TActionState>;
-
-    /** Storage client instance for the bot executing this action. */
-    readonly storage: IStorageClient;
-    /** Logger instance for the bot executing this action */
-    /** Scheduler instance for the bot executing this action */
-    readonly scheduler: IScheduler;
-
-    logger!: IScopedLogger;
-    /** Trace id of a action execution. */
-    traceId!: TraceId;
-    /** Name of a bot that executes this action. */
-    botName!: string;
-    /** Chat information. */
-    chatInfo!: ChatInfo;
-    /** Ordered collection of responses to be processed  */
-    responses: BotResponse[] = [];
-
-    isInitialized = false;
-
+export class ChatContext<
+    TActionState extends IActionState,
+    TAction extends IActionWithState<TActionState> = ScheduledAction<TActionState>
+> extends BaseContext<TAction> {
     constructor(storage: IStorageClient, scheduler: IScheduler) {
-        this.storage = storage;
-        this.scheduler = scheduler;
+        super(storage, scheduler);
     }
 
     protected createCaptureController(
@@ -71,24 +52,6 @@ export class ChatContext<TActionState extends IActionState> {
         };
     }
 
-    /**
-     * Loads state of another action for current chat.
-     * @param action Action to load state of.
-     * @template TAnotherActionState - Type of a state that is used by another action.
-     */
-    async loadStateOf<TAnotherActionState extends IActionState>(
-        action: IActionWithState<TAnotherActionState>
-    ) {
-        const allStates = await this.storage.load(action.key);
-        const stateForChat = allStates[this.chatInfo.id];
-
-        if (!stateForChat) {
-            return Object.freeze(action.stateConstructor());
-        }
-
-        return Object.freeze(stateForChat as TAnotherActionState);
-    }
-
     /**
      * Collection of actions that send something to chat as a standalone message.
      */

package/entities/context/inlineQueryContext.ts

@@ -1,27 +1,13 @@
 import { InlineQueryResult } from 'telegraf/types';
-import { IScopedLogger } from '../../types/logger';
 import { BotResponse } from '../../types/response';
 import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
-import { TraceId } from '../../types/trace';
 import { InlineQueryAction } from '../actions/inlineQueryAction';
 import { InlineQueryResponse } from '../../dtos/responses/inlineQueryResponse';
+import { BaseContext } from './baseContext';
 
-export class InlineQueryContext {
-    action!: InlineQueryAction;
+export class InlineQueryContext extends BaseContext<InlineQueryAction> {
     queryResults: InlineQueryResult[] = [];
-
-    /** Storage client instance for the bot executing this action. */
-    readonly storage: IStorageClient;
-    /** Scheduler instance for the bot executing this action */
-    readonly scheduler: IScheduler;
-
-    /** Logger instance for the bot executing this action */
-    logger!: IScopedLogger;
-    /** Trace id of a action execution. */
-    traceId!: TraceId;
-    /** Name of a bot that executes this action. */
-    botName!: string;
     /**
      * Abort signal to be utilized in query handler.
      * Signal will be aborted if new query comes from the same user.
@@ -46,11 +32,8 @@ export class InlineQueryContext {
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults: RegExpMatchArray[] = [];
 
-    isInitialized = false;
-
     constructor(storage: IStorageClient, scheduler: IScheduler) {
-        this.storage = storage;
-        this.scheduler = scheduler;
+        super(storage, scheduler);
     }
 
     /**

package/entities/context/messageContext.ts

@@ -17,13 +17,14 @@ import {
 } from '../../types/messageTypes';
 import { IScheduler } from '../../types/scheduler';
 import { ReplyInfo } from '../../dtos/replyInfo';
+import { CommandAction } from '../actions/commandAction';
 
 /**
  * Context of action executed in chat, in response to a message
  */
 export class MessageContext<
     TActionState extends IActionState
-> extends ChatContext<TActionState> {
+> extends ChatContext<TActionState, CommandAction<TActionState>> {
     /** Id of a message that triggered this action. */
     messageId!: number;
     /** Text of a message that triggered this action. */

package/entities/context/replyContext.ts

@@ -1,12 +1,10 @@
 import { TelegramEmoji } from 'telegraf/types';
-import { ChatInfo } from '../../dtos/chatInfo';
 import { ReplyInfo } from '../../dtos/replyInfo';
 import { ImageMessage } from '../../dtos/responses/imageMessage';
 import { Reaction } from '../../dtos/responses/reaction';
 import { TextMessage } from '../../dtos/responses/textMessage';
 import { VideoMessage } from '../../dtos/responses/videoMessage';
 import { IActionState } from '../../types/actionState';
-import { IScopedLogger } from '../../types/logger';
 import {
     TextMessageSendingOptions,
     MessageSendingOptions
@@ -15,32 +13,15 @@ import {
     MessageTypeValue,
     TelegrafContextMessage
 } from '../../types/messageTypes';
-import { BotResponse } from '../../types/response';
 import { IScheduler } from '../../types/scheduler';
 import { IStorageClient } from '../../types/storage';
-import { TraceId } from '../../types/trace';
 import { ReplyCaptureAction } from '../actions/replyCaptureAction';
 import { resolve } from 'path';
+import { BaseContext } from './baseContext';
 
-export class ReplyContext<TParentActionState extends IActionState> {
-    action!: ReplyCaptureAction<TParentActionState>;
-
-    /** Storage client instance for the bot executing this action. */
-    readonly storage: IStorageClient;
-    /** Scheduler instance for the bot executing this action */
-    readonly scheduler: IScheduler;
-
-    /** Trace id of a action execution. */
-    traceId!: TraceId;
-    /** Name of a bot that executes this action. */
-    botName!: string;
-    /** Logger instance for the bot executing this action */
-    logger!: IScopedLogger;
-
-    /** Ordered collection of responses to be processed  */
-    responses: BotResponse[] = [];
-    /** Chat information. */
-    chatInfo!: ChatInfo;
+export class ReplyContext<
+    TParentActionState extends IActionState
+> extends BaseContext<ReplyCaptureAction<TParentActionState>> {
     /** Collection of Regexp match results on a message that triggered this action. Will be empty if trigger is not a Regexp. */
     matchResults!: RegExpExecArray[];
     /** Id of a message that triggered this action. */
@@ -61,8 +42,7 @@ export class ReplyContext<TParentActionState extends IActionState> {
     isInitialized = false;
 
     constructor(storage: IStorageClient, scheduler: IScheduler) {
-        this.storage = storage;
-        this.scheduler = scheduler;
+        super(storage, scheduler);
     }
 
     private getQuotePart(quote: boolean | string) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chz-telegram-bot",
-    "version": "0.3.7",
+    "version": "0.3.9",
     "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/baseProcessor.ts

@@ -0,0 +1,60 @@
+import { Telegraf } from 'telegraf';
+import { ILogger } from '../../types/logger';
+import { IScheduler } from '../../types/scheduler';
+import { IStorageClient } from '../../types/storage';
+import { TelegramApiService } from '../telegramApi';
+import { IAction } from '../../types/action';
+import { BaseContext } from '../../entities/context/baseContext';
+
+export abstract class BaseActionProcessor {
+    protected readonly storage: IStorageClient;
+    protected readonly scheduler: IScheduler;
+    protected readonly logger: ILogger;
+
+    protected readonly botName: string;
+
+    protected api!: TelegramApiService;
+    protected telegraf!: Telegraf;
+
+    constructor(
+        botName: string,
+        storage: IStorageClient,
+        scheduler: IScheduler,
+        logger: ILogger
+    ) {
+        this.storage = storage;
+        this.scheduler = scheduler;
+        this.logger = logger;
+
+        this.botName = botName;
+    }
+
+    private defaultErrorHandler<
+        TAction extends IAction,
+        TActionContext extends BaseContext<TAction>
+    >(error: Error, ctx: TActionContext) {
+        ctx.logger.errorWithTraceId(error, ctx);
+    }
+
+    initializeDependencies(api: TelegramApiService, telegraf: Telegraf) {
+        this.api = api;
+        this.telegraf = telegraf;
+    }
+
+    async executeAction<
+        TAction extends IAction,
+        TActionContext extends BaseContext<TAction>
+    >(
+        action: TAction,
+        ctx: TActionContext,
+        errorHandler?: (error: Error, ctx: TActionContext) => void
+    ) {
+        try {
+            const responses = await action.exec(ctx);
+            this.api.enqueueBatchedResponses(responses);
+            ctx.isInitialized = false;
+        } catch (error) {
+            (errorHandler ?? this.defaultErrorHandler)(error as Error, ctx);
+        }
+    }
+}